Join Up! 104882 members and counting!

Login To PHPBuilder User Name: Password: Register A New Site Account * NOTE: This is for logging into the main site only! To login to the forums, click here

Linux Today Enterprise Linux Today Apache Today JustLinux.com Linux Planet PHPBuilder All Linux Devices Hiermenus DatabaseJournal Technology Jobs Covalent Extends Apache 2.0 to Microsoft ASP.NET ShopWorX - Support for Windows PHP Security Advisory: Vulnerability in PHP versions 4.2.0 and 4.2.1 Network Risk Assessment Full-Featured, Java-Based Apache GUI File based, custom logging PHP and Classes Reading RSS feeds in PHP: Part 1 Compressing and Caching Dynamic Output PHP Basics: Intro to PHP

php4-beta | 199912

From: Sascha Schumann (sascha <email protected>)
Date: 12/29/99

• Next message: Sascha Schumann: "[PHP4BETA] cvs: /php4 genfiles"
• Previous message: Sascha Schumann: "[PHP4BETA] cvs: /php4/sapi/apache config.m4"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

sas Wed Dec 29 22:00:29 1999 EDT

  Added files:
    /php4 snapshot
    /php4/build build.mk build2.mk buildcheck.sh fastgen.sh library.mk
                       ltlib.mk mkdep.perl program.mk rules.mk rules_pear.mk
                       shtool
    /php4/ext Makefile.in
    /php4/ext/apache Makefile.in
    /php4/ext/aspell Makefile.in
    /php4/ext/bcmath Makefile.in
    /php4/ext/cpdf Makefile.in
    /php4/ext/cybercash Makefile.in
    /php4/ext/dav Makefile.in
    /php4/ext/db Makefile.in
    /php4/ext/dba Makefile.in
    /php4/ext/dbase Makefile.in
    /php4/ext/domxml Makefile.in
    /php4/ext/fdf Makefile.in
    /php4/ext/filepro Makefile.in
    /php4/ext/ftp Makefile.in
    /php4/ext/gd Makefile.in
    /php4/ext/gettext Makefile.in
    /php4/ext/hyperwave Makefile.in
    /php4/ext/informix Makefile.in
    /php4/ext/interbase Makefile.in
    /php4/ext/java Makefile.in
    /php4/ext/ldap Makefile.in
    /php4/ext/mcrypt Makefile.in
    /php4/ext/mhash Makefile.in
    /php4/ext/msql Makefile.in
    /php4/ext/mysql Makefile.in
    /php4/ext/oci8 Makefile.in
    /php4/ext/odbc Makefile.in
    /php4/ext/oracle Makefile.in
    /php4/ext/pcre Makefile.in
    /php4/ext/pcre/pcrelib Makefile.in
    /php4/ext/pdf Makefile.in
    /php4/ext/pgsql Makefile.in
    /php4/ext/posix Makefile.in
    /php4/ext/readline Makefile.in
    /php4/ext/session Makefile.in
    /php4/ext/standard Makefile.in
    /php4/ext/sybase_ct Makefile.in
    /php4/ext/wddx Makefile.in
    /php4/ext/yp Makefile.in
    /php4/pear Makefile.in pear.m4 php-config.in phpize.in
    /php4/sapi Makefile.in
    /php4/sapi/aolserver Makefile.in
    /php4/sapi/apache Makefile.in
    /php4/sapi/cgi Makefile.in
    /php4/sapi/fhttpd .cvsignore
    /php4/sapi/isapi Makefile.in
    /php4/sapi/phttpd Makefile.in
    /php4/sapi/roxen Makefile.in
    /php4/sapi/servlet Makefile.in
    /php4/sapi/thttpd Makefile.in

  Removed files:
    /php4 Makefile.am build.mk build2.mk buildcheck.sh
    /php4/ext Makefile.am
    /php4/ext/apache Makefile.am
    /php4/ext/aspell Makefile.am
    /php4/ext/bcmath Makefile.am
    /php4/ext/cpdf Makefile.am
    /php4/ext/cybercash Makefile.am
    /php4/ext/dav Makefile.am
    /php4/ext/db Makefile.am
    /php4/ext/dba Makefile.am
    /php4/ext/dbase Makefile.am
    /php4/ext/domxml Makefile.am
    /php4/ext/fdf Makefile.am
    /php4/ext/filepro Makefile.am
    /php4/ext/ftp Makefile.am
    /php4/ext/gd Makefile.am
    /php4/ext/gettext Makefile.am
    /php4/ext/hyperwave Makefile.am
    /php4/ext/icap Makefile.am
    /php4/ext/imap Makefile.am
    /php4/ext/informix Makefile.am
    /php4/ext/interbase Makefile.am
    /php4/ext/java Makefile.am
    /php4/ext/ldap Makefile.am
    /php4/ext/mcal Makefile.am
    /php4/ext/mcrypt Makefile.am
    /php4/ext/mhash Makefile.am
    /php4/ext/msql Makefile.am
    /php4/ext/mysql Makefile.am config.h.stub
    /php4/ext/oci8 Makefile.am
    /php4/ext/odbc Makefile.am
    /php4/ext/oracle Makefile.am
    /php4/ext/pcre Makefile.am
    /php4/ext/pcre/pcrelib Makefile.am
    /php4/ext/pdf Makefile.am
    /php4/ext/pgsql Makefile.am
    /php4/ext/posix Makefile.am
    /php4/ext/readline Makefile.am
    /php4/ext/session Makefile.am config.h.stub
    /php4/ext/snmp Makefile.am
    /php4/ext/standard Makefile.am
    /php4/ext/sybase Makefile.am
    /php4/ext/sybase_ct Makefile.am
    /php4/ext/sysvsem Makefile.am
    /php4/ext/sysvshm Makefile.am
    /php4/ext/wddx Makefile.am
    /php4/ext/xml Makefile.am
    /php4/ext/yp Makefile.am
    /php4/ext/zlib Makefile.am
    /php4/pear Makefile.am
    /php4/regex Makefile.am
    /php4/sapi Makefile.am
    /php4/sapi/aolserver Makefile.am
    /php4/sapi/apache Makefile.am
    /php4/sapi/cgi Makefile.am
    /php4/sapi/isapi Makefile.am
    /php4/sapi/phttpd Makefile.am
    /php4/sapi/roxen Makefile.am
    /php4/sapi/servlet Makefile.am
    /php4/sapi/thttpd Makefile.am

  Modified files:
    /php4 Makefile.in .cvsignore acinclude.m4 buildconf configure.in
                 internal_functions_win32.c
    /php4/ext .cvsignore ext_skel
    /php4/ext/apache .cvsignore
    /php4/ext/aspell .cvsignore
    /php4/ext/bcmath .cvsignore
    /php4/ext/com .cvsignore
    /php4/ext/cpdf .cvsignore
    /php4/ext/cybercash .cvsignore
    /php4/ext/dav .cvsignore
    /php4/ext/db .cvsignore config.m4
    /php4/ext/dba .cvsignore
    /php4/ext/dbase .cvsignore config.m4
    /php4/ext/domxml .cvsignore
    /php4/ext/fdf .cvsignore
    /php4/ext/filepro .cvsignore
    /php4/ext/ftp .cvsignore
    /php4/ext/gd .cvsignore config.m4
    /php4/ext/gettext .cvsignore
    /php4/ext/hyperwave .cvsignore
    /php4/ext/icap Makefile.in .cvsignore
    /php4/ext/imap Makefile.in .cvsignore
    /php4/ext/informix .cvsignore config.m4
    /php4/ext/interbase .cvsignore
    /php4/ext/java .cvsignore config.m4
    /php4/ext/ldap .cvsignore
    /php4/ext/mcal Makefile.in .cvsignore
    /php4/ext/mcrypt .cvsignore
    /php4/ext/mhash .cvsignore
    /php4/ext/msql .cvsignore
    /php4/ext/mssql .cvsignore
    /php4/ext/mysql .cvsignore config.m4
    /php4/ext/oci8 .cvsignore config.m4
    /php4/ext/odbc .cvsignore config.m4
    /php4/ext/oracle .cvsignore config.m4
    /php4/ext/pcre .cvsignore config.m4
    /php4/ext/pcre/pcrelib .cvsignore
    /php4/ext/pdf .cvsignore
    /php4/ext/pgsql .cvsignore config.m4
    /php4/ext/posix .cvsignore
    /php4/ext/readline .cvsignore config.m4
    /php4/ext/session .cvsignore config.m4
    /php4/ext/snmp Makefile.in .cvsignore config.m4
    /php4/ext/standard .cvsignore config.m4
    /php4/ext/sybase Makefile.in .cvsignore
    /php4/ext/sybase_ct .cvsignore
    /php4/ext/sysvsem Makefile.in .cvsignore
    /php4/ext/sysvshm Makefile.in .cvsignore
    /php4/ext/wddx .cvsignore
    /php4/ext/xml Makefile.in .cvsignore config.m4
    /php4/ext/yp .cvsignore
    /php4/ext/zlib Makefile.in .cvsignore
    /php4/pear .cvsignore
    /php4/regex Makefile.in .cvsignore
    /php4/sapi .cvsignore
    /php4/sapi/aolserver .cvsignore config.m4
    /php4/sapi/apache .cvsignore config.m4
    /php4/sapi/cgi .cvsignore config.m4
    /php4/sapi/isapi .cvsignore
    /php4/sapi/phttpd .cvsignore config.m4
    /php4/sapi/roxen .cvsignore
    /php4/sapi/servlet .cvsignore config.m4
    /php4/sapi/thttpd .cvsignore config.m4
    /php4/scripts .cvsignore
  Log:
  Integration of -ng changes. Changes:
  
  - added support for externally built modules,
  - improved support for in-tree shared modules,
  - fixed diversion bugs,
  - configure displays some informative messages,
  - faster static build
    (libtool isn't used anymore for compiling non-PIC objects),
  - dependencies comparable to automake's without requiring GNU make or GCC,
  - working make clean for non-GNU makes.
  
  
Index: php4/.cvsignore
diff -u php4/.cvsignore:1.24 php4/.cvsignore:1.25
--- php4/.cvsignore:1.24 Fri Dec 24 18:29:39 1999
+++ php4/.cvsignore Wed Dec 29 21:58:26 1999
@@ -1,7 +1,4 @@
-TSRM
-Zend
 Makefile
-Makefile.in
 acconfig.h
 aclocal.m4
 build-defs.h
@@ -10,17 +7,19 @@
 config.cache
 config.log
 config.status
+config_vars.mk
 configuration-parser.c
 configuration-parser.h
 configuration-parser.output
 configuration-scanner.c
 configure
 generated_lists
+mkinstalldirs
+missing
 install-sh
 internal_functions.c
 libtool
-missing
-mkinstalldirs
+shlibtool
 php
 php4.spec
 php_config.h
@@ -34,3 +33,4 @@
 modules
 php-*.tar.gz
 want_dependencies
+.deps
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.53 php4/acinclude.m4:1.54
--- php4/acinclude.m4:1.53 Mon Dec 20 21:34:26 1999
+++ php4/acinclude.m4 Wed Dec 29 21:58:26 1999
@@ -1,7 +1,127 @@
-dnl $Id: acinclude.m4,v 1.53 1999/12/21 02:34:26 sas Exp $
+dnl $Id: acinclude.m4,v 1.54 1999/12/30 02:58:26 sas Exp $
 dnl
 dnl This file contains local autoconf functions.
 
+AC_DEFUN(PHP_SUBST,[
+ PHP_VAR_SUBST="$PHP_VAR_SUBST $1"
+ AC_SUBST($1)
+])
+
+AC_DEFUN(PHP_FAST_OUTPUT,[
+ PHP_FAST_OUTPUT_FILES="$PHP_FAST_OUTPUT_FILES $1"
+])
+
+AC_DEFUN(PHP_MKDIR_P_CHECK,[
+ AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
+ test -d conftestdir && rm -rf conftestdir
+ mkdir -p conftestdir/somedir >/dev/null 2>&1
+ if test -d conftestdir/somedir; then
+ ac_cv_mkdir_p=yes
+ else
+ ac_cv_mkdir_p=no
+ fi
+ rm -rf conftestdir
+ ])
+])
+
+AC_DEFUN(PHP_FAST_GENERATE,[
+ PHP_MKDIR_P_CHECK
+ echo creating config_vars.mk
+ > config_vars.mk
+ for i in $PHP_VAR_SUBST; do
+ eval echo "$i = \$$i" >> config_vars.mk
+ done
+ $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $PHP_FAST_OUTPUT_FILES
+])
+
+AC_DEFUN(PHP_TM_GMTOFF,[
+AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
+ ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
+
+if test "$ac_cv_struct_tm_gmtoff" = yes; then
+ AC_DEFINE(HAVE_TM_GMTOFF)
+fi
+])
+
+dnl PHP_CONFIGURE_PART(MESSAGE)
+dnl Idea borrowed from mm
+AC_DEFUN(PHP_CONFIGURE_PART,[
+ AC_MSG_RESULT()
+ AC_MSG_RESULT(${T_MD}$1${T_ME})
+])
+
+AC_DEFUN(PHP_PROG_SENDMAIL,[
+AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib)
+if test -n "$PROG_SENDMAIL"; then
+ AC_DEFINE(HAVE_SENDMAIL)
+fi
+])
+
+AC_DEFUN(PHP_RUNPATH_SWITCH,[
+dnl check for -R, etc. switch
+AC_MSG_CHECKING(if compiler supports -R)
+AC_CACHE_VAL(php_cv_cc_dashr,[
+ SAVE_LIBS="${LIBS}"
+ LIBS="-R /usr/lib ${LIBS}"
+ AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
+ LIBS="${SAVE_LIBS}"])
+AC_MSG_RESULT($php_cv_cc_dashr)
+if test $php_cv_cc_dashr = "yes"; then
+ ld_runpath_switch="-R"
+else
+ AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
+ AC_CACHE_VAL(php_cv_cc_rpath,[
+ SAVE_LIBS="${LIBS}"
+ LIBS="-Wl,-rpath,/usr/lib ${LIBS}"
+ AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
+ LIBS="${SAVE_LIBS}"])
+ AC_MSG_RESULT($php_cv_cc_rpath)
+ if test $php_cv_cc_rpath = "yes"; then
+ ld_runpath_switch="-Wl,-rpath,"
+ else
+ dnl something innocuous
+ ld_runpath_switch="-L"
+ fi
+fi
+])
+
+AC_DEFUN(PHP_STRUCT_FLOCK,[
+AC_CACHE_CHECK(for struct flock,ac_cv_struct_flock,
+ AC_TRY_COMPILE([
+#include <unistd.h>
+#include <fcntl.h>
+ ],
+ [struct flock x;],
+ [
+ ac_cv_struct_flock=yes
+ ],[
+ ac_cv_struct_flock=no
+ ])
+)
+if test "$ac_cv_struct_flock" = "yes" ; then
+ AC_DEFINE(HAVE_STRUCT_FLOCK, 1)
+fi
+])
+
+AC_DEFUN(PHP_SOCKLEN_T,[
+AC_CACHE_CHECK(for socklen_t,ac_cv_socklen_t,
+ AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+],[
+socklen_t x;
+],[
+ ac_cv_socklen_t=yes
+],[
+ ac_cv_socklen_t=no
+]))
+if test "$ac_cv_socklen_t" = "no"; then
+ AC_DEFINE(socklen_t, unsigned int)
+fi
+])
+
 dnl
 dnl PHP_SET_SYM_FILE(path)
 dnl
