summaryrefslogtreecommitdiff
path: root/Build/source/m4/kpse-teckit-flags.m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-19 09:31:37 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-19 09:31:37 +0000
commitb3d5371919d86702e12560b756e016fa50d4f302 (patch)
treee3a2b1d0419dc23ccdfb1c7a5dba35ac8c3aff1a /Build/source/m4/kpse-teckit-flags.m4
parentea8fb06b7354090b299af352efc12765a158b4e7 (diff)
Build system: Update a few M4 macros
git-svn-id: svn://tug.org/texlive/trunk@36322 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4/kpse-teckit-flags.m4')
-rw-r--r--Build/source/m4/kpse-teckit-flags.m425
1 files changed, 15 insertions, 10 deletions
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