summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-25 17:27:50 +0000
committerKarl Berry <karl@freefriends.org>2019-03-25 17:27:50 +0000
commite24fc18b90825b817bfd32398da225ec6a73a37e (patch)
tree87ca7b2d6404d61671d54c0a911b252bc8758681 /Build/source/m4
parentbdcc55431dbe3549206237187f32d5ba894ae0e5 (diff)
try pkg-config if freetype-config not available
git-svn-id: svn://tug.org/texlive/trunk@50584 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog5
-rw-r--r--Build/source/m4/kpse-freetype2-flags.m423
2 files changed, 21 insertions, 7 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index b4589fdc733..f4345adb408 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2019-03-25 Karl Berry <karl@freefriends.org>
+
+ * kpse-freetype2-flags.m4 (KPSE_FREETYPE2_SYSTEM_FLAGS): try
+ pkg-config if freetype-config is not available. From Debian.
+
2019-02-18 Luigi Scarso <luigi.scarso@gmail.com>
* kpse-win32.m4 (KPSE_COND_WIN32_WRAP): if w64 and mingw,
diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4
index c00b24a2488..d6292912a2d 100644
--- a/Build/source/m4/kpse-freetype2-flags.m4
+++ b/Build/source/m4/kpse-freetype2-flags.m4
@@ -1,5 +1,6 @@
-# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+# Public macros for the TeX Live (TL) tree - freetype2.
+# Copyright 2015-2019 Karl Berry <tex-live@tug.org>
+# Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -9,28 +10,36 @@
# --------------------
# Provide the configure option '--with-system-freetype2' (if in the TL tree).
#
-# Set the make variables FREETYPE2_INCLUDES and FREETYPE2_LIBS to the CPPFLAGS and
-# LIBS required for the `-lfreetype' library in libs/freetype2/ of the TL tree.
+# Set the make variables FREETYPE2_INCLUDES and FREETYPE2_LIBS to the
+# CPPFLAGS and LIBS required for the `-lfreetype' library in
+# libs/freetype2/ of the TL tree.
+#
AC_DEFUN([KPSE_FREETYPE2_FLAGS], [dnl
AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
_KPSE_LIB_FLAGS([freetype2], [freetype], [],
[-IBLD/libs/freetype2/freetype2],
- [BLD/libs/freetype2/libfreetype.a], [],
- [], [${top_builddir}/../../libs/freetype2/freetype2/ft2build.h])[]dnl
+ [BLD/libs/freetype2/libfreetype.a], [], [],
+ [${top_builddir}/../../libs/freetype2/freetype2/ft2build.h])[]dnl
]) # KPSE_FREETYPE2_FLAGS
# KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
# -------------------------------------
-AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
+AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [dnl
+_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
# KPSE_FREETYPE2_SYSTEM_FLAGS
# ---------------------------
+# try pkg-config if freetype-config isn't available.
AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
+AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+ FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
fi