diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-12 14:42:02 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-12 14:42:02 +0000 |
commit | e96d533771de7ceeb155f9e2a093e67e0dc40ab1 (patch) | |
tree | e307e1ae0d17abcb640c37be30b7bdf5e370e074 /Build/source/m4/kpse-harfbuzz-flags.m4 | |
parent | 43053489cfb1957b1779be81ba6bd1ac96f71165 (diff) |
Build system: Reorganize flags for system (installed) libraries
git-svn-id: svn://tug.org/texlive/trunk@36495 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4/kpse-harfbuzz-flags.m4')
-rw-r--r-- | Build/source/m4/kpse-harfbuzz-flags.m4 | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Build/source/m4/kpse-harfbuzz-flags.m4 b/Build/source/m4/kpse-harfbuzz-flags.m4 index 716ab28a3b9..51bc12d60b9 100644 --- a/Build/source/m4/kpse-harfbuzz-flags.m4 +++ b/Build/source/m4/kpse-harfbuzz-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, @@ -11,8 +11,8 @@ # # Set the make variables HARFBUZZ_INCLUDES and HARFBUZZ_LIBS to the CPPFLAGS and # LIBS required for the `-lharfbuzz' library in libs/harfbuzz/ of the TL tree. -AC_DEFUN([KPSE_HARFBUZZ_FLAGS], -[AC_REQUIRE([KPSE_GRAPHITE2_FLAGS])[]dnl +AC_DEFUN([KPSE_HARFBUZZ_FLAGS], [dnl +AC_REQUIRE([KPSE_GRAPHITE2_FLAGS])[]dnl AC_REQUIRE([KPSE_ICU_FLAGS])[]dnl _KPSE_LIB_FLAGS([harfbuzz], [harfbuzz], [], [-IBLD/libs/harfbuzz/include], [BLD/libs/harfbuzz/libharfbuzz.a], [], @@ -25,12 +25,5 @@ AC_DEFUN([KPSE_HARFBUZZ_OPTIONS], [_KPSE_LIB_OPTIONS([harfbuzz], [$1], [pkg-conf # KPSE_HARFBUZZ_SYSTEM_FLAGS # -------------------------- -AC_DEFUN([KPSE_HARFBUZZ_SYSTEM_FLAGS], -[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG harfbuzz-icu; then - HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags` - HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs` -elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then - AC_MSG_ERROR([did not find harfbuzz-icu]) -fi -]) # KPSE_HARFBUZZ_SYSTEM_FLAGS +AC_DEFUN([KPSE_HARFBUZZ_SYSTEM_FLAGS], [dnl +_KPSE_PKG_CONFIG_FLAGS([harfbuzz], [harfbuzz-icu])]) |