summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-14 07:43:09 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-14 07:43:09 +0000
commitbfa06ebb7d339ad013b73442f691c0187783c2ec (patch)
treea3f2ed05acd396af4bb13e081b4756bbee60ddbf /Build/source/m4
parent7992232747feb7de2d1493bf918b446f3175048d (diff)
build system: handling of freetype-config and pkg-config
git-svn-id: svn://tug.org/texlive/trunk@13083 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/kpse-common.m48
-rw-r--r--Build/source/m4/kpse-freetype2-flags.m44
-rw-r--r--Build/source/m4/kpse-xpdf-flags.m48
3 files changed, 10 insertions, 10 deletions
diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4
index 667bd81d047..2a0d0d66e0f 100644
--- a/Build/source/m4/kpse-common.m4
+++ b/Build/source/m4/kpse-common.m4
@@ -277,3 +277,11 @@ AC_DEFUN([KPSE_MSG_ERROR],
$2])],
[AC_MSG_ERROR([$2], m4_default([$3], 1))])
]) # KPSE_MSG_ERROR
+
+# _KPSE_CHECK_PKG_CONFIG
+# ----------------------
+# Check for pkg-config
+AC_DEFUN([_KPSE_CHECK_PKG_CONFIG],
+[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
+]) # _KPSE_CHECK_PKG_CONFIG
diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4
index c3bc661473c..138dc025941 100644
--- a/Build/source/m4/kpse-freetype2-flags.m4
+++ b/Build/source/m4/kpse-freetype2-flags.m4
@@ -37,7 +37,7 @@ AC_DEFUN([KPSE_FREETYPE2_OPTIONS],
# ---------------------------
AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS],
[AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
-if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then
@@ -50,5 +50,5 @@ fi
# Check for freetype-config
AC_DEFUN([_KPSE_CHECK_FT2_CONFIG],
[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [:])[]dnl
+AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
]) # _KPSE_CHECK_FT2_CONFIG
diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4
index c8cfd96f2c0..3591464133c 100644
--- a/Build/source/m4/kpse-xpdf-flags.m4
+++ b/Build/source/m4/kpse-xpdf-flags.m4
@@ -40,11 +40,3 @@ elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then
AC_MSG_ERROR([did not find poppler-0.10 or better])
fi
]) # KPSE_XPDF_SYSTEM_FLAGS
-
-# _KPSE_CHECK_PKG_CONFIG
-# ----------------------
-# Check for pkg-config
-AC_DEFUN([_KPSE_CHECK_PKG_CONFIG],
-[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
-AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
-]) # _KPSE_CHECK_PKG_CONFIG