diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-14 07:43:09 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-14 07:43:09 +0000 |
commit | bfa06ebb7d339ad013b73442f691c0187783c2ec (patch) | |
tree | a3f2ed05acd396af4bb13e081b4756bbee60ddbf /Build/source/texk | |
parent | 7992232747feb7de2d1493bf918b446f3175048d (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/texk')
-rwxr-xr-x | Build/source/texk/dvipng/configure | 4 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/man/Makefile.in | 18 | ||||
-rwxr-xr-x | Build/source/texk/web2c/configure | 4 | ||||
-rwxr-xr-x | Build/source/texk/xdvipdfmx/configure | 4 |
4 files changed, 9 insertions, 21 deletions
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 72be72578e8..239ab64acca 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -18194,7 +18194,7 @@ $as_echo "no" >&6; } fi if test "x$ac_ct_FT2_CONFIG" = x; then - FT2_CONFIG=":" + FT2_CONFIG="false" else case $cross_compiling:$ac_tool_warned in yes:) @@ -18215,7 +18215,7 @@ if test "${with_system_freetype2+set}" = set; then withval=$with_system_freetype2; fi if test "x$with_system_freetype2" = xyes; then - 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 diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in index 0b628fbec1d..82c1278202f 100644 --- a/Build/source/texk/kpathsea/man/Makefile.in +++ b/Build/source/texk/kpathsea/man/Makefile.in @@ -226,16 +226,10 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-man1: $(man1_MANS) $(man_MANS) +install-man1: $(nodist_man1_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ + @list='$(nodist_man1_MANS)'; \ for i in $$list; do \ if test -f $$i; then file=$$i; \ else file=$(srcdir)/$$i; fi; \ @@ -252,13 +246,7 @@ install-man1: $(man1_MANS) $(man_MANS) done uninstall-man1: @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ + @list='$(nodist_man1_MANS)'; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ case "$$ext" in \ diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 091d55dfb50..bd55f38654b 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -23992,7 +23992,7 @@ $as_echo "no" >&6; } fi if test "x$ac_ct_FT2_CONFIG" = x; then - FT2_CONFIG=":" + FT2_CONFIG="false" else case $cross_compiling:$ac_tool_warned in yes:) @@ -24013,7 +24013,7 @@ if test "${with_system_freetype2+set}" = set; then withval=$with_system_freetype2; fi if test "x$with_system_freetype2" = xyes; then - 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 diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 55bf19800d8..9bd40c5c653 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -17425,7 +17425,7 @@ $as_echo "no" >&6; } fi if test "x$ac_ct_FT2_CONFIG" = x; then - FT2_CONFIG=":" + FT2_CONFIG="false" else case $cross_compiling:$ac_tool_warned in yes:) @@ -17446,7 +17446,7 @@ if test "${with_system_freetype2+set}" = set; then withval=$with_system_freetype2; fi if test "x$with_system_freetype2" = xyes; then - 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 |