Bug #3196: ttf autoconf check broken for freetype-1.3

From: sps@caldera.de Operating system: OpenLinux eCow PHP version: 3.0.14 PHP Bug Type: Installation problem Bug description: ttf autoconf check broken for freetype-1.3 freetype-1.3 installs it's headers in ${prefix}/include/freetype by default. Configure doesn't find them there. The patch is against 3.0.13 but also applies to 3.0.14. php-4.0b3 seems to have the same problem. --- php-3.0.13/configure.in.orig Sat Jan 1 03:30:52 2000 +++ php-3.0.13/configure.in Tue Jan 4 19:20:49 2000 @@ -890,23 +890,28 @@ if test -n "$CHECK_TTF" ; then for i in /usr /usr/local "$CHECK_TTF" ; do if test -f "$i/include/truetype.h" ; then - FREETYPE_DIR="$i" + FREETYPE_INCDIR="$i/include" + FREETYPE_LIBDIR="$i/lib" fi - if test -f "$i/include/freetype.h" ; then - TTF_DIR="$i" + if test -f "$i/include/freetype/freetype.h" ; then + TTF_INCDIR="$i/include/freetype" + TTF_LIBDIR="$i/lib" + elif test -f "$i/include/freetype.h" ; then + TTF_INCDIR="$i/include" + TTF_LIBDIR="$i/lib" fi done - if test -n "$FREETYPE_DIR" ; then + if test -n "$FREETYPE_INCDIR" ; then AC_DEFINE(HAVE_LIBFREETYPE) - AC_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE_DIR/lib) - AC_ADD_INCLUDE($FREETYPE_DIR/include) + AC_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE_LIBDIR) + AC_ADD_INCLUDE($FREETYPE_INCDIR) AC_MSG_RESULT(yes) else - if test -n "$TTF_DIR" ; then + if test -n "$TTF_INCDIR" ; then AC_DEFINE(HAVE_LIBTTF) - AC_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib) - AC_ADD_INCLUDE($TTF_DIR/include) + AC_ADD_LIBRARY_WITH_PATH(ttf, $TTF_LIBDIR) + AC_ADD_INCLUDE($TTF_INCDIR) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no)