From a221d478c0af19226e1086b2d5381f6d3abdf2c9 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 2 Mar 2010 13:00:44 +0000 Subject: build system: adapt to GNU M4 1.4.14 git-svn-id: svn://tug.org/texlive/trunk@17287 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 88 ++++++++++++++++++------------------ Build/source/libs/configure | 48 ++++++++++---------- Build/source/m4/kpse-gd-flags.m4 | 2 +- Build/source/m4/kpse-web2c.m4 | 8 ++-- Build/source/texk/configure | 48 ++++++++++---------- Build/source/texk/kpathsea/configure | 45 +++++++++--------- Build/source/texk/web2c/ac/web2c.ac | 4 +- Build/source/texk/web2c/configure | 71 +++++++++++++++-------------- Build/source/utils/configure | 48 ++++++++++---------- 9 files changed, 176 insertions(+), 186 deletions(-) diff --git a/Build/source/configure b/Build/source/configure index 1d29952a4ea..575acd66f82 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1687,23 +1687,23 @@ Optional Features: program --disable-omfonts do not compile and install omfonts (use Web2C versions) - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX - --disable-xetex do not compile and install XeTeX + --disable-tex do not compile and install TeX + --enable-etex compile and install e-TeX + --disable-aleph do not compile and install Aleph + --disable-pdftex do not compile and install pdfTeX + --disable-luatex do not compile and install luaTeX + --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --disable-mf-nowin do not build a separate non-windows-capable - METAFONT - --enable-epsfwin include EPSF pseudo window support - --enable-hp2627win include HP 2627 window support - --enable-mftalkwin include mftalk (generic server) window support - --enable-nextwin include NeXT window support - --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (not X) window support - --enable-tektronixwin include Tektronix window support - --enable-unitermwin include Uniterm window support + --disable-mf-nowin do not build a separate non-windows-capable + METAFONT + --enable-epsfwin include EPSF pseudo window support + --enable-hp2627win include HP 2627 window support + --enable-mftalkwin include mftalk (generic server) window support + --enable-nextwin include NeXT window support + --enable-regiswin include Regis window support + --enable-suntoolswin include old Suntools (not X) window support + --enable-tektronixwin include Tektronix window support + --enable-unitermwin include Uniterm window support --disable-mp do not build METAPOST --disable-web-progs do not build WEB programs bibtex ... weave --disable-afm2pl do not build the afm2pl package @@ -1753,15 +1753,13 @@ Optional Features: --disable-xdvipdfmx do not build the xdvipdfmx package --disable-tetex do not build the tetex (teTeX scripts) package --disable-texlive do not build the texlive (TeX Live scripts) package - --disable-mktexmf-default do not run mktexmf if MF source missing - --disable-mktexpk-default do not run mktexpk if PK font missing - --disable-mktextfm-default - do not run mktextfm if TFM file missing - --disable-mkocp-default do not run mkocp if OCP file missing - --disable-mkofm-default do not run mkofm if OFM file missing - --disable-mktexfmt-default - do not run mktexfmt if format file missing - --enable-mktextex-default run mktextex if TeX source missing + --disable-mktexmf-default do not run mktexmf if MF source missing + --disable-mktexpk-default do not run mktexpk if PK font missing + --disable-mktextfm-default do not run mktextfm if TFM file missing + --disable-mkocp-default do not run mkocp if OCP file missing + --disable-mkofm-default do not run mkofm if OFM file missing + --disable-mktexfmt-default do not run mktexfmt if format file missing + --enable-mktextex-default run mktextex if TeX source missing --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-shared[=PKGS] build shared libraries [default=yes] @@ -6905,13 +6903,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:6908: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6906: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6911: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6909: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6914: output\"" >&5) + (eval echo "\"\$as_me:6912: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -8114,7 +8112,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8117 "configure"' > conftest.$ac_ext + echo '#line 8115 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10044,11 +10042,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:10047: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10045: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10051: \$? = $ac_status" >&5 + echo "$as_me:10049: \$? = $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. @@ -10383,11 +10381,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:10386: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10384: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10390: \$? = $ac_status" >&5 + echo "$as_me:10388: \$? = $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. @@ -10488,11 +10486,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:10491: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10489: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10495: \$? = $ac_status" >&5 + echo "$as_me:10493: \$? = $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 @@ -10543,11 +10541,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:10546: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10544: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10550: \$? = $ac_status" >&5 + echo "$as_me:10548: \$? = $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 @@ -12910,7 +12908,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12913 "configure" +#line 12911 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13006,7 +13004,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13009 "configure" +#line 13007 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17480,11 +17478,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:17483: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17481: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17487: \$? = $ac_status" >&5 + echo "$as_me:17485: \$? = $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. @@ -17579,11 +17577,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:17582: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17580: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17586: \$? = $ac_status" >&5 + echo "$as_me:17584: \$? = $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 @@ -17631,11 +17629,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:17634: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17632: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17638: \$? = $ac_status" >&5 + echo "$as_me:17636: \$? = $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 diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 91b7da626d8..d8bf46ebab8 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -1429,23 +1429,23 @@ Optional Features: program --disable-omfonts do not compile and install omfonts (use Web2C versions) - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX - --disable-xetex do not compile and install XeTeX + --disable-tex do not compile and install TeX + --enable-etex compile and install e-TeX + --disable-aleph do not compile and install Aleph + --disable-pdftex do not compile and install pdfTeX + --disable-luatex do not compile and install luaTeX + --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --disable-mf-nowin do not build a separate non-windows-capable - METAFONT - --enable-epsfwin include EPSF pseudo window support - --enable-hp2627win include HP 2627 window support - --enable-mftalkwin include mftalk (generic server) window support - --enable-nextwin include NeXT window support - --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (not X) window support - --enable-tektronixwin include Tektronix window support - --enable-unitermwin include Uniterm window support + --disable-mf-nowin do not build a separate non-windows-capable + METAFONT + --enable-epsfwin include EPSF pseudo window support + --enable-hp2627win include HP 2627 window support + --enable-mftalkwin include mftalk (generic server) window support + --enable-nextwin include NeXT window support + --enable-regiswin include Regis window support + --enable-suntoolswin include old Suntools (not X) window support + --enable-tektronixwin include Tektronix window support + --enable-unitermwin include Uniterm window support --disable-mp do not build METAPOST --disable-web-progs do not build WEB programs bibtex ... weave --disable-afm2pl do not build the afm2pl package @@ -1495,15 +1495,13 @@ Optional Features: --disable-xdvipdfmx do not build the xdvipdfmx package --disable-tetex do not build the tetex (teTeX scripts) package --disable-texlive do not build the texlive (TeX Live scripts) package - --disable-mktexmf-default do not run mktexmf if MF source missing - --disable-mktexpk-default do not run mktexpk if PK font missing - --disable-mktextfm-default - do not run mktextfm if TFM file missing - --disable-mkocp-default do not run mkocp if OCP file missing - --disable-mkofm-default do not run mkofm if OFM file missing - --disable-mktexfmt-default - do not run mktexfmt if format file missing - --enable-mktextex-default run mktextex if TeX source missing + --disable-mktexmf-default do not run mktexmf if MF source missing + --disable-mktexpk-default do not run mktexpk if PK font missing + --disable-mktextfm-default do not run mktextfm if TFM file missing + --disable-mkocp-default do not run mkocp if OCP file missing + --disable-mkofm-default do not run mkofm if OFM file missing + --disable-mktexfmt-default do not run mktexfmt if format file missing + --enable-mktextex-default run mktextex if TeX source missing --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer diff --git a/Build/source/m4/kpse-gd-flags.m4 b/Build/source/m4/kpse-gd-flags.m4 index 8501fb25728..db5213bd751 100644 --- a/Build/source/m4/kpse-gd-flags.m4 +++ b/Build/source/m4/kpse-gd-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009 Peter Breitenlohner +# Copyright (C) 2009, 2010 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, diff --git a/Build/source/m4/kpse-web2c.m4 b/Build/source/m4/kpse-web2c.m4 index 7f73ea92e0c..e6380c8fccb 100644 --- a/Build/source/m4/kpse-web2c.m4 +++ b/Build/source/m4/kpse-web2c.m4 @@ -1,5 +1,5 @@ # Private macros for the TeX Live (TL) tree. -# Copyright (C) 2009 Peter Breitenlohner +# Copyright (C) 2009, 2010 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ m4_define([KPSE_WITH_MKTEX], AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1-default], m4_if($2, [yes], [do not ])[run $1 if $3 missing], - kpse_indent_26+2))[]dnl + m4_eval(kpse_indent_26+2)))[]dnl AS_CASE([$enable_$1_default], [yes|no], , [enable_$1_default=$2]) ]) # KPSE_WITH_MKTEX @@ -44,7 +44,7 @@ m4_define([KPSE_WITH_XTEX], AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1], m4_if($2, [yes], [do not ])[compile and install $4], - kpse_indent_26+2))[]dnl + m4_eval(kpse_indent_26+2)))[]dnl AS_CASE([$enable_$1], [yes|no], , [enable_$1=$2]) m4_ifval([$5], [ @@ -69,7 +69,7 @@ m4_define([KPSE_WITH_MFWIN], [AC_ARG_ENABLE([$1win], AS_HELP_STRING([--enable-$1win], [include $3 window support], - kpse_indent_26+2))[]dnl + m4_eval(kpse_indent_26+2)))[]dnl ]) # KPSE_WITH_MFWIN # KPSE_MFWIN_DEFINE(WINDOW, DEFINE, TEXT) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 6244a87c760..805097c6ecb 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -1448,23 +1448,23 @@ Optional Features: program --disable-omfonts do not compile and install omfonts (use Web2C versions) - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX - --disable-xetex do not compile and install XeTeX + --disable-tex do not compile and install TeX + --enable-etex compile and install e-TeX + --disable-aleph do not compile and install Aleph + --disable-pdftex do not compile and install pdfTeX + --disable-luatex do not compile and install luaTeX + --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --disable-mf-nowin do not build a separate non-windows-capable - METAFONT - --enable-epsfwin include EPSF pseudo window support - --enable-hp2627win include HP 2627 window support - --enable-mftalkwin include mftalk (generic server) window support - --enable-nextwin include NeXT window support - --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (not X) window support - --enable-tektronixwin include Tektronix window support - --enable-unitermwin include Uniterm window support + --disable-mf-nowin do not build a separate non-windows-capable + METAFONT + --enable-epsfwin include EPSF pseudo window support + --enable-hp2627win include HP 2627 window support + --enable-mftalkwin include mftalk (generic server) window support + --enable-nextwin include NeXT window support + --enable-regiswin include Regis window support + --enable-suntoolswin include old Suntools (not X) window support + --enable-tektronixwin include Tektronix window support + --enable-unitermwin include Uniterm window support --disable-mp do not build METAPOST --disable-web-progs do not build WEB programs bibtex ... weave --disable-afm2pl do not build the afm2pl package @@ -1514,15 +1514,13 @@ Optional Features: --disable-xdvipdfmx do not build the xdvipdfmx package --disable-tetex do not build the tetex (teTeX scripts) package --disable-texlive do not build the texlive (TeX Live scripts) package - --disable-mktexmf-default do not run mktexmf if MF source missing - --disable-mktexpk-default do not run mktexpk if PK font missing - --disable-mktextfm-default - do not run mktextfm if TFM file missing - --disable-mkocp-default do not run mkocp if OCP file missing - --disable-mkofm-default do not run mkofm if OFM file missing - --disable-mktexfmt-default - do not run mktexfmt if format file missing - --enable-mktextex-default run mktextex if TeX source missing + --disable-mktexmf-default do not run mktexmf if MF source missing + --disable-mktexpk-default do not run mktexpk if PK font missing + --disable-mktextfm-default do not run mktextfm if TFM file missing + --disable-mkocp-default do not run mkocp if OCP file missing + --disable-mkofm-default do not run mkofm if OFM file missing + --disable-mktexfmt-default do not run mktexfmt if format file missing + --enable-mktextex-default run mktextex if TeX source missing --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure index 4c5370bec2a..7530565200e 100755 --- a/Build/source/texk/kpathsea/configure +++ b/Build/source/texk/kpathsea/configure @@ -1526,18 +1526,15 @@ Optional Features: --enable-compiler-warnings=[no|min|yes|max|all] Turn on compiler warnings [default: yes if maintainer-mode, min otherwise] - --disable-mktexmf-default - do not run mktexmf if MF source missing - --disable-mktexpk-default - do not run mktexpk if PK font missing + --disable-mktexmf-default do not run mktexmf if MF source missing + --disable-mktexpk-default do not run mktexpk if PK font missing --disable-mktextfm-default - do not run mktextfm if TFM file missing - --disable-mkocp-default do not run mkocp if OCP file missing - --disable-mkofm-default do not run mkofm if OFM file missing + do not run mktextfm if TFM file missing + --disable-mkocp-default do not run mkocp if OCP file missing + --disable-mkofm-default do not run mkofm if OFM file missing --disable-mktexfmt-default - do not run mktexfmt if format file missing - --enable-mktextex-default - run mktextex if TeX source missing + do not run mktexfmt if format file missing + --enable-mktextex-default run mktextex if TeX source missing Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -4546,13 +4543,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:4549: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4546: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4552: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4549: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4555: output\"" >&5) + (eval echo "\"\$as_me:4552: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5755,7 +5752,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5758 "configure"' > conftest.$ac_ext + echo '#line 5755 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7685,11 +7682,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:7688: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7685: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7692: \$? = $ac_status" >&5 + echo "$as_me:7689: \$? = $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. @@ -8024,11 +8021,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:8027: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8024: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8031: \$? = $ac_status" >&5 + echo "$as_me:8028: \$? = $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. @@ -8129,11 +8126,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:8132: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8129: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8136: \$? = $ac_status" >&5 + echo "$as_me:8133: \$? = $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 @@ -8184,11 +8181,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:8187: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8184: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8191: \$? = $ac_status" >&5 + echo "$as_me:8188: \$? = $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 @@ -10551,7 +10548,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10554 "configure" +#line 10551 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10647,7 +10644,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10650 "configure" +#line 10647 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index 4bcb9cefebb..c25b056050d 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -1,6 +1,6 @@ ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ dnl -dnl Copyright (C) 2009 Peter Breitenlohner +dnl Copyright (C) 2009, 2010 Peter Breitenlohner dnl You may freely use, modify and/or distribute this file. dnl ## configure options for TeX and MF @@ -47,7 +47,7 @@ AC_ARG_ENABLE([mf], AC_ARG_ENABLE([mf-nowin], AS_HELP_STRING([--disable-mf-nowin], [do not build a separate non-windows-capable METAFONT], - kpse_indent_26+2))[]dnl + m4_eval(kpse_indent_26+2)))[]dnl AC_ARG_WITH([mf-x-toolkit], AS_HELP_STRING([--without-mf-x-toolkit], [do not use X toolkit for METAFONT]))[]dnl diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 8da471bb500..8217cde183c 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -1710,22 +1710,23 @@ Optional Features: --disable-ipc disable TeX's --ipc option, i.e., pipe to a program --disable-omfonts do not compile and install omfonts (use Web2C versions) - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX - --disable-xetex do not compile and install XeTeX + --disable-tex do not compile and install TeX + --enable-etex compile and install e-TeX + --disable-aleph do not compile and install Aleph + --disable-pdftex do not compile and install pdfTeX + --disable-luatex do not compile and install luaTeX + --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --disable-mf-nowin do not build a separate non-windows-capable METAFONT - --enable-epsfwin include EPSF pseudo window support - --enable-hp2627win include HP 2627 window support - --enable-mftalkwin include mftalk (generic server) window support - --enable-nextwin include NeXT window support - --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (not X) window support - --enable-tektronixwin include Tektronix window support - --enable-unitermwin include Uniterm window support + --disable-mf-nowin do not build a separate non-windows-capable + METAFONT + --enable-epsfwin include EPSF pseudo window support + --enable-hp2627win include HP 2627 window support + --enable-mftalkwin include mftalk (generic server) window support + --enable-nextwin include NeXT window support + --enable-regiswin include Regis window support + --enable-suntoolswin include old Suntools (not X) window support + --enable-tektronixwin include Tektronix window support + --enable-unitermwin include Uniterm window support --disable-mp do not build METAPOST --disable-web-progs do not build WEB programs bibtex ... weave --disable-missing terminate if a requested program or feature must be @@ -5171,13 +5172,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:5174: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5175: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5177: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5178: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5180: output\"" >&5) + (eval echo "\"\$as_me:5181: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6380,7 +6381,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6383 "configure"' > conftest.$ac_ext + echo '#line 6384 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8310,11 +8311,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:8313: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8314: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8317: \$? = $ac_status" >&5 + echo "$as_me:8318: \$? = $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. @@ -8649,11 +8650,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:8652: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8653: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8656: \$? = $ac_status" >&5 + echo "$as_me:8657: \$? = $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. @@ -8754,11 +8755,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:8757: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8758: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8761: \$? = $ac_status" >&5 + echo "$as_me:8762: \$? = $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 @@ -8809,11 +8810,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:8812: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8813: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8816: \$? = $ac_status" >&5 + echo "$as_me:8817: \$? = $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 @@ -11176,7 +11177,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11179 "configure" +#line 11180 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11272,7 +11273,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11275 "configure" +#line 11276 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15062,11 +15063,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:15065: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15066: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15069: \$? = $ac_status" >&5 + echo "$as_me:15070: \$? = $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. @@ -15161,11 +15162,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:15164: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15165: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15168: \$? = $ac_status" >&5 + echo "$as_me:15169: \$? = $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 @@ -15213,11 +15214,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:15216: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15217: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15220: \$? = $ac_status" >&5 + echo "$as_me:15221: \$? = $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 diff --git a/Build/source/utils/configure b/Build/source/utils/configure index c5b5fc438b1..f3952fc3003 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -1426,23 +1426,23 @@ Optional Features: program --disable-omfonts do not compile and install omfonts (use Web2C versions) - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX - --disable-xetex do not compile and install XeTeX + --disable-tex do not compile and install TeX + --enable-etex compile and install e-TeX + --disable-aleph do not compile and install Aleph + --disable-pdftex do not compile and install pdfTeX + --disable-luatex do not compile and install luaTeX + --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --disable-mf-nowin do not build a separate non-windows-capable - METAFONT - --enable-epsfwin include EPSF pseudo window support - --enable-hp2627win include HP 2627 window support - --enable-mftalkwin include mftalk (generic server) window support - --enable-nextwin include NeXT window support - --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (not X) window support - --enable-tektronixwin include Tektronix window support - --enable-unitermwin include Uniterm window support + --disable-mf-nowin do not build a separate non-windows-capable + METAFONT + --enable-epsfwin include EPSF pseudo window support + --enable-hp2627win include HP 2627 window support + --enable-mftalkwin include mftalk (generic server) window support + --enable-nextwin include NeXT window support + --enable-regiswin include Regis window support + --enable-suntoolswin include old Suntools (not X) window support + --enable-tektronixwin include Tektronix window support + --enable-unitermwin include Uniterm window support --disable-mp do not build METAPOST --disable-web-progs do not build WEB programs bibtex ... weave --disable-afm2pl do not build the afm2pl package @@ -1492,15 +1492,13 @@ Optional Features: --disable-xdvipdfmx do not build the xdvipdfmx package --disable-tetex do not build the tetex (teTeX scripts) package --disable-texlive do not build the texlive (TeX Live scripts) package - --disable-mktexmf-default do not run mktexmf if MF source missing - --disable-mktexpk-default do not run mktexpk if PK font missing - --disable-mktextfm-default - do not run mktextfm if TFM file missing - --disable-mkocp-default do not run mkocp if OCP file missing - --disable-mkofm-default do not run mkofm if OFM file missing - --disable-mktexfmt-default - do not run mktexfmt if format file missing - --enable-mktextex-default run mktextex if TeX source missing + --disable-mktexmf-default do not run mktexmf if MF source missing + --disable-mktexpk-default do not run mktexpk if PK font missing + --disable-mktextfm-default do not run mktextfm if TFM file missing + --disable-mkocp-default do not run mkocp if OCP file missing + --disable-mkofm-default do not run mkofm if OFM file missing + --disable-mktexfmt-default do not run mktexfmt if format file missing + --enable-mktextex-default run mktextex if TeX source missing --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer -- cgit v1.2.3