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/source/libs | |
parent | 6fe018282ebe6acac6f4c9aab818346f304e7373 (diff) |
build system cleanup
git-svn-id: svn://tug.org/texlive/trunk@12807 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r-- | Build/source/libs/Makefile.in | 12 | ||||
-rw-r--r-- | Build/source/libs/aclocal.m4 | 10 | ||||
-rwxr-xr-x | Build/source/libs/configure | 29 | ||||
-rw-r--r-- | Build/source/libs/freetype2/ac/withenable.ac | 5 | ||||
-rw-r--r-- | Build/source/libs/gd/ac/withenable.ac | 2 | ||||
-rwxr-xr-x | Build/source/libs/gd/configure | 2 | ||||
-rwxr-xr-x | Build/source/libs/libpng/configure | 1 | ||||
-rwxr-xr-x | Build/source/libs/teckit/configure | 1 | ||||
-rw-r--r-- | Build/source/libs/xpdf/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/xpdf/Makefile.in | 6 | ||||
-rw-r--r-- | Build/source/libs/xpdf/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/libs/xpdf/configure | 5 | ||||
-rw-r--r-- | Build/source/libs/xpdf/configure.ac | 4 | ||||
-rw-r--r-- | Build/source/libs/xpdf/fofi/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/libs/xpdf/goo/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/libs/xpdf/xpdf/Makefile.in | 4 |
16 files changed, 61 insertions, 31 deletions
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@ |