@@ -176,7 +296,7 @@
   REGEX_DIR=regex
   AC_DEFINE(HSREGEX)
   AC_DEFINE(REGEX,1)
- PHP_OUTPUT(regex/Makefile)
+ PHP_FAST_OUTPUT(regex/Makefile)
 elif test "$REGEX_TYPE" = "system"; then
   AC_DEFINE(REGEX,0)
 elif test "$REGEX_TYPE" = "apache"; then
@@ -186,9 +306,9 @@
 AC_MSG_CHECKING(which regex library to use)
 AC_MSG_RESULT($REGEX_TYPE)
 
-AC_SUBST(REGEX_DIR)
-AC_SUBST(REGEX_LIB)
-AC_SUBST(HSREGEX)
+PHP_SUBST(REGEX_DIR)
+PHP_SUBST(REGEX_LIB)
+PHP_SUBST(HSREGEX)
 ])
 
 dnl
@@ -209,17 +329,20 @@
 dnl Check for broken sprintf()
 dnl
 AC_DEFUN(AC_BROKEN_SPRINTF,[
- AC_MSG_CHECKING([for broken sprintf])
- AC_TRY_RUN([main() { char buf[20]; exit (sprintf(buf,"testing 123")!=11); }],[
- AC_DEFINE(BROKEN_SPRINTF,0)
- AC_MSG_RESULT(ok)
- ],[
- AC_DEFINE(BROKEN_SPRINTF,1)
- AC_MSG_RESULT(broken)
- ],[
- AC_DEFINE(BROKEN_SPRINTF,0)
- AC_MSG_RESULT(cannot check, guessing ok)
+ AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
+ AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
+ ac_cv_broken_sprintf=no
+ ],[
+ ac_cv_broken_sprintf=yes
+ ],[
+ ac_cv_broken_sprintf=no
+ ])
   ])
+ if test "$ac_cv_broken_sprintf" = "yes"; then
+ AC_DEFINE(BROKEN_SPRINTF, 1)
+ else
+ AC_DEFINE(BROKEN_SPRINTF, 0)
+ fi
 ])
 
 dnl
@@ -234,24 +357,24 @@
 AC_DEFUN(PHP_EXTENSION,[
   if test -d "$cwd/$srcdir/ext/$1" ; then
     EXT_SUBDIRS="$EXT_SUBDIRS $1"
- if test "$2" != "shared" -a "$2" != "yes"; then
- _extlib="libphpext_$1.a"
- EXT_LTLIBS="$EXT_LTLIBS ext/$1/libphpext_$1.la"
+ if test "$2" != "shared" && test "$2" != "yes" && test -z "$php_always_shared"; then
+ _extlib="lib$1.a"
+ EXT_LTLIBS="$EXT_LTLIBS ext/$1/lib$1.la"
       EXT_LIBS="$EXT_LIBS $1/$_extlib"
       EXT_STATIC="$EXT_STATIC $1"
     else
- AC_DEFINE_UNQUOTED(COMPILE_DL_`echo $1|tr a-z A-Z`, 1, Whether to build $1 as dynamic module)
+ AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z,A-Z), 1, Whether to build $1 as dynamic module)
       EXT_SHARED="$EXT_SHARED $1"
     fi
- PHP_OUTPUT(ext/$1/Makefile)
+ PHP_FAST_OUTPUT(ext/$1/Makefile)
   fi
 ])
 
-AC_SUBST(EXT_SUBDIRS)
-AC_SUBST(EXT_STATIC)
-AC_SUBST(EXT_SHARED)
-AC_SUBST(EXT_LIBS)
-AC_SUBST(EXT_LTLIBS)
+PHP_SUBST(EXT_SUBDIRS)
+PHP_SUBST(EXT_STATIC)
+PHP_SUBST(EXT_SHARED)
+PHP_SUBST(EXT_LIBS)
+PHP_SUBST(EXT_LTLIBS)
 
 dnl
 dnl Solaris requires main code to be position independent in order
@@ -298,6 +421,9 @@
             shared=no
             ;;
     esac
+ if test -n "$php_always_shared"; then
+ shared=yes
+ fi
 ])
 
 dnl The problem is that the default compilation flags in Solaris 2.6 won't
@@ -354,9 +480,11 @@
   ])
 ])
 
+
 dnl ## PHP_AC_OUTPUT(file)
 dnl ## adds "file" to the list of files generated by AC_OUTPUT
 dnl ## This macro can be used several times.
 AC_DEFUN(PHP_OUTPUT,[
   PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES $1"
 ])
+
Index: php4/buildconf
diff -u php4/buildconf:1.47 php4/buildconf:1.48
--- php4/buildconf:1.47 Wed Dec 1 21:14:06 1999
+++ php4/buildconf Wed Dec 29 21:58:26 1999
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf,v 1.47 1999/12/02 02:14:06 sas Exp $
+# $Id: buildconf,v 1.48 1999/12/30 02:58:26 sas Exp $
 
 supplied_flag=$1
 
@@ -26,4 +26,4 @@
   subdirs=''
 fi
 
-${MAKE:-make} -s -f build.mk AMFLAGS="$automake_flags" $subdirs
+${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags"
Index: php4/configure.in
diff -u php4/configure.in:1.80 php4/configure.in:1.81
--- php4/configure.in:1.80 Fri Dec 24 10:47:44 1999
+++ php4/configure.in Wed Dec 29 21:58:26 1999
@@ -1,10 +1,12 @@
-dnl ## $Id: configure.in,v 1.80 1999/12/24 15:47:44 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.81 1999/12/30 02:58:26 sas Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
-divert(0)
+divert(1)
 
 AC_INIT(main.c)
 
+PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile)
+
 dnl Because ``make install'' is often performed by the superuser,
 dnl we create the libs subdirectory as the user who configures PHP.
 dnl Otherwise, the current user will not be able to delete libs
@@ -25,25 +27,30 @@
 for arg in "$@"; do
     CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
 done
-AC_SUBST(CONFIGURE_COMMAND)
 
-dnl ## Diversion 1 is the initial checking of OS features, programs,
+php_shtool="$srcdir/build/shtool"
+T_MD=`$php_shtool echo -n -e %B`
+T_ME=`$php_shtool echo -n -e %b`
+
+dnl ## Diversion 2 is the initial checking of OS features, programs,
 dnl ## libraries and so on.
 
-dnl ## In diversion 2 we check for compile-time options to the PHP
+dnl ## In diversion 3 we check for compile-time options to the PHP
 dnl ## core and how to deal with different system dependencies. This
 dnl ## includes what regex library is used and whether debugging or short
 dnl ## tags are enabled, and the default behaviour of php.ini options.
 dnl ## This is also where an SAPI interface is selected (choosing between
 dnl ## Apache module, CGI etc.)
 
-dnl ## In diversion 3 we check which extensions should be compiled.
+dnl ## In diversion 4 we check which extensions should be compiled.
 dnl ## All of these are normally in the extension directories.
 
