diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-09 10:07:08 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-09 10:07:08 +0000 |
commit | e981cdbd1662ed82436259f1046987c5b7204f1a (patch) | |
tree | 031a0f1bd753e2495237b10de7d1ff6fe5a1a909 /Build/source/configure.ac | |
parent | 3ad3db6624b55ad14658410f68ab6cb878904c7c (diff) |
Various updates of build system: Use AC_CONFIG_MACRO_DIRS instead of ACLOCAL_AMFLAGS,
Factor recursion into subdirs into .am fragment and m4 macros,
Avoid unnecessary use of Libtool,
Use z_const
git-svn-id: svn://tug.org/texlive/trunk@31606 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure.ac')
-rw-r--r-- | Build/source/configure.ac | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/Build/source/configure.ac b/Build/source/configure.ac index 242e4c7cbf7..4f2416a91b8 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -12,7 +12,7 @@ AC_INIT([TeX Live], tex_live_tardate, [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4]) AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIRS([m4]) dnl Prevent to configure the source tree by mistake. if test "x$srcdir" = x. && test "x$enable_build_in_source_tree" != xyes; then @@ -111,26 +111,7 @@ if test "x$enable_web2c" = xyes && test "x$with_system_kpathsea" = xyes; then fi fi -AC_MSG_CHECKING([for TeX specific libraries to build]) -MAKE_SUBDIRS= -CONF_SUBDIRS= -KPSE_FOR_PKGS([texlibs], [ -if test -x $srcdir/texk/Kpse_Pkg/configure; then - if test "x$with_system_[]Kpse_pkg" != xyes && \ - test "x$need_[]Kpse_pkg" = xyes; then - MAKE_SUBDIRS="texk/Kpse_Pkg $MAKE_SUBDIRS" - fi -dnl Cause 'make dist' to recurse into all texlibs dirs - CONF_SUBDIRS="texk/Kpse_Pkg $CONF_SUBDIRS" -dnl Cause 'configure -hr' and 'autoreconf' to recurse into all texlibs dirs - if false; then - AC_CONFIG_SUBDIRS([texk/]Kpse_Pkg) - fi -fi -]) -AC_SUBST([MAKE_SUBDIRS]) -AC_SUBST([CONF_SUBDIRS]) -AC_MSG_RESULT([$MAKE_SUBDIRS]) +KPSE_RECURSE_LIBS([texlibs], [TeX specific], [texk/]) dnl We check that all required system libraries are usable, and may dnl reduce frustration if anything is wrong by doing this first. |