CVS update: php3

Date: Sunday February 7, 1999 @ 1:14 Author: rasmus Update of /repository/php3 In directory asf:/home/rasmus/php3 Modified Files: ChangeLog Makefile.in configure.in Added Files: INSTALL.DSO Log Message: apxs cleanup - tested on Solaris 2.6 so far Index: php3/ChangeLog diff -c php3/ChangeLog:1.572 php3/ChangeLog:1.573 *** php3/ChangeLog:1.572 Fri Feb 5 23:58:24 1999 --- php3/ChangeLog Sun Feb 7 01:12:57 1999 *************** *** 1,6 **** --- 1,7 ---- PHP 3.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| xxx xx xxxx, Version 3.0.7 + - Clean up apxs build - Added YP/NIS module from Stephanie Wehner - Added optional second argument to mysql_fetch_array(); MYSQL_ASSOC will cause the resulting array to contain the associative indices only, Index: php3/Makefile.in diff -c php3/Makefile.in:1.288 php3/Makefile.in:1.289 *** php3/Makefile.in:1.288 Fri Feb 5 23:58:24 1999 --- php3/Makefile.in Sun Feb 7 01:13:14 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.288 1999/02/06 04:58:24 rasmus Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.289 1999/02/07 06:13:14 rasmus Exp $ # prefix = @prefix@ *************** *** 50,56 **** YACC = @YACC@ MAINT = @MAINT@ APXS = @APXS@ ! APXS_LDFLAGS = @APXS_LDFLAGS@ WARNING_LEVEL = @WARNING_LEVEL@ SOURCE = language-parser.tab.c language-scanner.c main.c php3_hash.c operators.c \ --- 50,56 ---- YACC = @YACC@ MAINT = @MAINT@ APXS = @APXS@ ! APXS_LDFLAGS = @PHP_LIBS@ @APXS_LDFLAGS@ WARNING_LEVEL = @WARNING_LEVEL@ SOURCE = language-parser.tab.c language-scanner.c main.c php3_hash.c operators.c \ *************** *** 98,104 **** FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_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@ @IMAP_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@ @LIBS@ all: $(BINNAME) --- 98,104 ---- FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_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@ @IMAP_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@ @LIBS@ all: $(BINNAME) *************** *** 118,124 **** $(RANLIB) libmodphp3-so.a libphp3.so: mod_php3.c libmodphp3-so.a ! $(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a docs: cd doc; $(MAKE) --- 118,124 ---- $(RANLIB) libmodphp3-so.a libphp3.so: mod_php3.c libmodphp3-so.a ! $(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a docs: cd doc; $(MAKE) Index: php3/configure.in diff -c php3/configure.in:1.311 php3/configure.in:1.312 *** php3/configure.in:1.311 Fri Feb 5 23:58:25 1999 --- php3/configure.in Sun Feb 7 01:13:32 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.311 1999/02/06 04:58:25 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.312 1999/02/07 06:13:32 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 80,87 **** LDFLAGS="$LDFLAGS -L/usr/pkg/lib" fi - AC_PREFERRED_DB_LIB - AC_CHECK_LIB(nsl, gethostname, [ LIBS="-lnsl $LIBS" AC_DEFINE(HAVE_LIBNSL) ], []) --- 80,85 ---- *************** *** 143,165 **** AC_MISSING_FCLOSE_DECL dnl QNX requires unix.h to allow functions in libunix to work properly AC_CHECK_HEADERS(fcntl.h unistd.h crypt.h sys/file.h memory.h pwd.h grp.h sys/socket.h sys/wait.h syslog.h string.h sys/varargs.h stdarg.h sys/resource.h sys/time.h signal.h netinet/in.h dlfcn.h limits.h sys/types.h sys/statvfs.h sys/statfs.h unix.h) - if test "$DBM_LIB" = "-lgdbm"; then - AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [ - AC_MSG_RESULT("Try /usr/local/include/gdbm.h"); - AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE="-I/usr/local/include" ],[ - AC_MSG_RESULT("Try /opt/local/include/gdbm.h"); - AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE="-I/opt/local/include" ],[ - dnl if in /usr/pkg/include, don't add anything. See above. - AC_MSG_RESULT("Try /usr/pkg/include/gdbm.h"); - AC_CHECK_HEADER(/usr/pkg/include/gdbm.h, [ GDBM_INCLUDE="" ],[ - AC_MSG_RESULT("Giving up - You need to install gdbm.h somewhere"); - exit - ]) - ]) - ]) - ]) - AC_SUBST(GDBM_INCLUDE) - fi dnl Checks for typedefs, structures, and compiler characteristics. AC_STRUCT_TM --- 141,146 ---- *************** *** 233,256 **** AC_CRYPT_CAP - AC_MSG_CHECKING(whether to use bundled regex library) - AC_ARG_WITH(system-regex, - [ --with-system-regex Do not use the bundled regex library], - [ - REGEX_LIB= - HSREGEX=no - AC_MSG_RESULT(no) - AC_DEFINE(REGEX,0) - ],[ - REGEX_LIB=regex/libregex.a - HSREGEX=yes - AC_MSG_RESULT(yes) - AC_DEFINE(HSREGEX) - AC_DEFINE(REGEX,1) - ]) - AC_SUBST(REGEX_LIB) - AC_SUBST(HSREGEX) - AC_MSG_CHECKING(for Apache module support via DSO through APXS) AC_ARG_WITH(apxs, [ --with-apxs[=FILE] Build shared Apache module. FILE is the optional --- 214,219 ---- *************** *** 261,274 **** withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@DBASE_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_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" CFLAGS_SHLIB=perl -V:cccdlflags | cut -d\' -f2 LDFLAGS_SHLIB=perl -V:lddlflags | cut -d\' -f2 LDFLAGS_SHLIB_EXPORT=perl -V:ccdlflags | cut -d\' -f2 ! PHP_LIBS= STRONGHOLD= AC_DEFINE(APACHE) AC_SUBST(APXS) --- 224,238 ---- withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_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@ @DBM_LIB@ @IMAP_LIBS@ @REGEX_LIB@" ! APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" CFLAGS_SHLIB=perl -V:cccdlflags | cut -d\' -f2 LDFLAGS_SHLIB=perl -V:lddlflags | cut -d\' -f2 LDFLAGS_SHLIB_EXPORT=perl -V:ccdlflags | cut -d\' -f2 ! PHP_LIBS=-L/usr/local/lib STRONGHOLD= AC_DEFINE(APACHE) AC_SUBST(APXS) *************** *** 479,484 **** --- 443,486 ---- fi fi + AC_MSG_CHECKING(whether to use bundled regex library) + AC_ARG_WITH(system-regex, + [ --with-system-regex Do not use the bundled regex library], + [ + REGEX_LIB= + HSREGEX=no + AC_MSG_RESULT(no) + AC_DEFINE(REGEX,0) + ],[ + REGEX_LIB=regex/libregex.a + HSREGEX=yes + AC_MSG_RESULT(yes) + AC_DEFINE(HSREGEX) + AC_DEFINE(REGEX,1) + ]) + AC_SUBST(REGEX_LIB) + AC_SUBST(HSREGEX) + + AC_PREFERRED_DB_LIB + + if test "$DBM_LIB" = "-lgdbm"; then + AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [ + AC_MSG_RESULT("Try /usr/local/include/gdbm.h"); + AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE="-I/usr/local/include" ],[ + AC_MSG_RESULT("Try /opt/local/include/gdbm.h"); + AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE="-I/opt/local/include" ],[ + dnl if in /usr/pkg/include, don't add anything. See above. + AC_MSG_RESULT("Try /usr/pkg/include/gdbm.h"); + AC_CHECK_HEADER(/usr/pkg/include/gdbm.h, [ GDBM_INCLUDE="" ],[ + AC_MSG_RESULT("Giving up - You need to install gdbm.h somewhere"); + exit + ]) + ]) + ]) + ]) + AC_SUBST(GDBM_INCLUDE) + fi + AC_MSG_CHECKING(for mod_charset compatibility option) AC_ARG_WITH(mod_charset, [ --with-mod_charset Enable transfer tables for mod_charset (Rus Apache).], *************** *** 730,736 **** # Oracle libs - nightmare :-) ORACLE_LIBDIR=lib ! ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR ${ld_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR" if test -f "$ORACLEINST_TOP/rdbms/lib/sysliblist" then ORA_SYSLIB="cat $ORACLEINST_TOP/rdbms/lib/sysliblist" --- 732,742 ---- # Oracle libs - nightmare :-) ORACLE_LIBDIR=lib ! if test -n "$APXS"; then ! ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR ${apxs_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR" ! else ! ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR ${ld_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR" ! fi if test -f "$ORACLEINST_TOP/rdbms/lib/sysliblist" then ORA_SYSLIB="cat $ORACLEINST_TOP/rdbms/lib/sysliblist" *************** *** 1011,1017 **** fi MYSQL_INCLUDE=-I$MYSQL_INCDIR if test -n "$APXS"; then ! MYSQL_LFLAGS="'${apxs_runpath_switch}$MYSQL_LIBDIR' -L$MYSQL_LIBDIR" else MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" fi --- 1017,1023 ---- fi MYSQL_INCLUDE=-I$MYSQL_INCDIR if test -n "$APXS"; then ! MYSQL_LFLAGS="${apxs_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" else MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" fi *************** *** 1027,1034 **** CPPFLAGS="$old_CPPFLAGS" else AC_MSG_RESULT(no) - dnl Why are we defining HAVE_MYSQL here?? - AC_DEFINE(HAVE_MYSQL) fi ],[ AC_MSG_RESULT(no) --- 1033,1038 ---- *************** *** 1184,1190 **** LDAP_LIBDIR=$withval/lib fi LDAP_INCLUDE=-I$LDAP_INCDIR ! LDAP_LFLAGS="-L$LDAP_LIBDIR ${ld_runpath_switch}$LDAP_LIBDIR" LDAP_LIBS="-lldap -llber" AC_DEFINE(HAVE_LDAP) --- 1188,1198 ---- LDAP_LIBDIR=$withval/lib fi LDAP_INCLUDE=-I$LDAP_INCDIR ! if test -n "$APXS"; then ! LDAP_LFLAGS="-L$LDAP_LIBDIR ${apxs_runpath_switch}$LDAP_LIBDIR" ! else ! LDAP_LFLAGS="-L$LDAP_LIBDIR ${ld_runpath_switch}$LDAP_LIBDIR" ! fi LDAP_LIBS="-lldap -llber" AC_DEFINE(HAVE_LDAP) *************** *** 1215,1221 **** MCK_LIBDIR=$withval/c-api/lib fi MCK_INCLUDE=-I$MCK_INCDIR ! MCK_LFLAGS="-L$MCK_LIBDIR ${ld_runpath_switch}$MCK_LIBDIR" MCK_LIBS="-lmckcrypto" AC_DEFINE(HAVE_MCK) --- 1223,1233 ---- MCK_LIBDIR=$withval/c-api/lib fi MCK_INCLUDE=-I$MCK_INCDIR ! if test -n "$APXS"; then ! MCK_LFLAGS="-L$MCK_LIBDIR ${apxs_runpath_switch}$MCK_LIBDIR" ! else ! MCK_LFLAGS="-L$MCK_LIBDIR ${ld_runpath_switch}$MCK_LIBDIR" ! fi MCK_LIBS="-lmckcrypto" AC_DEFINE(HAVE_MCK) *************** *** 2042,2047 **** --- 2054,2060 ---- AC_DEFINE(HAVE_DISPLAY_SOURCE, 1) AC_MSG_RESULT(yes) ]) + dnl If we're using gcc and the user hasn't specified CFLAGS, add -O2. test -n "$auto_cflags" && test -n "$GCC" && CFLAGS="$CFLAGS -O2" -- 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