-dnl ## Diversion 4 is the last one. Here we generate files and clean up.
+dnl ## Diversion 5 is the last one. Here we generate files and clean up.
 
-divert(1)
+divert(2)
 
+PHP_CONFIGURE_PART(Running system checks)
+
 dnl ## This is where the version number is changed from now on!
 AM_INIT_AUTOMAKE(php, 4.0b4-dev)
 
@@ -62,10 +69,6 @@
 AM_CONFIG_HEADER(php_config.h)
 AM_MAINTAINER_MODE
 
-phplibdir=$libdir/php
-AC_SUBST(phplibdir)
-AC_SUBST(PHP_VERSION)
-
 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1
 
@@ -109,14 +112,13 @@
 if test "$ac_cv_c_const" = "yes" ; then
   LEX_CFLAGS="-DYY_USE_CONST"
 fi
-AC_SUBST(LEX_CFLAGS)
 
 sinclude(Zend/acinclude.m4)
 sinclude(Zend/Zend.m4)
 sinclude(TSRM/tsrm.m4)
 
 dnl check for -R, etc. switch
-AC_MSG_CHECKING(if compiler supports -R)
+AC_MSG_CHECKING(whether compiler supports -R)
 AC_CACHE_VAL(php_cv_cc_dashr,[
         SAVE_LIBS="${LIBS}"
         LIBS="-R /usr/lib ${LIBS}"
@@ -126,7 +128,7 @@
 if test $php_cv_cc_dashr = "yes"; then
         ld_runpath_switch="-R"
 else
- AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
+ AC_MSG_CHECKING([whether compiler supports -Wl,-rpath,])
         AC_CACHE_VAL(php_cv_cc_rpath,[
                 SAVE_LIBS="${LIBS}"
                 LIBS="-Wl,-rpath,/usr/lib ${LIBS}"
@@ -157,7 +159,6 @@
 fi
 
 INCLUDES="-I\$(top_builddir)/Zend -I\$(top_srcdir)"
-AC_SUBST(INCLUDES)
 
 AC_CHECK_LIB(nsl, gethostname, [
  AC_ADD_LIBRARY(nsl)
@@ -249,49 +250,10 @@
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_STRUCT_TM
 AC_STRUCT_TIMEZONE
-
-AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
- ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
-
-if test "$ac_cv_struct_tm_gmtoff" = yes; then
- AC_DEFINE(HAVE_TM_GMTOFF)
-fi
-
-AC_CACHE_CHECK(for struct flock,ac_cv_struct_flock,
- AC_TRY_COMPILE([
-#include <unistd.h>
-#include <fcntl.h>
- ],
- [struct flock x;],
- [
- ac_cv_struct_flock=yes
- ],[
- ac_cv_struct_flock=no
- ])
-)
-
-AC_CACHE_CHECK(for socklen_t,ac_cv_socklen_t,
- AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-],[
-socklen_t x;
-],[
- ac_cv_socklen_t=yes
-],[
- ac_cv_socklen_t=no
-]))
-
-
-if test "$ac_cv_struct_flock" = "yes" ; then
- AC_DEFINE(HAVE_STRUCT_FLOCK, 1)
-fi
 
-if test "$ac_cv_socklen_t" = "no"; then
- AC_CHECK_TYPE(socklen_t, unsigned int)
-fi
+PHP_TM_GMTOFF
+PHP_STRUCT_FLOCK
+PHP_SOCKLEN_T
 
 AC_CHECK_SIZEOF(long, 8)
 AC_CHECK_SIZEOF(int, 4)
@@ -307,7 +269,6 @@
 else
     AC_MSG_WARN(warnings level for cc set to 0)
         WARNING_LEVEL=0
- AC_SUBST(WARNING_LEVEL)
 fi
 AC_STRUCT_ST_RDEV
 
@@ -395,12 +356,12 @@
   AC_DEFINE(in_addr_t, u_int)
 fi
 
-divert(2)
+divert(3)
 
+
+
 abs_srcdir=`(cd $srcdir; pwd)`
 abs_builddir=`pwd`
-AC_SUBST(abs_srcdir)
-AC_SUBST(abs_builddir)
 
 AC_MSG_CHECKING(whether to use a configuration file)
 AC_ARG_WITH(config-file-path,
@@ -451,7 +412,6 @@
 fi
 
 
-AC_SUBST(DEBUG_CFLAGS)
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
 
@@ -606,26 +566,30 @@
   PEAR_DIR=pear
 fi
 
-AC_SUBST(PEAR_DIR)
 
 PHP_SAPI=cgi
 PHP_BUILD_PROGRAM
 dnl paths to the targets relative to the build directory
 SAPI_PROGRAM=php
+dnl on HP-UX, the extension is .sl. Need to improve this
 SAPI_SHARED=libs/libphp4.so
 SAPI_STATIC=libs/libphp4.a
 
-esyscmd(./scripts/config-stubs sapi)
+PHP_CONFIGURE_PART(Configuring SAPI modules)
 
-divert(3)
+esyscmd(./scripts/config-stubs sapi)
 
-AC_SUBST(EXTRA_LIBS)
-AC_SUBST(EXTRA_LDFLAGS)
+AC_MSG_CHECKING(for chosen SAPI module)
+AC_MSG_RESULT($PHP_SAPI)
+
+divert(4)
 
+PHP_CONFIGURE_PART(Configuring extensions)
+
 # reading config stubs
 esyscmd(./scripts/config-stubs ext)
 
-PHP_OUTPUT(sapi/$PHP_SAPI/Makefile)
+PHP_FAST_OUTPUT(sapi/$PHP_SAPI/Makefile)
 
 AC_MSG_CHECKING(whether to enable versioning)
 AC_ARG_ENABLE(versioning,
@@ -644,7 +608,7 @@
   fi
 fi
 
-divert(4)
+divert(5)
 
 enable_shared=yes
 enable_static=yes
@@ -663,13 +627,6 @@
 ;;
 esac
 
-
-
-AM_PROG_LIBTOOL
-if test "$enable_debug" != "yes"; then
- AM_SET_LIBTOOL_VARIABLE([--silent])
-fi
-
 PHP_REGEX
 
 case "`uname -s`" in
@@ -679,6 +636,7 @@
 
 CPPFLAGS="$CPPFLAGS -D_REENTRANT"
 
+PHP_CONFIGURE_PART(Configuring Zend)
 LIBZEND_BASIC_CHECKS
 LIBZEND_OTHER_CHECKS
 
@@ -688,7 +646,6 @@
   AC_DEFINE(ZTS)
   INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"
   PHP_THREAD_SAFETY=yes
- PHP_OUTPUT(TSRM/Makefile)
 else
   PHP_THREAD_SAFETY=no
 fi
@@ -700,9 +657,6 @@
   fi
 fi
 
-AC_SUBST(TSRM_DIR)
-AC_SUBST(TSRM_LIB)
-
 dnl *** Commented out - generates slow code and consumes a lot of
 dnl *** resources during compilation - we need to figure out how
 dnl *** to supply it only when absolutely necessary
@@ -716,47 +670,109 @@
 LIBS=""
 LDFLAGS=""
 if test "$PHP_THREAD_SAFETY" = "yes"; then
+ PHP_CONFIGURE_PART(Configuring TSRM)
   TSRM_BASIC_CHECKS
   TSRM_OTHER_CHECKS
   EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
   EXTRA_LIBS="$EXTRA_LIBS $LIBS"
   LDFLAGS=""
   LIBS=""
+ PHP_OUTPUT(TSRM/Makefile)
 fi
 
 
 phplibdir="`pwd`/modules"
 phptempdir="`pwd`/libs"
-AC_SUBST(phplibdir)
-AC_SUBST(phptempdir)
 
 AC_BUILD_RPATH
 
 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
-
-AC_SUBST(CFLAGS)
-AC_SUBST(PROG_SENDMAIL)
-AC_SUBST(PHP_RPATHS)
-AC_SUBST(NATIVE_RPATHS)
-AC_SUBST(PHP_PROGRAM)
         
 PHP_BUILD_DATE=`date '+%Y-%m-%d'`
-AC_SUBST(PHP_BUILD_DATE)
 AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE")
 PHP_UNAME=`uname -a`
 AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME")
 PHP_OS=`uname`
 AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS")
+
 
-AC_SUBST(PHP_LDFLAGS)
-AC_SUBST(PHP_LIBS)
-AC_SUBST(PHP_SAPI)
-AC_SUBST(INSTALL_IT)
         
+PHP_SUBST(abs_builddir)
+PHP_SUBST(abs_srcdir)
+PHP_SUBST(bindir)
+PHP_SUBST(exec_prefix)
+PHP_SUBST(includedir)
+PHP_SUBST(libdir)
+PHP_SUBST(phplibdir)
+PHP_SUBST(phptempdir)
+PHP_SUBST(prefix)
+
+PHP_SUBST(CC)
+PHP_SUBST(CFLAGS)
+PHP_SUBST(CONFIGURE_COMMAND)
+PHP_SUBST(CPP)
+PHP_SUBST(CPPFLAGS)
+PHP_SUBST(CXX)
+PHP_SUBST(DEBUG_CFLAGS)
+PHP_SUBST(DEFS)
+PHP_SUBST(EXTRA_LDFLAGS)
+PHP_SUBST(EXTRA_LIBS)
+PHP_SUBST(INCLUDES)
+PHP_SUBST(INSTALL_IT)
+PHP_SUBST(LEX)
+PHP_SUBST(LEX_OUTPUT_ROOT)
+PHP_SUBST(LFLAGS)
+PHP_SUBST(LIBTOOL)
+PHP_SUBST(NATIVE_RPATHS)
+PHP_SUBST(PEAR_DIR)
+PHP_SUBST(PHP_BUILD_DATE)
+PHP_SUBST(PHP_COMPILE)
+PHP_SUBST(PHP_LDFLAGS)
+PHP_SUBST(PHP_LIBS)
+PHP_SUBST(PHP_PROGRAM)
+PHP_SUBST(PHP_RPATHS)
+PHP_SUBST(PHP_SAPI)
+PHP_SUBST(PHP_VERSION)
+PHP_SUBST(PROG_SENDMAIL)
+PHP_SUBST(SHELL)
+PHP_SUBST(SHLIBTOOL)
+PHP_SUBST(TSRM_DIR)
+PHP_SUBST(TSRM_LIB)
+PHP_SUBST(WARNING_LEVEL)
+PHP_SUBST(YACC)
+
+PHP_CONFIGURE_PART(Configuring libtool)
+AM_PROG_LIBTOOL
+if test "$enable_debug" != "yes"; then
+ AM_SET_LIBTOOL_VARIABLE([--silent])
+fi
+
+PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
+
+if test "$enable_shared" = "yes"; then
+ SHLIBTOOL='$(LIBTOOL)'
+else
+ if test -n "$EXT_SHARED"; then
+ PHP_CONFIGURE_PART(Configuring shared libtool)
+ $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
+ SHLIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
+ else
+ PHP_COMPILE='$(COMPILE) -c $< && touch $@'
+ fi
+fi
+
+test "$prefix" = "NONE" && prefix="/usr/local"
+test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
+
+PHP_CONFIGURE_PART(Generating files)
+
+PHP_FAST_GENERATE
+
 #libphp4.module
-AC_OUTPUT([Makefile php4.spec Zend/Makefile ext/Makefile sapi/Makefile pear/Makefile
- $PHP_OUTPUT_FILES
- scripts/mkextlib build-defs.h], [], [
+AC_OUTPUT([php4.spec Zend/Makefile
+ scripts/mkextlib build-defs.h
+ $PHP_OUTPUT_FILES
+ ], [], [
 
 if test ! -f $srcdir/ext/bcmath/number.c; then
         echo "creating number.c"
@@ -817,10 +833,7 @@
   echo "+--------------------------------------------------------------------+"
 
 fi
-
 ])
-
-divert
 
 dnl ## Local Variables:
 dnl ## tab-width: 4
Index: php4/internal_functions_win32.c
diff -u php4/internal_functions_win32.c:1.20 php4/internal_functions_win32.c:1.21
--- php4/internal_functions_win32.c:1.20 Tue Dec 7 15:49:01 1999
+++ php4/internal_functions_win32.c Wed Dec 29 21:58:27 1999
@@ -18,7 +18,7 @@
  */
 
 
-/* $Id: internal_functions_win32.c,v 1.20 1999/12/07 20:49:01 rubys Exp $ */
+/* $Id: internal_functions_win32.c,v 1.21 1999/12/30 02:58:27 sas Exp $ */
 
 
 #include "php.h"
@@ -49,7 +49,7 @@
 #include "ext/standard/php_output.h"
 #include "ext/standard/php_array.h"
 #include "ext/standard/php_assert.h"
-#include "ext/COM/php_COM.h"
+#include "ext/com/php_COM.h"
 #include "ext/standard/reg.h"
 #include "ext/pcre/php_pcre.h"
 #include "ext/odbc/php_odbc.h"
Index: php4/ext/.cvsignore
diff -u php4/ext/.cvsignore:1.1 php4/ext/.cvsignore:1.2
--- php4/ext/.cvsignore:1.1 Fri Apr 16 20:37:05 1999
+++ php4/ext/.cvsignore Wed Dec 29 21:58:33 1999
@@ -1,3 +1,3 @@
-.deps
 Makefile
-Makefile.in
+Makefile.am
+.deps
Index: php4/ext/ext_skel
diff -u php4/ext/ext_skel:1.11 php4/ext/ext_skel:1.12
--- php4/ext/ext_skel:1.11 Sat Nov 27 19:55:39 1999
+++ php4/ext/ext_skel Wed Dec 29 21:58:33 1999
@@ -46,13 +46,19 @@
 
 eof
 
-$ECHO_N " Makefile.am$ECHO_C"
-cat >Makefile.am <<eof
+$ECHO_N " Makefile.in$ECHO_C"
+cat >Makefile.in <<eof
 # \$Id\$
 
-noinst_LTLIBRARIES=libphpext_$extname.la
-libphpext_${extname}_la_SOURCES=$extname.c
+DEPTH = ../..
+topsrcdir =  <email protected>@
+srcdir =  <email protected>@
+VPATH =  <email protected>@
 
+LTLIBRARY_NAME = lib$extname.la
+LTLIBRARY_SOURCES = $extname.c
+
+include \$(topsrcdir)/build/ltlib.mk
 eof
 
 
Index: php4/ext/apache/.cvsignore
diff -u php4/ext/apache/.cvsignore:1.2 php4/ext/apache/.cvsignore:1.3
--- php4/ext/apache/.cvsignore:1.2 Thu Oct 7 09:52:12 1999
+++ php4/ext/apache/.cvsignore Wed Dec 29 21:58:35 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/aspell/.cvsignore
diff -u php4/ext/aspell/.cvsignore:1.2 php4/ext/aspell/.cvsignore:1.3
--- php4/ext/aspell/.cvsignore:1.2 Thu Oct 7 09:52:12 1999
+++ php4/ext/aspell/.cvsignore Wed Dec 29 21:58:36 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/bcmath/.cvsignore
diff -u php4/ext/bcmath/.cvsignore:1.3 php4/ext/bcmath/.cvsignore:1.4
--- php4/ext/bcmath/.cvsignore:1.3 Thu Oct 7 09:52:13 1999
+++ php4/ext/bcmath/.cvsignore Wed Dec 29 21:58:38 1999
@@ -1,8 +1,8 @@
-.deps
-Makefile.in
 Makefile
 number.h
 number.c
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/com/.cvsignore
diff -u php4/ext/com/.cvsignore:1.2 php4/ext/com/.cvsignore:1.3
--- php4/ext/com/.cvsignore:1.2 Thu Oct 7 09:52:14 1999
+++ php4/ext/com/.cvsignore Wed Dec 29 21:58:39 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/cpdf/.cvsignore
diff -u php4/ext/cpdf/.cvsignore:1.1 php4/ext/cpdf/.cvsignore:1.2
--- php4/ext/cpdf/.cvsignore:1.1 Mon Nov 22 22:08:10 1999
+++ php4/ext/cpdf/.cvsignore Wed Dec 29 21:58:40 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/cybercash/.cvsignore
diff -u php4/ext/cybercash/.cvsignore:1.1 php4/ext/cybercash/.cvsignore:1.2
--- php4/ext/cybercash/.cvsignore:1.1 Tue Dec 7 07:17:53 1999
+++ php4/ext/cybercash/.cvsignore Wed Dec 29 21:58:41 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/dav/.cvsignore
diff -u php4/ext/dav/.cvsignore:1.2 php4/ext/dav/.cvsignore:1.3
--- php4/ext/dav/.cvsignore:1.2 Thu Oct 7 09:52:14 1999
+++ php4/ext/dav/.cvsignore Wed Dec 29 21:58:42 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/db/.cvsignore
diff -u php4/ext/db/.cvsignore:1.2 php4/ext/db/.cvsignore:1.3
--- php4/ext/db/.cvsignore:1.2 Thu Oct 7 09:52:15 1999
+++ php4/ext/db/.cvsignore Wed Dec 29 21:58:44 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/db/config.m4
diff -u php4/ext/db/config.m4:1.4 php4/ext/db/config.m4:1.5
--- php4/ext/db/config.m4:1.4 Sun Nov 14 18:03:45 1999
+++ php4/ext/db/config.m4 Wed Dec 29 21:58:44 1999
@@ -1,8 +1,8 @@
-dnl $Id: config.m4,v 1.4 1999/11/14 23:03:45 sas Exp $
+dnl $Id: config.m4,v 1.5 1999/12/30 02:58:44 sas Exp $
 dnl config.m4 for extension db
 dnl don't forget to call PHP_EXTENSION(db)
 
-divert(1)
+divert(2)dnl
 
 AC_CHECK_HEADERS(db1/ndbm.h)
 
@@ -21,13 +21,13 @@
   else
     AC_MSG_RESULT($DBM_TYPE chosen)
   fi
- AC_SUBST(DBM_LIB)
- AC_SUBST(DBM_TYPE)
+ PHP_SUBST(DBM_LIB)
+ PHP_SUBST(DBM_TYPE)
 ])
 
 AC_PREFERRED_DB_LIB
 
-divert(3)
+divert(4)dnl
 
 if test "$DBM_LIB" = "-lgdbm"; then
   AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [
Index: php4/ext/dba/.cvsignore
diff -u php4/ext/dba/.cvsignore:1.2 php4/ext/dba/.cvsignore:1.3
--- php4/ext/dba/.cvsignore:1.2 Thu Oct 7 09:52:15 1999
+++ php4/ext/dba/.cvsignore Wed Dec 29 21:58:45 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/dbase/.cvsignore
diff -u php4/ext/dbase/.cvsignore:1.2 php4/ext/dbase/.cvsignore:1.3
--- php4/ext/dbase/.cvsignore:1.2 Thu Oct 7 09:52:16 1999
+++ php4/ext/dbase/.cvsignore Wed Dec 29 21:58:46 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/dbase/config.m4
diff -u php4/ext/dbase/config.m4:1.1 php4/ext/dbase/config.m4:1.2
--- php4/ext/dbase/config.m4:1.1 Mon Apr 19 09:56:50 1999
+++ php4/ext/dbase/config.m4 Wed Dec 29 21:58:46 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.1 1999/04/19 13:56:50 ssb Exp $
+dnl $Id: config.m4,v 1.2 1999/12/30 02:58:46 sas Exp $
 
 AC_MSG_CHECKING(whether to include the bundled dbase library)
 AC_ARG_WITH(dbase,
@@ -11,11 +11,8 @@
   else
         AC_MSG_RESULT(no)
         AC_DEFINE(DBASE,0)
- DBASE_LIB=
   fi
 ],[
   AC_MSG_RESULT(no)
   AC_DEFINE(DBASE,0)
- DBASE_LIB=
 ])
-AC_SUBST(DBASE_LIB)
Index: php4/ext/domxml/.cvsignore
diff -u php4/ext/domxml/.cvsignore:1.1 php4/ext/domxml/.cvsignore:1.2
--- php4/ext/domxml/.cvsignore:1.1 Sat Nov 27 16:19:14 1999
+++ php4/ext/domxml/.cvsignore Wed Dec 29 21:58:47 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/fdf/.cvsignore
diff -u php4/ext/fdf/.cvsignore:1.2 php4/ext/fdf/.cvsignore:1.3
--- php4/ext/fdf/.cvsignore:1.2 Thu Oct 7 09:52:17 1999
+++ php4/ext/fdf/.cvsignore Wed Dec 29 21:58:49 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/filepro/.cvsignore
diff -u php4/ext/filepro/.cvsignore:1.2 php4/ext/filepro/.cvsignore:1.3
--- php4/ext/filepro/.cvsignore:1.2 Thu Oct 7 09:52:17 1999
+++ php4/ext/filepro/.cvsignore Wed Dec 29 21:58:50 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/ftp/.cvsignore
diff -u php4/ext/ftp/.cvsignore:1.2 php4/ext/ftp/.cvsignore:1.3
--- php4/ext/ftp/.cvsignore:1.2 Thu Oct 7 09:52:18 1999
+++ php4/ext/ftp/.cvsignore Wed Dec 29 21:58:51 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/gd/.cvsignore
diff -u php4/ext/gd/.cvsignore:1.2 php4/ext/gd/.cvsignore:1.3
--- php4/ext/gd/.cvsignore:1.2 Thu Oct 7 09:52:18 1999
+++ php4/ext/gd/.cvsignore Wed Dec 29 21:58:52 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.19 php4/ext/gd/config.m4:1.20
--- php4/ext/gd/config.m4:1.19 Mon Nov 29 16:26:52 1999
+++ php4/ext/gd/config.m4 Wed Dec 29 21:58:52 1999
@@ -187,7 +187,5 @@
   fi
 fi
 
-AC_SUBST(GD_LFLAGS)
-AC_SUBST(GD_LIBS)
-AC_SUBST(GD_STATIC)
-AC_SUBST(GD_SHARED)
+PHP_SUBST(GD_LFLAGS)
+PHP_SUBST(GD_LIBS)
Index: php4/ext/gettext/.cvsignore
diff -u php4/ext/gettext/.cvsignore:1.2 php4/ext/gettext/.cvsignore:1.3
--- php4/ext/gettext/.cvsignore:1.2 Thu Oct 7 09:52:19 1999
+++ php4/ext/gettext/.cvsignore Wed Dec 29 21:58:53 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/hyperwave/.cvsignore
diff -u php4/ext/hyperwave/.cvsignore:1.2 php4/ext/hyperwave/.cvsignore:1.3
--- php4/ext/hyperwave/.cvsignore:1.2 Thu Oct 7 09:52:19 1999
+++ php4/ext/hyperwave/.cvsignore Wed Dec 29 21:58:55 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/icap/.cvsignore
diff -u php4/ext/icap/.cvsignore:1.2 php4/ext/icap/.cvsignore:1.3
--- php4/ext/icap/.cvsignore:1.2 Thu Oct 7 09:52:20 1999
+++ php4/ext/icap/.cvsignore Wed Dec 29 21:58:56 1999
@@ -1,5 +1,3 @@
-.deps
-Makefile.in
 Makefile
 .libs
 *.lo
@@ -7,3 +5,5 @@
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/imap/.cvsignore
diff -u php4/ext/imap/.cvsignore:1.2 php4/ext/imap/.cvsignore:1.3
--- php4/ext/imap/.cvsignore:1.2 Thu Oct 7 09:52:21 1999
+++ php4/ext/imap/.cvsignore Wed Dec 29 21:58:57 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/informix/.cvsignore
diff -u php4/ext/informix/.cvsignore:1.2 php4/ext/informix/.cvsignore:1.3
--- php4/ext/informix/.cvsignore:1.2 Thu Oct 7 09:52:21 1999
+++ php4/ext/informix/.cvsignore Wed Dec 29 21:58:58 1999
@@ -1,7 +1,7 @@
-.deps
-Makefile.in
 Makefile
 ifx.c
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/informix/config.m4
diff -u php4/ext/informix/config.m4:1.9 php4/ext/informix/config.m4:1.10
--- php4/ext/informix/config.m4:1.9 Sun Dec 5 18:11:37 1999
+++ php4/ext/informix/config.m4 Wed Dec 29 21:58:58 1999
@@ -1,7 +1,5 @@
-dnl $Id: config.m4,v 1.9 1999/12/05 23:11:37 sas Exp $
+dnl $Id: config.m4,v 1.10 1999/12/30 02:58:58 sas Exp $
 
-divert(3)
-
 PHPIFXLIB=ext/informix/libphp_ifx.a
         
 AC_MSG_CHECKING(for Informix support)
@@ -68,7 +66,7 @@
       else
         IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS"
       fi
- AC_SUBST(IFX_ESQL_FLAGS)
+ PHP_SUBST(IFX_ESQL_FLAGS)
       AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION)
       AC_MSG_RESULT(yes)
       PHP_EXTENSION(informix)
@@ -99,10 +97,10 @@
 ],[
   AC_MSG_RESULT(no)
 ])
-AC_SUBST(INFORMIXDIR)
-AC_SUBST(IFX_LIBS)
+PHP_SUBST(INFORMIXDIR)
+PHP_SUBST(IFX_LIBS)
         
-divert(5)
+divert(6)dnl
 
 dnl Warn if Informix support was requested but environment is not set up correctly.
 if test "$INFORMIX_WARNING" != ""; then
Index: php4/ext/interbase/.cvsignore
diff -u php4/ext/interbase/.cvsignore:1.2 php4/ext/interbase/.cvsignore:1.3
--- php4/ext/interbase/.cvsignore:1.2 Thu Oct 7 09:52:22 1999
+++ php4/ext/interbase/.cvsignore Wed Dec 29 21:58:59 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/java/.cvsignore
diff -u php4/ext/java/.cvsignore:1.2 php4/ext/java/.cvsignore:1.3
--- php4/ext/java/.cvsignore:1.2 Tue Nov 9 19:48:49 1999
+++ php4/ext/java/.cvsignore Wed Dec 29 21:59:00 1999
@@ -1,5 +1,3 @@
-.deps
-Makefile.in
 Makefile
 *.jar
 *.lo
@@ -7,3 +5,5 @@
 *.plg
 .libs
 net
+Makefile.am
+.deps
Index: php4/ext/java/config.m4
diff -u php4/ext/java/config.m4:1.5 php4/ext/java/config.m4:1.6
--- php4/ext/java/config.m4:1.5 Thu Dec 16 12:15:01 1999
+++ php4/ext/java/config.m4 Wed Dec 29 21:59:00 1999
@@ -1,4 +1,4 @@
-# $Id: config.m4,v 1.5 1999/12/16 17:15:01 rubys Exp $
+# $Id: config.m4,v 1.6 1999/12/30 02:59:00 sas Exp $
 # config.m4 for extension java
 
 AC_MSG_CHECKING(for Java support)
@@ -50,7 +50,7 @@
     fi
 
     AC_DEFINE(HAVE_JAVA)
- PHP_EXTENSION(java, "shared")
+ PHP_EXTENSION(java, shared)
     PHP_BUILD_SHARED
     AC_MSG_RESULT(yes)
   else
@@ -60,9 +60,9 @@
   AC_MSG_RESULT(no)
 ])
 
-AC_SUBST(JAVA_CFLAGS)
-AC_SUBST(JAVA_CLASSPATH)
-AC_SUBST(JAVA_INCLUDE)
-AC_SUBST(JAVA_SHARED)
-AC_SUBST(JAVA_LFLAGS)
+PHP_SUBST(JAVA_CFLAGS)
+PHP_SUBST(JAVA_CLASSPATH)
+PHP_SUBST(JAVA_INCLUDE)
+PHP_SUBST(JAVA_SHARED)
+PHP_SUBST(JAVA_LFLAGS)
 
Index: php4/ext/ldap/.cvsignore
diff -u php4/ext/ldap/.cvsignore:1.2 php4/ext/ldap/.cvsignore:1.3
--- php4/ext/ldap/.cvsignore:1.2 Thu Oct 7 09:52:22 1999
+++ php4/ext/ldap/.cvsignore Wed Dec 29 21:59:01 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/mcal/.cvsignore
diff -u php4/ext/mcal/.cvsignore:1.2 php4/ext/mcal/.cvsignore:1.3
--- php4/ext/mcal/.cvsignore:1.2 Thu Oct 7 09:52:23 1999
+++ php4/ext/mcal/.cvsignore Wed Dec 29 21:59:02 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/mcrypt/.cvsignore
diff -u php4/ext/mcrypt/.cvsignore:1.2 php4/ext/mcrypt/.cvsignore:1.3
--- php4/ext/mcrypt/.cvsignore:1.2 Thu Oct 7 09:52:24 1999
+++ php4/ext/mcrypt/.cvsignore Wed Dec 29 21:59:03 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/mhash/.cvsignore
diff -u php4/ext/mhash/.cvsignore:1.2 php4/ext/mhash/.cvsignore:1.3
--- php4/ext/mhash/.cvsignore:1.2 Thu Oct 7 09:52:24 1999
+++ php4/ext/mhash/.cvsignore Wed Dec 29 21:59:05 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/msql/.cvsignore
diff -u php4/ext/msql/.cvsignore:1.2 php4/ext/msql/.cvsignore:1.3
--- php4/ext/msql/.cvsignore:1.2 Thu Oct 7 09:52:25 1999
+++ php4/ext/msql/.cvsignore Wed Dec 29 21:59:06 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/mssql/.cvsignore
diff -u php4/ext/mssql/.cvsignore:1.2 php4/ext/mssql/.cvsignore:1.3
--- php4/ext/mssql/.cvsignore:1.2 Wed Nov 3 15:37:51 1999
+++ php4/ext/mssql/.cvsignore Wed Dec 29 21:59:07 1999
@@ -1,5 +1,3 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
@@ -8,4 +6,6 @@
 MSSQL_65_Release
 MSSQL_70_Release
 MSSQL_65_Debug
-MSSQL_70_Debug
\ No newline at end of file
+MSSQL_70_Debug
+Makefile.am
+.deps
Index: php4/ext/mysql/.cvsignore
diff -u php4/ext/mysql/.cvsignore:1.2 php4/ext/mysql/.cvsignore:1.3
--- php4/ext/mysql/.cvsignore:1.2 Thu Oct 7 09:52:25 1999
+++ php4/ext/mysql/.cvsignore Wed Dec 29 21:59:08 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/mysql/config.m4
diff -u php4/ext/mysql/config.m4:1.11 php4/ext/mysql/config.m4:1.12
--- php4/ext/mysql/config.m4:1.11 Mon Oct 4 11:18:13 1999
+++ php4/ext/mysql/config.m4 Wed Dec 29 21:59:08 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.11 1999/10/04 15:18:13 sas Exp $
+dnl $Id: config.m4,v 1.12 1999/12/30 02:59:08 sas Exp $
 
 AC_MSG_CHECKING(for MySQL support)
 AC_ARG_WITH(mysql,
@@ -48,7 +48,7 @@
         fi
         MYSQL_INCLUDE=-I$MYSQL_INCDIR
 
- AC_DEFINE(HAVE_MYSQL)
+ AC_DEFINE(HAVE_MYSQL,1,[Whether you want MySQL])
         if test "$shared" = "yes"; then
             AC_MSG_RESULT(yes (shared))
             MYSQL_LFLAGS="-L$MYSQL_LIBDIR"
@@ -56,9 +56,9 @@
         else
             AC_MSG_RESULT(yes (static))
             AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR)
- AC_ADD_INCLUDE($MYSQL_INCDIR)
             MYSQL_STATIC="libphpext_mysql.la"
         fi
+ AC_ADD_INCLUDE($MYSQL_INCDIR)
         PHP_EXTENSION(mysql, $shared)
 
         dnl check for errmsg.h, which isn't installed by some versions of 3.21
@@ -68,12 +68,9 @@
         CPPFLAGS="$old_CPPFLAGS"
     else
         AC_MSG_RESULT(no)
- AC_DEFINE(HAVE_MYSQL, 0)
+ AC_DEFINE(HAVE_MYSQL, 0,[Whether you want MySQL])
     fi
 ],[
     AC_MSG_RESULT(no)
 ])
