cvs: php4 /ext/gd config.m4
| From: | Rui Hirokawa | Date: | Sat, 23 Feb 2002 01:36:56 +0000 |
| Subject: | cvs: php4 /ext/gd config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9430@lists.php.net to get a copy of this message | ||
hirokawa Fri Feb 22 20:36:56 2002 EDT
Modified files:
/php4/ext/gd config.m4
Log:
fixed configure error with freetype1.
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.82 php4/ext/gd/config.m4:1.83
--- php4/ext/gd/config.m4:1.82 Sun Jan 13 01:25:18 2002
+++ php4/ext/gd/config.m4 Fri Feb 22 20:36:55 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.82 2002/01/13 06:25:18 hirokawa Exp $
+dnl $Id: config.m4,v 1.83 2002/02/23 01:36:55 hirokawa Exp $
dnl
AC_DEFUN(PHP_GD_JPEG,[
@@ -125,6 +125,10 @@
AC_DEFUN(PHP_GD_FREETYPE2,[
PHP_ARG_WITH(freetype-dir, for freetype(2),
[ --with-freetype-dir=DIR GD: Set the path to freetype2 install prefix.])
+
+ if test "$PHP_TTF" != "no"; then
+ PHP_FREETYPE_DIR="no"
+ fi
if test "$PHP_FREETYPE_DIR" != "no"; then
for i in /usr /usr/local $PHP_FREETYPE_DIR; do