From 09950a732cfa76559d18b3540d69bf7eed235171 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 16 Nov 2009 09:51:30 +0000 Subject: build system: --enable-libtool-hack to prvent linking with dependency_libs git-svn-id: svn://tug.org/texlive/trunk@16027 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/Makefile.in | 1 + Build/source/README.config | 13 ++-- Build/source/aclocal.m4 | 1 + Build/source/configure | 83 ++++++++++++++-------- Build/source/configure.ac | 12 ++-- Build/source/libs/Makefile.in | 1 + Build/source/libs/aclocal.m4 | 1 + Build/source/libs/configure | 19 +++++ Build/source/libs/icu/icu-4.2.1-PATCHES/TL-Changes | 5 ++ Build/source/m4/kpse-cxx-hack.m4 | 2 +- Build/source/m4/kpse-lt-hack.m4 | 37 ++++++++++ Build/source/m4/kpse-setup.m4 | 8 +++ Build/source/texk/Makefile.in | 1 + Build/source/texk/aclocal.m4 | 1 + Build/source/texk/configure | 19 +++++ Build/source/texk/web2c/Makefile.in | 1 + Build/source/texk/web2c/aclocal.m4 | 1 + Build/source/texk/web2c/configure | 67 +++++++++++------ Build/source/texk/web2c/configure.ac | 1 + Build/source/texk/web2c/doc/Makefile.in | 1 + Build/source/texk/web2c/lib/Makefile.in | 1 + Build/source/texk/web2c/man/Makefile.in | 1 + Build/source/texk/web2c/omegafonts/Makefile.in | 1 + Build/source/texk/web2c/otps/Makefile.in | 1 + Build/source/texk/web2c/window/Makefile.in | 1 + Build/source/texk/xdv2pdf/configure | 8 +-- Build/source/texk/xdv2pdf/configure.ac | 8 +-- Build/source/texk/xdvipdfmx/Makefile.in | 1 + Build/source/texk/xdvipdfmx/aclocal.m4 | 1 + Build/source/texk/xdvipdfmx/config.h.in | 4 +- Build/source/texk/xdvipdfmx/configure | 64 ++++++++++++----- Build/source/texk/xdvipdfmx/configure.ac | 14 ++-- Build/source/texk/xdvipdfmx/src/Makefile.in | 1 + Build/source/utils/Makefile.in | 1 + Build/source/utils/aclocal.m4 | 1 + Build/source/utils/configure | 19 +++++ 36 files changed, 308 insertions(+), 94 deletions(-) create mode 100644 Build/source/m4/kpse-lt-hack.m4 (limited to 'Build/source') diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index f51ed5b1614..6a4f8beba01 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \ $(top_srcdir)/m4/kpse-icu-flags.m4 \ $(top_srcdir)/m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/m4/kpse-lt-hack.m4 \ $(top_srcdir)/m4/kpse-options.m4 $(top_srcdir)/m4/kpse-pkgs.m4 \ $(top_srcdir)/m4/kpse-setup.m4 \ $(top_srcdir)/m4/kpse-t1lib-flags.m4 \ diff --git a/Build/source/README.config b/Build/source/README.config index b9e6a6a1c63..2175fe3e901 100644 --- a/Build/source/README.config +++ b/Build/source/README.config @@ -57,19 +57,24 @@ any program or library package. If enabled and when using g++, try to statically link with libstc++, somewhat improving portability. -1.4. --enable-shared +1.4. --enable-libtool-hack +-------------------------- +If enabled (by default for linux and solaris) prevents libtool from linking +explicitly with dependency_libs. + +1.5. --enable-shared --------------------- Build a shared Kpathsea library (not allowed for a TeX Live native build). -1.5. --disable-largefile +1.6. --disable-largefile ------------------------ Omit support for large files (>=2GB). -1.6. --without-x +1.7. --without-x ---------------- Do not use the X Window System. -1.7. --enable-compiler-warnings=[no|min|yes|max|all] +1.8. --enable-compiler-warnings=[no|min|yes|max|all] ---------------------------------------------------- Enable various degrees of compiler warnings for C and C++. The default is 'yes' in maintainer-mode and 'min' otherwise. This options defines diff --git a/Build/source/aclocal.m4 b/Build/source/aclocal.m4 index 802fbaf2fb7..18f60cdf10e 100644 --- a/Build/source/aclocal.m4 +++ b/Build/source/aclocal.m4 @@ -998,6 +998,7 @@ m4_include([m4/kpse-graphite-flags.m4]) m4_include([m4/kpse-icu-flags.m4]) m4_include([m4/kpse-kpathsea-flags.m4]) m4_include([m4/kpse-libpng-flags.m4]) +m4_include([m4/kpse-lt-hack.m4]) m4_include([m4/kpse-options.m4]) m4_include([m4/kpse-pkgs.m4]) m4_include([m4/kpse-setup.m4]) diff --git a/Build/source/configure b/Build/source/configure index 2d9089aaa61..3c59e2a525f 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -881,6 +881,7 @@ enable_all_pkgs enable_native_texlive_build enable_multiplatform enable_cxx_runtime_hack +enable_libtool_hack enable_dialog enable_pdfopen enable_ps2eps @@ -1655,6 +1656,7 @@ Optional Features: --enable-multiplatform put executables into bin/PLATFORM and libraries into lib/PLATFORM --enable-cxx-runtime-hack link C++ runtime statically + --enable-libtool-hack ignore libtool dependency_libs --disable-dialog do not build the dialog package --disable-pdfopen do not build the pdfopen package --disable-ps2eps do not build the ps2eps package @@ -2934,6 +2936,18 @@ esac ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;; esac fi +case $enable_libtool_hack in #( + yes | no) : + : ;; #( + *) : + case $host_os in #( + linux* | solaris*) : + enable_libtool_hack=yes ;; #( + *) : + enable_libtool_hack=no ;; +esac + ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'" ;; +esac case $enable_shared in #( no) : : ;; #( @@ -2974,6 +2988,11 @@ if test "${enable_cxx_runtime_hack+set}" = set; then : enableval=$enable_cxx_runtime_hack; fi +# Check whether --enable-libtool-hack was given. +if test "${enable_libtool_hack+set}" = set; then : + enableval=$enable_libtool_hack; +fi + case $with_x in #( @@ -6692,13 +6711,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:6695: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6714: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6698: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6717: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6701: output\"" >&5) + (eval echo "\"\$as_me:6720: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7904,7 +7923,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7907 "configure"' > conftest.$ac_ext + echo '#line 7926 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9536,11 +9555,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:9539: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9558: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9543: \$? = $ac_status" >&5 + echo "$as_me:9562: \$? = $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. @@ -9875,11 +9894,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:9878: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9897: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9882: \$? = $ac_status" >&5 + echo "$as_me:9901: \$? = $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. @@ -9980,11 +9999,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:9983: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10002: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9987: \$? = $ac_status" >&5 + echo "$as_me:10006: \$? = $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 @@ -10035,11 +10054,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:10038: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10057: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10042: \$? = $ac_status" >&5 + echo "$as_me:10061: \$? = $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 @@ -12402,7 +12421,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12405 "configure" +#line 12424 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12498,7 +12517,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12501 "configure" +#line 12520 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16971,11 +16990,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:16974: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16993: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16978: \$? = $ac_status" >&5 + echo "$as_me:16997: \$? = $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. @@ -17070,11 +17089,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:17073: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17092: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17077: \$? = $ac_status" >&5 + echo "$as_me:17096: \$? = $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 @@ -17122,11 +17141,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:17125: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17144: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17129: \$? = $ac_status" >&5 + echo "$as_me:17148: \$? = $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 @@ -21503,20 +21522,24 @@ case $kpse_bld$kpse_bld in *' '*) as_fn_error "Absolute source and/or build path with embedded spaces" "$LINENO" 5;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: - prefix: $prefix - enable_shared: $enable_shared - enable_multiplatform: $enable_multiplatform - enable_cxx_runtime_hack: $enable_cxx_runtime_hack - enable_compiler_warnings: $enable_compiler_warnings + prefix: $prefix + enable_native_texlive_build: $enable_native_texlive_build + enable_shared: $enable_shared + enable_multiplatform: $enable_multiplatform + enable_cxx_runtime_hack: $enable_cxx_runtime_hack + enable_libtool_hack: $enable_libtool_hack + enable_compiler_warnings: $enable_compiler_warnings ** Next run \`make' to configure and build each library and program. " >&5 $as_echo " - prefix: $prefix - enable_shared: $enable_shared - enable_multiplatform: $enable_multiplatform - enable_cxx_runtime_hack: $enable_cxx_runtime_hack - enable_compiler_warnings: $enable_compiler_warnings + prefix: $prefix + enable_native_texlive_build: $enable_native_texlive_build + enable_shared: $enable_shared + enable_multiplatform: $enable_multiplatform + enable_cxx_runtime_hack: $enable_cxx_runtime_hack + enable_libtool_hack: $enable_libtool_hack + enable_compiler_warnings: $enable_compiler_warnings ** Next run \`make' to configure and build each library and program. " >&6; } diff --git a/Build/source/configure.ac b/Build/source/configure.ac index 4b62e1b2655..1753bc79a29 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -145,11 +145,13 @@ case $kpse_bld$kpse_bld in *' '*) AC_MSG_ERROR([Absolute source and/or build path with embedded spaces]);; esac AC_MSG_RESULT([ - prefix: $prefix - enable_shared: $enable_shared - enable_multiplatform: $enable_multiplatform - enable_cxx_runtime_hack: $enable_cxx_runtime_hack - enable_compiler_warnings: $enable_compiler_warnings + prefix: $prefix + enable_native_texlive_build: $enable_native_texlive_build + enable_shared: $enable_shared + enable_multiplatform: $enable_multiplatform + enable_cxx_runtime_hack: $enable_cxx_runtime_hack + enable_libtool_hack: $enable_libtool_hack + enable_compiler_warnings: $enable_compiler_warnings ** Next run `make' to configure and build each library and program. ]) diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index f051eedc8c5..42b54777d7e 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/Makefile.in @@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../m4/kpse-options.m4 \ $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../m4/kpse-setup.m4 \ diff --git a/Build/source/libs/aclocal.m4 b/Build/source/libs/aclocal.m4 index 7931fe41449..8d3167a2f5b 100644 --- a/Build/source/libs/aclocal.m4 +++ b/Build/source/libs/aclocal.m4 @@ -684,6 +684,7 @@ m4_include([../m4/kpse-graphite-flags.m4]) m4_include([../m4/kpse-icu-flags.m4]) m4_include([../m4/kpse-kpathsea-flags.m4]) m4_include([../m4/kpse-libpng-flags.m4]) +m4_include([../m4/kpse-lt-hack.m4]) m4_include([../m4/kpse-options.m4]) m4_include([../m4/kpse-pkgs.m4]) m4_include([../m4/kpse-setup.m4]) diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 4d06dc30fc9..95c8891dff3 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -640,6 +640,7 @@ enable_all_pkgs enable_native_texlive_build enable_multiplatform enable_cxx_runtime_hack +enable_libtool_hack enable_dialog enable_pdfopen enable_ps2eps @@ -1398,6 +1399,7 @@ Optional Features: --enable-multiplatform put executables into bin/PLATFORM and libraries into lib/PLATFORM --enable-cxx-runtime-hack link C++ runtime statically + --enable-libtool-hack ignore libtool dependency_libs --disable-dialog do not build the dialog package --disable-pdfopen do not build the pdfopen package --disable-ps2eps do not build the ps2eps package @@ -2112,6 +2114,18 @@ esac ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;; esac fi +case $enable_libtool_hack in #( + yes | no) : + : ;; #( + *) : + case $host_os in #( + linux* | solaris*) : + enable_libtool_hack=yes ;; #( + *) : + enable_libtool_hack=no ;; +esac + ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'" ;; +esac case $enable_shared in #( no) : : ;; #( @@ -2152,6 +2166,11 @@ if test "${enable_cxx_runtime_hack+set}" = set; then : enableval=$enable_cxx_runtime_hack; fi +# Check whether --enable-libtool-hack was given. +if test "${enable_libtool_hack+set}" = set; then : + enableval=$enable_libtool_hack; +fi + case $with_x in #( diff --git a/Build/source/libs/icu/icu-4.2.1-PATCHES/TL-Changes b/Build/source/libs/icu/icu-4.2.1-PATCHES/TL-Changes index b5affa2e3b6..7090fd322f4 100644 --- a/Build/source/libs/icu/icu-4.2.1-PATCHES/TL-Changes +++ b/Build/source/libs/icu/icu-4.2.1-PATCHES/TL-Changes @@ -13,3 +13,8 @@ Run the shell script fix-case-insensitive to rename source/layout/Features.h => ICUFeatures.h and modify references to that file accordingly. +Removed empty dirs: + layout/unicode + test/perf/results + tools/cpysearch + diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4 index 75a3ac89956..9beec894270 100644 --- a/Build/source/m4/kpse-cxx-hack.m4 +++ b/Build/source/m4/kpse-cxx-hack.m4 @@ -55,7 +55,7 @@ AC_SUBST([CXX_HACK_LIBS]) # _KPSE_CXX_HACK() # ---------------- -# internal subroutine +# Internal subroutine. m4_define([_KPSE_CXX_HACK], [ AC_LANG_PUSH([C++]) AC_CHECK_HEADERS([iostream]) diff --git a/Build/source/m4/kpse-lt-hack.m4 b/Build/source/m4/kpse-lt-hack.m4 new file mode 100644 index 00000000000..fc5a78dec75 --- /dev/null +++ b/Build/source/m4/kpse-lt-hack.m4 @@ -0,0 +1,37 @@ +# Public macros for the TeX Live (TL) tree. +# Copyright (C) 2009 Peter Breitenlohner +# +# This file is free software; the copyright holders +# give unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 0 + +# KPSE_ENABLE_LT_HACK +# ------------------- +# Provide the configure option '--enable-libtool-hack'. +AC_DEFUN([KPSE_ENABLE_LT_HACK], +[AC_ARG_ENABLE([libtool-hack], + AS_HELP_STRING([--enable-libtool-hack], + [ignore libtool dependency_libs]))[]dnl +]) # KPSE_ENABLE_LT_HACK + +# KPSE_LT_HACK() +# -------------- +# Try to ignore libtool dependency_libs when possible, e.g., on systems +# using ELF shared libraries. +AC_DEFUN([KPSE_LT_HACK], +[AC_REQUIRE([KPSE_ENABLE_LT_HACK])[]dnl +AC_PROVIDE_IFELSE([LT_INIT], , + [m4_fatal([$0: requires libtool])])[]dnl +AC_PROVIDE_IFELSE([LT_OUTPUT], + [m4_fatal([$0: too late])])[]dnl +_LT_CONFIG_SAVE_COMMANDS([## $0: Prevent libtool from linking dependency_libs +if test "x$enable_libtool_hack" = xyes; then + sed '/for search_ext in/s/ \.la / /' "$ofile" >"$cfgfile" + mv "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +fi], [enable_libtool_hack='$enable_libtool_hack']) +]) # KPSE_LT_HACK + diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4 index 2579286c11a..765a9fd7f8e 100644 --- a/Build/source/m4/kpse-setup.m4 +++ b/Build/source/m4/kpse-setup.m4 @@ -41,6 +41,13 @@ if test "x$enable_native_texlive_build" = xyes; then [enable_cxx_runtime_hack=yes ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'"]) fi +AS_CASE([$enable_libtool_hack], + [yes | no], [:], + [AS_CASE([$host_os], + [linux* | solaris*], + [enable_libtool_hack=yes], + [enable_libtool_hack=no]) + ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'"]) AS_CASE([$enable_shared], [no], [:], [yes ], [AS_IF([test "x$enable_native_texlive_build" = xyes], @@ -55,6 +62,7 @@ AS_CASE([$enable_texlive_build], ac_configure_args="$ac_configure_args '--enable-texlive-build'"]) KPSE_OPTIONS KPSE_ENABLE_CXX_HACK +KPSE_ENABLE_LT_HACK KPSE_LIBS_PREPARE KPSE_WEB2C_PREPARE AS_CASE([$with_x], diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index b1a4a13ec16..23038359beb 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../m4/kpse-options.m4 \ $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../m4/kpse-setup.m4 \ diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4 index 7931fe41449..8d3167a2f5b 100644 --- a/Build/source/texk/aclocal.m4 +++ b/Build/source/texk/aclocal.m4 @@ -684,6 +684,7 @@ m4_include([../m4/kpse-graphite-flags.m4]) m4_include([../m4/kpse-icu-flags.m4]) m4_include([../m4/kpse-kpathsea-flags.m4]) m4_include([../m4/kpse-libpng-flags.m4]) +m4_include([../m4/kpse-lt-hack.m4]) m4_include([../m4/kpse-options.m4]) m4_include([../m4/kpse-pkgs.m4]) m4_include([../m4/kpse-setup.m4]) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 5f7c4e9458d..7dfd4229ca7 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -640,6 +640,7 @@ enable_all_pkgs enable_native_texlive_build enable_multiplatform enable_cxx_runtime_hack +enable_libtool_hack enable_dialog enable_pdfopen enable_ps2eps @@ -1418,6 +1419,7 @@ Optional Features: --enable-multiplatform put executables into bin/PLATFORM and libraries into lib/PLATFORM --enable-cxx-runtime-hack link C++ runtime statically + --enable-libtool-hack ignore libtool dependency_libs --disable-dialog do not build the dialog package --disable-pdfopen do not build the pdfopen package --disable-ps2eps do not build the ps2eps package @@ -2132,6 +2134,18 @@ esac ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;; esac fi +case $enable_libtool_hack in #( + yes | no) : + : ;; #( + *) : + case $host_os in #( + linux* | solaris*) : + enable_libtool_hack=yes ;; #( + *) : + enable_libtool_hack=no ;; +esac + ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'" ;; +esac case $enable_shared in #( no) : : ;; #( @@ -2172,6 +2186,11 @@ if test "${enable_cxx_runtime_hack+set}" = set; then : enableval=$enable_cxx_runtime_hack; fi +# Check whether --enable-libtool-hack was given. +if test "${enable_libtool_hack+set}" = set; then : + enableval=$enable_libtool_hack; +fi + case $with_x in #( diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index ff49c806cfd..79acc069655 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -197,6 +197,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4 index 4464ed6efb8..f248d4b3eba 100644 --- a/Build/source/texk/web2c/aclocal.m4 +++ b/Build/source/texk/web2c/aclocal.m4 @@ -1111,6 +1111,7 @@ m4_include([../../m4/kpse-icu-flags.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-lex.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) +m4_include([../../m4/kpse-lt-hack.m4]) m4_include([../../m4/kpse-macos-framework.m4]) m4_include([../../m4/kpse-obsdcompat-flags.m4]) m4_include([../../m4/kpse-socket-libs.m4]) diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 7928bfa254b..73a8e2d4db2 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -991,6 +991,7 @@ enable_libtool_lock enable_largefile enable_compiler_warnings enable_cxx_runtime_hack +enable_libtool_hack with_tex_banner with_editor enable_auto_core @@ -1689,6 +1690,7 @@ Optional Features: Turn on compiler warnings [default: yes if maintainer-mode, min otherwise] --enable-cxx-runtime-hack link C++ runtime statically + --enable-libtool-hack ignore libtool dependency_libs --enable-auto-core cause TeX&MF to dump core, given a certain filename --disable-dump-share make fmt/base/mem files architecture-dependent --disable-ipc disable TeX's --ipc option, i.e., pipe to a program @@ -5089,13 +5091,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:5092: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5094: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5095: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5097: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5098: output\"" >&5) + (eval echo "\"\$as_me:5100: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6301,7 +6303,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6304 "configure"' > conftest.$ac_ext + echo '#line 6306 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7933,11 +7935,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:7936: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7938: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7940: \$? = $ac_status" >&5 + echo "$as_me:7942: \$? = $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. @@ -8272,11 +8274,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:8275: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8277: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8279: \$? = $ac_status" >&5 + echo "$as_me:8281: \$? = $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. @@ -8377,11 +8379,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:8380: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8382: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8384: \$? = $ac_status" >&5 + echo "$as_me:8386: \$? = $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 @@ -8432,11 +8434,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:8435: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8437: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8439: \$? = $ac_status" >&5 + echo "$as_me:8441: \$? = $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 @@ -10799,7 +10801,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10802 "configure" +#line 10804 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10895,7 +10897,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10898 "configure" +#line 10900 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14684,11 +14686,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:14687: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14689: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14691: \$? = $ac_status" >&5 + echo "$as_me:14693: \$? = $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. @@ -14783,11 +14785,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:14786: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14788: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14790: \$? = $ac_status" >&5 + echo "$as_me:14792: \$? = $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 @@ -14835,11 +14837,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:14838: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14840: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14842: \$? = $ac_status" >&5 + echo "$as_me:14844: \$? = $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 @@ -15881,6 +15883,15 @@ fi +# Check whether --enable-libtool-hack was given. +if test "${enable_libtool_hack+set}" = set; then : + enableval=$enable_libtool_hack; +fi + + + + + ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ @@ -19418,6 +19429,7 @@ fi +enable_libtool_hack='$enable_libtool_hack' _LTEOF @@ -20226,6 +20238,13 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX # ### END LIBTOOL TAG CONFIG: CXX _LT_EOF +## KPSE_LT_HACK: Prevent libtool from linking dependency_libs +if test "x$enable_libtool_hack" = xyes; then + sed '/for search_ext in/s/ \.la / /' "$ofile" >"$cfgfile" + mv "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +fi as_fn_exit 0 _LTEOF @@ -22262,6 +22281,7 @@ fi +enable_libtool_hack='$enable_libtool_hack' ac_aux_dir='$ac_aux_dir' @@ -23770,6 +23790,13 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX # ### END LIBTOOL TAG CONFIG: CXX _LT_EOF +## KPSE_LT_HACK: Prevent libtool from linking dependency_libs +if test "x$enable_libtool_hack" = xyes; then + sed '/for search_ext in/s/ \.la / /' "$ofile" >"$cfgfile" + mv "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +fi ;; "CXXLD.sh":F) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;; "c-auto.h":H) sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \ diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 9c3d423a812..245cb1eccb6 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -39,6 +39,7 @@ KPSE_CANONICAL_HOST AC_PROG_CXX KPSE_CXX_HACK +KPSE_LT_HACK dnl Include additional code for web2c. KPSE_WEB2C_PREPARE diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index bf076747675..ab946ca5a95 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index f2dca167edc..812b9bf1436 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index e8bcf6e626f..859b5e7b738 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -64,6 +64,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 191e7521583..78138066727 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -53,6 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index b081508db79..b24743a14f5 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index 2ca51210e18..a3dbd3594e4 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure index 9efc113c08a..1489da22492 100755 --- a/Build/source/texk/xdv2pdf/configure +++ b/Build/source/texk/xdv2pdf/configure @@ -17540,14 +17540,14 @@ fi if test "x$kpse_cv_have_Carbon:$kpse_cv_have_QuickTime" = xyes:yes; then - build=yes + can_build=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Carbon or QuickTime framework not found, can not build xdv2pdf." >&5 $as_echo "$as_me: WARNING: Carbon or QuickTime framework not found, can not build xdv2pdf." >&2;} - build=no + can_build=no fi -if test "x$build" = xyes; then +if test "x$can_build" = xyes; then ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" if test "x$ac_cv_type_size_t" = x""yes; then : @@ -17939,7 +17939,7 @@ fi fi - if test "x$build" = xyes; then + if test "x$can_build" = xyes; then build_TRUE= build_FALSE='#' else diff --git a/Build/source/texk/xdv2pdf/configure.ac b/Build/source/texk/xdv2pdf/configure.ac index ac7bf31a321..240b26a960c 100644 --- a/Build/source/texk/xdv2pdf/configure.ac +++ b/Build/source/texk/xdv2pdf/configure.ac @@ -29,13 +29,13 @@ KPSE_CHECK_FRAMEWORK([Carbon], [ATSUStyle style]) KPSE_CHECK_FRAMEWORK([QuickTime], [ImageDescriptionHandle h]) if test "x$kpse_cv_have_Carbon:$kpse_cv_have_QuickTime" = xyes:yes; then - build=yes + can_build=yes else AC_MSG_WARN([Carbon or QuickTime framework not found, can not build xdv2pdf.]) - build=no + can_build=no fi -if test "x$build" = xyes; then +if test "x$can_build" = xyes; then dnl Checks for typedefs, structures, and compiler characteristics. AC_TYPE_SIZE_T @@ -59,7 +59,7 @@ fi fi -AM_CONDITIONAL([build], [test "x$build" = xyes]) +AM_CONDITIONAL([build], [test "x$can_build" = xyes]) AC_CONFIG_FILES([Makefile]) diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in index bf23e153c5a..892ffa6d5eb 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.in +++ b/Build/source/texk/xdvipdfmx/Makefile.in @@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-libs.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ diff --git a/Build/source/texk/xdvipdfmx/aclocal.m4 b/Build/source/texk/xdvipdfmx/aclocal.m4 index 8a33a14025c..f1cabcb30ea 100644 --- a/Build/source/texk/xdvipdfmx/aclocal.m4 +++ b/Build/source/texk/xdvipdfmx/aclocal.m4 @@ -995,6 +995,7 @@ m4_include([../../m4/kpse-fontconfig-flags.m4]) m4_include([../../m4/kpse-freetype2-flags.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) +m4_include([../../m4/kpse-lt-hack.m4]) m4_include([../../m4/kpse-macos-framework.m4]) m4_include([../../m4/kpse-warnings.m4]) m4_include([../../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/texk/xdvipdfmx/config.h.in b/Build/source/texk/xdvipdfmx/config.h.in index bcd157f438b..fdb4ec6f3b3 100644 --- a/Build/source/texk/xdvipdfmx/config.h.in +++ b/Build/source/texk/xdvipdfmx/config.h.in @@ -257,10 +257,10 @@ # endif #endif -/* Define if part of a teTeX/TeX Live build. */ +/* Define if part of a TeX Live build. */ #undef XETEX -/* Define if part of a teTeX/TeX Live build for Mac OS X. */ +/* Define if part of a TeX Live build for Mac OS X. */ #undef XETEX_MAC /* Number of bits in a file offset, on hosts where this is settable. */ diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 34a1e82c0e8..4c6ff4481f5 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -890,6 +890,7 @@ with_gnu_ld enable_libtool_lock enable_largefile enable_compiler_warnings +enable_libtool_hack with_system_kpathsea with_kpathsea_includes with_kpathsea_libdir @@ -1545,6 +1546,7 @@ Optional Features: --enable-compiler-warnings=[no|min|yes|max|all] Turn on compiler warnings [default: yes if maintainer-mode, min otherwise] + --enable-libtool-hack ignore libtool dependency_libs Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -4775,13 +4777,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:4778: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4780: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4781: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4783: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4784: output\"" >&5) + (eval echo "\"\$as_me:4786: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5987,7 +5989,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5990 "configure"' > conftest.$ac_ext + echo '#line 5992 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7619,11 +7621,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:7622: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7624: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7626: \$? = $ac_status" >&5 + echo "$as_me:7628: \$? = $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. @@ -7958,11 +7960,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:7961: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7963: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7965: \$? = $ac_status" >&5 + echo "$as_me:7967: \$? = $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. @@ -8063,11 +8065,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:8066: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8068: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8070: \$? = $ac_status" >&5 + echo "$as_me:8072: \$? = $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 @@ -8118,11 +8120,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:8121: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8123: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8125: \$? = $ac_status" >&5 + echo "$as_me:8127: \$? = $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 @@ -10485,7 +10487,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10488 "configure" +#line 10490 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10581,7 +10583,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10584 "configure" +#line 10586 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11676,6 +11678,16 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags ac_config_headers="$ac_config_headers config.h" +# Check whether --enable-libtool-hack was given. +if test "${enable_libtool_hack+set}" = set; then : + enableval=$enable_libtool_hack; +fi + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } if test "${ac_cv_header_stdc+set}" = set; then : @@ -13132,6 +13144,7 @@ fi RM='$RM' ofile='$ofile' +enable_libtool_hack='$enable_libtool_hack' _LTEOF @@ -13773,6 +13786,13 @@ _LT_EOF (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +## KPSE_LT_HACK: Prevent libtool from linking dependency_libs +if test "x$enable_libtool_hack" = xyes; then + sed '/for search_ext in/s/ \.la / /' "$ofile" >"$cfgfile" + mv "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +fi as_fn_exit 0 _LTEOF @@ -14508,7 +14528,7 @@ fi if test "x$kpse_cv_have_ApplicationServices" = xyes; then - build=yes + can_build=yes $as_echo "#define XETEX_MAC 1" >>confdefs.h @@ -14561,10 +14581,10 @@ fi CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS - build=$cho_cv_have_fontconfig + can_build=$cho_cv_have_fontconfig fi -if test "x$build" = xyes; then +if test "x$can_build" = xyes; then $as_echo "#define XETEX 1" >>confdefs.h @@ -14574,7 +14594,7 @@ This version of xdvipdfmx requires either ApplicationServices (on Mac OS X) or the fontconfig library (on other platforms) to be available, otherwise it cannot support XeTeX output using standard system-installed fonts." "$LINENO" 5 fi - if test "x$build" = xyes; then + if test "x$can_build" = xyes; then build_TRUE= build_FALSE='#' else @@ -15557,6 +15577,7 @@ fi RM='$RM' ofile='$ofile' +enable_libtool_hack='$enable_libtool_hack' ac_aux_dir='$ac_aux_dir' @@ -16887,6 +16908,13 @@ _LT_EOF (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +## KPSE_LT_HACK: Prevent libtool from linking dependency_libs +if test "x$enable_libtool_hack" = xyes; then + sed '/for search_ext in/s/ \.la / /' "$ofile" >"$cfgfile" + mv "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +fi ;; esac diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac index 121ded467a9..bee1fd6e569 100644 --- a/Build/source/texk/xdvipdfmx/configure.ac +++ b/Build/source/texk/xdvipdfmx/configure.ac @@ -17,6 +17,8 @@ KPSE_COMMON([xdvipdfmx]) AC_CONFIG_HEADERS([config.h]) +KPSE_LT_HACK + dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([stdint.h inttypes.h sys/types.h]) @@ -83,24 +85,24 @@ fi KPSE_CHECK_FRAMEWORK([ApplicationServices], [ATSFontRef fontRef]) KPSE_FONTCONFIG_FLAGS if test "x$kpse_cv_have_ApplicationServices" = xyes; then - build=yes - AC_DEFINE([XETEX_MAC], 1, [Define if part of a teTeX/TeX Live build for Mac OS X.]) + can_build=yes + AC_DEFINE([XETEX_MAC], 1, [Define if part of a TeX Live build for Mac OS X.]) else KPSE_ADD_FLAGS([fontconfig]) CHO_CHECK_LIBFONTCONFIG KPSE_RESTORE_FLAGS - build=$cho_cv_have_fontconfig + can_build=$cho_cv_have_fontconfig fi -if test "x$build" = xyes; then - AC_DEFINE([XETEX], 1, [Define if part of a teTeX/TeX Live build.]) +if test "x$can_build" = xyes; then + AC_DEFINE([XETEX], 1, [Define if part of a TeX Live build.]) else AC_MSG_ERROR([fontconfig library or ApplicationServices framework not found. This version of xdvipdfmx requires either ApplicationServices (on Mac OS X) or the fontconfig library (on other platforms) to be available, otherwise it cannot support XeTeX output using standard system-installed fonts.]) fi -AM_CONDITIONAL([build], [test "x$build" = xyes]) +AM_CONDITIONAL([build], [test "x$can_build" = xyes]) AM_CONDITIONAL([build_MacOsX], [test "x$kpse_cv_have_ApplicationServices" = xyes]) AC_CONFIG_FILES([Makefile src/Makefile]) diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in index 48ff3be9919..45ed917f170 100644 --- a/Build/source/texk/xdvipdfmx/src/Makefile.in +++ b/Build/source/texk/xdvipdfmx/src/Makefile.in @@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-libs.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index c60ac5c7884..a0dc70f8032 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../m4/kpse-options.m4 \ $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../m4/kpse-setup.m4 \ diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4 index 7931fe41449..8d3167a2f5b 100644 --- a/Build/source/utils/aclocal.m4 +++ b/Build/source/utils/aclocal.m4 @@ -684,6 +684,7 @@ m4_include([../m4/kpse-graphite-flags.m4]) m4_include([../m4/kpse-icu-flags.m4]) m4_include([../m4/kpse-kpathsea-flags.m4]) m4_include([../m4/kpse-libpng-flags.m4]) +m4_include([../m4/kpse-lt-hack.m4]) m4_include([../m4/kpse-options.m4]) m4_include([../m4/kpse-pkgs.m4]) m4_include([../m4/kpse-setup.m4]) diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 4ffe5e9cea6..f60a8b6222a 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -640,6 +640,7 @@ enable_all_pkgs enable_native_texlive_build enable_multiplatform enable_cxx_runtime_hack +enable_libtool_hack enable_dialog enable_pdfopen enable_ps2eps @@ -1395,6 +1396,7 @@ Optional Features: --enable-multiplatform put executables into bin/PLATFORM and libraries into lib/PLATFORM --enable-cxx-runtime-hack link C++ runtime statically + --enable-libtool-hack ignore libtool dependency_libs --disable-dialog do not build the dialog package --disable-pdfopen do not build the pdfopen package --disable-ps2eps do not build the ps2eps package @@ -2109,6 +2111,18 @@ esac ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;; esac fi +case $enable_libtool_hack in #( + yes | no) : + : ;; #( + *) : + case $host_os in #( + linux* | solaris*) : + enable_libtool_hack=yes ;; #( + *) : + enable_libtool_hack=no ;; +esac + ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'" ;; +esac case $enable_shared in #( no) : : ;; #( @@ -2149,6 +2163,11 @@ if test "${enable_cxx_runtime_hack+set}" = set; then : enableval=$enable_cxx_runtime_hack; fi +# Check whether --enable-libtool-hack was given. +if test "${enable_libtool_hack+set}" = set; then : + enableval=$enable_libtool_hack; +fi + case $with_x in #( -- cgit v1.2.3