summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-06-03 09:48:21 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-06-03 09:48:21 +0000
commitf1ac6f3e0cfbdd6d2d1ab9f5225c2af340039b09 (patch)
treefbf6c48c13b3307098f22808ffe6b6adde324b80 /Build/source/m4
parentcfd31fe0d15b872cbd26a3c1c3e2b8747404a559 (diff)
fix bug in fontconfig detection
git-svn-id: svn://tug.org/texlive/trunk@13603 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/kpse-fontconfig-flags.m47
1 files changed, 3 insertions, 4 deletions
diff --git a/Build/source/m4/kpse-fontconfig-flags.m4 b/Build/source/m4/kpse-fontconfig-flags.m4
index 681f1349692..dac61e89690 100644
--- a/Build/source/m4/kpse-fontconfig-flags.m4
+++ b/Build/source/m4/kpse-fontconfig-flags.m4
@@ -28,19 +28,18 @@ AC_CACHE_CHECK([for installed fontconfig headers and library],
[kpse_cv_have_fontconfig],
[kpse_save_CPPFLAGS=$CPPFLAGS
kpse_save_LIBS=$LIBS
+kpse_cv_fontconfig_includes=
+kpse_cv_fontconfig_libs='-lfontconfig'
if test "x$with_fontconfig_includes:$with_fontconfig_libdir" != x:; then
if test "x$with_fontconfig_includes" != x; then
kpse_cv_fontconfig_includes="-I$with_fontconfig_includes"
fi
if test "x$with_fontconfig_libdir" != x; then
- kpse_cv_fontconfig_libdir="-L$with_fontconfig_libdir -lfontconfig"
+ kpse_cv_fontconfig_libs="-L$with_fontconfig_libdir $kpse_cv_fontconfig_libs"
fi
elif $PKG_CONFIG fontconfig; then
kpse_cv_fontconfig_includes=`$PKG_CONFIG fontconfig --cflags`
kpse_cv_fontconfig_libs=`$PKG_CONFIG fontconfig --libs`
-else
- kpse_cv_fontconfig_includes=
- kpse_cv_fontconfig_libs='-lfontconfig'
fi
CPPFLAGS="$kpse_cv_fontconfig_includes $CPPFLAGS"
LIBS="$kpse_cv_fontconfig_libs $LIBS"