wez Fri Apr 13 17:15:26 2001 EDT
Modified files:
/php4/ext/gd config.m4
Log:
When using freetype2, turn off libttf and turn on native gd ttf.
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.55 php4/ext/gd/config.m4:1.56
--- php4/ext/gd/config.m4:1.55 Fri Apr 13 05:00:12 2001
+++ php4/ext/gd/config.m4 Fri Apr 13 17:15:26 2001
@@ -77,20 +77,21 @@
for i in /usr /usr/local "$CHECK_FREETYPE" ; do
if test -f "$i/include/freetype2/freetype/freetype.h"; then
FREETYPE2_DIR="$i"
- FREETYPE2_INC_DIR="$i/include/freetype/freetype2"
+ FREETYPE2_INC_DIR="$i/include/freetype2/freetype"
fi
done
if test -n "$FREETYPE2_DIR" ; then
AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib)
PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
+ AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no (freetype2 not found))
fi
],[
AC_MSG_RESULT(no)
- AC_MSG_RESULT(If configure fails, try
--with-freetype2-dir=<DIR>)
+ AC_MSG_RESULT(If configure fails, try
+--with-freetype-dir=<DIR>)
])
])
@@ -246,7 +247,13 @@
CHECK_TTF="$withval"
fi
])
-
+
+ if test "$with_freetype_dir" != "no" ; then
+ CHECK_TTF=""
+ else
+ CHECK_TTF="$withval"
+ fi
+
AC_MSG_CHECKING(whether to include FreeType 1.x support)
if test -n "$CHECK_TTF" ; then
for i in /usr /usr/local "$CHECK_TTF" ; do
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
