diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-04-16 09:43:14 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-04-16 09:43:14 +0000 |
commit | 3ba06bc5a98bfc651ab7ec896205727f7373045d (patch) | |
tree | a656831d5fc8b8fc2714314c2908b7bea55a72cc /Build/source/texk/web2c | |
parent | 900bee30486216b7356a1f3756f00277318c18a7 (diff) |
build system update
git-svn-id: svn://tug.org/texlive/trunk@17891 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rwxr-xr-x | Build/source/texk/web2c/configure | 73 |
1 files changed, 53 insertions, 20 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 8813cc632e3..eb0831a7d5d 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -1043,6 +1043,9 @@ with_x with_system_kpathsea with_kpathsea_includes with_kpathsea_libdir +with_system_ptexenc +with_ptexenc_includes +with_ptexenc_libdir with_system_zlib with_zlib_includes with_zlib_libdir @@ -1760,6 +1763,11 @@ Optional Packages: kpathsea headers installed in DIR --with-kpathsea-libdir=DIR kpathsea library installed in DIR + --with-system-ptexenc use installed ptexenc headers and library + --with-ptexenc-includes=DIR + ptexenc headers installed in DIR + --with-ptexenc-libdir=DIR + ptexenc library installed in DIR --with-system-zlib use installed zlib headers and library --with-zlib-includes=DIR zlib headers installed in DIR @@ -5235,13 +5243,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:5238: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5246: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5241: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5249: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5244: output\"" >&5) + (eval echo "\"\$as_me:5252: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6444,7 +6452,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6447 "configure"' > conftest.$ac_ext + echo '#line 6455 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8374,11 +8382,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:8377: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8385: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8381: \$? = $ac_status" >&5 + echo "$as_me:8389: \$? = $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. @@ -8713,11 +8721,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:8716: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8724: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8720: \$? = $ac_status" >&5 + echo "$as_me:8728: \$? = $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. @@ -8818,11 +8826,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:8821: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8829: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8825: \$? = $ac_status" >&5 + echo "$as_me:8833: \$? = $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 @@ -8873,11 +8881,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:8876: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8884: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8880: \$? = $ac_status" >&5 + echo "$as_me:8888: \$? = $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 @@ -11240,7 +11248,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11243 "configure" +#line 11251 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11336,7 +11344,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11339 "configure" +#line 11347 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15137,11 +15145,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:15140: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15148: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15144: \$? = $ac_status" >&5 + echo "$as_me:15152: \$? = $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. @@ -15236,11 +15244,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:15239: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15247: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15243: \$? = $ac_status" >&5 + echo "$as_me:15251: \$? = $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 @@ -15288,11 +15296,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:15291: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15299: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15295: \$? = $ac_status" >&5 + echo "$as_me:15303: \$? = $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 @@ -21194,6 +21202,30 @@ if test "x$kpse_cv_kpse_debug" != xyes; then : fi ## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags + +# Check whether --with-system-ptexenc was given. +if test "${with_system_ptexenc+set}" = set; then : + withval=$with_system_ptexenc; +fi + +# Check whether --with-ptexenc-includes was given. +if test "${with_ptexenc_includes+set}" = set; then : + withval=$with_ptexenc_includes; +fi + +# Check whether --with-ptexenc-libdir was given. +if test "${with_ptexenc_libdir+set}" = set; then : + withval=$with_ptexenc_libdir; +fi +if test "x$with_system_ptexenc" = xyes; then + if test "x$with_ptexenc_includes" != x && test "x$with_ptexenc_includes" != xyes; then + PTEXENC_INCLUDES="-I$with_ptexenc_includes" +fi +PTEXENC_LIBS="-lptexenc" +if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; then + PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS" +fi +else PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` @@ -21207,6 +21239,7 @@ $(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/pt cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../ptexenc/ptexenc.h: cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild' +fi ## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags |