summaryrefslogtreecommitdiff
path: root/Build/source/texk/lcdf-typetools
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/lcdf-typetools
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/lcdf-typetools')
-rw-r--r--Build/source/texk/lcdf-typetools/ChangeLog5
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.am2
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.in1
-rw-r--r--Build/source/texk/lcdf-typetools/configure.ac2
4 files changed, 6 insertions, 4 deletions
diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog
index b8ea9ed4909..92424172495 100644
--- a/Build/source/texk/lcdf-typetools/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/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.
+
2013-04-11 Peter Breitenlohner <peb@mppmu.mpg.de>
Import lcdf-typetools-2.98.
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am
index 6fc60a02503..fc3903844b3 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/Makefile.am
@@ -10,8 +10,6 @@
#
#************************************************************************
##
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-
## We use the original lcdf-typetools source tree.
##
SUBDIRS = . $(LCDF_TYPETOOLS_TREE)
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index 8c8e99a2e20..94d3ebd2202 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -553,7 +553,6 @@ top_srcdir = @top_srcdir@
# Copyright (c) 2003-2011 Eddie Kohler
#
#************************************************************************
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
SUBDIRS = . $(LCDF_TYPETOOLS_TREE)
DIST_SUBDIRS = $(SUBDIRS)
EXTRA_DIST = $(LCDF_TYPETOOLS_TREE)-PATCHES \
diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac
index 4e9ccab946a..68f03c0eb11 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -18,7 +18,7 @@ AC_INIT([LCDF typetools (TeX Live)], lcdf_typetools_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([lcdf-typetools-]lcdf_typetools_version[/NEWS])
AC_CONFIG_AUX_DIR([../../build-aux])
-AC_CONFIG_MACRO_DIR([../../m4])
+AC_CONFIG_MACRO_DIRS([../../m4 m4])
dnl Common code for all programs using libkpathsea.
KPSE_COMMON([lcdf-typetools])