CVS update: php3

Date: Wednesday September 9, 1998 @ 15:05 Author: jah Update of /repository/php3 In directory asf:/tmp/cvs-serv9893 Modified Files: Makefile.in build-defs.h.in config.h.in configure.in libphp3.module.in Log Message: Added Informix support to configuration process. Compiles, links both as cgi and apache module, and the resulting binaries don't dump core immediately. Nothing else promised. Index: php3/Makefile.in diff -c php3/Makefile.in:1.248 php3/Makefile.in:1.249 *** php3/Makefile.in:1.248 Tue Sep 8 23:58:41 1998 --- php3/Makefile.in Wed Sep 9 15:05:30 1998 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.248 1998/09/09 03:58:41 rasmus Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.249 1998/09/09 19:05:30 jah Exp $ # prefix = @prefix@ *************** *** 37,43 **** AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ ! INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ --- 37,43 ---- AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ ! INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @IFX_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ *************** *** 87,97 **** functions/info.c @BCMATH_SRC@ \ functions/unified_odbc.c functions/ldap.c functions/browscap.c \ functions/velocis.c functions/gdttf.c functions/gdcache.c \ ! functions/zlib.c functions/COM.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @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@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @LIBS@ all: $(BINNAME) --- 87,97 ---- functions/info.c @BCMATH_SRC@ \ functions/unified_odbc.c functions/ldap.c functions/browscap.c \ functions/velocis.c functions/gdttf.c functions/gdcache.c \ ! functions/zlib.c functions/COM.c functions/ifx.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @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@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @LIBS@ all: $(BINNAME) *************** *** 122,127 **** --- 122,130 ---- dbase/libdbf.a: (cd dbase; $(MAKE)) + functions/ifx.c: functions/ifx.ec + (esql -e functions/ifx.ec; mv ifx.c functions) + language-parser.tab.h language-parser.tab.c: $(srcdir)/language-parser.y bison -p php -v -d $(srcdir)/language-parser.y -o language-parser.tab.c *************** *** 142,148 **** clean: -rm libphp3.a libmodphp3.a php *.o ! -rm -f $(FUNCTIONS) -rm -f test/php.desc test/php.in test/php.out test/php.test -rm -f test/a.tmp test/b.tmp test/test.dbm* (cd dbase; $(MAKE) clean) --- 145,151 ---- clean: -rm libphp3.a libmodphp3.a php *.o ! -rm -f $(FUNCTIONS) functions/informix.c -rm -f test/php.desc test/php.in test/php.out test/php.test -rm -f test/a.tmp test/b.tmp test/test.dbm* (cd dbase; $(MAKE) clean) *************** *** 591,596 **** --- 594,600 ---- functions/head.h modules.h internal_functions.h php3_list.h \ functions/php3_string.h functions/php3_zlib.h snprintf.h functions/COM.o: functions/COM.c + functions/ifx.o: functions/ifx.c # Local Variables: # tab-width: 4 Index: php3/build-defs.h.in diff -c php3/build-defs.h.in:1.17 php3/build-defs.h.in:1.18 *** php3/build-defs.h.in:1.17 Wed Apr 29 09:22:34 1998 --- php3/build-defs.h.in Wed Sep 9 15:05:31 1998 *************** *** 41,46 **** --- 41,49 ---- #define PHP_DEBUG "@PHP_DEBUG@" #define PHP_GDBM_INCLUDE "@GDBM_INCLUDE@" #define PHP_HSREGEX "@HSREGEX@" + #define PHP_IFX_INCLUDE "@IFX_INCLUDE@" + #define PHP_IFX_LFLAGS "@IFX_LFLAGS@" + #define PHP_IFX_LIBS "@IFX_LIBS@" #define PHP_INSTALL_IT "@INSTALL_IT@" #define PHP_IODBC_INCLUDE "@IODBC_INCLUDE@" #define PHP_IODBC_LFLAGS "@IODBC_LFLAGS@" Index: php3/config.h.in diff -c php3/config.h.in:1.109 php3/config.h.in:1.110 *** php3/config.h.in:1.109 Mon Jul 27 11:55:40 1998 --- php3/config.h.in Wed Sep 9 15:05:31 1998 *************** *** 201,206 **** --- 201,210 ---- #define HAVE_VELOCIS 0 #endif + #ifndef HAVE_IFX + #define HAVE_IFX 0 + #endif + #ifndef HAVE_PQCMDTUPLES #define HAVE_PQCMDTUPLES 0 #endif Index: php3/configure.in diff -c php3/configure.in:1.234 php3/configure.in:1.235 *** php3/configure.in:1.234 Thu Aug 6 17:40:07 1998 --- php3/configure.in Wed Sep 9 15:05:32 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.234 1998/08/06 21:40:07 sr Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.235 1998/09/09 19:05:32 jah Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 180,186 **** 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@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" --- 180,186 ---- 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@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" *************** *** 1011,1016 **** --- 1011,1050 ---- AC_SUBST(VELOCIS_LIBS) AC_SUBST(VELOCIS_LFLAGS) AC_SUBST(VELOCIS_INCLUDE) + + AC_MSG_CHECKING(for Informix support) + AC_ARG_WITH(informix, + [ --with-informix[=DIR] Include Informix support. DIR is the Informix base + install directory, defaults to $INFORMIXDIR.], + [ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + IFX_INCDIR=$INFORMIXDIR/incl/esql + IFX_LIBDIR="-L$INFORMIXDIR/lib -L$INFORMIXDIR/lib/esql" + else + IFX_INCDIR=$withval/incl/esql + IFX_LIBDIR="-L$withval/lib -L$withval/lib/esql" + fi + IFX_INCLUDE=-I$IFX_INCDIR + IFX_LFLAGS=$IFX_LIBDIR + IFX_LIBS="-lixsql -lixasf -lixos -lixgen -lixgls -lnetstub $INFORMIXDIR/lib/esql/checkapi.o -lixglx" + + old_CFLAGS=$CFLAGS; old_LDFLAGS=$LDFLAGS; old_LIBS=$LIBS + CFLAGS="$CFLAGS $IFX_INCLUDE" + LDFLAGS="$LDFLAGS $IFX_LFLAGS" + LIBS="$LIBS $IFX_LIBS" + AC_DEFINE(HAVE_IFX) + AC_MSG_RESULT(yes) + CFLAGS=$old_CFLAGS; LDFLAGS=$old_LDFLAGS; LIBS=$old_LIBS + else + AC_MSG_RESULT(no) + fi + ],[ + AC_MSG_RESULT(no) + ]) + AC_SUBST(IFX_LIBS) + AC_SUBST(IFX_LFLAGS) + AC_SUBST(IFX_INCLUDE) AC_MSG_CHECKING(for a custom ODBC support) AC_ARG_WITH(custom-odbc, Index: php3/libphp3.module.in diff -c php3/libphp3.module.in:1.10 php3/libphp3.module.in:1.11 *** php3/libphp3.module.in:1.10 Mon Jul 27 11:55:42 1998 --- php3/libphp3.module.in Wed Sep 9 15:05:32 1998 *************** *** 2,8 **** ConfigStart RULE_WANTHSREGEX=@HSREGEX@ SUBVERSION="$SUBVERSION PHP/@PHP_VERSION@" ! LIBS="@PHP_LIBS@ @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@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @LIBS@ $LIBS" RULE_HIDE=yes ConfigEnd --- 2,8 ---- ConfigStart RULE_WANTHSREGEX=@HSREGEX@ SUBVERSION="$SUBVERSION PHP/@PHP_VERSION@" ! LIBS="@PHP_LIBS@ @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@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @LIBS@ $LIBS" 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