-AC_SUBST(MYSQL_STATIC)
-AC_SUBST(MYSQL_SHARED)
-AC_SUBST(MYSQL_INCLUDE)
-AC_SUBST(MYSQL_LFLAGS)
+PHP_SUBST(MYSQL_LFLAGS)
Index: php4/ext/oci8/.cvsignore
diff -u php4/ext/oci8/.cvsignore:1.2 php4/ext/oci8/.cvsignore:1.3
--- php4/ext/oci8/.cvsignore:1.2 Thu Oct 7 09:52:26 1999
+++ php4/ext/oci8/.cvsignore Wed Dec 29 21:59:09 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/oci8/config.m4
diff -u php4/ext/oci8/config.m4:1.7 php4/ext/oci8/config.m4:1.8
--- php4/ext/oci8/config.m4:1.7 Wed Dec 22 17:16:47 1999
+++ php4/ext/oci8/config.m4 Wed Dec 29 21:59:09 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.7 1999/12/22 22:16:47 sas Exp $
+dnl $Id: config.m4,v 1.8 1999/12/30 02:59:09 sas Exp $
 
 AC_DEFUN(AC_ORACLE_VERSION,[
   AC_MSG_CHECKING([Oracle version])
@@ -170,5 +170,5 @@
 #EXTRA_LIBS="$EXTRA_LIBS $ORACLE_SHLIBS $ORACLE_STLIBS $ORACLE_LIBS $ORACLE_LFLAGS"
 EXTRA_LIBS="$EXTRA_LIBS $ORACLE_LFLAGS $ORACLE_LIBS"
 INCLUDES="$INCLUDES $ORACLE_INCLUDE"
-AC_SUBST(ORACLE_HOME)
-AC_SUBST(ORACLE_VERSION)
+PHP_SUBST(ORACLE_HOME)
+PHP_SUBST(ORACLE_VERSION)
Index: php4/ext/odbc/.cvsignore
diff -u php4/ext/odbc/.cvsignore:1.2 php4/ext/odbc/.cvsignore:1.3
--- php4/ext/odbc/.cvsignore:1.2 Thu Oct 7 09:52:26 1999
+++ php4/ext/odbc/.cvsignore Wed Dec 29 21:59:10 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/odbc/config.m4
diff -u php4/ext/odbc/config.m4:1.11 php4/ext/odbc/config.m4:1.12
--- php4/ext/odbc/config.m4:1.11 Sat Dec 4 14:15:57 1999
+++ php4/ext/odbc/config.m4 Wed Dec 29 21:59:10 1999
@@ -84,7 +84,7 @@
     AC_ADD_INCLUDE($withval/incl)
     AC_ADD_LIBPATH($withval/lib)
     ODBC_OBJS="${ODBC_LIBDIR}/odbclib.a"
- AC_SUBST(ODBC_OBJS)
+ PHP_SUBST(ODBC_OBJS)
     AC_ADD_LIBRARY_WITH_PATH(php_odbc, $abs_builddir/ext/odbc)
     AC_ADD_LIBRARY(sqlrte)
     AC_ADD_LIBRARY(sqlptc)
@@ -391,11 +391,11 @@
   INCLUDES="$INCLUDES $ODBC_INCLUDE"
   EXTRA_LIBS="$EXTRA_LIBS $ODBC_LFLAGS $ODBC_LIBS"
   AC_DEFINE(HAVE_UODBC)
- AC_SUBST(ODBC_INCDIR)
- AC_SUBST(ODBC_INCLUDE)
- AC_SUBST(ODBC_LIBDIR)
- AC_SUBST(ODBC_LIBS)
- AC_SUBST(ODBC_LFLAGS)
- AC_SUBST(ODBC_TYPE)
+ PHP_SUBST(ODBC_INCDIR)
+ PHP_SUBST(ODBC_INCLUDE)
+ PHP_SUBST(ODBC_LIBDIR)
+ PHP_SUBST(ODBC_LIBS)
+ PHP_SUBST(ODBC_LFLAGS)
+ PHP_SUBST(ODBC_TYPE)
   PHP_EXTENSION(odbc)
 fi
Index: php4/ext/oracle/.cvsignore
diff -u php4/ext/oracle/.cvsignore:1.2 php4/ext/oracle/.cvsignore:1.3
--- php4/ext/oracle/.cvsignore:1.2 Thu Oct 7 09:52:27 1999
+++ php4/ext/oracle/.cvsignore Wed Dec 29 21:59:10 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/oracle/config.m4
diff -u php4/ext/oracle/config.m4:1.4 php4/ext/oracle/config.m4:1.5
--- php4/ext/oracle/config.m4:1.4 Tue Nov 9 14:48:56 1999
+++ php4/ext/oracle/config.m4 Wed Dec 29 21:59:11 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.4 1999/11/09 19:48:56 thies Exp $
+dnl $Id: config.m4,v 1.5 1999/12/30 02:59:11 sas Exp $
 
 AC_DEFUN(AC_ORACLE_VERSION,[
   AC_MSG_CHECKING([Oracle version])
@@ -168,5 +168,5 @@
 #EXTRA_LIBS="$EXTRA_LIBS $ORACLE_SHLIBS $ORACLE_STLIBS $ORACLE_LIBS $ORACLE_LFLAGS"
 EXTRA_LIBS="$EXTRA_LIBS $ORACLE_LFLAGS $ORACLE_LIBS"
 INCLUDES="$INCLUDES $ORACLE_INCLUDE"
-AC_SUBST(ORACLE_HOME)
-AC_SUBST(ORACLE_VERSION)
+PHP_SUBST(ORACLE_HOME)
+PHP_SUBST(ORACLE_VERSION)
Index: php4/ext/pcre/.cvsignore
diff -u php4/ext/pcre/.cvsignore:1.2 php4/ext/pcre/.cvsignore:1.3
--- php4/ext/pcre/.cvsignore:1.2 Thu Oct 7 09:52:28 1999
+++ php4/ext/pcre/.cvsignore Wed Dec 29 21:59:11 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/pcre/config.m4
diff -u php4/ext/pcre/config.m4:1.15 php4/ext/pcre/config.m4:1.16
--- php4/ext/pcre/config.m4:1.15 Sun Oct 24 12:37:28 1999
+++ php4/ext/pcre/config.m4 Wed Dec 29 21:59:12 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.15 1999/10/24 16:37:28 sas Exp $
+dnl $Id: config.m4,v 1.16 1999/12/30 02:59:12 sas Exp $
 dnl config.m4 for extension pcre
 
 dnl By default we'll compile and link against the bundled PCRE library
@@ -21,7 +21,7 @@
                         AC_DEFINE(HAVE_BUNDLED_PCRE, 1)
                         AC_MSG_RESULT(yes)
                         PHP_EXTENSION(pcre)
- PHP_OUTPUT(ext/pcre/pcrelib/Makefile)
+ PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile)
                         ;;
                 *)
                         if test -f $withval/pcre.h ; then
@@ -56,9 +56,9 @@
   AC_DEFINE(HAVE_BUNDLED_PCRE, 1)
   AC_MSG_RESULT(yes)
   PHP_EXTENSION(pcre)
- PHP_OUTPUT(ext/pcre/pcrelib/Makefile)
+ PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile)
 ])
