diff options
| author | Sascha Schumann <sas@php.net> | 2000-03-12 15:52:14 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-03-12 15:52:14 +0000 |
| commit | 00c14f7413e7dff82fb187d990d5d19c0ad2a7cf (patch) | |
| tree | 9ab3a9f03c45b320f23dd7bc928553ace68c207a | |
| parent | caeaaf4d98bbc0369f0216c98242eca9f00026e6 (diff) | |
| download | php-git-00c14f7413e7dff82fb187d990d5d19c0ad2a7cf.tar.gz | |
Also search for freetype headers in $prefix/include/freetype
PR: #3775
| -rw-r--r-- | ext/gd/config.m4 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index a9747fbe95..68ebe14e21 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -131,6 +131,11 @@ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then 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 @@ -152,7 +157,10 @@ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then else AC_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib) fi - AC_ADD_INCLUDE($TTF_DIR/include) + if test -z "$TTF_INC_DIR"; then + TTF_INC_DIR="$TTF_DIR/include" + fi + AC_ADD_INCLUDE($TTF_INC_DIR) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) |