Build system: Update a few M4 macros

git-svn-id: svn://tug.org/texlive/trunk@36322 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 38 insertions, 27 deletions

diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index c8395fb6923..3ed7f07ad9a 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-cairo-flags.m4: Require KPSE_PIXMAN_FLAGS.
+	* kpse-poppler-flags.m4: Require KPSE_ZLIB_FLAGS.
+	* kpse-teckit-flags.m4: Use pkg-config.
+
 2015-02-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-pkgs.m4 (kpse_texk_pkgs): Add musixtnt.
diff --git a/Build/source/m4/kpse-cairo-flags.m4 b/Build/source/m4/kpse-cairo-flags.m4
index 3d7539633fc..b6f2d6839d4 100644
--- a/Build/source/m4/kpse-cairo-flags.m4
+++ b/Build/source/m4/kpse-cairo-flags.m4
@@ -1,5 +1,5 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -7,11 +7,12 @@
 
 # KPSE_CAIRO_FLAGS
 # ----------------
-# Provide the configure options '--with-system-pixman' (if in the TL tree).
+# Provide the configure options '--with-system-cairo' (if in the TL tree).
 #
 # Set the make variables CAIRO_INCLUDES and CAIRO_LIBS to the CPPFLAGS and
 # LIBS required for the `-lcairo' library in libs/cairo/ of the TL tree.
 AC_DEFUN([KPSE_CAIRO_FLAGS], [dnl
+AC_REQUIRE([KPSE_PIXMAN_FLAGS])[]dnl
 _KPSE_LIB_FLAGS([cairo], [cairo], [],
                 [-IBLD/libs/cairo/cairo], [BLD/libs/cairo/libcairo.a], [],
                 [], [${top_builddir}/../../libs/cairo/cairo/cairo.h])[]dnl
diff --git a/Build/source/m4/kpse-dll-name.m4 b/Build/source/m4/kpse-dll-name.m4
index 019cf0b1328..ba6a4096801 100644
--- a/Build/source/m4/kpse-dll-name.m4
+++ b/Build/source/m4/kpse-dll-name.m4
@@ -1,8 +1,8 @@
 # Public macros for the TeX Live (TL) tree.
 # Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
 #
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # KPSE_DLL_NAME([M32], [M64], [C32], [C64])
diff --git a/Build/source/m4/kpse-lt-hack.m4 b/Build/source/m4/kpse-lt-hack.m4
index 0110e3578e1..10c0ad78d57 100644
--- a/Build/source/m4/kpse-lt-hack.m4
+++ b/Build/source/m4/kpse-lt-hack.m4
@@ -1,12 +1,10 @@
 # Public macros for the TeX Live (TL) tree.
 # Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 #
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 0
-
 # KPSE_ENABLE_LT_HACK
 # -------------------
 # Provide the configure option '--enable-libtool-hack'.
diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4
index 37aa4af0977..1ba2d5bf729 100644
--- a/Build/source/m4/kpse-poppler-flags.m4
+++ b/Build/source/m4/kpse-poppler-flags.m4
@@ -1,5 +1,5 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -13,6 +13,7 @@
 # LIBS required for the `-lpoppler' library in libs/poppler/ of the TL tree.
 AC_DEFUN([KPSE_POPPLER_FLAGS], [dnl
 AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
 _KPSE_LIB_FLAGS([poppler], [poppler], [],
                 [-IBLD/libs/poppler/include],
                 [BLD/libs/poppler/libpoppler.a], [],
diff --git a/Build/source/m4/kpse-search-libs.m4 b/Build/source/m4/kpse-search-libs.m4
index 7f459990622..ff24c0f40bf 100644
--- a/Build/source/m4/kpse-search-libs.m4
+++ b/Build/source/m4/kpse-search-libs.m4
@@ -1,8 +1,8 @@
 # Public macros for the TeX Live (TL) tree.
 # Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
 #
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # KPSE_SEARCH_LIBS(VARIABLE, FUNCTION, SEARCH-LIBS, [ACTION-IF-NOT-FOUND])
diff --git a/Build/source/m4/kpse-size-max.m4 b/Build/source/m4/kpse-size-max.m4
index d80276c42d7..4f03a3a2481 100644
--- a/Build/source/m4/kpse-size-max.m4
+++ b/Build/source/m4/kpse-size-max.m4
@@ -1,8 +1,8 @@
 # Public macros for the TeX Live (TL) tree.
 # Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
 #
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # KPSE_CHECK_SIZE_MAX
diff --git a/Build/source/m4/kpse-teckit-flags.m4 b/Build/source/m4/kpse-teckit-flags.m4
index 52f5d13a0f7..7e027c0e1d4 100644
--- a/Build/source/m4/kpse-teckit-flags.m4
+++ b/Build/source/m4/kpse-teckit-flags.m4
@@ -1,21 +1,18 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 0
-
 # KPSE_TECKIT_FLAGS
 # -----------------
-# Provide the configure options '--with-system-teckit' (if in the TL tree),
-# '--with-teckit-includes', and '--with-teckit-libdir'.
+# Provide the configure options '--with-system-teckit' (if in the TL tree).
 #
 # Set the make variables TECKIT_INCLUDES and TECKIT_LIBS to the CPPFLAGS and
 # LIBS required for the `-lTECkit' library in libs/teckit/ of the TL tree.
-AC_DEFUN([KPSE_TECKIT_FLAGS],
-[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
+AC_DEFUN([KPSE_TECKIT_FLAGS], [dnl
+AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
 _KPSE_LIB_FLAGS([teckit], [TECkit], [],
                 [-IBLD/libs/teckit/include], [BLD/libs/teckit/libTECkit.a], [],
                 [], [${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h])[]dnl
@@ -23,8 +20,16 @@ _KPSE_LIB_FLAGS([teckit], [TECkit], [],
 
 # KPSE_TECKIT_OPTIONS([WITH-SYSTEM])
 # ----------------------------------
-AC_DEFUN([KPSE_TECKIT_OPTIONS], [_KPSE_LIB_OPTIONS([teckit], [$1])])
+AC_DEFUN([KPSE_TECKIT_OPTIONS], [_KPSE_LIB_OPTIONS([teckit], [$1], [pkg-config])])
 
 # KPSE_TECKIT_SYSTEM_FLAGS
-# ------------------------
-AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([teckit], [TECkit])])
+# -------------------------
+AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS], [dnl
+AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
+if $PKG_CONFIG teckit; then
+  TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags`
+  TECKIT_LIBS=`$PKG_CONFIG teckit --libs`
+elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then
+  AC_MSG_ERROR([did not find teckit])
+fi
+]) # KPSE_TECKIT_SYSTEM_FLAGS
diff --git a/Build/source/m4/kpse-visibility.m4 b/Build/source/m4/kpse-visibility.m4
index f5db6f9da09..8eeb029cc58 100644
--- a/Build/source/m4/kpse-visibility.m4
+++ b/Build/source/m4/kpse-visibility.m4
@@ -1,8 +1,8 @@
 # Public macros for the TeX Live (TL) tree.
 # Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
 #
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # KPSE_COMPILER_VISIBILITY
diff --git a/Build/source/m4/kpse-warnings.m4 b/Build/source/m4/kpse-warnings.m4
index 782674ef786..54f2e0a1ab8 100644
--- a/Build/source/m4/kpse-warnings.m4
+++ b/Build/source/m4/kpse-warnings.m4
@@ -1,8 +1,8 @@
 # Public macros for the TeX Live (TL) tree.
 # Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 #
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # KPSE_COMPILER_WARNINGS