-AC_SUBST(PCRE_LIBADD)
-AC_SUBST(PCRE_SUBDIRS)
+PHP_SUBST(PCRE_LIBADD)
+PHP_SUBST(PCRE_SUBDIRS)
 
 AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)])
Index: php4/ext/pcre/pcrelib/.cvsignore
diff -u php4/ext/pcre/pcrelib/.cvsignore:1.2 php4/ext/pcre/pcrelib/.cvsignore:1.3
--- php4/ext/pcre/pcrelib/.cvsignore:1.2 Thu Oct 7 09:53:35 1999
+++ php4/ext/pcre/pcrelib/.cvsignore Wed Dec 29 21:59:12 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/pdf/.cvsignore
diff -u php4/ext/pdf/.cvsignore:1.2 php4/ext/pdf/.cvsignore:1.3
--- php4/ext/pdf/.cvsignore:1.2 Thu Oct 7 09:52:29 1999
+++ php4/ext/pdf/.cvsignore Wed Dec 29 21:59:14 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/pgsql/.cvsignore
diff -u php4/ext/pgsql/.cvsignore:1.2 php4/ext/pgsql/.cvsignore:1.3
--- php4/ext/pgsql/.cvsignore:1.2 Thu Oct 7 09:52:29 1999
+++ php4/ext/pgsql/.cvsignore Wed Dec 29 21:59:15 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/pgsql/config.m4
diff -u php4/ext/pgsql/config.m4:1.6 php4/ext/pgsql/config.m4:1.7
--- php4/ext/pgsql/config.m4:1.6 Sat Dec 4 13:30:53 1999
+++ php4/ext/pgsql/config.m4 Wed Dec 29 21:59:16 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.6 1999/12/04 18:30:53 sas Exp $
+dnl $Id: config.m4,v 1.7 1999/12/30 02:59:16 sas Exp $
 
 AC_MSG_CHECKING(for PostgresSQL support)
 AC_ARG_WITH(pgsql,
@@ -56,8 +56,6 @@
 ],[
   AC_MSG_RESULT(no)
 ])
