From eb5da0fa2dab043786ca8eca9ed5df4453633c4f Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 12 Apr 2010 16:37:51 +0000 Subject: regenerated files git-svn-id: svn://tug.org/texlive/trunk@17820 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 56 ++++++++++++++------------------------ Build/source/texk/ChangeLog | 2 +- Build/source/texk/configure | 16 ----------- Build/source/texk/dvipng/configure | 15 +++++----- Build/source/utils/configure | 16 ----------- 5 files changed, 28 insertions(+), 77 deletions(-) diff --git a/Build/source/configure b/Build/source/configure index 08e821d9fbe..6327b08d73c 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -912,7 +912,6 @@ enable_ipc enable_omfonts enable_tex enable_etex -enable_ptex enable_aleph enable_pdftex enable_luatex @@ -1696,7 +1695,6 @@ Optional Features: versions) --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX - --disable-ptex do not compile and install pTeX --disable-aleph do not compile and install Aleph --disable-pdftex do not compile and install pdfTeX --disable-luatex do not compile and install luaTeX @@ -3446,20 +3444,6 @@ case $enable_etex in #( *) : enable_etex=no ;; esac -# Check whether --enable-ptex was given. -if test "${enable_ptex+set}" = set; then : - enableval=$enable_ptex; -fi -case $enable_ptex in #( - yes|no) : - ;; #( - *) : - enable_ptex=yes ;; -esac - -test "x$enable_web2c:$enable_ptex" = xyes:yes && { - need_ptexenc=yes -} # Check whether --enable-aleph was given. if test "${enable_aleph+set}" = set; then : enableval=$enable_aleph; @@ -7047,13 +7031,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:7050: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7034: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7053: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7037: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7056: output\"" >&5) + (eval echo "\"\$as_me:7040: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -8256,7 +8240,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8259 "configure"' > conftest.$ac_ext + echo '#line 8243 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10186,11 +10170,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:10189: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10173: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10193: \$? = $ac_status" >&5 + echo "$as_me:10177: \$? = $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. @@ -10525,11 +10509,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:10528: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10512: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10532: \$? = $ac_status" >&5 + echo "$as_me:10516: \$? = $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. @@ -10630,11 +10614,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:10633: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10617: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10637: \$? = $ac_status" >&5 + echo "$as_me:10621: \$? = $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 @@ -10685,11 +10669,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:10688: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10672: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10692: \$? = $ac_status" >&5 + echo "$as_me:10676: \$? = $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 @@ -13052,7 +13036,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13055 "configure" +#line 13039 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13148,7 +13132,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13151 "configure" +#line 13135 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17633,11 +17617,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:17636: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17620: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17640: \$? = $ac_status" >&5 + echo "$as_me:17624: \$? = $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. @@ -17732,11 +17716,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:17735: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17719: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17739: \$? = $ac_status" >&5 + echo "$as_me:17723: \$? = $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 @@ -17784,11 +17768,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:17787: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17771: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17791: \$? = $ac_status" >&5 + echo "$as_me:17775: \$? = $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/texk/ChangeLog b/Build/source/texk/ChangeLog index 520d6125aab..c1e9486260a 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -945,7 +945,7 @@ Thu Feb 24 13:54:36 1994 Karl Berry (karl@cs.umb.edu) Mon Feb 21 13:32:30 1994 Karl Berry (karl@cs.umb.edu) - * Makefile.in (triptrap ...): Defpend on do-kpathsea, to help + * Makefile.in (triptrap ...): Depend on do-kpathsea, to help propagate the paths. From Martyn. * configure.in: Merge srcdir ==/!= . cases. diff --git a/Build/source/texk/configure b/Build/source/texk/configure index d69f255e94e..e19ea5a8ab6 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -667,7 +667,6 @@ enable_ipc enable_omfonts enable_tex enable_etex -enable_ptex enable_aleph enable_pdftex enable_luatex @@ -1458,7 +1457,6 @@ Optional Features: versions) --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX - --disable-ptex do not compile and install pTeX --disable-aleph do not compile and install Aleph --disable-pdftex do not compile and install pdfTeX --disable-luatex do not compile and install luaTeX @@ -2589,20 +2587,6 @@ case $enable_etex in #( *) : enable_etex=no ;; esac -# Check whether --enable-ptex was given. -if test "${enable_ptex+set}" = set; then : - enableval=$enable_ptex; -fi -case $enable_ptex in #( - yes|no) : - ;; #( - *) : - enable_ptex=yes ;; -esac - -test "x$enable_web2c:$enable_ptex" = xyes:yes && { - need_ptexenc=yes -} # Check whether --enable-aleph was given. if test "${enable_aleph+set}" = set; then : enableval=$enable_aleph; diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index bc8c5073c4d..582474e9998 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -2183,11 +2183,11 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default - enum { N = $2 / 2 - 1 }; int main () { -static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; +static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 }; + 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; test_array [0] = 0 ; @@ -2198,11 +2198,11 @@ if ac_fn_c_try_compile "$LINENO"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default - enum { N = $2 / 2 - 1 }; int main () { -static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) +static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 }; + ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; test_array [0] = 0 @@ -13260,7 +13260,6 @@ int main () { char *data, *data2, *data3; - const char *cdata2; int i, pagesize; int fd, fd2; @@ -13285,10 +13284,10 @@ main () fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); if (fd2 < 0) return 4; - cdata2 = ""; - if (write (fd2, cdata2, 1) != 1) + data2 = ""; + if (write (fd2, data2, 1) != 1) return 5; - data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); if (data2 == MAP_FAILED) return 6; for (i = 0; i < pagesize; ++i) diff --git a/Build/source/utils/configure b/Build/source/utils/configure index e43a49ce1f8..a6cda4be57e 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -667,7 +667,6 @@ enable_ipc enable_omfonts enable_tex enable_etex -enable_ptex enable_aleph enable_pdftex enable_luatex @@ -1433,7 +1432,6 @@ Optional Features: versions) --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX - --disable-ptex do not compile and install pTeX --disable-aleph do not compile and install Aleph --disable-pdftex do not compile and install pdfTeX --disable-luatex do not compile and install luaTeX @@ -2564,20 +2562,6 @@ case $enable_etex in #( *) : enable_etex=no ;; esac -# Check whether --enable-ptex was given. -if test "${enable_ptex+set}" = set; then : - enableval=$enable_ptex; -fi -case $enable_ptex in #( - yes|no) : - ;; #( - *) : - enable_ptex=yes ;; -esac - -test "x$enable_web2c:$enable_ptex" = xyes:yes && { - need_ptexenc=yes -} # Check whether --enable-aleph was given. if test "${enable_aleph+set}" = set; then : enableval=$enable_aleph; -- cgit v1.2.3