Build system: Update a few M4 macros

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

15 files changed, 58 insertions, 124 deletions

diff --git a/Build/source/configure b/Build/source/configure
index 12eb19f6e5a..8c6b9e1aedd 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -896,8 +896,6 @@ enable_linked_scripts
 with_system_harfbuzz
 with_system_icu
 with_system_teckit
-with_teckit_includes
-with_teckit_libdir
 with_system_graphite2
 with_system_zziplib
 with_system_xpdf
@@ -1758,11 +1756,8 @@ Optional Packages:
                           pkg-config)
   --with-system-icu       use installed ICU headers and libraries (requires
                           icu-config)
-  --with-system-teckit    use installed teckit headers and library
-  --with-teckit-includes=DIR
-                          teckit headers installed in DIR
-  --with-teckit-libdir=DIR
-                          teckit library installed in DIR
+  --with-system-teckit    use installed teckit headers and library (requires
+                          pkg-config)
   --with-system-graphite2 use installed graphite2 headers and library
                           (requires pkg-config)
   --with-system-zziplib   use installed zziplib headers and library (requires
@@ -5656,16 +5651,6 @@ fi
 if test "${with_system_teckit+set}" = set; then :
   withval=$with_system_teckit;
 fi
-
-# Check whether --with-teckit-includes was given.
-if test "${with_teckit_includes+set}" = set; then :
-  withval=$with_teckit_includes;
-fi
-
-# Check whether --with-teckit-libdir was given.
-if test "${with_teckit_libdir+set}" = set; then :
-  withval=$with_teckit_libdir;
-fi
 if test "x$with_system_teckit" = x; then
   if test -f $srcdir/libs/teckit/configure; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
@@ -21316,12 +21301,11 @@ elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
   as_fn_error $? "did not find graphite2" "$LINENO" 5
 fi
 
-if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
-  TECKIT_INCLUDES="-I$with_teckit_includes"
-fi
-TECKIT_LIBS="-lTECkit"
-if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
-  TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
+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
+  as_fn_error $? "did not find teckit" "$LINENO" 5
 fi
 
 if test -n "$ac_tool_prefix"; then
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index db499f706f5..ff121a0b952 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -807,8 +807,6 @@ enable_linked_scripts
 with_system_harfbuzz
 with_system_icu
 with_system_teckit
-with_teckit_includes
-with_teckit_libdir
 with_system_graphite2
 with_system_zziplib
 with_system_xpdf
@@ -1657,11 +1655,8 @@ Optional Packages:
                           pkg-config)
   --with-system-icu       use installed ICU headers and libraries (requires
                           icu-config)
-  --with-system-teckit    use installed teckit headers and library
-  --with-teckit-includes=DIR
-                          teckit headers installed in DIR
-  --with-teckit-libdir=DIR
-                          teckit library installed in DIR
+  --with-system-teckit    use installed teckit headers and library (requires
+                          pkg-config)
   --with-system-graphite2 use installed graphite2 headers and library
                           (requires pkg-config)
   --with-system-zziplib   use installed zziplib headers and library (requires
@@ -4880,16 +4875,6 @@ fi
 if test "${with_system_teckit+set}" = set; then :
   withval=$with_system_teckit;
 fi
-
-# Check whether --with-teckit-includes was given.
-if test "${with_teckit_includes+set}" = set; then :
-  withval=$with_teckit_includes;
-fi
-
-# Check whether --with-teckit-libdir was given.
-if test "${with_teckit_libdir+set}" = set; then :
-  withval=$with_teckit_libdir;
-fi
 if test "x$with_system_teckit" = x; then
   if test -f $srcdir/../libs/teckit/configure; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
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
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index d9d3cc9b989..36a6438575d 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -807,8 +807,6 @@ enable_linked_scripts
 with_system_harfbuzz
 with_system_icu
 with_system_teckit
-with_teckit_includes
-with_teckit_libdir
 with_system_graphite2
 with_system_zziplib
 with_system_xpdf
@@ -1667,11 +1665,8 @@ Optional Packages:
                           pkg-config)
   --with-system-icu       use installed ICU headers and libraries (requires
                           icu-config)
