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/libs/zziplib | |
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/libs/zziplib')
-rw-r--r-- | Build/source/libs/zziplib/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/libs/zziplib/configure.ac | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index b0597623504..4c2af6059fb 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,8 @@ +2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop ACLOCAL_AMFLAGS. + * configure.ac: Use AC_CONFIG_MACRO_DIRS. + 2012-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am. diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index 58cabc0dab9..1ea30e7d63e 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -6,8 +6,6 @@ ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 - ## We want to re-distribute the whole original zziplib source tree. ## EXTRA_DIST = $(ZZIPLIB_TREE) diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index 258671bfddb..3e74eeb36d1 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -558,7 +558,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 EXTRA_DIST = $(ZZIPLIB_TREE) $(ZZIPLIB_TREE)-PATCHES SUBDIRS = . include/zzip AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) \ diff --git a/Build/source/libs/zziplib/configure.ac b/Build/source/libs/zziplib/configure.ac index 704b18be8a4..98ff5c7fb40 100644 --- a/Build/source/libs/zziplib/configure.ac +++ b/Build/source/libs/zziplib/configure.ac @@ -14,7 +14,7 @@ AC_INIT([zziplib (TeX Live)], zziplib_version, [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([zziplib-]zziplib_version[/zziplib.spec]) AC_CONFIG_AUX_DIR([../../build-aux]) -AC_CONFIG_MACRO_DIR([../../m4]) +AC_CONFIG_MACRO_DIRS([../../m4 m4]) KPSE_BASIC([zziplib]) |