-AC_SUBST(PGSQL_LIBS)
-AC_SUBST(PGSQL_LFLAGS)
-AC_SUBST(PGSQL_INCLUDE)
-AC_SUBST(PGSQL_STATIC)
-AC_SUBST(PGSQL_SHARED)
+PHP_SUBST(PGSQL_LIBS)
+PHP_SUBST(PGSQL_LFLAGS)
+PHP_SUBST(PGSQL_INCLUDE)
Index: php4/ext/posix/.cvsignore
diff -u php4/ext/posix/.cvsignore:1.1 php4/ext/posix/.cvsignore:1.2
--- php4/ext/posix/.cvsignore:1.1 Fri Dec 3 08:13:47 1999
+++ php4/ext/posix/.cvsignore Wed Dec 29 21:59:17 1999
@@ -1,7 +1,7 @@
-.deps
-Makefile.in
 Makefile
 *.o
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/readline/.cvsignore
diff -u php4/ext/readline/.cvsignore:1.1 php4/ext/readline/.cvsignore:1.2
--- php4/ext/readline/.cvsignore:1.1 Thu Oct 14 11:20:56 1999
+++ php4/ext/readline/.cvsignore Wed Dec 29 21:59:18 1999
@@ -1,7 +1,7 @@
-.deps
-Makefile.in
 Makefile
 *.o
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/readline/config.m4
diff -u php4/ext/readline/config.m4:1.3 php4/ext/readline/config.m4:1.4
--- php4/ext/readline/config.m4:1.3 Tue Dec 7 08:11:19 1999
+++ php4/ext/readline/config.m4 Wed Dec 29 21:59:18 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.3 1999/12/07 13:11:19 thies Exp $
+dnl $Id: config.m4,v 1.4 1999/12/30 02:59:18 sas Exp $
 dnl config.m4 for extension readline
 dnl don't forget to call PHP_EXTENSION(readline)
 
@@ -18,7 +18,7 @@
       AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h)
     fi
     AC_ADD_INCLUDE($READLINE_DIR/include)
- AC_ADD_LIBRARY(termcap)
+ AC_ADD_LIBRARY(ncurses)
     AC_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib)
     AC_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib)
 
Index: php4/ext/session/.cvsignore
diff -u php4/ext/session/.cvsignore:1.2 php4/ext/session/.cvsignore:1.3
--- php4/ext/session/.cvsignore:1.2 Thu Oct 7 09:52:30 1999
+++ php4/ext/session/.cvsignore Wed Dec 29 21:59:19 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/session/config.m4
diff -u php4/ext/session/config.m4:1.4 php4/ext/session/config.m4:1.5
--- php4/ext/session/config.m4:1.4 Sat Sep 11 19:47:16 1999
+++ php4/ext/session/config.m4 Wed Dec 29 21:59:20 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.4 1999/09/11 23:47:16 sas Exp $
+dnl $Id: config.m4,v 1.5 1999/12/30 02:59:20 sas Exp $
 dnl config.m4 for extension session
 dnl don't forget to call PHP_EXTENSION(session)
 
