fix bug in fontconfig detection

git-svn-id: svn://tug.org/texlive/trunk@13603 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 10 insertions, 18 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"
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index e51d94938f1..94cde9399ff 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18671,19 +18671,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"
diff --git a/Build/source/texk/web2c/mplibdir/mptrap.test b/Build/source/texk/web2c/mplibdir/mptrap.test
index dca656a9615..1af9882f7e4 100755
--- a/Build/source/texk/web2c/mplibdir/mptrap.test
+++ b/Build/source/texk/web2c/mplibdir/mptrap.test
@@ -36,7 +36,6 @@ diff $testdir/writeo.2 writeo.2
 $LN_S $testdir/trap.mp . || exit 1
 $LN_S $testdir/trap.mpx . || exit 1
 
-## Why is --jobname required? And why --ini?
 ./mpost --progname=inimpost --jobname=trap --ini <$testdir/mptrap1.in >mptrapin.fot
 mv trap.log mptrapin.log || exit 1
 diff $testdir/mptrapin.log mptrapin.log
@@ -44,8 +43,6 @@ diff $testdir/mptrapin.log mptrapin.log
 # Must run inimpost or font_name[null_font] is not initialized, leading to diffs.
 ./mpost --progname=inimpost --jobname=trap --memname=trap <$testdir/mptrap2.in >mptrap.fot
 
-## Here the test fails, but we just exit or 'make distcheck' would fail
-
 mv trap.log mptrap.log || exit 1
 mv trap.tfm mptrap.tfm || exit 1
 diff $testdir/mptrap.fot mptrap.fot
@@ -60,7 +57,5 @@ diff $testdir/trap.197 trap.197
 diff $testdir/trap.200 trap.200
 
 ./tftopl ./mptrap.tfm mptrap.pl || exit 1
-diff $testdir/mptrap.pl mptrap.pl
-
-exit 0
+diff $testdir/mptrap.pl mptrap.pl || exit 1
 
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"