summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvipdfmx
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-16 09:51:30 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-16 09:51:30 +0000
commit09950a732cfa76559d18b3540d69bf7eed235171 (patch)
tree00e395f5458e8c3d6904d313d1d513fc9d1dabfb /Build/source/texk/xdvipdfmx
parent6d04c5f72978b866477b0608d68285045337b061 (diff)
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
Diffstat (limited to 'Build/source/texk/xdvipdfmx')
-rw-r--r--Build/source/texk/xdvipdfmx/Makefile.in1
-rw-r--r--Build/source/texk/xdvipdfmx/aclocal.m41
-rw-r--r--Build/source/texk/xdvipdfmx/config.h.in4
-rwxr-xr-xBuild/source/texk/xdvipdfmx/configure64
-rw-r--r--Build/source/texk/xdvipdfmx/configure.ac14
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.in1
6 files changed, 59 insertions, 26 deletions
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 \