diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-23 16:33:37 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-23 16:33:37 +0000 |
| commit | b789d9d640329830153fd0b4ec23c7545100969b (patch) | |
| tree | c4a428db3de017c18afac09b8a5648162e960e8e /Build | |
| parent | 6fe018282ebe6acac6f4c9aab818346f304e7373 (diff) | |
build system cleanup
git-svn-id: svn://tug.org/texlive/trunk@12807 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
116 files changed, 615 insertions, 498 deletions
diff --git a/Build/source/README.layout b/Build/source/README.layout index 2ca916bda8f..e23626f8044 100644 --- a/Build/source/README.layout +++ b/Build/source/README.layout @@ -1,8 +1,8 @@ Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> You may freely use, modify and/or distribute this file. - Layout of the teTeX / TeX Live (TL) build system - ================================================ + Layout of the TeX Live (TL) build system + ======================================== The TL 2009 build system has been completely restructured, using Autoconf, Automake, and Libtool. The main purpose was to configure and build each diff --git a/Build/source/configure b/Build/source/configure index 4b886c4dc5d..418f9db811a 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -2449,6 +2449,7 @@ if test "x$enable_multiplatform" = xyes; then fi + ## ac/withenable.ac: configure.ac fragment for the TeX Live top-level ## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ @@ -3631,15 +3632,25 @@ $as_echo "$as_me: -> installed \`libpng' headers and library" >&6;} $as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-libpng'" >&2;} { (exit 1); exit 1; }; } fi + if test "x$with_system_freetype2" = x; then + { $as_echo "$as_me:$LINENO: -> installed \`freetype2' headers and library" >&5 +$as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;} + with_system_freetype2=yes + ac_configure_args="$ac_configure_args '--with-system-freetype2'" + elif test "x$with_system_freetype2" != xyes; then + { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&5 +$as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&2;} + { (exit 1); exit 1; }; } + fi fi test "x$need_gd" = xyes && { need_libpng=yes + need_freetype2=yes } ## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ -## configure options and TL libraries required for freetype2 # Check whether --with-system-freetype2 was given. if test "${with_system_freetype2+set}" = set; then @@ -3667,6 +3678,22 @@ $as_echo "$as_me: Using \`freetype2' headers and library from TL tree" >&6;} ac_configure_args="$ac_configure_args '--without-system-freetype2'" fi fi +if test "x$with_system_freetype2" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:$LINENO: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5 +$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;} + { (exit 1); exit 1; }; } + fi +fi + +test "x$need_freetype2" = xyes && { + need_zlib=yes +} ## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ @@ -5871,13 +5898,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:5874: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5901: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5877: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5904: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5880: output\"" >&5) + (eval echo "\"\$as_me:5907: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7083,7 +7110,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7086 "configure"' > conftest.$ac_ext + echo '#line 7113 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9130,11 +9157,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:9133: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9160: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9137: \$? = $ac_status" >&5 + echo "$as_me:9164: \$? = $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. @@ -9469,11 +9496,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:9472: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9499: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9476: \$? = $ac_status" >&5 + echo "$as_me:9503: \$? = $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. @@ -9574,11 +9601,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:9577: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9604: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9581: \$? = $ac_status" >&5 + echo "$as_me:9608: \$? = $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 @@ -9629,11 +9656,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:9632: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9659: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9636: \$? = $ac_status" >&5 + echo "$as_me:9663: \$? = $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 @@ -12429,7 +12456,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12432 "configure" +#line 12459 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12525,7 +12552,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12528 "configure" +#line 12555 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18921,11 +18948,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:18924: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18951: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18928: \$? = $ac_status" >&5 + echo "$as_me:18955: \$? = $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. @@ -19020,11 +19047,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:19023: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19050: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19027: \$? = $ac_status" >&5 + echo "$as_me:19054: \$? = $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 @@ -19072,11 +19099,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:19075: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19102: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19079: \$? = $ac_status" >&5 + echo "$as_me:19106: \$? = $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 @@ -20073,7 +20100,6 @@ $as_echo "$as_me: error: Sorry, not found under any of: $list *****" >&2;} fi syslib_status=yes - if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then ZLIB_INCLUDES="-I$with_zlib_includes" fi diff --git a/Build/source/configure.ac b/Build/source/configure.ac index 0920ff6e6d7..c735d66b25c 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -12,10 +12,10 @@ AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -dnl ## --------------------------------------------------- ## -dnl ## Setup of the teTeX / TeX Live (TL) infrastructure ## -dnl ## done in ./, libs/, utils/, and texk/ ## -dnl ## --------------------------------------------------- ## +dnl ## ------------------------------------------- ## +dnl ## Setup of the TeX Live (TL) infrastructure ## +dnl ## done in ./, libs/, utils/, and texk/ ## +dnl ## ------------------------------------------- ## dnl dnl 1. Define three lists of TeXk programs, utility programs, and dnl TL libraries. Hopefully these list occur nowhere else. diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index 3cd374e123c..55f962d335a 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/Makefile.in @@ -44,11 +44,21 @@ DIST_COMMON = README $(am__configure_deps) \ ../build-aux/ltmain.sh ../build-aux/missing \ ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ + $(top_srcdir)/../m4/kpse-cxx-hack.m4 \ + $(top_srcdir)/../m4/kpse-freetype-flags.m4 \ + $(top_srcdir)/../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../m4/kpse-gd-flags.m4 \ + $(top_srcdir)/../m4/kpse-graphite-flags.m4 \ + $(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../m4/kpse-libpng-flags.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 \ + $(top_srcdir)/../m4/kpse-teckit-flags.m4 \ $(top_srcdir)/../m4/kpse-web2c.m4 \ + $(top_srcdir)/../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../ac/withenable.ac \ $(top_srcdir)/../utils/ac/withenable.ac \ $(top_srcdir)/../utils/dialog/ac/withenable.ac \ diff --git a/Build/source/libs/aclocal.m4 b/Build/source/libs/aclocal.m4 index c917492c6a5..9fae18de399 100644 --- a/Build/source/libs/aclocal.m4 +++ b/Build/source/libs/aclocal.m4 @@ -616,8 +616,18 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../m4/kpse-common.m4]) m4_include([../m4/kpse-cxx-hack.m4]) +m4_include([../m4/kpse-freetype-flags.m4]) +m4_include([../m4/kpse-freetype2-flags.m4]) +m4_include([../m4/kpse-gd-flags.m4]) +m4_include([../m4/kpse-graphite-flags.m4]) +m4_include([../m4/kpse-kpathsea-flags.m4]) +m4_include([../m4/kpse-libpng-flags.m4]) m4_include([../m4/kpse-options.m4]) m4_include([../m4/kpse-pkgs.m4]) m4_include([../m4/kpse-setup.m4]) +m4_include([../m4/kpse-t1lib-flags.m4]) +m4_include([../m4/kpse-teckit-flags.m4]) m4_include([../m4/kpse-web2c.m4]) +m4_include([../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 189c6d7e4f2..f1b2ab33847 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -2173,6 +2173,7 @@ if test "x$enable_multiplatform" = xyes; then fi + ## ac/withenable.ac: configure.ac fragment for the TeX Live top-level ## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ @@ -3315,15 +3316,25 @@ $as_echo "$as_me: -> installed \`libpng' headers and library" >&6;} $as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-libpng'" >&2;} { (exit 1); exit 1; }; } fi + if test "x$with_system_freetype2" = x; then + { $as_echo "$as_me:$LINENO: -> installed \`freetype2' headers and library" >&5 +$as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;} + with_system_freetype2=yes + ac_configure_args="$ac_configure_args '--with-system-freetype2'" + elif test "x$with_system_freetype2" != xyes; then + { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&5 +$as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&2;} + { (exit 1); exit 1; }; } + fi fi test "x$need_gd" = xyes && { need_libpng=yes + need_freetype2=yes } ## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ -## configure options and TL libraries required for freetype2 # Check whether --with-system-freetype2 was given. if test "${with_system_freetype2+set}" = set; then @@ -3341,6 +3352,22 @@ $as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;} fi ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'" fi +if test "x$with_system_freetype2" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:$LINENO: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5 +$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;} + { (exit 1); exit 1; }; } + fi +fi + +test "x$need_freetype2" = xyes && { + need_zlib=yes +} ## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ diff --git a/Build/source/libs/freetype2/ac/withenable.ac b/Build/source/libs/freetype2/ac/withenable.ac index 26d7144f440..4bbb05f503b 100644 --- a/Build/source/libs/freetype2/ac/withenable.ac +++ b/Build/source/libs/freetype2/ac/withenable.ac @@ -3,7 +3,4 @@ dnl dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl -## configure options and TL libraries required for freetype2 -dnl Due to Mac OS X problems we use the internal zlib code. -dnl KPSE_WITH_LIB([freetype2], [zlib], [nodirs]) -KPSE_WITH_LIB([freetype2], , [nodirs], [requires freetype-config]) +KPSE_WITH_LIB([freetype2], [zlib]) diff --git a/Build/source/libs/gd/ac/withenable.ac b/Build/source/libs/gd/ac/withenable.ac index be03732231b..ad82e4f490a 100644 --- a/Build/source/libs/gd/ac/withenable.ac +++ b/Build/source/libs/gd/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for gd -KPSE_WITH_LIB([gd], [libpng]) +KPSE_WITH_LIB([gd], [libpng freetype2]) diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure index dea77b6ccd0..57014cfc9a2 100755 --- a/Build/source/libs/gd/configure +++ b/Build/source/libs/gd/configure @@ -4777,6 +4777,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz @@ -4816,6 +4817,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure index 6b6d663760c..bc05f29fd10 100755 --- a/Build/source/libs/libpng/configure +++ b/Build/source/libs/libpng/configure @@ -5113,6 +5113,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure index b963ee153fc..8446c6e31cc 100755 --- a/Build/source/libs/teckit/configure +++ b/Build/source/libs/teckit/configure @@ -5282,6 +5282,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am index 060b39fdbd2..b2f7a43d61f 100644 --- a/Build/source/libs/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/Makefile.am @@ -37,7 +37,7 @@ FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi XPDF_SRC = $(top_srcdir)/$(XPDF_TREE)/xpdf INCLUDES = -Igoo -Ifofi -Ixpdf -I$(GOO_SRC) -I$(FOFI_SRC) -I$(XPDF_SRC) -AM_CPPFLAGS = $(XPDF_SELF_FLAGS) +AM_CPPFLAGS = -DPDF_PARSER_ONLY noinst_LIBRARIES = libxpdf.a diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in index 24782dfc4ba..f70265973bd 100644 --- a/Build/source/libs/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/Makefile.in @@ -41,8 +41,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \ ../../build-aux/missing ../../build-aux/texinfo.tex \ ../../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -163,7 +162,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -XPDF_SELF_FLAGS = @XPDF_SELF_FLAGS@ XPDF_TREE = @XPDF_TREE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -220,7 +218,7 @@ GOO_SRC = $(top_srcdir)/$(XPDF_TREE)/goo FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi XPDF_SRC = $(top_srcdir)/$(XPDF_TREE)/xpdf INCLUDES = -Igoo -Ifofi -Ixpdf -I$(GOO_SRC) -I$(FOFI_SRC) -I$(XPDF_SRC) -AM_CPPFLAGS = $(XPDF_SELF_FLAGS) +AM_CPPFLAGS = -DPDF_PARSER_ONLY noinst_LIBRARIES = libxpdf.a nodist_libxpdf_a_SOURCES = \ $(goo_libGoo_a_sources) \ diff --git a/Build/source/libs/xpdf/aclocal.m4 b/Build/source/libs/xpdf/aclocal.m4 index 15ac07208d2..542504c5f15 100644 --- a/Build/source/libs/xpdf/aclocal.m4 +++ b/Build/source/libs/xpdf/aclocal.m4 @@ -904,4 +904,3 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([../../m4/kpse-xpdf-flags.m4]) diff --git a/Build/source/libs/xpdf/configure b/Build/source/libs/xpdf/configure index 38976579aec..1ee05068ab4 100755 --- a/Build/source/libs/xpdf/configure +++ b/Build/source/libs/xpdf/configure @@ -640,7 +640,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS XPDF_TREE -XPDF_SELF_FLAGS EGREP GREP CPP @@ -5709,10 +5708,6 @@ _ACEOF fi - -XPDF_SELF_FLAGS=-DPDF_PARSER_ONLY - - ac_config_headers="$ac_config_headers aconf.h" diff --git a/Build/source/libs/xpdf/configure.ac b/Build/source/libs/xpdf/configure.ac index a465d0f0276..24d82ee2e45 100644 --- a/Build/source/libs/xpdf/configure.ac +++ b/Build/source/libs/xpdf/configure.ac @@ -59,10 +59,6 @@ AC_CHECK_FUNCS([popen mkstemp mkstemps]) AC_SYS_LARGEFILE AC_FUNC_FSEEKO -dnl **** We need to use the same flags when building and using libxpdf.a - -KPSE_XPDF_SELF_FLAGS - AC_CONFIG_HEADERS([aconf.h], [sed -e 's/^#define PACKAGE/#define XPDF_PACKAGE/' \ -e 's/^#define VERSION/#define XPDF_VERSION/' aconf.h >aconf.tmp && mv -f aconf.tmp aconf.h]) diff --git a/Build/source/libs/xpdf/fofi/Makefile.in b/Build/source/libs/xpdf/fofi/Makefile.in index 4ecb6a28056..74690e2506d 100644 --- a/Build/source/libs/xpdf/fofi/Makefile.in +++ b/Build/source/libs/xpdf/fofi/Makefile.in @@ -33,8 +33,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/hdrs.am subdir = fofi ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -92,7 +91,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -XPDF_SELF_FLAGS = @XPDF_SELF_FLAGS@ XPDF_TREE = @XPDF_TREE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/Build/source/libs/xpdf/goo/Makefile.in b/Build/source/libs/xpdf/goo/Makefile.in index d1be34901a9..6dbcfa7e99e 100644 --- a/Build/source/libs/xpdf/goo/Makefile.in +++ b/Build/source/libs/xpdf/goo/Makefile.in @@ -33,8 +33,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/hdrs.am subdir = goo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -92,7 +91,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -XPDF_SELF_FLAGS = @XPDF_SELF_FLAGS@ XPDF_TREE = @XPDF_TREE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/Build/source/libs/xpdf/xpdf/Makefile.in b/Build/source/libs/xpdf/xpdf/Makefile.in index 1109e1a2bb6..3fc89a36d78 100644 --- a/Build/source/libs/xpdf/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/xpdf/Makefile.in @@ -33,8 +33,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/hdrs.am subdir = xpdf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -92,7 +91,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -XPDF_SELF_FLAGS = @XPDF_SELF_FLAGS@ XPDF_TREE = @XPDF_TREE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/Build/source/m4/README b/Build/source/m4/README index ee5af011a98..beeb13a3989 100644 --- a/Build/source/m4/README +++ b/Build/source/m4/README @@ -2,7 +2,7 @@ Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> You may freely use, modify and/or distribute this file. This directory is the central repository for Autoconf macros needed to build -the teTeX / TeX Live (TL) tree. +the TeX Live (TL) tree. (1) Public macros such as libtool.m4 used to build the libraries and programs in the TL subdirectories libs/*/, utils/*/, and texk/*/ that are diff --git a/Build/source/m4/cho-kpse.m4 b/Build/source/m4/cho-kpse.m4 index 34ea0ff1e37..abecf850bbf 100644 --- a/Build/source/m4/cho-kpse.m4 +++ b/Build/source/m4/cho-kpse.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 1998 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr> # Copyright (C) 2008 - 2009 Peter Breitenlohner <tex-live@tug.org> # diff --git a/Build/source/m4/cho-libs.m4 b/Build/source/m4/cho-libs.m4 index fa3d6f812f2..a6de533f8d1 100644 --- a/Build/source/m4/cho-libs.m4 +++ b/Build/source/m4/cho-libs.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 1998 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr> # Copyright (C) 2008 - 2009 Peter Breitenlohner <tex-live@tug.org> # diff --git a/Build/source/m4/kpse-asm.m4 b/Build/source/m4/kpse-asm.m4 index 2063c474bb0..e9e415355c3 100644 --- a/Build/source/m4/kpse-asm.m4 +++ b/Build/source/m4/kpse-asm.m4 @@ -1,5 +1,4 @@ -# Private macro for the teTeX / TeX Live (TL) tree. -# by Peter Breitenlohner, April 15, 1996. +# Private macro for the TeX Live (TL) tree. # Copyright (C) 1996 - 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4 index 05386a7b70d..667bd81d047 100644 --- a/Build/source/m4/kpse-common.m4 +++ b/Build/source/m4/kpse-common.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 1995 - 2009 Karl Berry <tex-live@tug.org> # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # @@ -34,7 +34,7 @@ AC_DEFUN([KPSE_INIT], [AC_REQUIRE([_KPSE_INIT])]) # _KPSE_USE_LIBTOOL() -# ------------------ +# ------------------- AC_DEFUN([_KPSE_USE_LIBTOOL], [## $0: Generate a libtool script for use in configure tests AC_PROVIDE_IFELSE([LT_INIT], , @@ -50,28 +50,30 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], AC_LANG(_AC_LANG)[]dnl ]) # _KPSE_USE_LIBTOOL -# _KPSE_LIB_FLAGS(LIBDIR, LIBNAME, -# [SHELL-CODE=DEFAULT-SHELL-CODE], -# INCLUDES, LIBS, OPTIONS, +# _KPSE_LIB_FLAGS(LIBDIR, LIBNAME, OPTIONS, +# TL-INCLUDES, TL-LIBS, TL-EXTRA, # [REBUILD-SRC-DEPENDENCIES], # [REBUILD-BLD-DEPENDENCIES]) -# ------------------------------------------------ +# ----------------------------------------------- # Provide the configure options '--with-system-LIBDIR' (if in the TL tree), # '--with-LIBDIR-includes', and '--with-LIBDIR-libdir'. +# Options: +# lt - this is a Libtool library +# tree - only use library from the TL tree # # Set the make variables LIBDIR_INCLUDES and LIBDIR_LIBS to the CPPFLAGS and # LIBS required for the library in the directory libs/LIBDIR/ of the TL tree. # # If an installed (system) version of the library has been selected or is -# implied, then execute SHELL-CODE to set the two variables. -# In most cases DEFAULT-SHELL-CODE will do the right thing, based on the -# values of with_LIBDIR_includes and with_LIBDIR_libdir. +# implied, then execute KPSE_LIBDIR_SYSTEM_FLAGS to set the two variables. # -# Otherwise, set LIBDIR_INCLUDES based on the value of INCLUDES and -# LIBDIR_LIBS based on the value of LIBS. If OPTIONS specifies a libtool -# library, then arrange that future configure test use libtool. +# Otherwise, set LIBDIR_INCLUDES based on the value of TL_INCLUDES and +# LIBDIR_LIBS based on the value of TL_LIBS; the optional shell code +# TL-EXTRA may modifiy these values. +# If OPTIONS specifies a Libtool library, then arrange that future configure +# test use Libtool. # Furthermore, set LIBDIR_DEPEND and LIBDIR_RULE to values suitable as -# dependency and rule to rebuild the library (assuming that +# dependency and (multiline) Make rule to rebuild the library (assuming that # '${top_srcdir}/../../' and '${top_builddir}/../../' point to the root of # the TL tree). AC_DEFUN([_KPSE_LIB_FLAGS], @@ -87,30 +89,27 @@ AC_SUBST(AS_TR_CPP($1)[_RULE])[]dnl m4_provide_if([AM_INIT_AUTOMAKE], [_AM_SUBST_NOTMAKE(AS_TR_CPP($1)[_RULE])])[]dnl ]) # _KPSE_LIB_FLAGS -# _KPSE_LIB_FLAGS_TL(LIBDIR, LIBNAME, -# [SHELL-CODE=DEFAULT-SHELL-CODE], -# INCLUDES, LIBS, OPTIONS, +# _KPSE_LIB_FLAGS_TL(LIBDIR, LIBNAME, OPTIONS, +# TL-INCLUDES, TL-LIBS, TL-EXTRA, # [REBUILD-SRC-DEPENDENCIES], # [REBUILD-BLD-DEPENDENCIES]) -# --------------------------------------------------- +# -------------------------------------------------- # Internal subroutine for use of _KPSE_LIB_FLAGS inside the TL tree. m4_define([_KPSE_LIB_FLAGS_TL], -[m4_if(m4_index([ $6 ], [ lt ]), [-1], , +[m4_if(m4_index([ $3 ], [ lt ]), [-1], , [AC_REQUIRE([_KPSE_USE_LIBTOOL])])[]dnl m4_if -m4_if(m4_index([ $6 ], [ tree ]), [-1], - [AC_ARG_WITH([system-$1], - [AS_HELP_STRING([--with-system-$1], - [use installed $1 headers and library])])[]dnl -_KPSE_LIB_FLAGS_WITH([$1])[]dnl +m4_if(m4_index([ $3 ], [ tree ]), [-1], +[KPSE_]AS_TR_CPP([$1])[_OPTIONS([with-system])[]dnl if test "x$with_system_[]AS_TR_SH($1)" = xyes; then - m4_ifval([$3], [$3], AS_TR_CPP([kpse-$1-system-flags]))[]dnl + AS_TR_CPP([kpse-$1-system-flags])[]dnl else ])[]dnl m4_if AS_TR_CPP($1)[_INCLUDES=`echo '$4' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"`] AS_TR_CPP($1)[_LIBS=`echo '$5' | sed \ - -e "s,BLD/,$kpse_BLD/,g"`] + -e "s,BLD/,$kpse_BLD/,g"` + $6] m4_if([$1], [kpathsea], [AS_TR_CPP($1)[_DEPEND=`echo '$5' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'`] @@ -128,38 +127,41 @@ $(]AS_TR_CPP($1)[_DEPEND):]m4_ifval([$7], cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) $8:]])[ cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS)']]) -m4_if(m4_index([ $6 ], [ tree ]), [-1], +m4_if(m4_index([ $3 ], [ tree ]), [-1], [fi ])[]dnl m4_if ]) # _KPSE_LIB_FLAGS_TL -# _KPSE_LIB_FLAGS_STANDALONE(LIBDIR, LIBNAME, -# [SHELL-CODE=DEFAULT-SHELL-CODE], -# INCLUDES, LIBS, OPTIONS) -# ------------------------------------------------ -# Internal subroutine for standalone use of_KPSE_LIB_FLAGS. +# _KPSE_LIB_FLAGS_STANDALONE(LIBDIR, LIBNAME, OPTIONS) +# ---------------------------------------------------- +# Internal subroutine for standalone use of _KPSE_LIB_FLAGS. m4_define([_KPSE_LIB_FLAGS_STANDALONE], -[m4_if(m4_index([ $6 ], [ tree ]), [-1], , +[m4_if(m4_index([ $3 ], [ tree ]), [-1], +[KPSE_]AS_TR_CPP([$1])[_OPTIONS([])]dnl +[KPSE_]AS_TR_CPP([$1])[_SYSTEM_FLAGS], [m4_fatal([$0: not in TL tree])])[]dnl m4_if -_KPSE_LIB_FLAGS_WITH([$1])[]dnl -m4_ifval([$3], [$3], [_KPSE_LIB_FLAGS_SYSTEM([$1], [$2])])[]dnl ]) # _KPSE_LIB_FLAGS_STANDALONE -# _KPSE_LIB_FLAGS_WITH(LIBDIR) -# ---------------------------- -# Internal subroutine for of_KPSE_LIB_FLAGS: configure options. -m4_define([_KPSE_LIB_FLAGS_WITH], -[AC_ARG_WITH([$1-includes], - [AS_HELP_STRING([--with-$1-includes=DIR], - [$1 headers installed in DIR])])[]dnl +# _KPSE_LIB_OPTIONS(LIBDIR, [WITH-SYSTEM]) +# ---------------------------------------- +# Internal subroutine: default configure options for system library, +# including '--with-system-LIBDIR' if WITH-SYSTEM is nonempty. +m4_define([_KPSE_LIB_OPTIONS], +[m4_ifval([$2], + [AC_ARG_WITH([system-$1], + AS_HELP_STRING([--with-system-$1], + [use installed $1 headers and library]))])[]dnl +AC_ARG_WITH([$1-includes], + AS_HELP_STRING([--with-$1-includes=DIR], + [$1 headers installed in DIR]))[]dnl AC_ARG_WITH([$1-libdir], - [AS_HELP_STRING([--with-$1-libdir=DIR], - [$1 library installed in DIR])])[]dnl -]) # _KPSE_LIB_FLAGS_WITH + AS_HELP_STRING([--with-$1-libdir=DIR], + [$1 library installed in DIR]))[]dnl +]) # _KPSE_LIB_OPTIONS # _KPSE_LIB_FLAGS_SYSTEM(LIBDIR, LIBNAME) # --------------------------------------- -# Internal subroutine for of_KPSE_LIB_FLAGS: default flags for system library. +# Internal subroutine: default flags for system library. m4_define([_KPSE_LIB_FLAGS_SYSTEM], [if test "x$with_[]AS_TR_SH($1)_includes" != x && test "x$with_[]AS_TR_SH($1)_includes" != xyes; then AS_TR_CPP($1)_INCLUDES="-I$with_[]AS_TR_SH($1)_includes" @@ -170,6 +172,32 @@ if test "x$with_[]AS_TR_SH($1)_libdir" != x && test "x$with_[]AS_TR_SH($1)_libdi fi ]) # _KPSE_LIB_FLAGS_SYSTEM +# KPSE_SAVE_FLAGS +# --------------- +# Save values of CPPFLAGS and LIBS. +AC_DEFUN([KPSE_SAVE_FLAGS], +[kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS +]) # KPSE_SAVE_FLAGS + +# KPSE_RESTORE_FLAGS +# ------------------ +# Restore values of CPPFLAGS and LIBS. +AC_DEFUN([KPSE_RESTORE_FLAGS], +[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl +CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS +]) # KPSE_RESTORE_FLAGS + +# KPSE_ADD_FLAGS(LIBDIR) +# ---------------------- +# Add flags for LIBDIR to values of CPPFLAGS and LIBS. +AC_DEFUN([KPSE_ADD_FLAGS], +[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl +CPPFLAGS="$CPPFLAGS $[]AS_TR_CPP($1)_INCLUDES" +LIBS="$[]AS_TR_CPP($1)_LIBS $LIBS" +]) # KPSE_ADD_FLAGS + # KPSE_COMMON(PACKAGE-NAME, [MORE-AUTOMAKE-OPTIONS]) # -------------------------------------------------- # Common Autoconf code for all programs using libkpathsea. @@ -234,32 +262,6 @@ if test "$kb_cv_var_program_inv_name" = yes; then fi ]) # KPSE_COMMON -# KPSE_SAVE_FLAGS -# --------------- -# Save values of CPPFLAGS and LIBS. -AC_DEFUN([KPSE_SAVE_FLAGS], -[kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS -]) # KPSE_SAVE_FLAGS - -# KPSE_RESTORE_FLAGS -# ------------------ -# Restore values of CPPFLAGS and LIBS. -AC_DEFUN([KPSE_RESTORE_FLAGS], -[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl -CPPFLAGS=$kpse_save_CPPFLAGS -LIBS=$kpse_save_LIBS -]) # KPSE_RESTORE_FLAGS - -# KPSE_ADD_FLAGS(LIBDIR) -# ---------------------- -# Add flags for LIBDIR to values of CPPFLAGS and LIBS. -AC_DEFUN([KPSE_ADD_FLAGS], -[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl -CPPFLAGS="$CPPFLAGS $[]AS_TR_CPP($1)_INCLUDES" -LIBS="$[]AS_TR_CPP($1)_LIBS $LIBS" -]) # KPSE_ADD_FLAGS - # KPSE_MSG_ERROR(PACKAGE, ERROR, [EXIT-STATUS = 1]) # ------------------------------------------------- # Same as AC_MSG_ERROR(ERROR, EXIT-STATUS), except when building this diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4 index e8fbd8533a4..5a093fc2ec5 100644 --- a/Build/source/m4/kpse-cxx-hack.m4 +++ b/Build/source/m4/kpse-cxx-hack.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2002 Olaf Weber <olaf@infovore.xs4all.nl> # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # diff --git a/Build/source/m4/kpse-fontconfig-flags.m4 b/Build/source/m4/kpse-fontconfig-flags.m4 index 40a95bf9d25..fd1e5406a6f 100644 --- a/Build/source/m4/kpse-fontconfig-flags.m4 +++ b/Build/source/m4/kpse-fontconfig-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -13,7 +13,7 @@ # installed fontconfig headers and library. # Check or set the cache variables kpse_cv_have_fontconfig, # kpse_cv_fontconfig_includes, and kpse_cv_fontconfig_libs. -# If found set the make variables FONTCONFIG_INCLUDES and FONTCONFIG_LIBS +# If found set the Make variables FONTCONFIG_INCLUDES and FONTCONFIG_LIBS # to the CPPFLAGS and LIBS required for the installed '-lfontconfig' # library and define HAVE_LIBFONTCONFIG. AC_DEFUN([KPSE_FONTCONFIG_FLAGS], diff --git a/Build/source/m4/kpse-freetype-flags.m4 b/Build/source/m4/kpse-freetype-flags.m4 index a8b7746dda9..ed28c506d6d 100644 --- a/Build/source/m4/kpse-freetype-flags.m4 +++ b/Build/source/m4/kpse-freetype-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,23 +7,23 @@ # serial 0 -# KPSE_FREETYPE_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE]) -# ---------------------------------------------------- +# KPSE_FREETYPE_FLAGS +# ------------------- # Provide the configure options '--with-system-freetype' (if in the TL tree), # '--with-freetype-includes', and '--with-freetype-libdir'. # # Set the make variables FREETYPE_INCLUDES and FREETYPE_LIBS to the CPPFLAGS and # LIBS required for the `-lttf' library in libs/freetype/ of the TL tree. AC_DEFUN([KPSE_FREETYPE_FLAGS], -[_KPSE_LIB_FLAGS([freetype], [ttf], - [$1], - [-IBLD/libs/freetype/freetype], - [BLD/libs/freetype/libttf.a], [], +[_KPSE_LIB_FLAGS([freetype], [ttf], [], + [-IBLD/libs/freetype/freetype], [BLD/libs/freetype/libttf.a], [], [], [${top_builddir}/../../libs/freetype/freetype/freetype.h])[]dnl ]) # KPSE_FREETYPE_FLAGS +# KPSE_FREETYPE_OPTIONS([WITH-SYSTEM]) +# ------------------------------------ +AC_DEFUN([KPSE_FREETYPE_OPTIONS], [_KPSE_LIB_OPTIONS([freetype], [$1])]) + # KPSE_FREETYPE_SYSTEM_FLAGS # -------------------------- -AC_DEFUN([KPSE_FREETYPE_SYSTEM_FLAGS], -[_KPSE_LIB_FLAGS_SYSTEM([freetype], [ttf])[]dnl -]) # KPSE_FREETYPE_SYSTEM_FLAGS +AC_DEFUN([KPSE_FREETYPE_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([freetype], [ttf])]) diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4 index 387aeaa3262..13477851c0f 100644 --- a/Build/source/m4/kpse-freetype2-flags.m4 +++ b/Build/source/m4/kpse-freetype2-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,33 +7,32 @@ # serial 0 -# KPSE_FREETYPE2_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE]) -# ----------------------------------------------------- +# KPSE_FREETYPE2_FLAGS +# -------------------- # Provide the configure options '--with-system-freetype2' (if in the TL tree). # # Set the make variables FREETYPE2_INCLUDES and FREETYPE2_LIBS to the CPPFLAGS and # LIBS required for the `-lfreetype' library in libs/freetype2/ of the TL tree. -dnl AC_DEFUN([KPSE_FREETYPE2_FLAGS], -dnl [AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl -dnl _KPSE_LIB_FLAGS([freetype2], [freetype], -dnl [$1], -dnl [-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2], -dnl [BLD/libs/freetype2/libfreetype.a], [], -dnl [], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl -dnl ]) # KPSE_FREETYPE2_FLAGS AC_DEFUN([KPSE_FREETYPE2_FLAGS], -[AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl -_KPSE_LIB_FLAGS([freetype2], [freetype], - [$1], - [cat BLD/libs/freetype2/ft-], - [BLD/libs/freetype2/libfreetype.a], [], +[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl +AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl +_KPSE_LIB_FLAGS([freetype2], [freetype], [], + [BLD/libs/freetype2], + [BLD/libs/freetype2/libfreetype.a], + [FREETYPE2_LIBS=`cat $FREETYPE2_INCLUDES/ft-libs` + FREETYPE2_INCLUDES=`cat $FREETYPE2_INCLUDES/ft-includes`], [], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl -if test "x$with_system_freetype2" = xno; then - FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`' - FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`' -fi ]) # KPSE_FREETYPE2_FLAGS +# KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM]) +# ------------------------------------- +AC_DEFUN([KPSE_FREETYPE2_OPTIONS], +[m4_ifval([$1], + [AC_ARG_WITH([system-freetype2], + AS_HELP_STRING([--with-system-freetype2], + [use installed freetype2 headers and library (requires freetype-config)]))])[]dnl +]) # KPSE_FREETYPE2_OPTIONS + # KPSE_FREETYPE2_SYSTEM_FLAGS # --------------------------- AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], diff --git a/Build/source/m4/kpse-gd-flags.m4 b/Build/source/m4/kpse-gd-flags.m4 index b29ff411be1..243fbfcaeba 100644 --- a/Build/source/m4/kpse-gd-flags.m4 +++ b/Build/source/m4/kpse-gd-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,8 +7,8 @@ # serial 0 -# KPSE_GD_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE]) -# ---------------------------------------------- +# KPSE_GD_FLAGS +# ------------- # Provide the configure options '--with-system-gd' (if in the TL tree), # '--with-gd-includes', and '--with-gd-libdir'. # @@ -16,14 +16,16 @@ # LIBS required for the `-lgd' library in libs/gd/ of the TL tree. AC_DEFUN([KPSE_GD_FLAGS], [AC_REQUIRE([KPSE_LIBPNG_FLAGS])[]dnl -_KPSE_LIB_FLAGS([gd], [gd], - [$1], - [-IBLD/libs/gd], [BLD/libs/gd/libgd.a], [], - [], [${top_builddir}/../../libs/gd/gd.h])[]dnl +AC_REQUIRE([KPSE_FREETYPE2_FLAGS])[]dnl +_KPSE_LIB_FLAGS([gd], [gd], [], + [-IBLD/libs/gd], [BLD/libs/gd/libgd.a], [], + [], [${top_builddir}/../../libs/gd/gd.h])[]dnl ]) # KPSE_GD_FLAGS +# KPSE_GD_OPTIONS([WITH-SYSTEM]) +# ------------------------------ +AC_DEFUN([KPSE_GD_OPTIONS], [_KPSE_LIB_OPTIONS([gd], [$1])]) + # KPSE_GD_SYSTEM_FLAGS # -------------------- -AC_DEFUN([KPSE_GD_SYSTEM_FLAGS], -[_KPSE_LIB_FLAGS_SYSTEM([gd], [gd])[]dnl -]) # KPSE_GD_SYSTEM_FLAGS +AC_DEFUN([KPSE_GD_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([gd], [gd])]) diff --git a/Build/source/m4/kpse-graphite-flags.m4 b/Build/source/m4/kpse-graphite-flags.m4 index 35276889cab..443a1958dfe 100644 --- a/Build/source/m4/kpse-graphite-flags.m4 +++ b/Build/source/m4/kpse-graphite-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,8 +7,8 @@ # serial 0 -# KPSE_GRAPHITE_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE]) -# ---------------------------------------------------- +# KPSE_GRAPHITE_FLAGS +# ------------------- # Provide the configure options '--with-system-graphite' (if in the TL tree), # '--with-graphite-includes', and '--with-graphite-libdir'. # @@ -16,15 +16,15 @@ # and LIBS required for the `-lgraphite' library in libs/graphite/ of the TL tree. AC_DEFUN([KPSE_GRAPHITE_FLAGS], [AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl -_KPSE_LIB_FLAGS([graphite], [graphite], - [$1], - [-ISRC/libs/graphite/include], - [BLD/libs/graphite/libgraphite.a], [], - [], [])[]dnl +_KPSE_LIB_FLAGS([graphite], [graphite], [], + [-ISRC/libs/graphite/include], [BLD/libs/graphite/libgraphite.a], [], + [], [])[]dnl ]) # KPSE_GRAPHITE_FLAGS +# KPSE_GRAPHITE_OPTIONS([WITH-SYSTEM]) +# ------------------------------------ +AC_DEFUN([KPSE_GRAPHITE_OPTIONS], [_KPSE_LIB_OPTIONS([graphite], [$1])]) + # KPSE_GRAPHITE_SYSTEM_FLAGS # -------------------------- -AC_DEFUN([KPSE_GRAPHITE_SYSTEM_FLAGS], -[_KPSE_LIB_FLAGS_SYSTEM([graphite], [graphite])[]dnl -]) # KPSE_GRAPHITE_SYSTEM_FLAGS +AC_DEFUN([KPSE_GRAPHITE_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([graphite], [graphite])]) diff --git a/Build/source/m4/kpse-icu-flags.m4 b/Build/source/m4/kpse-icu-flags.m4 index 261937388a6..7377f9a1338 100644 --- a/Build/source/m4/kpse-icu-flags.m4 +++ b/Build/source/m4/kpse-icu-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,15 +7,15 @@ # serial 0 -# KPSE_ICU_FLAGS() -# ---------------- +# KPSE_ICU_FLAGS +# -------------- # Set the make variables ICU_INCLUDES and ICU_LIBS to # the CPPFLAGS and LIBS required for the icu-xetex libraries in # libs/icu/ of the TL tree. AC_DEFUN([KPSE_ICU_FLAGS], -[_KPSE_LIB_FLAGS([icu], [sicuxxx], [], +[_KPSE_LIB_FLAGS([icu], [sicuxxx], [tree], [-IBLD/libs/icu/icu-build/common -ISRC/libs/icu/icu-xetex/common -ISRC/libs/icu/icu-xetex/layout], [BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a], - [tree], [], - [${top_builddir}/../../libs/icu/icu-build/common/unicode/platform.h])[]dnl + [], + [], [${top_builddir}/../../libs/icu/icu-build/common/unicode/platform.h])[]dnl ]) # KPSE_ICU_FLAGS diff --git a/Build/source/m4/kpse-kpathsea-flags.m4 b/Build/source/m4/kpse-kpathsea-flags.m4 index 141cf3c80f1..1fde7db3531 100644 --- a/Build/source/m4/kpse-kpathsea-flags.m4 +++ b/Build/source/m4/kpse-kpathsea-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,27 +7,27 @@ # serial 0 -# KPSE_KPATHSEA_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE]) -# ---------------------------------------------------- +# KPSE_KPATHSEA_FLAGS +# ------------------- # Provide the configure options '--with-system-kpathsea' (if in the TL tree), # '--with-kpathsea-includes', and '--with-kpathsea-libdir'. # # Set the make variables KPATHSEA_INCLUDES and KPATHSEA_LIBS to the CPPFLAGS and # LIBS required for the `-lkpathsea' library in texk/kpathsea/ of the TL tree. AC_DEFUN([KPSE_KPATHSEA_FLAGS], -[_KPSE_LIB_FLAGS([kpathsea], [kpathsea], - [$1], - [-IBLD/texk -ISRC/texk], - [BLD/texk/kpathsea/libkpathsea.la], [lt], +[_KPSE_LIB_FLAGS([kpathsea], [kpathsea], [lt], + [-IBLD/texk -ISRC/texk], [BLD/texk/kpathsea/libkpathsea.la], [], [${top_srcdir}/../kpathsea/*.[ch]], [${top_builddir}/../kpathsea/paths.h])[]dnl ]) # KPSE_KPATHSEA_FLAGS +# KPSE_KPATHSEA_OPTIONS([WITH-SYSTEM]) +# ------------------------------------ +AC_DEFUN([KPSE_KPATHSEA_OPTIONS], [_KPSE_LIB_OPTIONS([kpathsea], [$1])]) + # KPSE_KPATHSEA_SYSTEM_FLAGS # -------------------------- -AC_DEFUN([KPSE_KPATHSEA_SYSTEM_FLAGS], -[_KPSE_LIB_FLAGS_SYSTEM([kpathsea], [kpathsea])[]dnl -]) # KPSE__SYSTEM_FLAGS +AC_DEFUN([KPSE_KPATHSEA_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([kpathsea], [kpathsea])]) # KPSE_CHECK_KPSE_FORMAT(FORMAT, # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) diff --git a/Build/source/m4/kpse-libpng-flags.m4 b/Build/source/m4/kpse-libpng-flags.m4 index acf9929d3fe..9a1e2a974ee 100644 --- a/Build/source/m4/kpse-libpng-flags.m4 +++ b/Build/source/m4/kpse-libpng-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,8 +7,8 @@ # serial 0 -# KPSE_LIBPNG_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE]) -# -------------------------------------------------- +# KPSE_LIBPNG_FLAGS +# ----------------- # Provide the configure options '--with-system-libpng' (if in the TL tree), # '--with-libpng-includes', and '--with-libpng-libdir'. # @@ -16,14 +16,15 @@ # LIBS required for the `-lpng' library in libs/libpng/ of the TL tree. AC_DEFUN([KPSE_LIBPNG_FLAGS], [AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl -_KPSE_LIB_FLAGS([libpng], [png], - [$1], - [-IBLD/libs/libpng], [BLD/libs/libpng/libpng.a], [], - [], [${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h])[]dnl +_KPSE_LIB_FLAGS([libpng], [png], [], + [-IBLD/libs/libpng], [BLD/libs/libpng/libpng.a], [], + [], [${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h])[]dnl ]) # KPSE_LIBPNG_FLAGS +# KPSE_LIBPNG_OPTIONS([WITH-SYSTEM]) +# ---------------------------------- +AC_DEFUN([KPSE_LIBPNG_OPTIONS], [_KPSE_LIB_OPTIONS([libpng], [$1])]) + # KPSE_LIBPNG_SYSTEM_FLAGS # ------------------------ -AC_DEFUN([KPSE_LIBPNG_SYSTEM_FLAGS], -[_KPSE_LIB_FLAGS_SYSTEM([libpng], [png])[]dnl -]) # KPSE_LIBPNG_SYSTEM_FLAGS +AC_DEFUN([KPSE_LIBPNG_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([libpng], [png])]) diff --git a/Build/source/m4/kpse-macos-framework.m4 b/Build/source/m4/kpse-macos-framework.m4 index d76413d96a9..9013c1fffe4 100644 --- a/Build/source/m4/kpse-macos-framework.m4 +++ b/Build/source/m4/kpse-macos-framework.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2005 - 2008 Jonathan Kew <...@...> # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # diff --git a/Build/source/m4/kpse-obsdcompat-flags.m4 b/Build/source/m4/kpse-obsdcompat-flags.m4 index 4b374d99e1c..0a093b0be6b 100644 --- a/Build/source/m4/kpse-obsdcompat-flags.m4 +++ b/Build/source/m4/kpse-obsdcompat-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,15 +7,14 @@ # serial 0 -# KPSE_OBSDCOMPAT_FLAGS() -# ----------------------- +# KPSE_OBSDCOMPAT_FLAGS +# --------------------- # Set the make variables OBSDCOMPAT_INCLUDES and OBSDCOMPAT_LIBS to # the CPPFLAGS and LIBS required for the `-lobsdcompat' library in # libs/obsdcompat/ of the TL tree. AC_DEFUN([KPSE_OBSDCOMPAT_FLAGS], -[_KPSE_LIB_FLAGS([obsdcompat], [openbsd-compat], [], +[_KPSE_LIB_FLAGS([obsdcompat], [openbsd-compat], [tree], [-IBLD/libs/obsdcompat -ISRC/libs/obsdcompat], - [BLD/libs/obsdcompat/libopenbsd-compat.a], - [tree], - [${top_srcdir}/../../libs/obsdcompat/*.[ch]])[]dnl + [BLD/libs/obsdcompat/libopenbsd-compat.a], [], + [], [${top_srcdir}/../../libs/obsdcompat/*.[ch]])[]dnl ]) # KPSE_OBSDCOMPAT_FLAGS diff --git a/Build/source/m4/kpse-options.m4 b/Build/source/m4/kpse-options.m4 index 159c63b5f16..a96edab08c3 100644 --- a/Build/source/m4/kpse-options.m4 +++ b/Build/source/m4/kpse-options.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4 index 27ac4c7a7db..32708f69d7b 100644 --- a/Build/source/m4/kpse-pkgs.m4 +++ b/Build/source/m4/kpse-pkgs.m4 @@ -1,4 +1,4 @@ -# Private macros for the teTeX / TeX Live (TL) tree. +# Private macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4 index b6cfa8ebcb9..a135351f0bb 100644 --- a/Build/source/m4/kpse-setup.m4 +++ b/Build/source/m4/kpse-setup.m4 @@ -1,4 +1,4 @@ -# Private macros for the teTeX / TeX Live (TL) tree. +# Private macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -9,7 +9,7 @@ # KPSE_SETUP(TOP-LEVEL) # --------------------- -# Initialize path prefix kpse_TL to top-level teTeX / TeX Live (TL) directory. +# Initialize path prefix kpse_TL to top-level TeX Live (TL) directory. # Sinclude all withenable.ac files providing: # configure options --with-system-LIB, --with-LIB-includes, and --with-LIB-libdir # for libraries @@ -25,6 +25,7 @@ AC_ARG_ENABLE([all-pkgs], test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes KPSE_ENABLE_CXX_HACK KPSE_OPTIONS +KPSE_LIBS_PREPARE KPSE_WEB2C_PREPARE m4_sinclude(kpse_TL[ac/withenable.ac]) m4_sinclude(kpse_TL[utils/ac/withenable.ac]) @@ -36,60 +37,46 @@ m4_sinclude(kpse_TL[libs/ac/withenable.ac]) KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])]) ]) # KPSE_SETUP -# KPSE_WITH_PROG(PROG, REQUIRED-LIBS, OPTIONS, [COMMENT]) -# ------------------------------------------------------- -# Provide the configure option --enable-PROG if the option `without' is +# KPSE_ENABLE_PROG(PROG, REQUIRED-LIBS, OPTIONS, [COMMENT]) +# --------------------------------------------------------- +# Provide the configure option --enable-PROG if the option `disable' is # specified, or -disable-PROG otherwise. # Define the list of libraries required from the TL tree (if any). # Options: -# without - do not build by default -AC_DEFUN([KPSE_WITH_PROG], -[m4_pushdef([Kpse_with], m4_if(m4_index([ $3 ], [ without ]), [-1], [yes], [no]))[]dnl +# disable - do not build by default +AC_DEFUN([KPSE_ENABLE_PROG], +[m4_pushdef([Kpse_enable], m4_if(m4_index([ $3 ], [ disable ]), [-1], [yes], [no]))[]dnl AC_ARG_ENABLE([$1], - AS_HELP_STRING([[--]m4_if(Kpse_with, [yes], [dis], [en])[able-$1]], - m4_if(Kpse_with, [yes], + AS_HELP_STRING([[--]m4_if(Kpse_enable, [yes], [dis], [en])[able-$1]], + m4_if(Kpse_enable, [yes], [do not ])[build the $1 ]m4_ifval([$4], [($4) ])[package]))[]dnl case $enable_[]AS_TR_SH($1) in #( yes|no);; #( - *) enable_[]AS_TR_SH($1)=m4_if(Kpse_with, [yes], [$enable_all_pkgs], [no]) + *) enable_[]AS_TR_SH($1)=m4_if(Kpse_enable, [yes], [$enable_all_pkgs], [no]) AC_MSG_NOTICE([Assuming `--enable-$1=$enable_]AS_TR_SH($1)[']) ac_configure_args="$ac_configure_args '--enable-$1=$enable_[]AS_TR_SH($1)'";; esac -m4_popdef([Kpse_with])[]dnl +m4_popdef([Kpse_enable])[]dnl m4_ifval([$2], [ test "x$enable_[]AS_TR_SH($1)" = xno || { AC_FOREACH([Kpse_Lib], [$2], [ need_[]AS_TR_SH(Kpse_Lib)=yes ])} ])[]dnl m4_ifval -]) # KPSE_WITH_PROG +]) # KPSE_ENABLE_PROG -# KPSE_WITH_LIB(LIB, REQUIRED-LIBS, OPTIONS, [COMMENT-SYS], - [COMMENT-INC], [COMMENT-LIB]) +# KPSE_WITH_LIB(LIB, REQUIRED-LIBS, OPTIONS) # --------------------------------------------------------- -# Unless the option `tree' is specified, provide the configure option. -# --with-system-LIB; in addition provide --with-LIB-includes, and -# --with-LIB-libdir unless the option `nodirs' is specified. +# Unless the option `tree' is specified, provide the configure options +# --with-system-LIB, --with-LIB-includes, and --with-LIB-libdir. # Define the list of libraries required from the TL tree (if any). # Options: # tree - only use library from the TL tree -# nodirs - prevent --with-LIB-*=DIR configure options -# The last three arguments are optional additions to the help texts. # # At the top-level we build a (reversed) list of potential system libraries. AC_DEFUN([KPSE_WITH_LIB], [m4_if(m4_index([ $3 ], [ tree ]), [-1], -[AC_ARG_WITH([system-$1], - [AS_HELP_STRING([--with-system-$1], - [use installed $1 headers and library]m4_ifval([$4], [ ($4)]))])[]dnl -m4_if(m4_index([ $3 ], [ nodirs ]), [-1], -[AC_ARG_WITH([$1-includes], - [AS_HELP_STRING([--with-$1-includes=DIR], - [$1 headers installed in DIR]m4_ifval([$5], [ ($5)]))])[]dnl -AC_ARG_WITH([$1-libdir], - [AS_HELP_STRING([--with-$1-libdir=DIR], - [$1 library installed in DIR]m4_ifval([$6], [ ($6)]))])[]dnl -])[]dnl m4_if +[KPSE_]AS_TR_CPP([$1])[_OPTIONS([with-system])[]dnl if test "x$with_system_[]AS_TR_SH($1)" = x; then if test -f $srcdir/kpse_TL[]m4_if([$1], [kpathsea], [texk], [libs])/$1/configure; then AC_MSG_NOTICE([Assuming `$1' headers and library from TL tree]) diff --git a/Build/source/m4/kpse-socket-libs.m4 b/Build/source/m4/kpse-socket-libs.m4 index 1ff41d79914..9a942e938ac 100644 --- a/Build/source/m4/kpse-socket-libs.m4 +++ b/Build/source/m4/kpse-socket-libs.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 1997 Karl Berry <karl@cs.umb.edu> # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # with help from Taco Hoekwater <taco@luatex.org> diff --git a/Build/source/m4/kpse-t1lib-flags.m4 b/Build/source/m4/kpse-t1lib-flags.m4 index 7bc197b1d10..5e3a73e9552 100644 --- a/Build/source/m4/kpse-t1lib-flags.m4 +++ b/Build/source/m4/kpse-t1lib-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,22 +7,23 @@ # serial 0 -# KPSE_T1LIB_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE]) -# ------------------------------------------------- +# KPSE_T1LIB_FLAGS +# ---------------- # Provide the configure options '--with-system-t1lib' (if in the TL tree), # '--with-t1lib-includes', and '--with-t1lib-libdir'. # # Set the make variables T1LIB_INCLUDES and T1LIB_LIBS to the CPPFLAGS and # LIBS required for the `-lt1' library in libs/t1lib/ of the TL tree. AC_DEFUN([KPSE_T1LIB_FLAGS], -[_KPSE_LIB_FLAGS([t1lib], [t1], - [$1], +[_KPSE_LIB_FLAGS([t1lib], [t1], [], [-IBLD/libs/t1lib], [BLD/libs/t1lib/libt1.a], [], [], [${top_builddir}/../../libs/t1lib/t1lib.h])[]dnl ]) # KPSE_T1LIB_FLAGS +# KPSE_T1LIB_OPTIONS([WITH-SYSTEM]) +# --------------------------------- +AC_DEFUN([KPSE_T1LIB_OPTIONS], [_KPSE_LIB_OPTIONS([t1lib], [$1])]) + # KPSE_T1LIB_SYSTEM_FLAGS # ----------------------- -AC_DEFUN([KPSE_T1LIB_SYSTEM_FLAGS], -[_KPSE_LIB_FLAGS_SYSTEM([t1lib], [t1])[]dnl -]) # KPSE_T1LIB_SYSTEM_FLAGS +AC_DEFUN([KPSE_T1LIB_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([t1lib], [t1])]) diff --git a/Build/source/m4/kpse-teckit-flags.m4 b/Build/source/m4/kpse-teckit-flags.m4 index 434508c361a..cd748a5d5e4 100644 --- a/Build/source/m4/kpse-teckit-flags.m4 +++ b/Build/source/m4/kpse-teckit-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,8 +7,8 @@ # serial 0 -# KPSE_TECKIT_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE]) -# -------------------------------------------------- +# KPSE_TECKIT_FLAGS +# ----------------- # Provide the configure options '--with-system-teckit' (if in the TL tree), # '--with-teckit-includes', and '--with-teckit-libdir'. # @@ -16,15 +16,15 @@ # LIBS required for the `-lTECkit' library in libs/teckit/ of the TL tree. AC_DEFUN([KPSE_TECKIT_FLAGS], [AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl -_KPSE_LIB_FLAGS([teckit], [TECkit], - [$1], - [-ISRC/libs/teckit/source/Public-headers], - [BLD/libs/teckit/libTECkit.a], [], - [], [])[]dnl +_KPSE_LIB_FLAGS([teckit], [TECkit], [], + [-ISRC/libs/teckit/source/Public-headers], [BLD/libs/teckit/libTECkit.a], [], + [], [])[]dnl ]) # KPSE_TECKIT_FLAGS +# KPSE_TECKIT_OPTIONS([WITH-SYSTEM]) +# ---------------------------------- +AC_DEFUN([KPSE_TECKIT_OPTIONS], [_KPSE_LIB_OPTIONS([teckit], [$1])]) + # KPSE_TECKIT_SYSTEM_FLAGS # ------------------------ -AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS], -[_KPSE_LIB_FLAGS_SYSTEM([teckit], [TECkit])[]dnl -]) # KPSE_TECKIT_SYSTEM_FLAGS +AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([teckit], [TECkit])]) diff --git a/Build/source/m4/kpse-web2c.m4 b/Build/source/m4/kpse-web2c.m4 index 57d80bd9c32..b658ddf4ef1 100644 --- a/Build/source/m4/kpse-web2c.m4 +++ b/Build/source/m4/kpse-web2c.m4 @@ -1,4 +1,4 @@ -# Private macros for the teTeX / TeX Live (TL) tree. +# Private macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder diff --git a/Build/source/m4/kpse-win32.m4 b/Build/source/m4/kpse-win32.m4 index b953b76ee62..c98d9b80d03 100644 --- a/Build/source/m4/kpse-win32.m4 +++ b/Build/source/m4/kpse-win32.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4 index 82fb20542c7..4595ef6ccff 100644 --- a/Build/source/m4/kpse-xpdf-flags.m4 +++ b/Build/source/m4/kpse-xpdf-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,24 +7,13 @@ # serial 0 -# KPSE_XPDF_FLAGS() -# ----------------- +# KPSE_XPDF_FLAGS +# --------------- # Set the make variables XPDF_INCLUDES and XPDF_LIBS to the CPPFLAGS and # LIBS required for the `-lxpdf' library in libs/xpdf/ of the TL tree. AC_DEFUN([KPSE_XPDF_FLAGS], -[_KPSE_LIB_FLAGS([xpdf], [xpdf], [], - _Kpse_Xpdf_Flags[ -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/fofi -IBLD/libs/xpdf/xpdf], - [BLD/libs/xpdf/libxpdf.a], - [tree], +[_KPSE_LIB_FLAGS([xpdf], [xpdf], [tree], + [-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/fofi -IBLD/libs/xpdf/xpdf], + [BLD/libs/xpdf/libxpdf.a], [], [], [${top_builddir}/../../libs/xpdf/xpdf/Stream.h])[]dnl ]) # KPSE_XPDF_FLAGS - -# KPSE_XPDF_SELF_FLAGS() -# ---------------------- -# Flags for building and using libxpdf. -AC_DEFUN([KPSE_XPDF_SELF_FLAGS], -[XPDF_SELF_FLAGS=_Kpse_Xpdf_Flags -AC_SUBST([XPDF_SELF_FLAGS])[]dnl -]) # KPSE_XPDF_SELF_FLAGS - -m4_define([_Kpse_Xpdf_Flags], [-DPDF_PARSER_ONLY]) diff --git a/Build/source/m4/kpse-zlib-flags.m4 b/Build/source/m4/kpse-zlib-flags.m4 index 009528a3b24..15966a6bfb4 100644 --- a/Build/source/m4/kpse-zlib-flags.m4 +++ b/Build/source/m4/kpse-zlib-flags.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder @@ -7,22 +7,23 @@ # serial 0 -# KPSE_ZLIB_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE]) -# ------------------------------------------------ +# KPSE_ZLIB_FLAGS +# --------------- # Provide the configure options '--with-system-zlib' (if in the TL tree), # '--with-zlib-includes', and '--with-zlib-libdir'. # # Set the make variables ZLIB_INCLUDES and ZLIB_LIBS to the CPPFLAGS and # LIBS required for the `-lz' library in libs/zlib/ of the TL tree. AC_DEFUN([KPSE_ZLIB_FLAGS], -[_KPSE_LIB_FLAGS([zlib], [z], - [$1], +[_KPSE_LIB_FLAGS([zlib], [z], [], [-IBLD/libs/zlib], [BLD/libs/zlib/libz.a], [], [], [${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h])[]dnl ]) # KPSE_ZLIB_FLAGS +# KPSE_ZLIB_OPTIONS([WITH-SYSTEM]) +# -------------------------------- +AC_DEFUN([KPSE_ZLIB_OPTIONS], [_KPSE_LIB_OPTIONS([zlib], [$1])]) + # KPSE_ZLIB_SYSTEM_FLAGS # ---------------------- -AC_DEFUN([KPSE_ZLIB_SYSTEM_FLAGS], -[_KPSE_LIB_FLAGS_SYSTEM([zlib], [z])[]dnl -]) # KPSE_ZLIB_SYSTEM_FLAGS +AC_DEFUN([KPSE_ZLIB_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([zlib], [z])]) diff --git a/Build/source/m4/maw-time.m4 b/Build/source/m4/maw-time.m4 index 5893b5488c9..faf96e20d36 100644 --- a/Build/source/m4/maw-time.m4 +++ b/Build/source/m4/maw-time.m4 @@ -1,4 +1,4 @@ -# Public macros for the teTeX / TeX Live (TL) tree. +# Public macros for the TeX Live (TL) tree. # Copyright (C) 1998 - 2008 Mark A. Wicks <mwicks@kettering.edu> # Kettering University # Copyright (C) 2008 - 2009 Peter Breitenlohner <tex-live@tug.org> diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 6fb5f028f74..c218294970a 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -44,11 +44,21 @@ DIST_COMMON = README $(am__configure_deps) \ ../build-aux/ltmain.sh ../build-aux/missing \ ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ + $(top_srcdir)/../m4/kpse-cxx-hack.m4 \ + $(top_srcdir)/../m4/kpse-freetype-flags.m4 \ + $(top_srcdir)/../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../m4/kpse-gd-flags.m4 \ + $(top_srcdir)/../m4/kpse-graphite-flags.m4 \ + $(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../m4/kpse-libpng-flags.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 \ + $(top_srcdir)/../m4/kpse-teckit-flags.m4 \ $(top_srcdir)/../m4/kpse-web2c.m4 \ + $(top_srcdir)/../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../ac/withenable.ac \ $(top_srcdir)/../utils/ac/withenable.ac \ $(top_srcdir)/../utils/dialog/ac/withenable.ac \ diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4 index c917492c6a5..9fae18de399 100644 --- a/Build/source/texk/aclocal.m4 +++ b/Build/source/texk/aclocal.m4 @@ -616,8 +616,18 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../m4/kpse-common.m4]) m4_include([../m4/kpse-cxx-hack.m4]) +m4_include([../m4/kpse-freetype-flags.m4]) +m4_include([../m4/kpse-freetype2-flags.m4]) +m4_include([../m4/kpse-gd-flags.m4]) +m4_include([../m4/kpse-graphite-flags.m4]) +m4_include([../m4/kpse-kpathsea-flags.m4]) +m4_include([../m4/kpse-libpng-flags.m4]) m4_include([../m4/kpse-options.m4]) m4_include([../m4/kpse-pkgs.m4]) m4_include([../m4/kpse-setup.m4]) +m4_include([../m4/kpse-t1lib-flags.m4]) +m4_include([../m4/kpse-teckit-flags.m4]) m4_include([../m4/kpse-web2c.m4]) +m4_include([../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/texk/afm2pl/ac/withenable.ac b/Build/source/texk/afm2pl/ac/withenable.ac index 7d7539504f6..eb802145f06 100644 --- a/Build/source/texk/afm2pl/ac/withenable.ac +++ b/Build/source/texk/afm2pl/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for afm2pl -KPSE_WITH_PROG([afm2pl], [kpathsea]) +KPSE_ENABLE_PROG([afm2pl], [kpathsea]) diff --git a/Build/source/texk/afm2pl/configure b/Build/source/texk/afm2pl/configure index de624ecda92..9a83640af15 100755 --- a/Build/source/texk/afm2pl/configure +++ b/Build/source/texk/afm2pl/configure @@ -14248,6 +14248,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/bibtex8/ac/withenable.ac b/Build/source/texk/bibtex8/ac/withenable.ac index 93a32cec26c..b7af8cd8739 100644 --- a/Build/source/texk/bibtex8/ac/withenable.ac +++ b/Build/source/texk/bibtex8/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for bibtex8 -KPSE_WITH_PROG([bibtex8], [kpathsea]) +KPSE_ENABLE_PROG([bibtex8], [kpathsea]) diff --git a/Build/source/texk/bibtex8/configure b/Build/source/texk/bibtex8/configure index e3f9efd07d8..fd9a193bb82 100755 --- a/Build/source/texk/bibtex8/configure +++ b/Build/source/texk/bibtex8/configure @@ -14148,6 +14148,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/cjkutils/ac/withenable.ac b/Build/source/texk/cjkutils/ac/withenable.ac index 723c8a1ab3c..d8d34f12e4d 100644 --- a/Build/source/texk/cjkutils/ac/withenable.ac +++ b/Build/source/texk/cjkutils/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for cjkutils -KPSE_WITH_PROG([cjkutils], [kpathsea]) +KPSE_ENABLE_PROG([cjkutils], [kpathsea]) diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure index 9ae1fe2b057..e0e7c8fd42c 100755 --- a/Build/source/texk/cjkutils/configure +++ b/Build/source/texk/cjkutils/configure @@ -14549,6 +14549,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 47f47afedbd..f00c9d22282 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -2192,6 +2192,7 @@ if test "x$enable_multiplatform" = xyes; then fi + ## ac/withenable.ac: configure.ac fragment for the TeX Live top-level ## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ @@ -3334,15 +3335,25 @@ $as_echo "$as_me: -> installed \`libpng' headers and library" >&6;} $as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-libpng'" >&2;} { (exit 1); exit 1; }; } fi + if test "x$with_system_freetype2" = x; then + { $as_echo "$as_me:$LINENO: -> installed \`freetype2' headers and library" >&5 +$as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;} + with_system_freetype2=yes + ac_configure_args="$ac_configure_args '--with-system-freetype2'" + elif test "x$with_system_freetype2" != xyes; then + { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&5 +$as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&2;} + { (exit 1); exit 1; }; } + fi fi test "x$need_gd" = xyes && { need_libpng=yes + need_freetype2=yes } ## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ -## configure options and TL libraries required for freetype2 # Check whether --with-system-freetype2 was given. if test "${with_system_freetype2+set}" = set; then @@ -3360,6 +3371,22 @@ $as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;} fi ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'" fi +if test "x$with_system_freetype2" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:$LINENO: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5 +$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;} + { (exit 1); exit 1; }; } + fi +fi + +test "x$need_freetype2" = xyes && { + need_zlib=yes +} ## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ diff --git a/Build/source/texk/detex/ac/withenable.ac b/Build/source/texk/detex/ac/withenable.ac index 3c1c983f3ad..e342f6fd2d7 100644 --- a/Build/source/texk/detex/ac/withenable.ac +++ b/Build/source/texk/detex/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for detex -KPSE_WITH_PROG([detex], [kpathsea]) +KPSE_ENABLE_PROG([detex], [kpathsea]) diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure index f358f201543..b77bacfbf44 100755 --- a/Build/source/texk/detex/configure +++ b/Build/source/texk/detex/configure @@ -14447,6 +14447,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/devnag/ac/withenable.ac b/Build/source/texk/devnag/ac/withenable.ac index 1927321a1d7..862a4ae7e2e 100644 --- a/Build/source/texk/devnag/ac/withenable.ac +++ b/Build/source/texk/devnag/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for devnag -KPSE_WITH_PROG([devnag]) +KPSE_ENABLE_PROG([devnag]) diff --git a/Build/source/texk/dtl/ac/withenable.ac b/Build/source/texk/dtl/ac/withenable.ac index 89606bf9304..200c09e1663 100644 --- a/Build/source/texk/dtl/ac/withenable.ac +++ b/Build/source/texk/dtl/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dtl -KPSE_WITH_PROG([dtl], [kpathsea]) +KPSE_ENABLE_PROG([dtl], [kpathsea]) diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure index 58c23905fb2..f017cb17d4f 100755 --- a/Build/source/texk/dtl/configure +++ b/Build/source/texk/dtl/configure @@ -14580,6 +14580,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/dvi2tty/ac/withenable.ac b/Build/source/texk/dvi2tty/ac/withenable.ac index 2a6c817a08d..09ef82add68 100644 --- a/Build/source/texk/dvi2tty/ac/withenable.ac +++ b/Build/source/texk/dvi2tty/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvi2tty -KPSE_WITH_PROG([dvi2tty], [kpathsea]) +KPSE_ENABLE_PROG([dvi2tty], [kpathsea]) diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure index 505f9d47606..289e4605456 100755 --- a/Build/source/texk/dvi2tty/configure +++ b/Build/source/texk/dvi2tty/configure @@ -14160,6 +14160,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/dvidvi/ac/withenable.ac b/Build/source/texk/dvidvi/ac/withenable.ac index 78579276db8..e875dd52937 100644 --- a/Build/source/texk/dvidvi/ac/withenable.ac +++ b/Build/source/texk/dvidvi/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvidvi -KPSE_WITH_PROG([dvidvi], [kpathsea]) +KPSE_ENABLE_PROG([dvidvi], [kpathsea]) diff --git a/Build/source/texk/dvidvi/configure b/Build/source/texk/dvidvi/configure index ea3f1420212..9f014f528ee 100755 --- a/Build/source/texk/dvidvi/configure +++ b/Build/source/texk/dvidvi/configure @@ -14160,6 +14160,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/dviljk/ac/withenable.ac b/Build/source/texk/dviljk/ac/withenable.ac index b76e05d6c47..22ea684d4b2 100644 --- a/Build/source/texk/dviljk/ac/withenable.ac +++ b/Build/source/texk/dviljk/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dviljk -KPSE_WITH_PROG([dviljk], [kpathsea]) +KPSE_ENABLE_PROG([dviljk], [kpathsea]) diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure index ea24179ec69..d2ab4feb889 100755 --- a/Build/source/texk/dviljk/configure +++ b/Build/source/texk/dviljk/configure @@ -14675,6 +14675,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/dvipdfm/ac/withenable.ac b/Build/source/texk/dvipdfm/ac/withenable.ac index 6dea45665b8..789042b226d 100644 --- a/Build/source/texk/dvipdfm/ac/withenable.ac +++ b/Build/source/texk/dvipdfm/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvipdfm -KPSE_WITH_PROG([dvipdfm], [kpathsea libpng]) +KPSE_ENABLE_PROG([dvipdfm], [kpathsea libpng]) diff --git a/Build/source/texk/dvipdfm/configure b/Build/source/texk/dvipdfm/configure index c7f60eb525b..6edcf5e1a98 100755 --- a/Build/source/texk/dvipdfm/configure +++ b/Build/source/texk/dvipdfm/configure @@ -14988,6 +14988,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea @@ -15027,6 +15028,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz @@ -15066,6 +15068,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng diff --git a/Build/source/texk/dvipdfmx/ac/withenable.ac b/Build/source/texk/dvipdfmx/ac/withenable.ac index a41e7d396ee..6233831bc89 100644 --- a/Build/source/texk/dvipdfmx/ac/withenable.ac +++ b/Build/source/texk/dvipdfmx/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvipdfmx -KPSE_WITH_PROG([dvipdfmx], [kpathsea libpng]) +KPSE_ENABLE_PROG([dvipdfmx], [kpathsea libpng]) diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure index d299bc8fe8c..5c26f7c6f0a 100755 --- a/Build/source/texk/dvipdfmx/configure +++ b/Build/source/texk/dvipdfmx/configure @@ -17245,6 +17245,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea @@ -17284,6 +17285,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz @@ -17323,6 +17325,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng @@ -17397,6 +17400,28 @@ $as_echo "$kpse_cv_have_truetype_format" >&6; } if test "x$kpse_cv_have_truetype_format" = xyes; then : else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipdfmx has been disabled and would fail because +Required file formats not found in Kpathsea header files. + +This version of dvipdfmx requires that kpathsea and its headers be available. +If you are sure they are installed and in a standard place, maybe you need a +newer version of kpathsea? You also might try setting the environment +variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing +the file \"kpathsea/kpathsea.h\" + +" >&5 +$as_echo "$as_me: WARNING: building dvipdfmx has been disabled and would fail because +Required file formats not found in Kpathsea header files. + +This version of dvipdfmx requires that kpathsea and its headers be available. +If you are sure they are installed and in a standard place, maybe you need a +newer version of kpathsea? You also might try setting the environment +variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing +the file \"kpathsea/kpathsea.h\" + +" >&2;} +else { { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files. This version of dvipdfmx requires that kpathsea and its headers be available. @@ -17418,6 +17443,9 @@ the file \"kpathsea/kpathsea.h\" { (exit 1); exit 1; }; } fi + +fi + { $as_echo "$as_me:$LINENO: checking whether xbasename is declared" >&5 $as_echo_n "checking whether xbasename is declared... " >&6; } if test "${ac_cv_have_decl_xbasename+set}" = set; then @@ -17475,12 +17503,21 @@ $as_echo "$ac_cv_have_decl_xbasename" >&6; } if test "x$ac_cv_have_decl_xbasename" = x""yes; then : else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipdfmx has been disabled and would fail because +This version of dvipdfmx requires xbasename in libkpathsea." >&5 +$as_echo "$as_me: WARNING: building dvipdfmx has been disabled and would fail because +This version of dvipdfmx requires xbasename in libkpathsea." >&2;} +else { { $as_echo "$as_me:$LINENO: error: This version of dvipdfmx requires xbasename in libkpathsea." >&5 $as_echo "$as_me: error: This version of dvipdfmx requires xbasename in libkpathsea." >&2;} { (exit 1); exit 1; }; } fi +fi + + { $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_opentype_format" >&5 $as_echo_n "checking whether kpathsea declares the kpse_opentype_format... " >&6; } diff --git a/Build/source/texk/dvipng/ac/withenable.ac b/Build/source/texk/dvipng/ac/withenable.ac index 102fcee7cf4..0ccd52f780e 100644 --- a/Build/source/texk/dvipng/ac/withenable.ac +++ b/Build/source/texk/dvipng/ac/withenable.ac @@ -4,5 +4,5 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvipng -KPSE_WITH_PROG([dvipng], [kpathsea freetype2 gd t1lib]) +KPSE_ENABLE_PROG([dvipng], [kpathsea freetype2 gd t1lib]) m4_include(kpse_TL[texk/dvipng/ac/dvipng.ac]) diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 32189fb41c6..f2d716a822e 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -961,8 +961,6 @@ with_system_t1lib with_t1lib_includes with_t1lib_libdir with_system_freetype2 -with_freetype2_includes -with_freetype2_libdir with_system_gd with_gd_includes with_gd_libdir @@ -1645,10 +1643,7 @@ Optional Packages: t1lib headers installed in DIR --with-t1lib-libdir=DIR t1lib library installed in DIR --with-system-freetype2 use installed freetype2 headers and library - --with-freetype2-includes=DIR - freetype2 headers installed in DIR - --with-freetype2-libdir=DIR - freetype2 library installed in DIR + (requires freetype-config) --with-system-gd use installed gd headers and library --with-gd-includes=DIR gd headers installed in DIR --with-gd-libdir=DIR gd library installed in DIR @@ -4244,13 +4239,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:4247: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4242: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4250: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4245: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4253: output\"" >&5) + (eval echo "\"\$as_me:4248: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5456,7 +5451,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5459 "configure"' > conftest.$ac_ext + echo '#line 5454 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7503,11 +7498,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:7506: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7501: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7510: \$? = $ac_status" >&5 + echo "$as_me:7505: \$? = $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. @@ -7842,11 +7837,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:7845: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7840: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7849: \$? = $ac_status" >&5 + echo "$as_me:7844: \$? = $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. @@ -7947,11 +7942,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:7950: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7945: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7954: \$? = $ac_status" >&5 + echo "$as_me:7949: \$? = $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 @@ -8002,11 +7997,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:8005: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8000: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8009: \$? = $ac_status" >&5 + echo "$as_me:8004: \$? = $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 @@ -10802,7 +10797,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10805 "configure" +#line 10800 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10898,7 +10893,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10901 "configure" +#line 10896 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17991,6 +17986,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea @@ -18030,6 +18026,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz @@ -18069,6 +18066,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng @@ -18108,6 +18106,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` T1LIB_LIBS=`echo 'BLD/libs/t1lib/libt1.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + T1LIB_DEPEND=`echo 'BLD/libs/t1lib/libt1.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` T1LIB_RULE='# Rebuild libt1 @@ -18215,16 +18214,6 @@ fi if test "${with_system_freetype2+set}" = set; then withval=$with_system_freetype2; fi - -# Check whether --with-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval=$with_freetype2_includes; -fi - -# Check whether --with-freetype2-libdir was given. -if test "${with_freetype2_libdir+set}" = set; then - withval=$with_freetype2_libdir; -fi if test "x$with_system_freetype2" = xyes; then if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` @@ -18235,11 +18224,13 @@ $as_echo "$as_me: error: Can not use installed freetype2 headers and library" >& { (exit 1); exit 1; }; } fi else - FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \ + FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE2_LIBS=`cat $FREETYPE2_INCLUDES/ft-libs` + FREETYPE2_INCLUDES=`cat $FREETYPE2_INCLUDES/ft-includes` FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` FREETYPE2_RULE='# Rebuild libfreetype @@ -18248,13 +18239,7 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h ${top_builddir}/../../libs/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)' fi -if test "x$with_system_freetype2" = xno; then - FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`' - FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`' -fi -kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES -kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS ## _KPSE_LIB_FLAGS: Setup gd (-lgd) flags # Check whether --with-system-gd was given. @@ -18285,6 +18270,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` GD_LIBS=`echo 'BLD/libs/gd/libgd.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + GD_DEPEND=`echo 'BLD/libs/gd/libgd.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` GD_RULE='# Rebuild libgd @@ -18506,16 +18492,6 @@ fi fi -set -x -kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES -kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS -eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES" -eval FREETYPE2_LIBS="$FREETYPE2_LIBS" -set +x -{ $as_echo "$as_me:$LINENO: FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"" >&5 -$as_echo "$as_me: FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"" >&6;} -{ $as_echo "$as_me:$LINENO: FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"" >&5 -$as_echo "$as_me: FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"" >&6;} CPPFLAGS="$CPPFLAGS $FREETYPE2_INCLUDES" LIBS="$FREETYPE2_LIBS $LIBS" @@ -19466,8 +19442,6 @@ fi CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS -FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES -FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS DVIPNG_VERSION=1.12 diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index 135f48276c2..153cb8538fa 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -99,8 +99,6 @@ KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS KPSE_T1LIB_FLAGS KPSE_FREETYPE2_FLAGS -kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES -kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS KPSE_GD_FLAGS dnl We have to check properties of libraries, either installed (system) @@ -119,14 +117,6 @@ AC_CHECK_FUNC([png_read_image], [Define to 1 if you have the `png' library (-lpng).])], [KPSE_MSG_ERROR([dvipng], [cannot find/use libpng])]) -set -x -kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES -kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS -eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES" -eval FREETYPE2_LIBS="$FREETYPE2_LIBS" -set +x -AC_MSG_NOTICE([FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"]) -AC_MSG_NOTICE([FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"]) KPSE_ADD_FLAGS([freetype2]) KPSE_ADD_FLAGS([gd]) AC_CHECK_FUNC([gdImageCreate], @@ -174,8 +164,6 @@ AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImag AM_CONDITIONAL([have_gif], [test "x$ac_cv_func_gdImageGif" = xyes]) KPSE_RESTORE_FLAGS -FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES -FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS DVIPNG_VERSION=dvipng_version AC_SUBST([DVIPNG_VERSION]) diff --git a/Build/source/texk/dvipos/ac/withenable.ac b/Build/source/texk/dvipos/ac/withenable.ac index c4b7525dfba..93ed26f5508 100644 --- a/Build/source/texk/dvipos/ac/withenable.ac +++ b/Build/source/texk/dvipos/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvipos -KPSE_WITH_PROG([dvipos], [kpathsea]) +KPSE_ENABLE_PROG([dvipos], [kpathsea]) diff --git a/Build/source/texk/dvipos/configure b/Build/source/texk/dvipos/configure index bdbfede8445..19efdbc4276 100755 --- a/Build/source/texk/dvipos/configure +++ b/Build/source/texk/dvipos/configure @@ -14248,6 +14248,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/dvipsk/ac/withenable.ac b/Build/source/texk/dvipsk/ac/withenable.ac index 82596630bfc..836ab8fa68c 100644 --- a/Build/source/texk/dvipsk/ac/withenable.ac +++ b/Build/source/texk/dvipsk/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvipsk -KPSE_WITH_PROG([dvipsk], [kpathsea]) +KPSE_ENABLE_PROG([dvipsk], [kpathsea]) diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure index 9f4a0358568..08108d4d6ee 100755 --- a/Build/source/texk/dvipsk/configure +++ b/Build/source/texk/dvipsk/configure @@ -14609,6 +14609,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/gsftopk/ac/withenable.ac b/Build/source/texk/gsftopk/ac/withenable.ac index 323fe7654fe..97b38b19f9f 100644 --- a/Build/source/texk/gsftopk/ac/withenable.ac +++ b/Build/source/texk/gsftopk/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for gsftopk -KPSE_WITH_PROG([gsftopk], [kpathsea]) +KPSE_ENABLE_PROG([gsftopk], [kpathsea]) diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure index d61053975a4..5902c6c1850 100755 --- a/Build/source/texk/gsftopk/configure +++ b/Build/source/texk/gsftopk/configure @@ -15373,6 +15373,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/lacheck/ac/withenable.ac b/Build/source/texk/lacheck/ac/withenable.ac index ec65f8d6623..ca1b10f6a75 100644 --- a/Build/source/texk/lacheck/ac/withenable.ac +++ b/Build/source/texk/lacheck/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for lacheck -KPSE_WITH_PROG([lacheck], [kpathsea]) +KPSE_ENABLE_PROG([lacheck], [kpathsea]) diff --git a/Build/source/texk/lcdf-typetools/ac/withenable.ac b/Build/source/texk/lcdf-typetools/ac/withenable.ac index fdefd1ed472..86de85c9e2e 100644 --- a/Build/source/texk/lcdf-typetools/ac/withenable.ac +++ b/Build/source/texk/lcdf-typetools/ac/withenable.ac @@ -4,5 +4,5 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for lcdf-typetools -KPSE_WITH_PROG([lcdf-typetools], [kpathsea]) +KPSE_ENABLE_PROG([lcdf-typetools], [kpathsea]) m4_include(kpse_TL[texk/lcdf-typetools/ac/lcdf-typetools.ac]) diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index 53003774c77..351a7938fdf 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -19574,6 +19574,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/makeindexk/ac/withenable.ac b/Build/source/texk/makeindexk/ac/withenable.ac index d00b0ab0a42..abaf9f784fc 100644 --- a/Build/source/texk/makeindexk/ac/withenable.ac +++ b/Build/source/texk/makeindexk/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for makeindexk -KPSE_WITH_PROG([makeindexk], [kpathsea]) +KPSE_ENABLE_PROG([makeindexk], [kpathsea]) diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure index 340c9a62b87..783f5aebd91 100755 --- a/Build/source/texk/makeindexk/configure +++ b/Build/source/texk/makeindexk/configure @@ -14408,6 +14408,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/musixflx/ac/withenable.ac b/Build/source/texk/musixflx/ac/withenable.ac index 7fcb84a537b..819073a1653 100644 --- a/Build/source/texk/musixflx/ac/withenable.ac +++ b/Build/source/texk/musixflx/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for musixflx -KPSE_WITH_PROG([musixflx]) +KPSE_ENABLE_PROG([musixflx]) diff --git a/Build/source/texk/ps2pkm/ac/withenable.ac b/Build/source/texk/ps2pkm/ac/withenable.ac index d517dcb468d..f96aef61269 100644 --- a/Build/source/texk/ps2pkm/ac/withenable.ac +++ b/Build/source/texk/ps2pkm/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for ps2pkm -KPSE_WITH_PROG([ps2pkm], [kpathsea]) +KPSE_ENABLE_PROG([ps2pkm], [kpathsea]) diff --git a/Build/source/texk/ps2pkm/configure b/Build/source/texk/ps2pkm/configure index 93a3c14ad11..2fcb34d8701 100755 --- a/Build/source/texk/ps2pkm/configure +++ b/Build/source/texk/ps2pkm/configure @@ -14866,6 +14866,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/seetexk/ac/withenable.ac b/Build/source/texk/seetexk/ac/withenable.ac index e4b11948e59..d0595792f7a 100644 --- a/Build/source/texk/seetexk/ac/withenable.ac +++ b/Build/source/texk/seetexk/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for seetexk -KPSE_WITH_PROG([seetexk], [kpathsea]) +KPSE_ENABLE_PROG([seetexk], [kpathsea]) diff --git a/Build/source/texk/seetexk/configure b/Build/source/texk/seetexk/configure index c0601926578..2dd886cb428 100755 --- a/Build/source/texk/seetexk/configure +++ b/Build/source/texk/seetexk/configure @@ -14774,6 +14774,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/tetex/ac/withenable.ac b/Build/source/texk/tetex/ac/withenable.ac index 91ceb8cf219..abe1536b16b 100644 --- a/Build/source/texk/tetex/ac/withenable.ac +++ b/Build/source/texk/tetex/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for tetex -KPSE_WITH_PROG([tetex], , , [teTeX scripts]) +KPSE_ENABLE_PROG([tetex], , , [teTeX scripts]) diff --git a/Build/source/texk/tex4htk/ac/withenable.ac b/Build/source/texk/tex4htk/ac/withenable.ac index e79a0d42611..e4f1de2ddb3 100644 --- a/Build/source/texk/tex4htk/ac/withenable.ac +++ b/Build/source/texk/tex4htk/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for tex4htk -KPSE_WITH_PROG([tex4htk], [kpathsea]) +KPSE_ENABLE_PROG([tex4htk], [kpathsea]) diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index 491c4f69731..cef9d13a207 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -14520,6 +14520,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/texlive/ac/withenable.ac b/Build/source/texk/texlive/ac/withenable.ac index 974153136a2..82d635fb7ca 100644 --- a/Build/source/texk/texlive/ac/withenable.ac +++ b/Build/source/texk/texlive/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for texlive -KPSE_WITH_PROG([texlive], , , [TeX Live scripts]) +KPSE_ENABLE_PROG([texlive], , , [TeX Live scripts]) diff --git a/Build/source/texk/ttf2pk/ac/withenable.ac b/Build/source/texk/ttf2pk/ac/withenable.ac index 6709c989f42..fcebeff82bd 100644 --- a/Build/source/texk/ttf2pk/ac/withenable.ac +++ b/Build/source/texk/ttf2pk/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for ttf2pk -KPSE_WITH_PROG([ttf2pk], [kpathsea freetype]) +KPSE_ENABLE_PROG([ttf2pk], [kpathsea freetype]) diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure index 1f1cb75d9f2..22a58454c57 100755 --- a/Build/source/texk/ttf2pk/configure +++ b/Build/source/texk/ttf2pk/configure @@ -14260,6 +14260,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea @@ -14299,6 +14300,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` FREETYPE_LIBS=`echo 'BLD/libs/freetype/libttf.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE_DEPEND=`echo 'BLD/libs/freetype/libttf.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` FREETYPE_RULE='# Rebuild libttf diff --git a/Build/source/texk/ttfdump/ac/withenable.ac b/Build/source/texk/ttfdump/ac/withenable.ac index 14dcb612872..682d555186a 100644 --- a/Build/source/texk/ttfdump/ac/withenable.ac +++ b/Build/source/texk/ttfdump/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for ttfdump -KPSE_WITH_PROG([ttfdump], [kpathsea]) +KPSE_ENABLE_PROG([ttfdump], [kpathsea]) diff --git a/Build/source/texk/ttfdump/configure b/Build/source/texk/ttfdump/configure index 403c926a8da..13581829f5b 100755 --- a/Build/source/texk/ttfdump/configure +++ b/Build/source/texk/ttfdump/configure @@ -15996,6 +15996,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/web2c/ac/withenable.ac b/Build/source/texk/web2c/ac/withenable.ac index 42d9c3f6e99..42e6b71eedc 100644 --- a/Build/source/texk/web2c/ac/withenable.ac +++ b/Build/source/texk/web2c/ac/withenable.ac @@ -4,5 +4,5 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for web2c -KPSE_WITH_PROG([web2c], [kpathsea zlib], , [TeX & Co.]) +KPSE_ENABLE_PROG([web2c], [kpathsea zlib], , [TeX & Co.]) m4_include(kpse_TL[texk/web2c/ac/web2c.ac]) diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index c4ee2195f78..e69855d8a81 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -1070,8 +1070,6 @@ with_system_graphite with_graphite_includes with_graphite_libdir with_system_freetype2 -with_freetype2_includes -with_freetype2_libdir with_system_teckit with_teckit_includes with_teckit_libdir @@ -1790,10 +1788,7 @@ Optional Packages: --with-graphite-libdir=DIR graphite library installed in DIR --with-system-freetype2 use installed freetype2 headers and library - --with-freetype2-includes=DIR - freetype2 headers installed in DIR - --with-freetype2-libdir=DIR - freetype2 library installed in DIR + (requires freetype-config) --with-system-teckit use installed teckit headers and library --with-teckit-includes=DIR teckit headers installed in DIR @@ -4407,13 +4402,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:4410: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4405: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4413: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4408: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4416: output\"" >&5) + (eval echo "\"\$as_me:4411: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5619,7 +5614,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5622 "configure"' > conftest.$ac_ext + echo '#line 5617 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7666,11 +7661,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:7669: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7664: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7673: \$? = $ac_status" >&5 + echo "$as_me:7668: \$? = $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. @@ -8005,11 +8000,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:8008: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8003: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8012: \$? = $ac_status" >&5 + echo "$as_me:8007: \$? = $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. @@ -8110,11 +8105,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:8113: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8108: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8117: \$? = $ac_status" >&5 + echo "$as_me:8112: \$? = $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 @@ -8165,11 +8160,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:8168: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8163: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8172: \$? = $ac_status" >&5 + echo "$as_me:8167: \$? = $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 @@ -10965,7 +10960,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10968 "configure" +#line 10963 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11061,7 +11056,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11064 "configure" +#line 11059 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16077,11 +16072,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:16080: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16075: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16084: \$? = $ac_status" >&5 + echo "$as_me:16079: \$? = $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. @@ -16176,11 +16171,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:16179: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16174: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16183: \$? = $ac_status" >&5 + echo "$as_me:16178: \$? = $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 @@ -16228,11 +16223,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:16231: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16226: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16235: \$? = $ac_status" >&5 + echo "$as_me:16230: \$? = $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 @@ -23368,6 +23363,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea @@ -23407,6 +23403,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz @@ -23446,6 +23443,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng @@ -23461,6 +23459,7 @@ fi -e "s,BLD/,$kpse_BLD/,g"` XPDF_LIBS=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + XPDF_DEPEND=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` XPDF_RULE='# Rebuild libxpdf @@ -23499,6 +23498,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` GRAPHITE_LIBS=`echo 'BLD/libs/graphite/libgraphite.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + GRAPHITE_DEPEND=`echo 'BLD/libs/graphite/libgraphite.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` GRAPHITE_RULE='# Rebuild libgraphite @@ -23604,16 +23604,6 @@ fi if test "${with_system_freetype2+set}" = set; then withval=$with_system_freetype2; fi - -# Check whether --with-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval=$with_freetype2_includes; -fi - -# Check whether --with-freetype2-libdir was given. -if test "${with_freetype2_libdir+set}" = set; then - withval=$with_freetype2_libdir; -fi if test "x$with_system_freetype2" = xyes; then if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` @@ -23624,11 +23614,13 @@ $as_echo "$as_me: error: Can not use installed freetype2 headers and library" >& { (exit 1); exit 1; }; } fi else - FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \ + FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE2_LIBS=`cat $FREETYPE2_INCLUDES/ft-libs` + FREETYPE2_INCLUDES=`cat $FREETYPE2_INCLUDES/ft-includes` FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` FREETYPE2_RULE='# Rebuild libfreetype @@ -23637,10 +23629,6 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h ${top_builddir}/../../libs/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)' fi -if test "x$with_system_freetype2" = xno; then - FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`' - FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`' -fi ## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags @@ -23672,6 +23660,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` TECKIT_LIBS=`echo 'BLD/libs/teckit/libTECkit.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + TECKIT_DEPEND=`echo 'BLD/libs/teckit/libTECkit.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` TECKIT_RULE='# Rebuild libTECkit @@ -23685,6 +23674,7 @@ fi -e "s,BLD/,$kpse_BLD/,g"` ICU_LIBS=`echo 'BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ICU_DEPEND=`echo 'BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ICU_RULE='# Rebuild libsicuxxx @@ -23699,10 +23689,13 @@ ${top_builddir}/../../libs/icu/icu-build/common/unicode/platform.h: -e "s,BLD/,$kpse_BLD/,g"` OBSDCOMPAT_LIBS=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + OBSDCOMPAT_DEPEND=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` OBSDCOMPAT_RULE='# Rebuild libopenbsd-compat $(OBSDCOMPAT_DEPEND): ${top_srcdir}/../../libs/obsdcompat/*.[ch] + cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS) +${top_srcdir}/../../libs/obsdcompat/*.[ch]: cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS)' diff --git a/Build/source/texk/xdv2pdf/ac/withenable.ac b/Build/source/texk/xdv2pdf/ac/withenable.ac index a543a2b1dd3..9256f69e776 100644 --- a/Build/source/texk/xdv2pdf/ac/withenable.ac +++ b/Build/source/texk/xdv2pdf/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for xdv2pdf -KPSE_WITH_PROG([xdv2pdf], [kpathsea]) +KPSE_ENABLE_PROG([xdv2pdf], [kpathsea]) diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure index 23169dbbea5..fa7e6146796 100755 --- a/Build/source/texk/xdv2pdf/configure +++ b/Build/source/texk/xdv2pdf/configure @@ -19050,6 +19050,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea diff --git a/Build/source/texk/xdvik/ac/withenable.ac b/Build/source/texk/xdvik/ac/withenable.ac index 1156ac51f71..cefdcc4f609 100644 --- a/Build/source/texk/xdvik/ac/withenable.ac +++ b/Build/source/texk/xdvik/ac/withenable.ac @@ -4,5 +4,5 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for xdvik -KPSE_WITH_PROG([xdvik], [kpathsea t1lib]) +KPSE_ENABLE_PROG([xdvik], [kpathsea t1lib]) m4_include(kpse_TL[texk/xdvik/ac/xdvik.ac]) diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index 9a49616890f..adaccc54b1b 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -23181,6 +23181,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea @@ -23220,6 +23221,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` T1LIB_LIBS=`echo 'BLD/libs/t1lib/libt1.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + T1LIB_DEPEND=`echo 'BLD/libs/t1lib/libt1.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` T1LIB_RULE='# Rebuild libt1 diff --git a/Build/source/texk/xdvipdfmx/ac/withenable.ac b/Build/source/texk/xdvipdfmx/ac/withenable.ac index 421a0b3997a..69043225dbf 100644 --- a/Build/source/texk/xdvipdfmx/ac/withenable.ac +++ b/Build/source/texk/xdvipdfmx/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for xdvipdfmx -KPSE_WITH_PROG([xdvipdfmx], [kpathsea freetype2 libpng]) +KPSE_ENABLE_PROG([xdvipdfmx], [kpathsea freetype2 libpng]) diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 4e1b5058133..47cf6788a06 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -938,8 +938,6 @@ with_system_libpng with_libpng_includes with_libpng_libdir with_system_freetype2 -with_freetype2_includes -with_freetype2_libdir with_paper with_fontconfig ' @@ -1614,10 +1612,7 @@ Optional Packages: --with-libpng-libdir=DIR libpng library installed in DIR --with-system-freetype2 use installed freetype2 headers and library - --with-freetype2-includes=DIR - freetype2 headers installed in DIR - --with-freetype2-libdir=DIR - freetype2 library installed in DIR + (requires freetype-config) --with-paper=DIR use paper include/library files from DIR --with-fontconfig=DIR use fontconfig include/library files from DIR @@ -4212,13 +4207,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:4215: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4210: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4218: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4213: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4221: output\"" >&5) + (eval echo "\"\$as_me:4216: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5424,7 +5419,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5427 "configure"' > conftest.$ac_ext + echo '#line 5422 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7471,11 +7466,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:7474: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7469: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7478: \$? = $ac_status" >&5 + echo "$as_me:7473: \$? = $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. @@ -7810,11 +7805,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:7813: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7808: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7817: \$? = $ac_status" >&5 + echo "$as_me:7812: \$? = $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. @@ -7915,11 +7910,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:7918: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7913: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7922: \$? = $ac_status" >&5 + echo "$as_me:7917: \$? = $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 @@ -7970,11 +7965,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:7973: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7968: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7977: \$? = $ac_status" >&5 + echo "$as_me:7972: \$? = $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 @@ -10770,7 +10765,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10773 "configure" +#line 10768 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10866,7 +10861,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10869 "configure" +#line 10864 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17262,6 +17257,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea @@ -17301,6 +17297,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz @@ -17340,6 +17337,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng @@ -17447,16 +17445,6 @@ fi if test "${with_system_freetype2+set}" = set; then withval=$with_system_freetype2; fi - -# Check whether --with-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval=$with_freetype2_includes; -fi - -# Check whether --with-freetype2-libdir was given. -if test "${with_freetype2_libdir+set}" = set; then - withval=$with_freetype2_libdir; -fi if test "x$with_system_freetype2" = xyes; then if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` @@ -17467,11 +17455,13 @@ $as_echo "$as_me: error: Can not use installed freetype2 headers and library" >& { (exit 1); exit 1; }; } fi else - FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \ + FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE2_LIBS=`cat $FREETYPE2_INCLUDES/ft-libs` + FREETYPE2_INCLUDES=`cat $FREETYPE2_INCLUDES/ft-includes` FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` FREETYPE2_RULE='# Rebuild libfreetype @@ -17480,10 +17470,6 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h ${top_builddir}/../../libs/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)' fi -if test "x$with_system_freetype2" = xno; then - FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`' - FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`' -fi kpse_save_CPPFLAGS=$CPPFLAGS @@ -18194,12 +18180,6 @@ fi -set -x -kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES -kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS -eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES" -eval FREETYPE2_LIBS="$FREETYPE2_LIBS" -set +x CPPFLAGS="$CPPFLAGS $FREETYPE2_INCLUDES" LIBS="$FREETYPE2_LIBS $LIBS" @@ -18393,8 +18373,6 @@ fi CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS -FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES -FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then _cppflags=$CPPFLAGS _ldflags=$LDFLAGS diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac index 08fc22347a6..db6fd5ee46e 100644 --- a/Build/source/texk/xdvipdfmx/configure.ac +++ b/Build/source/texk/xdvipdfmx/configure.ac @@ -59,18 +59,10 @@ CHO_CHECK_ZLIB KPSE_ADD_FLAGS([libpng]) CHO_CHECK_LIBPNG -set -x -kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES -kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS -eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES" -eval FREETYPE2_LIBS="$FREETYPE2_LIBS" -set +x KPSE_ADD_FLAGS([freetype2]) CHO_CHECK_LIBFREETYPE([xdvipdfmx]) KPSE_RESTORE_FLAGS -FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES -FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS dnl We do not provide the configure option '--enable-tetex-build', but may dnl inherit enable_tetex_build when part of a teTeX / TeX Live installation. diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 3528c1e6355..9f9ee5fdc57 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -44,11 +44,21 @@ DIST_COMMON = README $(am__configure_deps) \ ../build-aux/ltmain.sh ../build-aux/missing \ ../build-aux/texinfo.tex ../build-aux/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ + $(top_srcdir)/../m4/kpse-cxx-hack.m4 \ + $(top_srcdir)/../m4/kpse-freetype-flags.m4 \ + $(top_srcdir)/../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../m4/kpse-gd-flags.m4 \ + $(top_srcdir)/../m4/kpse-graphite-flags.m4 \ + $(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../m4/kpse-libpng-flags.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 \ + $(top_srcdir)/../m4/kpse-teckit-flags.m4 \ $(top_srcdir)/../m4/kpse-web2c.m4 \ + $(top_srcdir)/../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../ac/withenable.ac \ $(top_srcdir)/../utils/ac/withenable.ac \ $(top_srcdir)/../utils/dialog/ac/withenable.ac \ diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4 index c917492c6a5..9fae18de399 100644 --- a/Build/source/utils/aclocal.m4 +++ b/Build/source/utils/aclocal.m4 @@ -616,8 +616,18 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../m4/kpse-common.m4]) m4_include([../m4/kpse-cxx-hack.m4]) +m4_include([../m4/kpse-freetype-flags.m4]) +m4_include([../m4/kpse-freetype2-flags.m4]) +m4_include([../m4/kpse-gd-flags.m4]) +m4_include([../m4/kpse-graphite-flags.m4]) +m4_include([../m4/kpse-kpathsea-flags.m4]) +m4_include([../m4/kpse-libpng-flags.m4]) m4_include([../m4/kpse-options.m4]) m4_include([../m4/kpse-pkgs.m4]) m4_include([../m4/kpse-setup.m4]) +m4_include([../m4/kpse-t1lib-flags.m4]) +m4_include([../m4/kpse-teckit-flags.m4]) m4_include([../m4/kpse-web2c.m4]) +m4_include([../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/utils/configure b/Build/source/utils/configure index f60611bb6af..bfdf78ebb1f 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -2169,6 +2169,7 @@ if test "x$enable_multiplatform" = xyes; then fi + ## ac/withenable.ac: configure.ac fragment for the TeX Live top-level ## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ @@ -3311,15 +3312,25 @@ $as_echo "$as_me: -> installed \`libpng' headers and library" >&6;} $as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-libpng'" >&2;} { (exit 1); exit 1; }; } fi + if test "x$with_system_freetype2" = x; then + { $as_echo "$as_me:$LINENO: -> installed \`freetype2' headers and library" >&5 +$as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;} + with_system_freetype2=yes + ac_configure_args="$ac_configure_args '--with-system-freetype2'" + elif test "x$with_system_freetype2" != xyes; then + { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&5 +$as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&2;} + { (exit 1); exit 1; }; } + fi fi test "x$need_gd" = xyes && { need_libpng=yes + need_freetype2=yes } ## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ -## configure options and TL libraries required for freetype2 # Check whether --with-system-freetype2 was given. if test "${with_system_freetype2+set}" = set; then @@ -3337,6 +3348,22 @@ $as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;} fi ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'" fi +if test "x$with_system_freetype2" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:$LINENO: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5 +$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;} + { (exit 1); exit 1; }; } + fi +fi + +test "x$need_freetype2" = xyes && { + need_zlib=yes +} ## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ diff --git a/Build/source/utils/dialog/ac/withenable.ac b/Build/source/utils/dialog/ac/withenable.ac index a4120c20a51..cebc0feba3e 100644 --- a/Build/source/utils/dialog/ac/withenable.ac +++ b/Build/source/utils/dialog/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dialog -KPSE_WITH_PROG([dialog]) +KPSE_ENABLE_PROG([dialog]) diff --git a/Build/source/utils/pdfopen/ac/withenable.ac b/Build/source/utils/pdfopen/ac/withenable.ac index 027f2b58a6a..af5081f81ca 100644 --- a/Build/source/utils/pdfopen/ac/withenable.ac +++ b/Build/source/utils/pdfopen/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for pdfopen -KPSE_WITH_PROG([pdfopen]) +KPSE_ENABLE_PROG([pdfopen]) diff --git a/Build/source/utils/ps2eps/ac/withenable.ac b/Build/source/utils/ps2eps/ac/withenable.ac index 0cc35384c75..d23be25fd0e 100644 --- a/Build/source/utils/ps2eps/ac/withenable.ac +++ b/Build/source/utils/ps2eps/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for ps2eps -KPSE_WITH_PROG([ps2eps]) +KPSE_ENABLE_PROG([ps2eps]) diff --git a/Build/source/utils/psutils/ac/withenable.ac b/Build/source/utils/psutils/ac/withenable.ac index 5155149ea59..2a30553663b 100644 --- a/Build/source/utils/psutils/ac/withenable.ac +++ b/Build/source/utils/psutils/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for psutils -KPSE_WITH_PROG([psutils]) +KPSE_ENABLE_PROG([psutils]) diff --git a/Build/source/utils/t1utils/ac/withenable.ac b/Build/source/utils/t1utils/ac/withenable.ac index 712ca6d3bcd..e4c5f91a37c 100644 --- a/Build/source/utils/t1utils/ac/withenable.ac +++ b/Build/source/utils/t1utils/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for t1utils -KPSE_WITH_PROG([t1utils]) +KPSE_ENABLE_PROG([t1utils]) diff --git a/Build/source/utils/tpic2pdftex/ac/withenable.ac b/Build/source/utils/tpic2pdftex/ac/withenable.ac index a8f812e9660..99ca0ee87ca 100644 --- a/Build/source/utils/tpic2pdftex/ac/withenable.ac +++ b/Build/source/utils/tpic2pdftex/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for tpic2pdftex -KPSE_WITH_PROG([tpic2pdftex]) +KPSE_ENABLE_PROG([tpic2pdftex]) diff --git a/Build/source/utils/vlna/ac/withenable.ac b/Build/source/utils/vlna/ac/withenable.ac index a1773efb38a..b81cc50e100 100644 --- a/Build/source/utils/vlna/ac/withenable.ac +++ b/Build/source/utils/vlna/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for vlna -KPSE_WITH_PROG([vlna]) +KPSE_ENABLE_PROG([vlna]) |