CVS update: php3

Date: Monday March 1, 1999 @ 19:18 Author: rasmus Update of /repository/php3 In directory asf:/u/temp/cvs-serv26626 Modified Files: configure.in libphp3.module.in Log Message: A couple of minor build fixes. The gettext module didn't work when the gettext functions were in libc as opposed to libintl, and take a shot at fixing the -lresolv detection problems. Index: php3/configure.in diff -c php3/configure.in:1.331 php3/configure.in:1.332 *** php3/configure.in:1.331 Sun Feb 28 11:56:21 1999 --- php3/configure.in Mon Mar 1 19:18:28 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.331 1999/02/28 16:56:21 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.332 1999/03/02 00:18:28 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 119,131 **** dnl is in neither of these libs, still check for dn_skipname in libresolv AC_CHECK_LIB(socket, res_search, [ AC_CHECK_LIB(resolv, dn_skipname) LIBS="$LIBS -lsocket" ! AC_DEFINE(HAVE_LIBSOCKET) ], [ AC_CHECK_LIB(resolv, res_search, [ LIBS="$LIBS -lresolv" AC_DEFINE(HAVE_LIBRESOLV) ], [ AC_CHECK_LIB(resolv, dn_skipname) ]) ]) --- 119,134 ---- dnl is in neither of these libs, still check for dn_skipname in libresolv AC_CHECK_LIB(socket, res_search, [ AC_CHECK_LIB(resolv, dn_skipname) + AC_CHECK_LIB(resolv, __dn_skipname) LIBS="$LIBS -lsocket" ! AC_DEFINE(HAVE_LIBSOCKET) ! ], [ AC_CHECK_LIB(resolv, res_search, [ LIBS="$LIBS -lresolv" AC_DEFINE(HAVE_LIBRESOLV) ], [ AC_CHECK_LIB(resolv, dn_skipname) + AC_CHECK_LIB(resolv, __dn_skipname) ]) ]) *************** *** 229,235 **** withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so --- 232,238 ---- withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so *************** *** 695,705 **** fi GETTEXT_INCLUDE=-I$GETTEXT_INCDIR GETTEXT_LFLAGS=-L$GETTEXT_LIBDIR ! GETTEXT_LIBS="-lintl" AC_DEFINE(HAVE_LIBINTL) - AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi --- 698,717 ---- fi GETTEXT_INCLUDE=-I$GETTEXT_INCDIR GETTEXT_LFLAGS=-L$GETTEXT_LIBDIR ! O_CPPFLAGS="$CPPFLAGS" ! O_LDFLAGS=$LDFLAGS ! CPPFLAGS="$CPPFLAGS -I$GETTEXT_INCDIR" ! LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" ! GETTEXT_LIBS= ! AC_MSG_RESULT(yes) ! AC_CHECK_LIB(intl, bindtextdomain, GETTEXT_LIBS="-lintl",[ ! AC_CHECK_LIB(c, bindtextdomain, GETTEXT_LIBS=,[ ! AC_MSG_ERROR(Unable to find required gettext library) ! ],) ! ],) AC_DEFINE(HAVE_LIBINTL) else AC_MSG_RESULT(no) fi Index: php3/libphp3.module.in diff -c php3/libphp3.module.in:1.21 php3/libphp3.module.in:1.22 *** php3/libphp3.module.in:1.21 Mon Mar 1 13:33:25 1999 --- php3/libphp3.module.in Mon Mar 1 19:18:28 1999 *************** *** 1,7 **** Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LIBS@ @LIBS@ $LIBS @DBM_LIB@" RULE_HIDE=yes ConfigEnd --- 1,7 ---- Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @LIBS@ $LIBS @DBM_LIB@" RULE_HIDE=yes ConfigEnd -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net