@@ -20,7 +20,7 @@
 
                 AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib)
                 AC_ADD_INCLUDE($MM_DIR/include)
- AC_DEFINE(HAVE_LIBMM, 1)
+ AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm])
                 RESULT=yes
                 PHP_EXTENSION(ps_mm)
         fi
@@ -33,7 +33,7 @@
 [ --enable-trans-sid Enable transparent session id propagation],
 [
   if test "$enableval" = "yes" ; then
- AC_DEFINE(TRANS_SID, 1)
+ AC_DEFINE(TRANS_SID, 1, [Whether you want transparent session id propagation])
         RESULT=yes
   fi
 ])
Index: php4/ext/snmp/.cvsignore
diff -u php4/ext/snmp/.cvsignore:1.2 php4/ext/snmp/.cvsignore:1.3
--- php4/ext/snmp/.cvsignore:1.2 Thu Oct 7 09:52:30 1999
+++ php4/ext/snmp/.cvsignore Wed Dec 29 21:59:21 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/snmp/config.m4
diff -u php4/ext/snmp/config.m4:1.9 php4/ext/snmp/config.m4:1.10
--- php4/ext/snmp/config.m4:1.9 Tue Nov 9 11:01:30 1999
+++ php4/ext/snmp/config.m4 Wed Dec 29 21:59:21 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.9 1999/11/09 16:01:30 rasmus Exp $
+dnl $Id: config.m4,v 1.10 1999/12/30 02:59:21 sas Exp $
 
 AC_MSG_CHECKING(for SNMP support)
 AC_ARG_WITH(snmp,
@@ -65,11 +65,9 @@
 ],[
   AC_MSG_RESULT(no)
 ])
-AC_SUBST(SNMP_LIBDIR)
-AC_SUBST(SNMP_INCLUDE)
-AC_SUBST(SNMP_SHARED)
-AC_SUBST(SNMP_STATIC)
-AC_SUBST(KSTAT_LIBS)
+PHP_SUBST(SNMP_LIBDIR)
+PHP_SUBST(SNMP_INCLUDE)
+PHP_SUBST(KSTAT_LIBS)
 
 AC_MSG_CHECKING(whether to enable UCD SNMP hack)
 AC_ARG_ENABLE(ucd-snmp-hack,
Index: php4/ext/standard/.cvsignore
diff -u php4/ext/standard/.cvsignore:1.4 php4/ext/standard/.cvsignore:1.5
--- php4/ext/standard/.cvsignore:1.4 Thu Oct 7 09:52:31 1999
+++ php4/ext/standard/.cvsignore Wed Dec 29 21:59:22 1999
@@ -1,5 +1,3 @@
-.deps
-Makefile.in
 Makefile
 parsedate.c
 parsedate.h
@@ -7,3 +5,5 @@
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/standard/config.m4
diff -u php4/ext/standard/config.m4:1.13 php4/ext/standard/config.m4:1.14
--- php4/ext/standard/config.m4:1.13 Sun Dec 26 17:35:55 1999
+++ php4/ext/standard/config.m4 Wed Dec 29 21:59:22 1999
@@ -1,6 +1,6 @@
-dnl $Id: config.m4,v 1.13 1999/12/26 22:35:55 sas Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.14 1999/12/30 02:59:22 sas Exp $ -*- sh -*-
 
-divert(1)
+divert(2)dnl
 
 dnl
 dnl Check for crypt() capabilities
@@ -129,7 +129,7 @@
 AC_CHECK_FUNCS(getcwd)
 AC_CHECK_FUNCS(getwd)
 
-divert(3)
+divert(4)dnl
 
 AC_ARG_WITH(regex,
 [ --with-regex=TYPE regex library type: system, apache, php],
Index: php4/ext/sybase/.cvsignore
diff -u php4/ext/sybase/.cvsignore:1.2 php4/ext/sybase/.cvsignore:1.3
--- php4/ext/sybase/.cvsignore:1.2 Thu Oct 7 09:52:32 1999
+++ php4/ext/sybase/.cvsignore Wed Dec 29 21:59:23 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/sybase_ct/.cvsignore
diff -u php4/ext/sybase_ct/.cvsignore:1.2 php4/ext/sybase_ct/.cvsignore:1.3
--- php4/ext/sybase_ct/.cvsignore:1.2 Thu Oct 7 09:52:32 1999
+++ php4/ext/sybase_ct/.cvsignore Wed Dec 29 21:59:24 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/sysvsem/.cvsignore
diff -u php4/ext/sysvsem/.cvsignore:1.2 php4/ext/sysvsem/.cvsignore:1.3
--- php4/ext/sysvsem/.cvsignore:1.2 Thu Oct 7 09:52:33 1999
+++ php4/ext/sysvsem/.cvsignore Wed Dec 29 21:59:26 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/sysvshm/.cvsignore
diff -u php4/ext/sysvshm/.cvsignore:1.2 php4/ext/sysvshm/.cvsignore:1.3
--- php4/ext/sysvshm/.cvsignore:1.2 Thu Oct 7 09:52:34 1999
+++ php4/ext/sysvshm/.cvsignore Wed Dec 29 21:59:27 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/wddx/.cvsignore
diff -u php4/ext/wddx/.cvsignore:1.2 php4/ext/wddx/.cvsignore:1.3
--- php4/ext/wddx/.cvsignore:1.2 Thu Oct 7 09:52:34 1999
+++ php4/ext/wddx/.cvsignore Wed Dec 29 21:59:28 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/xml/.cvsignore
diff -u php4/ext/xml/.cvsignore:1.2 php4/ext/xml/.cvsignore:1.3
--- php4/ext/xml/.cvsignore:1.2 Wed Jul 21 17:56:25 1999
+++ php4/ext/xml/.cvsignore Wed Dec 29 21:59:29 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 .libs
 *.lo
 *.la
+Makefile.am
+.deps
Index: php4/ext/xml/config.m4
diff -u php4/ext/xml/config.m4:1.14 php4/ext/xml/config.m4:1.15
--- php4/ext/xml/config.m4:1.14 Mon Oct 4 11:18:22 1999
+++ php4/ext/xml/config.m4 Wed Dec 29 21:59:29 1999
@@ -1,5 +1,5 @@
 # $Source: /local/repository/php4/ext/xml/config.m4,v $
-# $Id: config.m4,v 1.14 1999/10/04 15:18:22 sas Exp $
+# $Id: config.m4,v 1.15 1999/12/30 02:59:29 sas Exp $
 
 AC_MSG_CHECKING(for XML support)
 AC_ARG_WITH(xml,
@@ -52,7 +52,5 @@
 ],[
   AC_MSG_RESULT(no)
 ])
-AC_SUBST(XML_LIBS)
-AC_SUBST(XML_INCLUDE)
-AC_SUBST(XML_STATIC)
-AC_SUBST(XML_SHARED)
+PHP_SUBST(XML_LIBS)
+PHP_SUBST(XML_INCLUDE)
Index: php4/ext/yp/.cvsignore
diff -u php4/ext/yp/.cvsignore:1.2 php4/ext/yp/.cvsignore:1.3
--- php4/ext/yp/.cvsignore:1.2 Thu Oct 7 09:52:35 1999
+++ php4/ext/yp/.cvsignore Wed Dec 29 21:59:31 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/ext/zlib/.cvsignore
diff -u php4/ext/zlib/.cvsignore:1.2 php4/ext/zlib/.cvsignore:1.3
--- php4/ext/zlib/.cvsignore:1.2 Thu Oct 7 09:52:35 1999
+++ php4/ext/zlib/.cvsignore Wed Dec 29 21:59:32 1999
@@ -1,6 +1,6 @@
-.deps
-Makefile.in
 Makefile
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/pear/.cvsignore
diff -u php4/pear/.cvsignore:1.1 php4/pear/.cvsignore:1.2
--- php4/pear/.cvsignore:1.1 Mon Nov 29 10:13:55 1999
+++ php4/pear/.cvsignore Wed Dec 29 21:59:34 1999
@@ -1,2 +1,3 @@
-Makefile.in
 Makefile
+Makefile.am
+.deps
Index: php4/regex/.cvsignore
diff -u php4/regex/.cvsignore:1.3 php4/regex/.cvsignore:1.4
--- php4/regex/.cvsignore:1.3 Thu Oct 7 10:05:05 1999
+++ php4/regex/.cvsignore Wed Dec 29 21:59:34 1999
@@ -1,5 +1,6 @@
 Makefile
-Makefile.in
 *.lo
 *.la
 .libs
+Makefile.am
+.deps
Index: php4/sapi/.cvsignore
diff -u php4/sapi/.cvsignore:1.1 php4/sapi/.cvsignore:1.2
--- php4/sapi/.cvsignore:1.1 Mon Sep 27 12:34:27 1999
+++ php4/sapi/.cvsignore Wed Dec 29 21:59:35 1999
@@ -1,3 +1,3 @@
-.deps
 Makefile
-Makefile.in
+Makefile.am
+.deps
Index: php4/sapi/aolserver/.cvsignore
diff -u php4/sapi/aolserver/.cvsignore:1.2 php4/sapi/aolserver/.cvsignore:1.3
--- php4/sapi/aolserver/.cvsignore:1.2 Thu Oct 7 10:05:08 1999
+++ php4/sapi/aolserver/.cvsignore Wed Dec 29 21:59:36 1999
@@ -1,6 +1,6 @@
-.deps
 Makefile
-Makefile.in
 .libs
 *.la
 *.lo
+Makefile.am
+.deps
Index: php4/sapi/aolserver/config.m4
diff -u php4/sapi/aolserver/config.m4:1.6 php4/sapi/aolserver/config.m4:1.7
--- php4/sapi/aolserver/config.m4:1.6 Wed Dec 29 16:24:37 1999
+++ php4/sapi/aolserver/config.m4 Wed Dec 29 21:59:36 1999
@@ -1,4 +1,4 @@
-dnl ## $Id: config.m4,v 1.6 1999/12/29 21:24:37 sas Exp $ -*- sh -*-
+dnl ## $Id: config.m4,v 1.7 1999/12/30 02:59:36 sas Exp $ -*- sh -*-
 
 RESULT=no
 AC_MSG_CHECKING(for AOLserver support)
@@ -14,7 +14,7 @@
         AC_DEFINE(HAVE_AOLSERVER,1,[Whether you have AOLserver])
         PHP_SAPI=aolserver
         PHP_BUILD_SHARED
- INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $NS_DIR/root/bin/"
+ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $NS_DIR/root/bin/"
         RESULT=yes
 ])
 AC_MSG_RESULT($RESULT)
Index: php4/sapi/apache/.cvsignore
diff -u php4/sapi/apache/.cvsignore:1.3 php4/sapi/apache/.cvsignore:1.4
--- php4/sapi/apache/.cvsignore:1.3 Thu Oct 7 10:05:06 1999
+++ php4/sapi/apache/.cvsignore Wed Dec 29 21:59:38 1999
@@ -1,7 +1,7 @@
-.deps
 Makefile
-Makefile.in
 libphp4.module
 .libs
 *.la
 *.lo
