summaryrefslogtreecommitdiff
path: root/Build/source/m4/kpse-freetype2-flags.m4
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/m4/kpse-freetype2-flags.m4')
-rw-r--r--Build/source/m4/kpse-freetype2-flags.m422
1 files changed, 6 insertions, 16 deletions
diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4
index 18f0edaba5c..ce4da7a6ade 100644
--- a/Build/source/m4/kpse-freetype2-flags.m4
+++ b/Build/source/m4/kpse-freetype2-flags.m4
@@ -1,21 +1,18 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2012 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_FREETYPE2_FLAGS
# --------------------
# 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.
-AC_DEFUN([KPSE_FREETYPE2_FLAGS],
-[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
-AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
+AC_DEFUN([KPSE_FREETYPE2_FLAGS], [dnl
+AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
_KPSE_LIB_FLAGS([freetype2], [freetype], [lt],
[-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2],
[BLD/libs/freetype2/libfreetype.la], [],
@@ -33,8 +30,9 @@ AC_DEFUN([KPSE_FREETYPE2_OPTIONS],
# KPSE_FREETYPE2_SYSTEM_FLAGS
# ---------------------------
-AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS],
-[AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
+AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
+AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
@@ -42,11 +40,3 @@ 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
]) # KPSE_FREETYPE2_SYSTEM_FLAGS
-
-# _KPSE_CHECK_FT2_CONFIG
-# ----------------------
-# Check for freetype-config
-AC_DEFUN([_KPSE_CHECK_FT2_CONFIG],
-[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
-]) # _KPSE_CHECK_FT2_CONFIG