diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-06-03 09:48:21 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-06-03 09:48:21 +0000 |
| commit | f1ac6f3e0cfbdd6d2d1ab9f5225c2af340039b09 (patch) | |
| tree | fbf6c48c13b3307098f22808ffe6b6adde324b80 /Build/source/texk/web2c | |
| parent | cfd31fe0d15b872cbd26a3c1c3e2b8747404a559 (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/texk/web2c')
| -rwxr-xr-x | Build/source/texk/web2c/configure | 7 | ||||
| -rwxr-xr-x | Build/source/texk/web2c/mplibdir/mptrap.test | 7 |
2 files changed, 4 insertions, 10 deletions
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 |