+Makefile.am
+.deps
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.17 php4/sapi/apache/config.m4:1.18
--- php4/sapi/apache/config.m4:1.17 Wed Dec 29 21:21:21 1999
+++ php4/sapi/apache/config.m4 Wed Dec 29 21:59:38 1999
@@ -193,20 +193,20 @@
 ])
 
 INCLUDES="$INCLUDES $APACHE_INCLUDE"
-dnl## AC_SUBST(APACHE_INCLUDE)
+dnl## PHP_SUBST(APACHE_INCLUDE)
 fi
 
 if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
         APXS_EXP="-bE:sapi/apache/mod_php4.exp"
 fi
 
-AC_SUBST(APXS_EXP)
-AC_SUBST(APACHE_INCLUDE)
-AC_SUBST(APACHE_TARGET)
-AC_SUBST(APXS)
-AC_SUBST(APXS_LDFLAGS)
-AC_SUBST(APACHE_INSTALL)
-AC_SUBST(STRONGHOLD)
+PHP_SUBST(APXS_EXP)
+PHP_SUBST(APACHE_INCLUDE)
+PHP_SUBST(APACHE_TARGET)
+PHP_SUBST(APXS)
+PHP_SUBST(APXS_LDFLAGS)
+PHP_SUBST(APACHE_INSTALL)
+PHP_SUBST(STRONGHOLD)
 
 AC_MSG_CHECKING(for mod_charset compatibility option)
 AC_ARG_WITH(mod_charset,
@@ -232,7 +232,7 @@
   else
     APACHE_WANT_HSREGEX=no
   fi
- AC_SUBST(APACHE_WANT_HSREGEX)
+ PHP_SUBST(APACHE_WANT_HSREGEX)
   PHP_APACHE_CHECK_RDYNAMIC
   PHP_EXTENSION(apache)
   PHP_OUTPUT(sapi/apache/libphp4.module)
Index: php4/sapi/cgi/.cvsignore
diff -u php4/sapi/cgi/.cvsignore:1.2 php4/sapi/cgi/.cvsignore:1.3
--- php4/sapi/cgi/.cvsignore:1.2 Thu Oct 7 10:05:07 1999
+++ php4/sapi/cgi/.cvsignore Wed Dec 29 21:59:38 1999
@@ -1,6 +1,6 @@
-.deps
 Makefile
-Makefile.in
 .libs
 *.la
 *.lo
+Makefile.am
+.deps
Index: php4/sapi/cgi/config.m4
diff -u php4/sapi/cgi/config.m4:1.2 php4/sapi/cgi/config.m4:1.3
--- php4/sapi/cgi/config.m4:1.2 Thu Oct 7 17:04:26 1999
+++ php4/sapi/cgi/config.m4 Wed Dec 29 21:59:38 1999
@@ -46,7 +46,7 @@
 fi
 
 if test "$PHP_SAPI" = "cgi" ; then
- INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_CGI"
+ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_CGI"
 fi
 
 AC_MSG_CHECKING(for fhttpd module support)
Index: php4/sapi/isapi/.cvsignore
diff -u php4/sapi/isapi/.cvsignore:1.2 php4/sapi/isapi/.cvsignore:1.3
--- php4/sapi/isapi/.cvsignore:1.2 Thu Oct 7 10:05:07 1999
+++ php4/sapi/isapi/.cvsignore Wed Dec 29 21:59:41 1999
@@ -1,6 +1,6 @@
-.deps
 Makefile
-Makefile.in
 .libs
 *.la
 *.lo
+Makefile.am
+.deps
Index: php4/sapi/phttpd/.cvsignore
diff -u php4/sapi/phttpd/.cvsignore:1.1 php4/sapi/phttpd/.cvsignore:1.2
--- php4/sapi/phttpd/.cvsignore:1.1 Tue Dec 28 08:59:17 1999
+++ php4/sapi/phttpd/.cvsignore Wed Dec 29 21:59:45 1999
@@ -1,6 +1,6 @@
-.deps
 Makefile
-Makefile.in
+Makefile.am
 .libs
 *.la
 *.lo
+.deps
Index: php4/sapi/phttpd/config.m4
diff -u php4/sapi/phttpd/config.m4:1.2 php4/sapi/phttpd/config.m4:1.3
--- php4/sapi/phttpd/config.m4:1.2 Wed Dec 29 16:24:40 1999
+++ php4/sapi/phttpd/config.m4 Wed Dec 29 21:59:45 1999
@@ -1,4 +1,4 @@
-dnl ## $Id: config.m4,v 1.2 1999/12/29 21:24:40 sas Exp $ -*- sh -*-
+dnl ## $Id: config.m4,v 1.3 1999/12/30 02:59:45 sas Exp $ -*- sh -*-
 
 RESULT=no
 AC_MSG_CHECKING(for PHTTPD support)
@@ -14,7 +14,7 @@
         AC_DEFINE(HAVE_PHTTPD,1,[Whether you have phttpd])
         PHP_SAPI=phttpd
         PHP_BUILD_SHARED
- INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $PHTTPD_DIR/modules/"
+ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHTTPD_DIR/modules/"
         RESULT=yes
 ])
 AC_MSG_RESULT($RESULT)
Index: php4/sapi/roxen/.cvsignore
diff -u php4/sapi/roxen/.cvsignore:1.1 php4/sapi/roxen/.cvsignore:1.2
--- php4/sapi/roxen/.cvsignore:1.1 Tue Nov 23 19:24:49 1999
+++ php4/sapi/roxen/.cvsignore Wed Dec 29 21:59:48 1999
@@ -1,7 +1,7 @@
-.deps
 Makefile
-Makefile.in
 libphp4.module
 .libs
 *.la
 *.lo
+Makefile.am
+.deps
Index: php4/sapi/servlet/.cvsignore
diff -u php4/sapi/servlet/.cvsignore:1.1 php4/sapi/servlet/.cvsignore:1.2
--- php4/sapi/servlet/.cvsignore:1.1 Mon Nov 29 10:49:25 1999
+++ php4/sapi/servlet/.cvsignore Wed Dec 29 21:59:50 1999
@@ -1,5 +1,3 @@
-.deps
-Makefile.in
 Makefile
 java.*
 *.jar
@@ -8,3 +6,5 @@
 *.plg
 .libs
 net
+Makefile.am
+.deps
Index: php4/sapi/servlet/config.m4
diff -u php4/sapi/servlet/config.m4:1.3 php4/sapi/servlet/config.m4:1.4
--- php4/sapi/servlet/config.m4:1.3 Wed Dec 29 16:24:43 1999
+++ php4/sapi/servlet/config.m4 Wed Dec 29 21:59:50 1999
@@ -1,4 +1,4 @@
-# $Id: config.m4,v 1.3 1999/12/29 21:24:43 sas Exp $
+# $Id: config.m4,v 1.4 1999/12/30 02:59:50 sas Exp $
 # config.m4 for servlet sapi
 
 AC_MSG_CHECKING(for Servlet support)
@@ -37,4 +37,4 @@
   AC_MSG_RESULT(no)
 ])
 
-AC_SUBST(SERVLET_CLASSPATH)
+PHP_SUBST(SERVLET_CLASSPATH)
Index: php4/sapi/thttpd/.cvsignore
diff -u php4/sapi/thttpd/.cvsignore:1.1 php4/sapi/thttpd/.cvsignore:1.2
--- php4/sapi/thttpd/.cvsignore:1.1 Mon Dec 20 02:11:14 1999
+++ php4/sapi/thttpd/.cvsignore Wed Dec 29 21:59:52 1999
@@ -1,6 +1,6 @@
-.deps
 Makefile
-Makefile.in
 .libs
 *.la
 *.lo
+Makefile.am
+.deps
Index: php4/sapi/thttpd/config.m4
diff -u php4/sapi/thttpd/config.m4:1.1 php4/sapi/thttpd/config.m4:1.2
--- php4/sapi/thttpd/config.m4:1.1 Mon Dec 20 02:11:14 1999
+++ php4/sapi/thttpd/config.m4 Wed Dec 29 21:59:52 1999
@@ -8,9 +8,13 @@
     cp $abs_srcdir/sapi/thttpd/php_thttpd.h $SAPI_STATIC $THTTPD;\
     test -f $THTTPD/php_patched || \
     (cd $THTTPD && patch < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)"
- AC_MSG_CHECKING(for thttpd)
- AC_MSG_RESULT(yes - $THTTPD)
+ PHP_THTTPD="yes, using $THTTPD"
   AC_ADD_INCLUDE($THTTPD)
   PHP_BUILD_STATIC
   PHP_SAPI=thttpd
+],[
+ PHP_THTTPD="no"
 ])
+
+AC_MSG_CHECKING(for thttpd)
+AC_MSG_RESULT($PHP_THTTPD)
Index: php4/scripts/.cvsignore
diff -u php4/scripts/.cvsignore:1.1 php4/scripts/.cvsignore:1.2
--- php4/scripts/.cvsignore:1.1 Fri Apr 16 20:37:12 1999
+++ php4/scripts/.cvsignore Wed Dec 29 21:59:53 1999
@@ -1 +1,3 @@
 mkextlib
+Makefile.am
+.deps

-- 
PHP 4.0 Beta Mailing List <http://www.php.net/version4/>
To unsubscribe, e-mail: email protected>?subject=Re:%20[PHP4BETA]%20cvs:%20/php4%20snapshot%20/php4/build%20build.mk%20build2.mk%20buildcheck.sh%20fastgen.sh%20library.mk%20ltlib.mk%20mkdep.perl%20program.mk%20rules.mk%20rules_pear.mk%20shtool%20/php4/ext%20Makefile.in%20/php4/ext/apache%20Makefile.in%20/php4/ext/aspell%20Makefile.in%20/php4/ext/bcmath%20Makefile.in%20/php4/ext/cpdf%20Makefile.in%20/php4/ext/cybercash%20Makefile.in%20/php4/ext/dav%20Makefile.in%20/php4/ext/db%20Makefile.in%20/php4/ext/dba%20Makefile.in%20/php4/ext/dbase%20Makefile.in%20/php4/ext/domxml%20Makefile.in%20/php4/ext/fdf%20Makefile.in%20/php4/ext/filepro%20Makefile.in%20/php4/ext/ftp%20Makefile.in%20/php4/ext/gd%20Makefile.in%20/php4/ext/gettext%20Makefile.in%20/php4/ext/hyperwave%20Makefile.in%20/php4/ext/informix%20Makefile.in%20/php4/ext/interbase%20Makefile.in%20/php4/ext/java%20Makefile.in%20/php4/ext/ldap%20Makefile.in%20/php4/ext/mcrypt%20Makefile.in%20/php4/ext/mhash%20Makefile.in%20/php4/ext/msql%20Makefile.in%20/php4/e
To contact the list administrators, e-mail: 


Next message: Sascha Schumann: "[PHP4BETA] cvs: /php4 genfiles"
Previous message: Sascha Schumann: "[PHP4BETA] cvs: /php4/sapi/apache config.m4"


Messages sorted by: 
[ date ]
[ thread ]
[ subject ]
[ author ]

































	



























 

Columns / Articles | Tips / Quickies | News | News Linking and RSS Feeds | Shared Code Library Mail Archives | Support / Discussion Forums | Get Started! Links | Contribute! | Docs