From f1ac6f3e0cfbdd6d2d1ab9f5225c2af340039b09 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 3 Jun 2009 09:48:21 +0000 Subject: fix bug in fontconfig detection git-svn-id: svn://tug.org/texlive/trunk@13603 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/xdvipdfmx/configure | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Build/source/texk/xdvipdfmx') diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index b0285ef6956..b282f8c0e64 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -18754,19 +18754,18 @@ if test "${kpse_cv_have_fontconfig+set}" = set; then else 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" -- cgit v1.2.3