From f87b81c36d13160b0f2ae9058c548061b4cef6ae Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 9 May 2009 14:49:21 +0000 Subject: build system: more utils/xindy/ and general cleanup git-svn-id: svn://tug.org/texlive/trunk@13020 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 72 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 20 deletions(-) (limited to 'Build/source/configure') diff --git a/Build/source/configure b/Build/source/configure index 476ecc73cc2..a25e1e36911 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -928,6 +928,9 @@ enable_t1utils enable_tpic2pdftex enable_vlna enable_xindy +enable_xindy_make_rules +enable_xindy_docs +with_xindy_recode enable_web2c with_editor enable_auto_core @@ -1704,6 +1707,9 @@ Optional Features: --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package --enable-xindy build the xindy package + --enable-xindy-make-rules build and install make-rules package (default is + YES) + --enable-xindy-docs build and install documentation (default is YES) --disable-web2c do not build the web2c (TeX & Co.) package --enable-auto-core cause TeX&MF to dump core, given a certain filename @@ -1796,6 +1802,8 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-xindy-recode For `xindy': use `recode' instead of `iconv' + (default is NO) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript @@ -2611,6 +2619,22 @@ $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;} ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'";; esac +## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## configure options for xindy +# Check whether --enable-xindy-make-rules was given. +if test "${enable_xindy_make_rules+set}" = set; then + enableval=$enable_xindy_make_rules; +fi +# Check whether --enable-xindy-docs was given. +if test "${enable_xindy_docs+set}" = set; then + enableval=$enable_xindy_docs; +fi + +# Check whether --with-xindy-recode was given. +if test "${with_xindy_recode+set}" = set; then + withval=$with_xindy_recode; +fi + ## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ @@ -5974,13 +5998,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5977: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6001: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5980: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6004: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5983: output\"" >&5) + (eval echo "\"\$as_me:6007: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7186,7 +7210,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7189 "configure"' > conftest.$ac_ext + echo '#line 7213 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9233,11 +9257,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:9236: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9260: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9240: \$? = $ac_status" >&5 + echo "$as_me:9264: \$? = $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. @@ -9572,11 +9596,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:9575: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9599: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9579: \$? = $ac_status" >&5 + echo "$as_me:9603: \$? = $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. @@ -9677,11 +9701,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:9680: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9704: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9684: \$? = $ac_status" >&5 + echo "$as_me:9708: \$? = $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 @@ -9732,11 +9756,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:9735: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9759: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9739: \$? = $ac_status" >&5 + echo "$as_me:9763: \$? = $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 @@ -12532,7 +12556,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12535 "configure" +#line 12559 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12628,7 +12652,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12631 "configure" +#line 12655 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19024,11 +19048,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:19027: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19051: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19031: \$? = $ac_status" >&5 + echo "$as_me:19055: \$? = $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. @@ -19123,11 +19147,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:19126: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19150: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19130: \$? = $ac_status" >&5 + echo "$as_me:19154: \$? = $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 @@ -19175,11 +19199,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:19178: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19202: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19182: \$? = $ac_status" >&5 + echo "$as_me:19206: \$? = $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 @@ -20303,6 +20327,10 @@ fi if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` FREETYPE2_LIBS=`$FT2_CONFIG --libs` +elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then + { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5 +$as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;} + { (exit 1); exit 1; }; } fi if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then @@ -20409,6 +20437,10 @@ if $PKG_CONFIG poppler --atleast-version=0.10; then POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" XPDF_LIBS=`$PKG_CONFIG poppler --libs` +elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then + { { $as_echo "$as_me:$LINENO: error: did not find poppler-0.10 or better" >&5 +$as_echo "$as_me: error: did not find poppler-0.10 or better" >&2;} + { (exit 1); exit 1; }; } fi if test "x$with_graphite_includes" != x && test "x$with_graphite_includes" != xyes; then -- cgit v1.2.3