cvs: /php4/ext/gd config.m4
| From: | Sascha Schumann | Date: | Sun, 12 Mar 2000 15:52:14 +0000 |
| Subject: | cvs: /php4/ext/gd config.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-11945@lists.php.net to get a copy of this message | ||
sas Sun Mar 12 07:52:14 2000 EDT
Modified files:
/php4/ext/gd config.m4
Log:
Also search for freetype headers in $prefix/include/freetype
PR: #3775
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.24 php4/ext/gd/config.m4:1.25
--- php4/ext/gd/config.m4:1.24 Thu Feb 24 22:43:51 2000
+++ php4/ext/gd/config.m4 Sun Mar 12 07:52:14 2000
@@ -131,7 +131,12 @@
fi
if test -f "$i/include/freetype.h" ; then
TTF_DIR="$i"
+ unset TTF_INC_DIR
fi
+ if test -f "$i/include/freetype/freetype.h"; then
+ TTF_DIR="$i"
+ TTF_INC_DIR="$i/include/freetype"
+ fi
done
if test -n "$FREETYPE_DIR" ; then
AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
@@ -151,8 +156,11 @@
GD_LFLAGS="$GD_LFLAGS -L$TTF_DIR/lib"
else
AC_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib)
+ fi
+ if test -z "$TTF_INC_DIR"; then
+ TTF_INC_DIR="$TTF_DIR/include"
fi
- AC_ADD_INCLUDE($TTF_DIR/include)
+ AC_ADD_INCLUDE($TTF_INC_DIR)
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)