summaryrefslogtreecommitdiff
path: root/Build/source/texk/configure.ac
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-09 10:07:08 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-09 10:07:08 +0000
commite981cdbd1662ed82436259f1046987c5b7204f1a (patch)
tree031a0f1bd753e2495237b10de7d1ff6fe5a1a909 /Build/source/texk/configure.ac
parent3ad3db6624b55ad14658410f68ab6cb878904c7c (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/texk/configure.ac')
-rw-r--r--Build/source/texk/configure.ac20
1 files changed, 2 insertions, 18 deletions
diff --git a/Build/source/texk/configure.ac b/Build/source/texk/configure.ac
index 58ccbac524d..d2d02a940c1 100644
--- a/Build/source/texk/configure.ac
+++ b/Build/source/texk/configure.ac
@@ -11,7 +11,7 @@ AC_INIT([TeX Live texk], tex_live_version(), [peb@mppmu.mpg.de])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([../build-aux/missing])
AC_CONFIG_AUX_DIR([../build-aux])
-AC_CONFIG_MACRO_DIR([../m4])
+AC_CONFIG_MACRO_DIRS([../m4])
dnl See comment in ../configure.ac
KPSE_SETUP([../])
@@ -20,23 +20,7 @@ KPSE_BASIC([texk])
AC_PROG_MKDIR_P
-AC_MSG_CHECKING([for TeXk programs to build])
-MAKE_SUBDIRS=
-CONF_SUBDIRS=
-KPSE_FOR_PKGS([texk], [
-if test -x $srcdir/Kpse_Pkg/configure; then
- test "x$enable_[]Kpse_pkg" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS Kpse_Pkg"
-dnl Cause 'make dist' to recurse into all subtexk dirs
- CONF_SUBDIRS="$CONF_SUBDIRS Kpse_Pkg"
-dnl Cause 'configure -hr' and 'autoreconf' to recurse into all subtexk dirs
- if false; then
- AC_CONFIG_SUBDIRS(Kpse_Pkg)
- fi
-fi
-])
-AC_SUBST([MAKE_SUBDIRS])
-AC_SUBST([CONF_SUBDIRS])
-AC_MSG_RESULT([$MAKE_SUBDIRS])
+KPSE_RECURSE_PROGS([texk], [TeXk])
AC_CONFIG_FILES([Makefile])