From cd5ccd9c281233a37226165f2a1ee7bbb680f04f Mon Sep 17 00:00:00 2001 From: Chris Bagwell Date: Thu, 5 Mar 2009 14:47:29 +0000 Subject: [PATCH] Allow user to disable latex support. --- ChangeLog | 4 +++ configure | 69 ++++++++++++++++++++++++++++++++-------------------- configure.in | 19 +++++++++++---- 3 files changed, 60 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e4ba1a53..4dad77839 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-03-05 Chris Bagwell + * configure.in: Allow user to disable latex support; original + patch from Johnson Earls. + 2009-03-05 m. allan noah * doc/descriptions-external/epkowa.desc: update all broken urls diff --git a/configure b/configure index ae3d1fdc2..50f9da430 100755 --- a/configure +++ b/configure @@ -991,6 +991,7 @@ enable_local_backends enable_pnm_backend enable_parport_directio enable_translations +enable_latex ' ac_precious_vars='build_alias host_alias @@ -1675,6 +1676,8 @@ Optional Features: enable direct hardware access to the parallel port, so frontends will require special permission level --disable-translations don't install translations of backend options + --disable-latex disable use of latex, et.al., to generate + documentation Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -18671,7 +18674,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 18674 "configure"' > conftest.$ac_ext + echo '#line 18677 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -21551,11 +21554,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21554: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21557: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21558: \$? = $ac_status" >&5 + echo "$as_me:21561: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -21841,11 +21844,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21844: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21847: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21848: \$? = $ac_status" >&5 + echo "$as_me:21851: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -21945,11 +21948,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21948: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21951: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:21952: \$? = $ac_status" >&5 + echo "$as_me:21955: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -24347,7 +24350,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:26866: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:26867: \$? = $ac_status" >&5 + echo "$as_me:26870: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -26964,11 +26967,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:26967: $lt_compile\"" >&5) + (eval echo "\"\$as_me:26970: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:26971: \$? = $ac_status" >&5 + echo "$as_me:26974: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -28549,11 +28552,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:28552: $lt_compile\"" >&5) + (eval echo "\"\$as_me:28555: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:28556: \$? = $ac_status" >&5 + echo "$as_me:28559: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -28653,11 +28656,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:28656: $lt_compile\"" >&5) + (eval echo "\"\$as_me:28659: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:28660: \$? = $ac_status" >&5 + echo "$as_me:28663: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -30874,11 +30877,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:30877: $lt_compile\"" >&5) + (eval echo "\"\$as_me:30880: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:30881: \$? = $ac_status" >&5 + echo "$as_me:30884: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -31164,11 +31167,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:31167: $lt_compile\"" >&5) + (eval echo "\"\$as_me:31170: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:31171: \$? = $ac_status" >&5 + echo "$as_me:31174: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -31268,11 +31271,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:31271: $lt_compile\"" >&5) + (eval echo "\"\$as_me:31274: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:31275: \$? = $ac_status" >&5 + echo "$as_me:31278: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -34365,12 +34368,24 @@ else fi -if test "$LATEX" != "no" && test "$DVIPS" != "no" && test "$MAKEINDEX" != "no" ; then - USE_LATEX="yes" +# Check whether --enable-latex was given. +if test "${enable_latex+set}" = set; then + enableval=$enable_latex; else - USE_LATEX="no" + enable_latex=yes fi - if test x$USE_LATEX = xyes; then + +if test "x$enable_latex" = "xyes" ; then + if test "x$LATEX" = "xno" || test "x$DVIPS" = "xno" || test "x$MAKEINDEX" = "xno" ; then + enable_latex=no + echo "disabling latex (missing latex, dvips or makeindex)" + else + echo "enabling latex" + fi +else + echo "disabling latex" +fi + if test x$enable_latex = xyes; then USE_LATEX_TRUE= USE_LATEX_FALSE='#' else diff --git a/configure.in b/configure.in index 43b7f5f54..7cefa5549 100644 --- a/configure.in +++ b/configure.in @@ -646,12 +646,21 @@ else fi AM_CONDITIONAL(ENABLE_TRANSLATIONS, test x$enable_translations = xyes) -if test "$LATEX" != "no" && test "$DVIPS" != "no" && test "$MAKEINDEX" != "no" ; then - USE_LATEX="yes" +AC_ARG_ENABLE(latex, + AC_HELP_STRING([--disable-latex], + [disable use of latex, et.al., to generate documentation]),, + enable_latex=yes) +if test "x$enable_latex" = "xyes" ; then + if test "x$LATEX" = "xno" || test "x$DVIPS" = "xno" || test "x$MAKEINDEX" = "xno" ; then + enable_latex=no + echo "disabling latex (missing latex, dvips or makeindex)" + else + echo "enabling latex" + fi else - USE_LATEX="no" -fi -AM_CONDITIONAL(USE_LATEX, test x$USE_LATEX = xyes) + echo "disabling latex" +fi +AM_CONDITIONAL(USE_LATEX, test x$enable_latex = xyes) dnl *********************************************************************** dnl Write output files