cvs: /php3 configure.in

sas Thu Jan 27 10:40:02 2000 EDT Modified files: /php3 configure.in Log: Improve FreeType/TrueType check. Index: php3/configure.in diff -u php3/configure.in:1.491 php3/configure.in:1.492 --- php3/configure.in:1.491 Sun Jan 16 08:23:25 2000 +++ php3/configure.in Thu Jan 27 10:40:02 2000 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.491 2000/01/16 16:23:25 markonen Exp $ +dnl $Id: configure.in,v 1.492 2000/01/27 18:40:02 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -917,98 +917,62 @@ fi ]) +AC_MSG_CHECKING(whether to include FreeType support) AC_ARG_WITH(ttf, [ --with-ttf[=DIR] Include FreeType support], [ - case "$withval" in - no) - AC_MSG_CHECKING(whether to include FreeType support) - AC_MSG_RESULT(no) - ;; - yes) - AC_CHECK_LIB(freetype, TT_Init_FreeType, [ - AC_DEFINE(HAVE_LIBFREETYPE) - ]) - AC_CHECK_LIB(ttf, TT_Init_FreeType, [ - AC_DEFINE(HAVE_LIBTTF) + PHP_TTF=$withval +],[ + PHP_TTF=yes +]) +AC_MSG_RESULT($PHP_TTF) + +define(PHP_ICHK,[ +test -f "$i/$1"; then $2_PREFIX="$i"; $2_INCLUDE="$i/$1"; +]) + +define(PHP_LCHK,[ +test -f "$i/$1"; then $2_PREFIX="$i"; $2_LIBPATH="$i/$1"; +]) + +define(PHP_TTF_LIB_CHECK,[ + for i in lib lib/freetype ""; do + ac_save_ldflags="$LDFLAGS" + ac_save_libs="$LIBS" + LDFLAGS="$LDFLAGS -L$$1_PREFIX/$i" + unset ac_cv_lib_$2_TT_Init_FreeType + AC_CHECK_LIB($2, TT_Init_FreeType,[ + LDFLAGS="$ac_save_ldflags" + LIBS="$ac_save_libs" + AC_ADD_LIBRARY_WITH_PATH($2, $$1_PREFIX/$i) + AC_DEFINE(HAVE_LIB$1) + dir=dirname $$1_INCLUDE + AC_ADD_INCLUDE($dir) + break ]) - AC_CHECK_HEADERS(freetype.h truetype.h) - AC_MSG_CHECKING(whether to include FreeType support) - if test "$ac_cv_lib_freetype_TT_Init_FreeType" = "yes" && - test "$ac_cv_header_truetype_h" = "yes"; then - AC_ADD_LIBRARY(freetype) - AC_MSG_RESULT(yes) - else - if test "$ac_cv_lib_ttf_TT_Init_FreeType" = "yes" && - test "$ac_cv_header_freetype_h" = "yes"; then - AC_ADD_LIBRARY(ttf) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi - ;; - *) - test -f $withval/freetype.h && TTF_INCLUDE="$withval" - test -f $withval/include/freetype.h && TTF_INCLUDE="$withval/include" - test -f $withval/include/freetype/freetype.h && TTF_INCLUDE="$withval/include/freetype" - test -f $withval/truetype.h && FREETYPE_INCLUDE="$withval" - test -f $withval/include/truetype.h && FREETYPE_INCLUDE="$withval/include" - test -f $withval/include/freetype/truetype.h && FREETYPE_INCLUDE="$withval/include/freetype" - - test -f $withval/libttf.a && TTF_LIB="$withval" - test -f $withval/lib/libttf.a && TTF_LIB="$withval/lib" - test -f $withval/lib/freetype/libttf.a && TTF_LIB="$withval/lib/freetype" - test -f $withval/libfreetype.a && FREETYPE_LIB="$withval" - test -f $withval/lib/libfreetype.a && FREETYPE_LIB="$withval/lib" - test -f $withval/lib/freetype/libfreetype.a && FREETYPE_LIB="$withval/lib/freetype" - - dnl Based on our little probe above, we decide on which FreeType - dnl version gets used. Note that we prefer FreeType 2 with 1.x - dnl compatibility API. - - AC_MSG_CHECKING(whether to include FreeType support) - - if test -n "$FREETYPE_INCLUDE" && test -n "$FREETYPE_LIB"; then - AC_ADD_INCLUDE($FREETYPE_INCLUDE) - AC_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE_LIB) - AC_DEFINE(HAVE_LIBFREETYPE) - AC_MSG_RESULT(yes) - else - if test -n "$TTF_INCLUDE" && test -n "$TTF_LIB"; then - AC_ADD_INCLUDE($TTF_INCLUDE) - AC_ADD_LIBRARY_WITH_PATH(ttf, $TTF_LIB) - AC_DEFINE(HAVE_LIBTTF) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi - ;; - esac ], -[ - AC_CHECK_LIB(freetype, TT_Init_FreeType, [ - AC_DEFINE(HAVE_LIBFREETYPE) - ]) - AC_CHECK_LIB(ttf, TT_Init_FreeType, [ - AC_DEFINE(HAVE_LIBTTF) - ]) - AC_CHECK_HEADERS(freetype.h truetype.h) - AC_MSG_CHECKING(whether to include FreeType support) - if test "$ac_cv_lib_freetype_TT_Init_FreeType" = "yes" && - test "$ac_cv_header_truetype_h" = "yes"; then - AC_ADD_LIBRARY(freetype) - AC_MSG_RESULT(yes) - else - if test "$ac_cv_lib_ttf_TT_Init_FreeType" = "yes" && - test "$ac_cv_header_freetype_h" = "yes"; then - AC_ADD_LIBRARY(ttf) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + LDFLAGS="$ac_save_ldflags" + done +]) + +if test "$PHP_TTF" != "no"; then + for i in /usr/local /usr $PHP_TTF; do + if PHP_ICHK(freetype.h, TTF) + elif PHP_ICHK(include/freetype.h, TTF) + elif PHP_ICHK(include/freetype/freetype.h, TTF) fi + + if PHP_ICHK(truetype.h, FREETYPE) + elif PHP_ICHK(include/truetype.h, FREETYPE) + elif PHP_ICHK(include/freetype/truetype.h, FREETYPE) + fi + done + + if test -n "$FREETYPE_PREFIX"; then + PHP_TTF_LIB_CHECK(FREETYPE, freetype) + elif test -n "$TTF_PREFIX"; then + PHP_TTF_LIB_CHECK(TTF, ttf) fi -]) +fi AC_ARG_ENABLE(t1lib, [ --enable-t1lib Enable t1lib support.],[