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/cairo | |
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/cairo')
-rw-r--r-- | Build/source/libs/cairo/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/cairo/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/cairo/Makefile.in | 1 | ||||
-rwxr-xr-x | Build/source/libs/cairo/configure | 1 | ||||
-rw-r--r-- | Build/source/libs/cairo/configure.ac | 3 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog index f6593f901c3..6f701180afb 100644 --- a/Build/source/libs/cairo/ChangeLog +++ b/Build/source/libs/cairo/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/cairo/Makefile.am b/Build/source/libs/cairo/Makefile.am index bc6cd471bc9..f8be9a16d5b 100644 --- a/Build/source/libs/cairo/Makefile.am +++ b/Build/source/libs/cairo/Makefile.am @@ -7,8 +7,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 cairo source tree. ## EXTRA_DIST = $(CAIRO_TREE) diff --git a/Build/source/libs/cairo/Makefile.in b/Build/source/libs/cairo/Makefile.in index 231a4a68a2c..ca2de9b3603 100644 --- a/Build/source/libs/cairo/Makefile.in +++ b/Build/source/libs/cairo/Makefile.in @@ -903,7 +903,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 = $(CAIRO_TREE) $(CAIRO_TREE)-PATCHES CAIRO_SRC = $(CAIRO_TREE)/src SUBDIRS = . cairo diff --git a/Build/source/libs/cairo/configure b/Build/source/libs/cairo/configure index 8863b778795..fba1738dc40 100755 --- a/Build/source/libs/cairo/configure +++ b/Build/source/libs/cairo/configure @@ -2511,7 +2511,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` diff --git a/Build/source/libs/cairo/configure.ac b/Build/source/libs/cairo/configure.ac index 4c6ab12d4fa..e4bfc161e88 100644 --- a/Build/source/libs/cairo/configure.ac +++ b/Build/source/libs/cairo/configure.ac @@ -11,8 +11,7 @@ AC_INIT([cairo (TeX Live)], cairo_version, [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([cairo-]cairo_version[/src/cairo.h]) AC_CONFIG_AUX_DIR([../../build-aux]) -AC_CONFIG_MACRO_DIR([../../m4]) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIRS([../../m4 m4]) AC_USE_SYSTEM_EXTENSIONS |