summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2007-01-04 11:50:04 +0000
committerJonathan Kew <jfkthame@googlemail.com>2007-01-04 11:50:04 +0000
commit970e5d7488c7f5eef3534e37b5ac0cf513778c1f (patch)
treefd88b9827f8526dab12e368643919d056b5aa7dc /Build/source/libs/freetype2
parent587c1ce877452ff30ac22bbb2280f769da9764de (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/libs/freetype2')
-rw-r--r--Build/source/libs/freetype2/freetype2.ac8
-rw-r--r--Build/source/libs/freetype2/withenable.ac3
2 files changed, 6 insertions, 5 deletions
diff --git a/Build/source/libs/freetype2/freetype2.ac b/Build/source/libs/freetype2/freetype2.ac
index 9fae4be590a..0fc3780c07e 100644
--- a/Build/source/libs/freetype2/freetype2.ac
+++ b/Build/source/libs/freetype2/freetype2.ac
@@ -11,16 +11,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
AC_CHECK_LIB(freetype, FT_Init_FreeType,,
@@ -37,7 +37,7 @@ else
fi
LDFLAGS=$OLD_LDFLAGS
- CPP=$OLD_CPP
+ CPPFLAGS=$OLD_CPPFLAGS
LIBS=$OLD_LIBS
if test "$with_system_freetype2" != yes; then
diff --git a/Build/source/libs/freetype2/withenable.ac b/Build/source/libs/freetype2/withenable.ac
index 4f29e18a9cb..b28aa2d22b2 100644
--- a/Build/source/libs/freetype2/withenable.ac
+++ b/Build/source/libs/freetype2/withenable.ac
@@ -7,4 +7,5 @@ AC_ARG_WITH(freetype2_libdir,
AC_ARG_WITH(freetype2_include,
[ --with-freetype2-include=DIR
- Specify the freetype2 header files location.])
+ Specify the freetype2 header files location.
+ (both DIR and DIR/freetype2 will be added to the include paths)])