CVS update: php3

Date: Tuesday June 22, 1999 @ 22:45 Author: jah Update of /repository/php3 In directory php:/tmp/cvs-serv26461 Modified Files: acconfig.h config.h.in configure.in Log Message: Configuring t1lib support was actually quite broken. Index: php3/acconfig.h diff -u php3/acconfig.h:1.101 php3/acconfig.h:1.102 --- php3/acconfig.h:1.101 Sun Jun 20 08:38:41 1999 +++ php3/acconfig.h Tue Jun 22 22:45:50 1999 @@ -341,6 +341,7 @@ #define HAVE_YP 0 /* Define if you have the t1 library (-lt1). */ +#define HAVE_LIBT1 0 #undef HAVE_LIBT1_OUTLINE #define HAVE_LIBTTF 0 Index: php3/config.h.in diff -u php3/config.h.in:1.171 php3/config.h.in:1.172 --- php3/config.h.in:1.171 Sun Jun 20 14:14:53 1999 +++ php3/config.h.in Tue Jun 22 22:45:50 1999 @@ -375,6 +375,7 @@ #define HAVE_YP 0 /* Define if you have the t1 library (-lt1). */ +#define HAVE_LIBT1 0 #undef HAVE_LIBT1_OUTLINE #define HAVE_LIBTTF 0 Index: php3/configure.in diff -u php3/configure.in:1.403 php3/configure.in:1.404 --- php3/configure.in:1.403 Tue Jun 22 17:11:40 1999 +++ php3/configure.in Tue Jun 22 22:45:50 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.403 1999/06/22 21:11:40 sas Exp $ +dnl $Id: configure.in,v 1.404 1999/06/23 02:45:50 jah Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -778,8 +778,9 @@ [ --enable-t1lib Compile GD with t1lib support.],[ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then if test "$enableval" = "yes"; then - AC_CHECK_LIB(t1, T1_SetDefaultEncoding, [ AC_DEFINE(HAVE_LIBT1_OUTLINE) ], [ AC_MSG_ERROR(T1lib version 0.8 or higher required) ]) + AC_CHECK_LIB(t1, T1_SetDefaultEncoding, [ AC_DEFINE(HAVE_LIBT1) ], [ AC_MSG_ERROR(T1lib version 0.8 or higher required) ]) AC_CHECK_LIB(t1, T1_GetCharOutline, [ AC_DEFINE(HAVE_LIBT1_OUTLINE) T1LIB_WARNING="WARNING: You *must* read README.t1lib for a necessary patch"]) + AC_ADD_LIBRARY(t1) AC_MSG_RESULT(yes) else AC_DEFINE(HAVE_LIBT1, 0)