cvs: /php3 configure.in
| From: | Marko Karppinen | Date: | Sun, 16 Jan 2000 16:23:26 +0000 |
| Subject: | cvs: /php3 configure.in | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-14680@lists.php.net to get a copy of this message | ||
markonen Sun Jan 16 08:23:26 2000 EDT
Modified files:
/php3 configure.in
Log:
Do not enable freetype support if headers are not found
Index: php3/configure.in
diff -u php3/configure.in:1.490 php3/configure.in:1.491
--- php3/configure.in:1.490 Thu Jan 13 05:31:11 2000
+++ php3/configure.in Sun Jan 16 08:23:25 2000
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.490 2000/01/13 13:31:11 rasmus Exp $
+dnl $Id: configure.in,v 1.491 2000/01/16 16:23:25 markonen Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
@@ -932,12 +932,15 @@
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"; then
+ 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"; then
+ 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
@@ -990,12 +993,15 @@
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"; then
+ 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"; then
+ 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