diff options
| author | Jonathan Kew <jfkthame@googlemail.com> | 2007-01-04 11:50:04 +0000 |
|---|---|---|
| committer | Jonathan Kew <jfkthame@googlemail.com> | 2007-01-04 11:50:04 +0000 |
| commit | 970e5d7488c7f5eef3534e37b5ac0cf513778c1f (patch) | |
| tree | fd88b9827f8526dab12e368643919d056b5aa7dc /Build/source/texk/dvipng/configure | |
| parent | 587c1ce877452ff30ac22bbb2280f769da9764de (diff) | |
updated --with-freetype2-* options, rebuilt configure scripts where needed
git-svn-id: svn://tug.org/texlive/trunk@3134 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng/configure')
| -rwxr-xr-x | Build/source/texk/dvipng/configure | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 5d432b4ee34..92d0bd3c716 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -878,6 +878,7 @@ Optional Packages: Specify directory where the freetype2 library resides. --with-freetype2-include=DIR Specify the freetype2 header files location. + (both DIR and DIR/freetype2 will be added to the include paths) --without-mktexmf-default do not run mktexmf if MF source missing --without-mktexpk-default do not run mktexpk if PK font missing --without-mktextfm-default do not run mktextfm if TFM file missing @@ -6030,16 +6031,16 @@ else EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir" fi if test "x$with_freetype2_include" != x; then - EXTRA_FREETYPE2_INCLUDE="-I$with_freetype2_include" + EXTRA_FREETYPE2_INCLUDE="-I$with_freetype2_include -I$with_freetype2_include/freetype2" fi fi OLD_LDFLAGS=$LDFLAGS - OLD_CPP=$CPP + OLD_CPPFLAGS=$CPPFLAGS OLD_LIBS=$LIBS LDFLAGS="$LDFLAGS $EXTRA_FREETYPE2_LIBDIR" - CPP="$CPP $EXTRA_FREETYPE2_INCLUDE" + CPPFLAGS="$CPPFLAGS $EXTRA_FREETYPE2_INCLUDE" if test "$with_system_freetype2" = yes; then @@ -6281,7 +6282,7 @@ echo "$as_me: WARNING: ft2build.h not found. Using my own freetype2 sources." >& fi LDFLAGS=$OLD_LDFLAGS - CPP=$OLD_CPP + CPPFLAGS=$OLD_CPPFLAGS LIBS=$OLD_LIBS if test "$with_system_freetype2" != yes; then |