-  --with-system-teckit    use installed teckit headers and library
-  --with-teckit-includes=DIR
-                          teckit headers installed in DIR
-  --with-teckit-libdir=DIR
-                          teckit library installed in DIR
+  --with-system-teckit    use installed teckit headers and library (requires
+                          pkg-config)
   --with-system-graphite2 use installed graphite2 headers and library
                           (requires pkg-config)
   --with-system-zziplib   use installed zziplib headers and library (requires
@@ -4890,16 +4885,6 @@ fi
 if test "${with_system_teckit+set}" = set; then :
   withval=$with_system_teckit;
 fi
-
-# Check whether --with-teckit-includes was given.
-if test "${with_teckit_includes+set}" = set; then :
-  withval=$with_teckit_includes;
-fi
-
-# Check whether --with-teckit-libdir was given.
-if test "${with_teckit_libdir+set}" = set; then :
-  withval=$with_teckit_libdir;
-fi
 if test "x$with_system_teckit" = x; then
   if test -f $srcdir/../libs/teckit/configure; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 6600a964776..c12fbbef9cb 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1038,8 +1038,6 @@ with_system_poppler
 with_system_xpdf
 with_system_zziplib
 with_system_teckit
-with_teckit_includes
-with_teckit_libdir
 with_system_icu
 with_system_graphite2
 with_system_harfbuzz
@@ -1801,11 +1799,8 @@ Optional Packages:
                           xpdf library from TL (requires pkg-config)
   --with-system-zziplib   use installed zziplib headers and library (requires
                           pkg-config)
-  --with-system-teckit    use installed teckit headers and library
-  --with-teckit-includes=DIR
-                          teckit headers installed in DIR
-  --with-teckit-libdir=DIR
-                          teckit library installed in DIR
+  --with-system-teckit    use installed teckit headers and library (requires
+                          pkg-config)
   --with-system-icu       use installed ICU headers and libraries (requires
                           icu-config)
   --with-system-graphite2 use installed graphite2 headers and library
@@ -24129,23 +24124,12 @@ fi
 if test "${with_system_teckit+set}" = set; then :
   withval=$with_system_teckit;
 fi
-
-# Check whether --with-teckit-includes was given.
-if test "${with_teckit_includes+set}" = set; then :
-  withval=$with_teckit_includes;
-fi
-
-# Check whether --with-teckit-libdir was given.
-if test "${with_teckit_libdir+set}" = set; then :
-  withval=$with_teckit_libdir;
-fi
 if test "x$with_system_teckit" = xyes; then
-  if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
-  TECKIT_INCLUDES="-I$with_teckit_includes"
-fi
-TECKIT_LIBS="-lTECkit"
-if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
-  TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
+  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
+  as_fn_error $? "did not find teckit" "$LINENO" 5
 fi
 else
   TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include"
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 6e815cf8dbe..0aa336f9064 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -807,8 +807,6 @@ enable_linked_scripts
 with_system_harfbuzz
 with_system_icu
 with_system_teckit
-with_teckit_includes
-with_teckit_libdir
 with_system_graphite2
 with_system_zziplib
 with_system_xpdf
@@ -1649,11 +1647,8 @@ Optional Packages:
                           pkg-config)
   --with-system-icu       use installed ICU headers and libraries (requires
                           icu-config)
-  --with-system-teckit    use installed teckit headers and library
-  --with-teckit-includes=DIR
-                          teckit headers installed in DIR
-  --with-teckit-libdir=DIR
-                          teckit library installed in DIR
+  --with-system-teckit    use installed teckit headers and library (requires
+                          pkg-config)
   --with-system-graphite2 use installed graphite2 headers and library
                           (requires pkg-config)
   --with-system-zziplib   use installed zziplib headers and library (requires
@@ -4872,16 +4867,6 @@ fi
 if test "${with_system_teckit+set}" = set; then :
   withval=$with_system_teckit;
 fi
-
-# Check whether --with-teckit-includes was given.
-if test "${with_teckit_includes+set}" = set; then :
-  withval=$with_teckit_includes;
-fi
-
-# Check whether --with-teckit-libdir was given.
-if test "${with_teckit_libdir+set}" = set; then :
-  withval=$with_teckit_libdir;
-fi
 if test "x$with_system_teckit" = x; then
   if test -f $srcdir/../libs/teckit/configure; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5