CVS update: php31

Date: Monday November 9, 1998 @ 14:07 Author: ssb Update of /repository/php31 In directory asf:/u2/tmp/cvs-serv11119 Modified Files: Makefile.am WISHLIST-3.2 acconfig.h armerge configure.in.in ltconfig Log Message: sapi/libmodphp3.a builds now, I've successfully linked it into Apache :) Index: php31/Makefile.am diff -c php31/Makefile.am:2.2 php31/Makefile.am:2.3 *** php31/Makefile.am:2.2 Fri Jul 17 13:44:17 1998 --- php31/Makefile.am Mon Nov 9 14:07:02 1998 *************** *** 31,35 **** AUTOMAKE_OPTIONS = foreign SUBDIRS = os lib main ext sapi contrib ! configure.in: configure.in.in ! ./preconfig --- 31,35 ---- AUTOMAKE_OPTIONS = foreign SUBDIRS = os lib main ext sapi contrib ! $(srcdir)/configure.in: $(srcdir)/configure.in.in ! cd $(srcdir) && ./preconfig Index: php31/WISHLIST-3.2 diff -c php31/WISHLIST-3.2:2.3 php31/WISHLIST-3.2:2.4 *** php31/WISHLIST-3.2:2.3 Thu Sep 10 20:22:24 1998 --- php31/WISHLIST-3.2 Mon Nov 9 14:07:03 1998 *************** *** 29,40 **** * COM implementation so php can be used as an asp language (cant find any docs on how this is done though) * Clean up the file structure so the top-level directory isn't such a mess. - * Bring the module concept to maturity: use libtool and make it - possible to decide at compile time whether you want to compile a - module statically or dynamically. Remove the distinction between - the stuff currently in dl/ and functions/. - * a way of letting each module specify its options, so ini file options and - Apache directives can be set up from the same specification. V Make it possible to declare smarter user functions: (done in 3.0) - Optional parameters - Parameters that are forced/prefered by reference --- 29,34 ---- *************** *** 47,53 **** * odbc_fetch_assoc * Add env handling to gpc_order * Populate track_vars regardless of gpc_order - * a real exec() function * Support passing arguments to functions by name (e.g. foo(arg1 => "bar", arg2 => "foobar")) * Add an optional setting to destroy persistent resources if a PHP script terminates abnormally --- 41,46 ---- Index: php31/acconfig.h diff -c php31/acconfig.h:2.5 php31/acconfig.h:2.6 *** php31/acconfig.h:2.5 Fri Oct 30 10:23:10 1998 --- php31/acconfig.h Mon Nov 9 14:07:03 1998 *************** *** 11,16 **** --- 11,18 ---- #undef PHP_OS #undef PHP_UNAME + #define PHP_31 1 + /* type check for in_addr_t */ #undef in_addr_t Index: php31/armerge diff -c php31/armerge:1.1 php31/armerge:1.2 *** php31/armerge:1.1 Fri Jul 17 12:01:23 1998 --- php31/armerge Mon Nov 9 14:07:03 1998 *************** *** 35,41 **** # merged into the output archive. The prefix used is the same as the # directory name with "/" replaced by "_" and a "_" at the end. # ! # $Id: armerge,v 1.1 1998/07/17 16:01:23 ssb Exp $ # if test "$#" -lt "2"; then --- 35,41 ---- # merged into the output archive. The prefix used is the same as the # directory name with "/" replaced by "_" and a "_" at the end. # ! # $Id: armerge,v 1.2 1998/11/09 19:07:03 ssb Exp $ # if test "$#" -lt "2"; then *************** *** 56,61 **** --- 56,62 ---- ext_files=$files else prefix=echo $dir | sed -e 's#/#_#g'_ + prefix=echo $prefix | sed -e 's#^\.\._##g' ext_files="" for file in $files; do mv "$file" "$prefix$file" Index: php31/configure.in.in diff -c php31/configure.in.in:2.14 php31/configure.in.in:2.15 *** php31/configure.in.in:2.14 Sat Nov 7 21:43:31 1998 --- php31/configure.in.in Mon Nov 9 14:07:04 1998 *************** *** 1,4 **** ! dnl ## $Id: configure.in.in,v 2.14 1998/11/08 02:43:31 cschneid Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. dnl ## diversion 1 is the initial checking of OS features, programs, --- 1,4 ---- ! dnl ## $Id: configure.in.in,v 2.15 1998/11/09 19:07:04 ssb Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. dnl ## diversion 1 is the initial checking of OS features, programs, *************** *** 177,184 **** 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@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @VELOCIS_LIBS@ @ZLIB_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 --- 177,187 ---- 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@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @VELOCIS_LIBS@ @ZLIB_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" ! SAPI_TARGET=apache-apxs ! SAPI_LIBS=libphp3.so ! SAPI_PROGS= ! BINNAME=$(SAPI_LIBS) ! INSTALL_IT="\$(APXS) -i -a -n php3 $SAPI_LIBS" 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 *************** *** 211,225 **** if test -f $withval/src/include/httpd.h; then APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix" APACHE_TARGET=$withval/src/modules/php3 ! if test ! -d $APACHE_TARGET; then ! mkdir $APACHE_TARGET ! fi ! 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= ! BINNAME=libmodphp3-so.a ! INSTALL_IT="cp $BINNAME mod_php3.* php_version.h libphp3.module $APACHE_TARGET; cp apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp apMakefile.libdir $APACHE_TARGET/Makefile.libdir" AC_DEFINE(APACHE) AC_MSG_RESULT(yes - Shared Apache 1.3.x) STRONGHOLD= --- 214,231 ---- if test -f $withval/src/include/httpd.h; then APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix" APACHE_TARGET=$withval/src/modules/php3 ! if test ! -d $APACHE_TARGET; then ! mkdir $APACHE_TARGET ! fi ! 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= ! SAPI_TARGET=apache-shared ! SAPI_LIBS=libmodphp3-so.a ! SAPI_PROGS= ! BINNAME=$(SAPI_LIBS) ! INSTALL_IT="cp $SAPI_LIBS mod_php3.* php_version.h libphp3.module $APACHE_TARGET; cp apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp apMakefile.libdir $APACHE_TARGET/Makefile.libdir" AC_DEFINE(APACHE) AC_MSG_RESULT(yes - Shared Apache 1.3.x) STRONGHOLD= *************** *** 243,250 **** AC_MSG_RESULT(no) ]) ! if test "$BINNAME" != "libmodphp3-so.a"; then ! if test "$BINNAME" != "libphp3.so"; then AC_MSG_CHECKING(for Apache module support) AC_ARG_WITH(apache, [ --with-apache[=DIR] Build Apache module. DIR is the top-level Apache --- 249,256 ---- AC_MSG_RESULT(no) ]) ! if test "$SAPI_TARGET" != "apache-shared"; then ! if test "$SAPI_TARGET" != "apache-apxs"; then AC_MSG_CHECKING(for Apache module support) AC_ARG_WITH(apache, [ --with-apache[=DIR] Build Apache module. DIR is the top-level Apache *************** *** 302,309 **** if test ! -d $APACHE_TARGET; then mkdir $APACHE_TARGET fi ! BINNAME=libmodphp3.a ! PHP_LIBS="-Lmodules/php3 -L../modules/php3 -lmodphp3" INSTALL_IT="cp $BINNAME mod_php3.* php_version.h $APACHE_TARGET; cp apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp apMakefile.libdir $APACHE_TARGET/Makefile.libdir; cp libphp3.module $APACHE_TARGET" AC_DEFINE(APACHE) AC_MSG_RESULT(yes - Apache 1.3.x) --- 308,318 ---- if test ! -d $APACHE_TARGET; then mkdir $APACHE_TARGET fi ! SAPI_TARGET=apache ! SAPI_LIBS=libmodphp3.a ! SAPI_PROGS= ! BINNAME=$(SAPI_LIBS) ! PHP_LIBS="-Lmodules/php3 -L../modules/php3 -lmodphp3" INSTALL_IT="cp $BINNAME mod_php3.* php_version.h $APACHE_TARGET; cp apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp apMakefile.libdir $APACHE_TARGET/Makefile.libdir; cp libphp3.module $APACHE_TARGET" AC_DEFINE(APACHE) AC_MSG_RESULT(yes - Apache 1.3.x) *************** *** 318,325 **** elif test -f $withval/apache/httpd.h; then APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include" APACHE_TARGET=$withval/apache ! BINNAME=libmodphp3.a ! PHP_LIBS="-Lmodules/php3 -L../modules/php3 -lmodphp3" INSTALL_IT="cp $BINNAME mod_php3.* php_version.h libphp3.module $APACHE_TARGET" STRONGHOLD=-DSTRONGHOLD=1 AC_DEFINE(APACHE) --- 327,337 ---- elif test -f $withval/apache/httpd.h; then APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include" APACHE_TARGET=$withval/apache ! SAPI_TARGET=apache ! SAPI_LIBS=libmodphp3.a ! SAPI_PROGS= ! BINNAME=$(SAPI_LIBS) ! PHP_LIBS="-Lmodules/php3 -L../modules/php3 -lmodphp3" INSTALL_IT="cp $BINNAME mod_php3.* php_version.h libphp3.module $APACHE_TARGET" STRONGHOLD=-DSTRONGHOLD=1 AC_DEFINE(APACHE) *************** *** 336,347 **** fi else AC_MSG_RESULT(no) ! BINNAME=php INSTALL_IT="cp $BINNAME \$(bindir)" fi ],[ AC_MSG_RESULT(no) ! BINNAME=php INSTALL_IT="cp $BINNAME \$(bindir)" ]) AC_SUBST(APACHE_INCLUDE) --- 348,365 ---- fi else AC_MSG_RESULT(no) ! SAPI_TARGET=cgi ! SAPI_LIBS= ! SAPI_PROGS=php ! BINNAME=$(SAPI_PROGS) INSTALL_IT="cp $BINNAME \$(bindir)" fi ],[ AC_MSG_RESULT(no) ! SAPI_TARGET=cgi ! SAPI_LIBS= ! SAPI_PROGS=php ! BINNAME=$(SAPI_PROGS) INSTALL_IT="cp $BINNAME \$(bindir)" ]) AC_SUBST(APACHE_INCLUDE) *************** *** 352,357 **** --- 370,378 ---- AC_SUBST(PHP_LIBS) fi fi + AC_SUBST(SAPI_TARGET) + AC_SUBST(SAPI_PROGS) + AC_SUBST(SAPI_LIBS) AC_MSG_CHECKING(for fhttpd module support) AC_ARG_WITH(fhttpd, *************** *** 368,374 **** FHTTPD_INCLUDE=-I$withval/ FHTTPD_LIB=$withval/servproc.o FHTTPD_TARGET=$withval/ ! BINNAME=php AC_DEFINE(FHTTPD) AC_MSG_RESULT(yes - fhttpd 0.3.x) else --- 389,398 ---- FHTTPD_INCLUDE=-I$withval/ FHTTPD_LIB=$withval/servproc.o FHTTPD_TARGET=$withval/ ! SAPI_TARGET=fhttpd ! SAPI_LIBS= ! SAPI_PROGS=php ! BINNAME=$(SAPI_PROGS) AC_DEFINE(FHTTPD) AC_MSG_RESULT(yes - fhttpd 0.3.x) else Index: php31/ltconfig diff -c php31/ltconfig:2.0 php31/ltconfig:2.1 *** php31/ltconfig:2.0 Fri Jul 3 09:09:31 1998 --- php31/ltconfig Mon Nov 9 14:07:04 1998 *************** *** 27,32 **** --- 27,42 ---- # A lot of this script is taken from autoconf-2.10. + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + if test "X$1" = "X--no-reexec"; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X$SHELL" != X/bin/sh; then + # Restart under the correct shell. + exec "$SHELL" "$0" --no-reexec ${1+"$@@"} + fi + # The name of this program. progname=echo "$0" | sed 's%^.*/%%' -- 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