cvs: php4 / .cvsignore Makefile.frag Makefile.global Makefile.in README.SELF-CONTAINED-EXTENSIONS TODO.BUILDv5 acinclude.m4 configure.in dynlib.m4
scan_makefile_in.awk /build bsd_makefile build2.mk dynlib.mk fastgen.sh library.mk ltlib.mk shtool sysv_makefile /ext ext_skel /ext/aspell
.cvsignore /ext/bcmath .cvsignore Makefile.in config.m4 /ext/bcmath/libbcmath .cvsignore Makefile.in /ext/bcmath/libbcmath/src .cvsignore
Makefile.in /ext/bz2 .cvsignore /ext/calendar .cvsignore /ext/ccvs .cvsignore /ext/com .cvsignore /ext/cpdf .cvsignore /ext/crack .cvsignore
/ext/ctype .cvsignore /ext/curl .cvsignore /ext/cybercash .cvsignore /ext/cybermut .cvsignore /ext/cyrus .cvsignore /ext/db .cvsignore /ext/dba
.cvsignore /ext/dbase .cvsignore /ext/dbplus .cvsignore /ext/dbx .cvsignore /ext/dio .cvsignore /ext/domxml .cvsignore config.m4 /ext/exif
.cvsignore /ext/fbsql .cvsignore /ext/fdf .cvsignore /ext/filepro .cvsignore /ext/fribidi .cvsignore /ext/ftp .cvsignore /ext/gd .cvsignore
/ext/gettext .cvsignore /ext/gmp .cvsignore /ext/hyperwave .cvsignore /ext/icap .cvsignore /ext/iconv .cvsignore /ext/imap .cvsignore
/ext/informix .cvsignore Makefile.frag /ext/ingres_ii .cvsignore /ext/interbase .cvsignore /ext/ircg .cvsignore Makefile.frag config.m4 /ext/java
.cvsignore /ext/ldap .cvsignore /ext/mbstring .cvsignore /ext/mcal .cvsignore /ext/mcrypt .cvsignore /ext/mhash .cvsignore /ext/ming .cvsignore
/ext/mnogosearch .cvsignore /ext/msession .cvsignore /ext/msql .cvsignore /ext/mssql .cvsignore /ext/muscat .cvsignore /ext/mysql .cvsignore
config.m4 /ext/mysql/libmysql .cvsignore mysql.m4 /ext/ncurses .cvsignore /ext/notes .cvsignore /ext/oci8 .cvsignore /ext/odbc .cvsignore
/ext/openssl .cvsignore /ext/oracle .cvsignore /ext/overload .cvsignore /ext/ovrimos .cvsignore /ext/pcntl .cvsignore /ext/pcre .cvsignore
config.m4 /ext/pcre/pcrelib .cvsignore /ext/pcre/pcrelib/doc .cvsignore /ext/pcre/pcrelib/testdata .cvsignore /ext/pdf .cvsignore config.m4
/ext/pfpro .cvsignore /ext/pgsql .cvsignore /ext/posix .cvsignore /ext/pspell .cvsignore /ext/qtdom .cvsignore /ext/readline .cvsignore
/ext/recode .cvsignore /ext/session .cvsignore Makefile.in config.m4 /ext/shmop .cvsignore /ext/skeleton .cvsignore /ext/snmp .cvsignore
/ext/sockets .cvsignore /ext/standard .cvsignore Makefile.frag Makefile.in config.m4 /ext/swf .cvsignore /ext/sybase .cvsignore /ext/sybase_ct
.cvsignore /ext/sysvsem .cvsignore /ext/sysvshm .cvsignore /ext/vpopmail .cvsignore /ext/w32api .cvsignore /ext/wddx .cvsignore /ext/xml
.cvsignore config.m4 /ext/xml/expat .cvsignore /ext/xmlrpc .cvsignore config.m4 /ext/xmlrpc/libxmlrpc xmlrpc.m4 /ext/xslt .cvsignore /ext/yaz
.cvsignore /ext/yp .cvsignore /ext/zip .cvsignore /ext/zlib .cvsignore /pear .cvsignore Makefile.frag Makefile.in pear.m4 /pear/scripts phpize.in
/regex .cvsignore /sapi .cvsignore Makefile.in README /sapi/aolserver .cvsignore Makefile.in config.m4 /sapi/apache .cvsignore Makefile.in
config.m4 /sapi/apache2filter .cvsignore Makefile.in config.m4 /sapi/caudium .cvsignore Makefile.in config.m4 /sapi/cgi .cvsignore Makefile.in
config.m4 /sapi/cli .cvsignore Makefile.in config.m4 /sapi/fastcgi .cvsignore Makefile.in config.m4 /sapi/fhttpd .cvsignore /sapi/isapi .cvsignore
Makefile.in config.m4 /sapi/nsapi .cvsignore Makefile.in config.m4 /sapi/phttpd .cvsignore Makefile.in config.m4 /sapi/pi3web .cvsignore
Makefile.in config.m4 /sapi/roxen .cvsignore Makefile.in config.m4 /sapi/servlet .cvsignore Makefile.frag Makefile.in config.m4 /sapi/thttpd
.cvsignore Makefile.in config.m4 /sapi/tux .cvsignore Makefile.in config.m4 /sapi/webjames .cvsignore Makefile.in config.m4

sas Thu Mar 7 09:20:08 2002 EDT Added files: /php4 Makefile.frag Makefile.global TODO.BUILDv5 scan_makefile_in.awk /php4/ext/informix Makefile.frag /php4/ext/ircg Makefile.frag /php4/ext/standard Makefile.frag /php4/pear Makefile.frag /php4/sapi/servlet Makefile.frag Removed files: /php4 Makefile.in dynlib.m4 /php4/build bsd_makefile dynlib.mk fastgen.sh library.mk ltlib.mk sysv_makefile /php4/ext/bcmath Makefile.in /php4/ext/bcmath/libbcmath Makefile.in /php4/ext/bcmath/libbcmath/src Makefile.in /php4/ext/session Makefile.in /php4/ext/standard Makefile.in /php4/pear Makefile.in /php4/sapi Makefile.in README /php4/sapi/aolserver Makefile.in /php4/sapi/apache Makefile.in /php4/sapi/apache2filter Makefile.in /php4/sapi/caudium Makefile.in /php4/sapi/cgi Makefile.in /php4/sapi/cli Makefile.in /php4/sapi/fastcgi Makefile.in /php4/sapi/isapi Makefile.in /php4/sapi/nsapi Makefile.in /php4/sapi/phttpd Makefile.in /php4/sapi/pi3web Makefile.in /php4/sapi/roxen Makefile.in /php4/sapi/servlet Makefile.in /php4/sapi/thttpd Makefile.in /php4/sapi/tux Makefile.in /php4/sapi/webjames Makefile.in Modified files: /php4 .cvsignore README.SELF-CONTAINED-EXTENSIONS acinclude.m4 configure.in /php4/build build2.mk shtool /php4/ext ext_skel /php4/ext/aspell .cvsignore /php4/ext/bcmath .cvsignore config.m4 /php4/ext/bcmath/libbcmath .cvsignore /php4/ext/bcmath/libbcmath/src .cvsignore /php4/ext/bz2 .cvsignore /php4/ext/calendar .cvsignore /php4/ext/ccvs .cvsignore /php4/ext/com .cvsignore /php4/ext/cpdf .cvsignore /php4/ext/crack .cvsignore /php4/ext/ctype .cvsignore /php4/ext/curl .cvsignore /php4/ext/cybercash .cvsignore /php4/ext/cybermut .cvsignore /php4/ext/cyrus .cvsignore /php4/ext/db .cvsignore /php4/ext/dba .cvsignore /php4/ext/dbase .cvsignore /php4/ext/dbplus .cvsignore /php4/ext/dbx .cvsignore /php4/ext/dio .cvsignore /php4/ext/domxml .cvsignore config.m4 /php4/ext/exif .cvsignore /php4/ext/fbsql .cvsignore /php4/ext/fdf .cvsignore /php4/ext/filepro .cvsignore /php4/ext/fribidi .cvsignore /php4/ext/ftp .cvsignore /php4/ext/gd .cvsignore /php4/ext/gettext .cvsignore /php4/ext/gmp .cvsignore /php4/ext/hyperwave .cvsignore /php4/ext/icap .cvsignore /php4/ext/iconv .cvsignore /php4/ext/imap .cvsignore /php4/ext/informix .cvsignore /php4/ext/ingres_ii .cvsignore /php4/ext/interbase .cvsignore /php4/ext/ircg .cvsignore config.m4 /php4/ext/java .cvsignore /php4/ext/ldap .cvsignore /php4/ext/mbstring .cvsignore /php4/ext/mcal .cvsignore /php4/ext/mcrypt .cvsignore /php4/ext/mhash .cvsignore /php4/ext/ming .cvsignore /php4/ext/mnogosearch .cvsignore /php4/ext/msession .cvsignore /php4/ext/msql .cvsignore /php4/ext/mssql .cvsignore /php4/ext/muscat .cvsignore /php4/ext/mysql .cvsignore config.m4 /php4/ext/mysql/libmysql .cvsignore mysql.m4 /php4/ext/ncurses .cvsignore /php4/ext/notes .cvsignore /php4/ext/oci8 .cvsignore /php4/ext/odbc .cvsignore /php4/ext/openssl .cvsignore /php4/ext/oracle .cvsignore /php4/ext/overload .cvsignore /php4/ext/ovrimos .cvsignore /php4/ext/pcntl .cvsignore /php4/ext/pcre .cvsignore config.m4 /php4/ext/pcre/pcrelib .cvsignore /php4/ext/pcre/pcrelib/doc .cvsignore /php4/ext/pcre/pcrelib/testdata .cvsignore /php4/ext/pdf .cvsignore config.m4 /php4/ext/pfpro .cvsignore /php4/ext/pgsql .cvsignore /php4/ext/posix .cvsignore /php4/ext/pspell .cvsignore /php4/ext/qtdom .cvsignore /php4/ext/readline .cvsignore /php4/ext/recode .cvsignore /php4/ext/session .cvsignore config.m4 /php4/ext/shmop .cvsignore /php4/ext/skeleton .cvsignore /php4/ext/snmp .cvsignore /php4/ext/sockets .cvsignore /php4/ext/standard .cvsignore config.m4 /php4/ext/swf .cvsignore /php4/ext/sybase .cvsignore /php4/ext/sybase_ct .cvsignore /php4/ext/sysvsem .cvsignore /php4/ext/sysvshm .cvsignore /php4/ext/vpopmail .cvsignore /php4/ext/w32api .cvsignore /php4/ext/wddx .cvsignore /php4/ext/xml .cvsignore config.m4 /php4/ext/xml/expat .cvsignore /php4/ext/xmlrpc .cvsignore config.m4 /php4/ext/xmlrpc/libxmlrpc xmlrpc.m4 /php4/ext/xslt .cvsignore /php4/ext/yaz .cvsignore /php4/ext/yp .cvsignore /php4/ext/zip .cvsignore /php4/ext/zlib .cvsignore /php4/pear .cvsignore pear.m4 /php4/pear/scripts phpize.in /php4/regex .cvsignore /php4/sapi .cvsignore /php4/sapi/aolserver .cvsignore config.m4 /php4/sapi/apache .cvsignore config.m4 /php4/sapi/apache2filter .cvsignore config.m4 /php4/sapi/caudium .cvsignore config.m4 /php4/sapi/cgi .cvsignore config.m4 /php4/sapi/cli .cvsignore config.m4 /php4/sapi/fastcgi .cvsignore config.m4 /php4/sapi/fhttpd .cvsignore /php4/sapi/isapi .cvsignore config.m4 /php4/sapi/nsapi .cvsignore config.m4 /php4/sapi/phttpd .cvsignore config.m4 /php4/sapi/pi3web .cvsignore config.m4 /php4/sapi/roxen .cvsignore config.m4 /php4/sapi/servlet .cvsignore config.m4 /php4/sapi/thttpd .cvsignore config.m4 /php4/sapi/tux .cvsignore config.m4 /php4/sapi/webjames .cvsignore config.m4 Log: Please welcome the new build system. If you encounter any problems, please make sure to email sas@php.net directly. An introduction can be found on http://schumann.cx/buildv5.txt

Index: php4/.cvsignore diff -u php4/.cvsignore:1.38 php4/.cvsignore:1.39 --- php4/.cvsignore:1.38 Tue Jul 31 23:11:57 2001 +++ php4/.cvsignore Thu Mar 7 09:17:41 2002 @@ -1,3 +1,5 @@ +Makefile.objects +Makefile.fragments Makefile acconfig.h aclocal.m4 @@ -38,7 +40,6 @@ .deps config.nice php_version.h -libs.mk *.plg *.opt *.ncb Index: php4/README.SELF-CONTAINED-EXTENSIONS diff -u php4/README.SELF-CONTAINED-EXTENSIONS:1.9 php4/README.SELF-CONTAINED-EXTENSIONS:1.10 --- php4/README.SELF-CONTAINED-EXTENSIONS:1.9 Mon Jul 31 09:44:06 2000 +++ php4/README.SELF-CONTAINED-EXTENSIONS Thu Mar 7 09:17:43 2002 @@ -1,4 +1,4 @@ -$Id: README.SELF-CONTAINED-EXTENSIONS,v 1.9 2000/07/31 13:44:06 sas Exp $ +$Id: README.SELF-CONTAINED-EXTENSIONS,v 1.10 2002/03/07 14:17:43 sas Exp $ ============================================================================= HOW TO CREATE A SELF-CONTAINED PHP EXTENSION @@ -7,7 +7,6 @@ the PHP source. To create such an extension, three things are required: - - Makefile template (Makefile.in) - Configuration file (config.m4) - Source code for your module @@ -74,28 +73,9 @@ need to specify anything). -CREATING THE MAKEFILE TEMPLATE - - The Makefile Template (Makefile.in) contains three lines: - ------------------------------------------------------------------------------- -LTLIBRARY_SHARED_NAME = foobar.la -LTLIBRARY_SOURCES = foo.c bar.c - -include $(top_srcdir)/build/dynlib.mk ------------------------------------------------------------------------------- - - LTLIBRARY_SHARED_NAME specifies the name of the extension. - It must be of the form `ext-name.la'. - LTLIBRARY_SOURCES specifies the names of the sources files. You can name an arbitrary number of source files here. - The final include directive includes the build rules (you usually - don't need to care about what happens there). rules.mk and other - files are installed by phpize which we will cover later. - - CREATING THE M4 CONFIGURATION FILE The m4 configuration can perform additional checks. For a @@ -107,13 +87,17 @@ [ --enable-foobar Enable foobar]) if test "$PHP_FOOBAR" != "no"; then - PHP_EXTENSION(foobar, $ext_shared) + PHP_NEW_EXTENSION(foobar, foo.c bar.c, $ext_shared) fi ------------------------------------------------------------------------------ PHP_ARG_ENABLE will automatically set the correct variables, so - that the extension will be enabled by PHP_EXTENSION in shared mode. + that the extension will be enabled by PHP_NEW_EXTENSION in shared mode. + The first argument of PHP_NEW_EXTENSION describes the name of the + extension. The second names the source-code files. The third passes + $ext_shared which is set by PHP_ARG_ENABLE/WITH to PHP_NEW_EXTENSION. + Please use always PHP_ARG_ENABLE or PHP_ARG_WITH. Even if you do not plan to distribute your module with PHP, these facilities allow you to integrate your module easily into the main PHP module framework. @@ -131,8 +115,8 @@ CREATING THE SELF-CONTAINED EXTENSION - Put Makefile.in, config.m4 and the source files into one directory. - Then run phpize (this is installed during make install by PHP 4.0). + Put config.m4 and the source files into one directory. Afterwards, + run phpize (this is installed during make install by PHP 4.0). For example, if you configured PHP with --prefix=/php, you would run $ /php/bin/phpize @@ -157,17 +141,13 @@ support to an existing module called foo. 1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will - automatically be able to use --with-foo=shared or - --enable-foo=shared. + automatically be able to use --with-foo=shared[,..] or + --enable-foo=shared[,..]. - 2. In config.m4, use PHP_EXTENSION(foo, $ext_shared) to enable + 2. In config.m4, use PHP_NEW_EXTENSION(foo,.., $ext_shared) to enable building the extension. - 3. Add the following line to Makefile.in: - - LTLIBRARY_SHARED_NAME = foo.la - - 4. Add the following lines to your C source file: + 3. Add the following lines to your C source file: #ifdef COMPILE_DL_FOO ZEND_GET_MODULE(foo) Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.157 php4/acinclude.m4:1.158 --- php4/acinclude.m4:1.157 Wed Feb 20 21:12:37 2002 +++ php4/acinclude.m4 Thu Mar 7 09:17:44 2002 @@ -1,8 +1,125 @@ -dnl $Id: acinclude.m4,v 1.157 2002/02/21 02:12:37 elixer Exp $ +dnl $Id: acinclude.m4,v 1.158 2002/03/07 14:17:44 sas Exp $ dnl dnl This file contains local autoconf functions. -sinclude(dynlib.m4) +dnl PHP_ADD_MAKEFILE_FRAGMENT([srcfile[, ext_srcdir[, ext_builddir]]]) +dnl +dnl Processes a file called Makefile.frag in the source directory +dnl of the most recently added extension. $(srcdir) and $(builddir) +dnl are substituted with the proper paths. Can be used to supply +dnl custom rules and/or additional targets. +dnl +AC_DEFUN(PHP_ADD_MAKEFILE_FRAGMENT,[ + ifelse($1,,src=$ext_srcdir/Makefile.frag,src=$1) + ifelse($2,,ac_srcdir=$ext_srcdir,ac_srcdir=$2) + ifelse($3,,ac_builddir=$ext_builddir,ac_builddir=$3) + sed -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments +]) + + +dnl PHP_DEFINE(what[, value]) +dnl +dnl Creates builddir/include/what.h and in there #define what value +dnl +AC_DEFUN(PHP_DEFINE,[ + echo "#define $1 $2" > include/$1.h +]) + +dnl PHP_INIT_BUILD_SYSTEM +dnl +AC_DEFUN(PHP_INIT_BUILD_SYSTEM,[ +mkdir include >/dev/null 2>&1 +> Makefile.objects +> Makefile.fragments +]) + +dnl PHP_GEN_GLOBAL_MAKEFILE +dnl +dnl Generates the global makefile. +dnl +AC_DEFUN(PHP_GEN_GLOBAL_MAKEFILE,[ + cat >Makefile <<EOF +srcdir = $abs_srcdir +builddir = $abs_builddir +top_srcdir = $abs_srcdir +top_builddir = $abs_builddir +EOF + for i in $PHP_VAR_SUBST; do + eval echo "$i = \$$i" >> Makefile + done + + cat $abs_srcdir/Makefile.global Makefile.fragments Makefile.objects >> Makefile +]) + +dnl PHP_ADD_SOURCES(source-path, sources[, special-flags[, type]]) +dnl +dnl Adds sources which are located relative to source-path to the +dnl array of type type. Sources are processed with optional +dnl special-flags which are passed to the compiler. Sources +dnl can be either written in C or C++ (filenames shall end in .c +dnl or .cpp, respectively). +dnl +dnl Note: If source-path begins with a "/", the "/" is removed and +dnl the path is interpreted relative to the top build-directory. +dnl +dnl which array to append to? +AC_DEFUN(PHP_ADD_SOURCES,[ + ifelse($4,cli,ac_what=PHP_CLI_OBJS,ifelse($4,sapi,ac_what=PHP_SAPI_OBJS,ac_what=PHP_GLOBAL_OBJS)) + PHP_ADD_SOURCES_X($1, $2, $3, $ac_what) +]) + +dnl PHP_ASSIGN_BUILD_VARS(type) +dnl Internal macro, should/can be exploded manually +AC_DEFUN(PHP_ASSIGN_BUILD_VARS,[ + for acx in pre meta post; do for acy in c cxx; do eval b_${acy}_$acx=[\$]$1_${acy}_$acx; done; done + b_lo=[$]$1_lo +]) + +dnl PHP_ADD_SOURCES_X(source-path, sources[, special-flags[, target-var[, shared[, special-post-flags]]]]) +dnl +dnl Additional to PHP_ADD_SOURCES (see above), this lets you set the +dnl name of the array target-var directly, as well as whether +dnl shared objects will be built from the sources. Should not be +dnl used directly. +dnl +AC_DEFUN(PHP_ADD_SOURCES_X,[ + ac_what=$4 + +dnl relative to source- or build-directory? + case $1 in + /*[)] ac_srcdir=`echo $ac_n "$1$ac_c"|cut -c 2-`; ac_bdir=$ac_srcdir ;; + *[)] ac_srcdir="$abs_srcdir/$1"; ac_bdir=$1 ;; + esac + +dnl how to build .. shared or static? + ifelse($5,yes,PHP_ASSIGN_BUILD_VARS(shared),PHP_ASSIGN_BUILD_VARS(php)) + +dnl iterate over the sources + for ac_src in $2; do + +dnl remove the suffix + old_IFS=[$]IFS + IFS=. + set $ac_src + ac_obj=[$]1 + IFS=$old_IFS + +dnl append to the array which has been dynamically chosen + eval "$ac_what=\"[\$$]ac_what $ac_bdir/[$]ac_obj.lo\"" + +dnl choose the right compiler/flags/etc. for the source-file + case $ac_src in + *.c[)] ac_comp="$b_c_pre $3 -I$abs_srcdir/$ac_bdir -I$abs_builddir/$ac_bdir $b_c_meta -c $ac_srcdir/$ac_src -o $ac_bdir/$ac_obj.$b_lo $6$b_c_post" ;; + *.cpp[)] ac_comp="$b_cxx_pre $3 -I$abs_srcdir/$ac_bdir -I$abs_builddir/$ac_bdir $b_cxx_meta -c $ac_srcdir/$ac_src -o $ac_bdir/$ac_obj.$b_lo $6$b_cxx_post" ;; + esac + +dnl create a rule for the object/source combo + cat >>Makefile.objects<<EOF +$ac_bdir/[$]ac_obj.lo: $ac_srcdir/[$]ac_src + $ac_comp +EOF + done +]) dnl dnl Disable building CLI @@ -370,9 +487,7 @@ test "[$]$1" = "no" && $1=yes fi -if test -n "$2"; then - AC_MSG_RESULT([$ext_output]) -fi +ifelse([$2],,,[AC_MSG_RESULT([$ext_output])]) ]) dnl @@ -386,9 +501,7 @@ ]) AC_DEFUN(PHP_REAL_ARG_WITH,[ -if test -n "$2"; then - AC_MSG_CHECKING([$2]) -fi +ifelse([$2],,,[AC_MSG_CHECKING([$2])]) AC_ARG_WITH($1,[$3],$5=[$]withval,$5=ifelse($4,,no,$4)) PHP_ARG_ANALYZE($5,[$2]) ]) @@ -404,9 +517,7 @@ ]) AC_DEFUN(PHP_REAL_ARG_ENABLE,[ -if test -n "$2"; then - AC_MSG_CHECKING([$2]) -fi +ifelse([$2],,,[AC_MSG_CHECKING([$2])]) AC_ARG_ENABLE($1,[$3],$5=[$]enableval,$5=ifelse($4,,no,$4)) PHP_ARG_ANALYZE($5,[$2]) ]) @@ -493,10 +604,6 @@ 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 @@ -512,19 +619,6 @@ ]) ]) -AC_DEFUN(PHP_GEN_CONFIG_VARS,[ - PHP_MKDIR_P_CHECK - echo creating config_vars.mk - > config_vars.mk - for i in $PHP_VAR_SUBST; do - eval echo "$i = \$$i" | sed 's%#%\\#%g' >> config_vars.mk - done -]) - -AC_DEFUN(PHP_GEN_MAKEFILES,[ - $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $1 -]) - 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> @@ -645,13 +739,25 @@ dnl PHP_BUILD_SHARED dnl AC_DEFUN(PHP_BUILD_SHARED,[ + PHP_BUILD_PROGRAM + OVERALL_TARGET=libphp4.la php_build_target=shared + + php_c_pre=$shared_c_pre + php_c_meta=$shared_c_meta + php_c_post=$shared_c_post + php_cxx_pre=$shared_cxx_pre + php_cxx_meta=$shared_cxx_meta + php_cxx_post=$shared_cxx_post + php_lo=$shared_lo ]) dnl dnl PHP_BUILD_STATIC dnl AC_DEFUN(PHP_BUILD_STATIC,[ + PHP_BUILD_PROGRAM + OVERALL_TARGET=libphp4.la php_build_target=static ]) @@ -659,6 +765,23 @@ dnl PHP_BUILD_PROGRAM dnl AC_DEFUN(PHP_BUILD_PROGRAM,[ + OVERALL_TARGET=php + php_c_pre='$(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post=' && > $[@]' + php_cxx_pre='$(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post=' && > $[@]' + php_lo=o + + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -prefer-pic' + shared_c_post= + shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) -prefer-pic' + shared_cxx_post= + shared_lo=lo + php_build_target=program ]) @@ -722,7 +845,7 @@ dnl AC_DEFUN(PHP_BUILD_RPATH,[ if test "$PHP_RPATH" = "yes" && test -n "$PHP_RPATHS"; then - OLD_RPATHS="$PHP_RPATHS" + OLD_RPATHS=$PHP_RPATHS unset PHP_RPATHS for i in $OLD_RPATHS; do PHP_LDFLAGS="$PHP_LDFLAGS -L$i" @@ -752,7 +875,7 @@ ]) AC_DEFUN(PHP_X_ADD_LIBRARY,[ - ifelse($2,,$3="-l$1 [$]$3", $3="[$]$3 -l$1") + ifelse([$2],,$3="-l$1 [$]$3", $3="[$]$3 -l$1") ]) dnl @@ -838,8 +961,8 @@ dnl dnl Set libtool variable dnl -AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[ - LIBTOOL='$(SHELL) $(top_builddir)/libtool $1' +AC_DEFUN(PHP_SET_LIBTOOL_VARIABLE,[ + LIBTOOL='$(SHELL) libtool $1' ]) dnl @@ -870,21 +993,15 @@ AC_DEFUN(PHP_REGEX,[ if test "$REGEX_TYPE" = "php"; then - REGEX_LIB=regex/libregex.la - REGEX_DIR=regex AC_DEFINE(HSREGEX,1,[ ]) AC_DEFINE(REGEX,1,[ ]) - PHP_FAST_OUTPUT(regex/Makefile) + PHP_ADD_SOURCES(regex, regcomp.c regexec.c regerror.c regfree.c) elif test "$REGEX_TYPE" = "system"; then AC_DEFINE(REGEX,0,[ ]) fi AC_MSG_CHECKING([which regex library to use]) AC_MSG_RESULT([$REGEX_TYPE]) - -PHP_SUBST(REGEX_DIR) -PHP_SUBST(REGEX_LIB) -PHP_SUBST(HSREGEX) ]) dnl @@ -921,21 +1038,79 @@ fi ]) +dnl PHP_SHARED_MODULE(module-name, object-var, build-dir) +dnl +dnl Basically sets up the link-stage for building module-name +dnl from object_var in build-dir. +dnl +AC_DEFUN(PHP_SHARED_MODULE,[ + PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.la" + PHP_SUBST($2) + cat >>Makefile.objects<<EOF +\$(phplibdir)/$1.la: $3/$1.la + \$(LIBTOOL) --mode=install cp $3/$1.la \$(phplibdir) + +$3/$1.la: \$($2) \$(translit($1,a-z-,A-Z_)_SHARED_DEPENDENCIES) + \$(LIBTOOL) --mode=link \$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) -o \[$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z-,A-Z_)_SHARED_LIBADD) + +EOF +]) + +dnl +dnl PHP_SELECT_SAPI(name, type[, sources]) +dnl +dnl Selects the SAPI name and type (static, shared, programm) +dnl and optionally also the source-files for the SAPI-specific +dnl objects. +dnl +AC_DEFUN(PHP_SELECT_SAPI,[ + PHP_SAPI=$1 + + case "$2" in + static) PHP_BUILD_STATIC;; + shared) PHP_BUILD_SHARED;; + program) PHP_BUILD_PROGRAM;; + esac + + ifelse($3,,,[PHP_ADD_SOURCES(sapi/$1, $3,,sapi)]) +]) + +dnl deprecated +AC_DEFUN(PHP_EXTENSION,[ + sources=`awk -f $abs_srcdir/scan_makefile_in.awk < $abs_srcdir/ext/$1/Makefile.in` + + PHP_NEW_EXTENSION($1, $sources, $2, $3) + + if test -r "$ext_srcdir/Makefile.frag"; then + PHP_ADD_MAKEFILE_FRAGMENT + fi +]) + +AC_DEFUN(PHP_ADD_BUILD_DIR,[ + BUILD_DIR="$BUILD_DIR $1" +]) + +AC_DEFUN(PHP_GEN_BUILD_DIRS,[ + PHP_MKDIR_P_CHECK + if test "$ac_cv_mkdir_p" = "yes"; then + mkdir -p $BUILD_DIR + fi +]) + dnl -dnl PHP_EXTENSION(extname [, shared [,sapi_class]]) +dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags]]]) dnl dnl Includes an extension in the build. dnl -dnl "extname" is the name of the ext/ subdir where the extension resides +dnl "extname" is the name of the ext/ subdir where the extension resides. +dnl "sources" is a list of files relative to the subdir which are used +dnl to build the extension. dnl "shared" can be set to "shared" or "yes" to build the extension as dnl a dynamically loadable library. Optional parameter "sapi_class" can dnl be set to "cli" to mark extension build only with CLI or CGI sapi's. -dnl If "nocli" is passed the extension will be built only with a non-cli -dnl sapi. -dnl -AC_DEFUN(PHP_EXTENSION,[ - EXT_SUBDIRS="$EXT_SUBDIRS $1" - +dnl extra-cflags are passed to the compiler, with @ext_srcdir@ being +dnl substituted. +AC_DEFUN(PHP_NEW_EXTENSION,[ if test -d "$abs_srcdir/ext/$1"; then dnl ---------------------------------------------- Internal Module ext_builddir=ext/$1 @@ -946,35 +1121,39 @@ ext_srcdir=$abs_srcdir fi - if test "$2" != "shared" && test "$2" != "yes" && test "$3" != "cli"; then + ifelse($5,,,[ac_extra=`echo $ac_n "$5$ac_c"|sed s#@ext_srcdir@#$ext_srcdir#g`]) + + if test "$3" != "shared" && test "$3" != "yes" && test "$4" != "cli"; then dnl ---------------------------------------------- Static module - LIB_BUILD($ext_builddir) - EXT_LTLIBS="$EXT_LTLIBS $abs_builddir/$ext_builddir/lib$1.la" + + PHP_ADD_SOURCES($ext_builddir,$2,$ac_extra,) EXT_STATIC="$EXT_STATIC $1" if test "$3" != "nocli"; then EXT_CLI_LTLIBS="$EXT_CLI_LTLIBS $abs_builddir/$ext_builddir/lib$1.la" EXT_CLI_STATIC="$EXT_CLI_STATIC $1" fi else - if test "$2" = "shared" || test "$2" = "yes"; then + if test "$3" = "shared" || test "$3" = "yes"; then dnl ---------------------------------------------- Shared module - LIB_BUILD($ext_builddir,yes) + PHP_ADD_SOURCES_X($ext_builddir,$2,$ac_extra,shared_objects_$1,yes) + PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir) AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z-,A-Z_), 1, Whether to build $1 as dynamic module) fi fi - if test "$2" != "shared" && test "$2" != "yes" && test "$3" = "cli"; then -dnl ---------------------------------------------- CLI only static module - LIB_BUILD($ext_builddir) + if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then +dnl ---------------------------------------------- CLI static module if test "$PHP_SAPI" = "cgi"; then - EXT_LTLIBS="$EXT_LTLIBS $abs_builddir/$ext_builddir/lib$1.la" + PHP_ADD_SOURCES($ext_builddir,$2,$ac_extra,) EXT_STATIC="$EXT_STATIC $1" + else + PHP_ADD_SOURCES($ext_srcdir,$2,$ac_extra,cli) + EXT_CLI_STATIC="$EXT_CLI_STATIC $1" fi EXT_CLI_LTLIBS="$EXT_CLI_LTLIBS $abs_builddir/$ext_builddir/lib$1.la" EXT_CLI_STATIC="$EXT_CLI_STATIC $1" fi - - PHP_FAST_OUTPUT($ext_builddir/Makefile) + PHP_ADD_BUILD_DIR($ext_builddir) ]) dnl @@ -1126,11 +1305,6 @@ AC_DEFINE(CHARSET_EBCDIC,1, [Define if system uses EBCDIC]) fi ]) - -AC_DEFUN(AC_ADD_LIBPATH, [indir([PHP_ADD_LIBPATH], $@)]) -AC_DEFUN(AC_ADD_LIBRARY, [indir([PHP_ADD_LIBRARY], $@)]) -AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH, [indir([PHP_ADD_LIBRARY_WITH_PATH], $@)]) -AC_DEFUN(AC_ADD_INCLUDE, [indir([PHP_ADD_INCLUDE], $@)]) AC_DEFUN(PHP_FOPENCOOKIE,[ AC_CHECK_FUNC(fopencookie, [ have_glibc_fopencookie=yes ]) Index: php4/configure.in diff -u php4/configure.in:1.303 php4/configure.in:1.304 --- php4/configure.in:1.303 Wed Mar 6 17:26:01 2002 +++ php4/configure.in Thu Mar 7 09:17:45 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.303 2002/03/06 22:26:01 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.304 2002/03/07 14:17:45 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -36,10 +36,9 @@ done AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(php, 4.3.0-dev, nodefine) -AM_CONFIG_HEADER(main/php_config.h) -AM_MAINTAINER_MODE +AC_CONFIG_HEADER(main/php_config.h) +VERSION=4.3.0-dev dnl Setting up the PHP version based on the information above. @@ -109,6 +108,8 @@ cwd=`pwd` +PHP_INIT_BUILD_SYSTEM + php_shtool=$srcdir/build/shtool T_MD=`$php_shtool echo -n -e %B` T_ME=`$php_shtool echo -n -e %b` @@ -130,16 +131,13 @@ $php_shtool mkdir -p libs rm -f libs/* -PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile sapi/cli/Makefile) - - dnl Checks for programs. dnl ------------------------------------------------------------------------- AC_PROG_CC AC_PROG_CC_C_O dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf -AM_PROG_CC_STDC +dnl AC_PROG_CC_STDC AC_PROG_CPP AC_PROG_CXX AC_PROG_CXXCPP @@ -220,7 +218,7 @@ PTHREADS_CHECK PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAME -PHP_SAPI=cgi +PHP_SAPI=default PHP_BUILD_PROGRAM @@ -238,6 +236,10 @@ esyscmd(./scripts/config-stubs sapi) +if test "$PHP_SAPI" = "default"; then + PHP_SELECT_SAPI(cgi, program, cgi_main.c getopt.c) +fi + AC_MSG_CHECKING([for chosen SAPI module]) AC_MSG_RESULT([$PHP_SAPI]) @@ -247,7 +249,6 @@ fi - divert(3) dnl ## In diversion 3 we check for compile-time options to the PHP @@ -769,9 +770,6 @@ # reading config stubs esyscmd(./scripts/config-stubs ext) -PHP_FAST_OUTPUT(sapi/$PHP_SAPI/Makefile) - - dnl Other settings. dnl ------------------------------------------------------------------------- @@ -802,11 +800,9 @@ case $php_build_target in program|static) standard_libtool_flag='-prefer-non-pic -static' - if test "$lib_build_shared" != "yes"; then + if test -z "$PHP_MODULES"; then enable_shared=no fi - PHP_COMPILE='$(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -c $< && touch $@' - CXX_PHP_COMPILE='$(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) -c $< && touch $@' ;; shared) enable_static=no @@ -815,15 +811,6 @@ ;; esac -if test "$PHP_SAPI" = "cgi"; then - PHP_PROGRAM=php -fi - -if test "$PHP_SAPI" = "fastcgi"; then - PHP_PROGRAM=php -fi - - PHP_REGEX EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" @@ -960,20 +947,19 @@ PHP_OS=`uname` AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) -if test "$disable_cli" = "1"; then - CLI_DIR= -else - CLI_DIR=sapi/cli +if test "$disable_cli" != "1"; then + PHP_CLI_TARGET=sapi/cli/php + PHP_ADD_SOURCES(sapi/cli, php_cli.c getopt.c,, cli) fi -PHP_SUBST(CLI_DIR) +PHP_SUBST(PHP_CLI_TARGET) +PHP_SUBST(PHP_SAPI_OBJS) +PHP_SUBST(PHP_CLI_OBJS) +PHP_SUBST(PHP_GLOBAL_OBJS) + +PHP_SUBST(PHP_MODULES) -PHP_SUBST(EXT_SUBDIRS) -PHP_SUBST(EXT_STATIC) -PHP_SUBST(EXT_SHARED) PHP_SUBST(EXT_LIBS) -PHP_SUBST(EXT_LTLIBS) -PHP_SUBST(EXT_CLI_LTLIBS) PHP_SUBST_OLD(abs_builddir) PHP_SUBST_OLD(abs_srcdir) @@ -1020,7 +1006,7 @@ PHP_SUBST(PHP_COMPILE) PHP_SUBST_OLD(PHP_LDFLAGS) PHP_SUBST_OLD(PHP_LIBS) -PHP_SUBST(PHP_PROGRAM) +PHP_SUBST(OVERALL_TARGET) PHP_SUBST(PHP_RPATHS) PHP_SUBST(PHP_SAPI) PHP_SUBST(PHP_VERSION) @@ -1051,9 +1037,9 @@ CPPFLAGS="$CPPFLAGS -DTHREAD=1" fi -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL if test "$enable_debug" != "yes"; then - AM_SET_LIBTOOL_VARIABLE([--silent]) + PHP_SET_LIBTOOL_VARIABLE([--silent]) fi @@ -1071,13 +1057,61 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag" -PHP_GEN_CONFIG_VARS +all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' +install_targets='install-sapi install-modules install-cli install-data-local install-headers install-build install-programs' +PHP_SUBST(all_targets) +PHP_SUBST(install_targets) + +PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c) + +PHP_ADD_SOURCES(main, main.c snprintf.c php_sprintf.c \ + safe_mode.c fopen_wrappers.c alloca.c \ + php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ + strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ + streams.c network.c php_open_temporary_file.c php_logos.c \ + output.c) +PHP_ADD_SOURCES(/main, internal_functions.c,, sapi) +PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli) + +PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_language_scanner.c \ + zend_ini_parser.c zend_ini_scanner.c) + +PHP_ADD_SOURCES(Zend, \ + zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \ + zend_execute_API.c zend_highlight.c zend_llist.c \ + zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \ + zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ + zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ + zend_ini.c zend_qsort.c) + +dnl Selectively disable optimization due to high RAM usage during +dnl compiling the executor. +if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then + flag=-O0 +else + flag= +fi + +PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag) + +PHP_ADD_BUILD_DIR(main) +PHP_ADD_BUILD_DIR(regex) +PHP_ADD_BUILD_DIR(sapi/$PHP_SAPI sapi/cli) +PHP_ADD_BUILD_DIR(TSRM) +PHP_ADD_BUILD_DIR(Zend) + + +PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear) +PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend) + +PHP_GEN_BUILD_DIRS +PHP_GEN_GLOBAL_MAKEFILE $php_shtool mkdir -p pear/scripts -ALL_OUTPUT_FILES="php4.spec Zend/Makefile main/build-defs.h \ +ALL_OUTPUT_FILES="php4.spec main/build-defs.h \ pear/scripts/pear pear/scripts/phpize pear/scripts/php-config \ pear/scripts/pearize pear/scripts/phptar pear/scripts/pear-get \ -TSRM/Makefile $PHP_OUTPUT_FILES" +$PHP_OUTPUT_FILES" AC_OUTPUT($ALL_OUTPUT_FILES, [], [ @@ -1085,10 +1119,6 @@ REDO_ALL=yes fi -if test -n "\$REDO_ALL"; then - PHP_GEN_MAKEFILES($PHP_FAST_OUTPUT_FILES) -fi - if test ! -f $srcdir/ext/bcmath/number.c; then echo "creating number.c" echo "/* Dummy File */" > $srcdir/ext/bcmath/number.c Index: php4/build/build2.mk diff -u php4/build/build2.mk:1.25 php4/build/build2.mk:1.26 --- php4/build/build2.mk:1.25 Mon Mar 4 03:28:57 2002 +++ php4/build/build2.mk Thu Mar 7 09:17:48 2002 @@ -14,7 +14,7 @@ # | Author: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: build2.mk,v 1.25 2002/03/04 08:28:57 sas Exp $ +# $Id: build2.mk,v 1.26 2002/03/07 14:17:48 sas Exp $ # include generated_lists @@ -30,37 +30,16 @@ acconfig_h_SOURCES = acconfig.h.in $(config_h_files) -targets = $(TOUCH_FILES) $(makefile_in_files) configure $(config_h_in) +targets = $(TOUCH_FILES) configure $(config_h_in) -all: Zend/Makefile.am TSRM/Makefile.am $(targets) - -Zend/Makefile.am: - test -d Zend || (test -d ../Zend && ln -s ../Zend Zend) - -TSRM/Makefile.am: - test -d TSRM || (test -d ../TSRM && ln -s ../TSRM TSRM) +all: $(targets) acconfig.h: $(acconfig_h_SOURCES) @echo rebuilding $@ cat $(acconfig_h_SOURCES) > $@ -$(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.in $(config_m4_files) - @echo rebuilding Makefile templates - @for i in $(LT_TARGETS); do \ - if test -f "$$i"; then \ - mv $$i $$i.bak; \ - cp $$i.bak $$i; \ - fi; \ - done - @test -f want_dependencies || flag=-i; \ - automake -a $$flag $(AMFLAGS) $(makefile_files) 2>&1 | $(SUPPRESS_WARNINGS) - @for i in $(LT_TARGETS); do mv $$i.bak $$i; done - -aclocal.m4: configure.in acinclude.m4 dynlib.m4 - aclocal 2>&1 | $(SUPPRESS_WARNINGS) - -SUPPRESS_WARNINGS = (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|.*AM_PROG_LEX.*|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_PROG_CPP called before)'||true) +SUPPRESS_WARNINGS = (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_PROG_CPP was called before AC_PROG_CC)'||true) $(config_h_in): configure acconfig.h # explicitly remove target since autoheader does not seem to work @@ -72,6 +51,9 @@ $(TOUCH_FILES): touch $(TOUCH_FILES) +aclocal.m4: configure.in acinclude.m4 + aclocal 2>&1 | $(SUPPRESS_WARNINGS) + configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ @autoconf 2>&1 | $(SUPPRESS_WARNINGS) Index: php4/build/shtool diff -u php4/build/shtool:1.2 php4/build/shtool:1.3 --- php4/build/shtool:1.2 Fri May 12 03:33:55 2000 +++ php4/build/shtool Thu Mar 7 09:17:56 2002 @@ -1,13 +1,13 @@ #!/bin/sh ## ## GNU shtool -- The GNU Portable Shell Tool -## Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com> +## Copyright (c) 1994-2001 Ralf S. Engelschall <rse@engelschall.com> ## ## See http://www.gnu.org/software/shtool/ for more information. ## See ftp://ftp.gnu.org/gnu/shtool/ for latest version. ## -## Version 1.4.9 (16-Apr-2000) -## Ingredients: 3/17 available modules +## Version: 1.5.4 (14-Jun-2001) +## Contents: 3/17 available modules ## ## @@ -26,7 +26,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA, or contact Ralf S. Engelschall <rse@engelschall.com>. ## -## Notice: Given that you include this file verbatim into your own +## NOTICE: Given that you include this file verbatim into your own ## source tree, you are justified in saying that it remains separate ## from your package, and that this way you are simply just using GNU ## shtool. So, in this situation, there is no requirement that your @@ -55,7 +55,7 @@ ## arx Extended archive command ## slo Separate linker options by library class ## scpp Sharing C Pre-Processor -## version Generate and maintain a version information file +## version Maintain a version information file ## path Deal with program paths ## @@ -65,21 +65,22 @@ exit 1 fi if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then - echo "This is GNU shtool, version 1.4.9 (16-Apr-2000)" - echo "Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com>" + echo "This is GNU shtool, version 1.5.4 (14-Jun-2001)" + echo "Copyright (c) 1994-2001 Ralf S. Engelschall <rse@engelschall.com>" echo "Report bugs to <bug-shtool@gnu.org>" echo '' - echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]" + echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]" echo '' echo 'Available global <options>:' echo ' -v, --version display shtool version information' echo ' -h, --help display shtool usage help page (this one)' echo ' -d, --debug display shell trace information' + echo ' -r, --recreate recreate this shtool script via shtoolize' echo '' echo 'Available <cmd-name> [<cmd-options>] [<cmd-args>]:' echo ' echo [-n] [-e] [<str> ...]' echo ' install [-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>]' - echo ' [-e<ext>] <file> <path>' + echo ' [-e<sed-cmd>] <file> [<file> ...] <path>' echo ' mkdir [-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]' echo '' echo 'Not available <cmd-name> (because module was not built-in):' @@ -90,21 +91,25 @@ echo ' mkln [-t] [-f] [-s] <src-path> [<src-path> ...] <dst-path>' echo ' mkshadow [-v] [-t] [-a] <src-dir> <dst-dir>' echo ' fixperm [-v] [-t] <path> [<path> ...]' - echo ' tarball [-t] [-v] [-o <tarball>] [-c <prog>] [-d <dir>] [-u' - echo ' <user>] [-g <group>] [-e <pattern>] <path> [<path> ...]' + echo ' tarball [-t] [-v] [-o<tarball>] [-c<prog>] [-d<dir>] [-u<user>]' + echo ' [-g<group>] [-e<pattern>] <path> [<path> ...]' echo ' guessos ' echo ' arx [-t] [-C<cmd>] <op> <archive> [<file> ...]' echo ' slo [-p<str>] -- -L<dir> -l<lib> [-L<dir> -l<lib> ...]' echo ' scpp [-v] [-p] [-f<filter>] [-o<ofile>] [-t<tfile>] [-M<mark>]' echo ' [-D<dname>] [-C<cname>] <file> [<file> ...]' - echo ' version [-l<lang>] [-n<name>] [-p<prefix>] [-s<version>] [-i<knob>]' - echo ' [-d<type>] <file>' + echo ' version [-l<lang>] [-n<name>] [-p<prefix>] [-s<version>] [-e]' + echo ' [-i<knob>] [-d<type>] <file>' echo ' path [-s] [-r] [-d] [-b] [-m] [-p<path>] <str> [<str> ...]' echo '' exit 0 fi if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then - echo "GNU shtool 1.4.9 (16-Apr-2000)" + echo "GNU shtool 1.5.4 (14-Jun-2001)" + exit 0 +fi +if [ ".$1" = ".-r" -o ".$1" = ."--recreate" ]; then + shtoolize -ofoo echo install mkdir exit 0 fi if [ ".$1" = ".-d" -o ".$1" = ."--debug" ]; then @@ -142,15 +147,15 @@ ;; install ) str_tool="install" - str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<ext>] <file> <path>" - arg_spec="2=" - opt_spec="v.t.c.C.s.m:o:g:e:" + str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<sed-cmd>] <file> [<file> ...] <path>" + arg_spec="2+" + opt_spec="v.t.c.C.s.m:o:g:e+" opt_v=no opt_t=no opt_c=no opt_C=no opt_s=no - opt_m="" + opt_m="0755" opt_o="" opt_g="" opt_e="" @@ -312,6 +317,7 @@ tmpfile="$tmpdir/.shtool.$$" rm -f $tmpfile >/dev/null 2>&1 touch $tmpfile + chmod 600 $tmpfile fi ## @@ -323,7 +329,7 @@ echo ) ## ## echo -- Print string with optional construct expansion - ## Copyright (c) 1998-2000 Ralf S. Engelschall <rse@engelschall.com> + ## Copyright (c) 1998-2001 Ralf S. Engelschall <rse@engelschall.com> ## Originally written for WML as buildinfo ## @@ -347,7 +353,7 @@ fi # determine terminal bold sequence - term_bold='' + term_bold='' term_norm='' if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[Bb]'`" != . ]; then case $TERM in @@ -398,7 +404,7 @@ # determine user name username='' - if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[uU]'`" != . ]; then + if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[uUgG]'`" != . ]; then username="$LOGNAME" if [ ".$username" = . ]; then username="$USER" @@ -440,8 +446,38 @@ fi fi - # determine host name + # determine (primary) group id + groupid='' + if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[gG]'`" != . ]; then + groupid=`egrep "^${username}:" /etc/passwd 2>/dev/null | \ + sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'` + if [ ".$groupid" = . ]; then + groupid=`(ypcat passwd) 2>/dev/null | egrep "^${username}:" | \ + sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'` + if [ ".$groupid" = . ]; then + groupid='?' + fi + fi + fi + + # determine (primary) group name + groupname='' + if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%g'`" != . ]; then + groupname=`egrep "^[^:]*:[^:]*:${groupid}:" /etc/group 2>/dev/null | \ + sed -e 's/:.*$//'` + if [ ".$groupname" = . ]; then + groupname=`(ypcat group) 2>/dev/null | \ + egrep "^[^:]*:[^:]*:${groupid}:" | \ + sed -e 's/:.*$//'` + if [ ".$groupname" = . ]; then + groupname='?' + fi + fi + fi + + # determine host and domain name hostname='' + domainname='' if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%h'`" != . ]; then hostname="`(uname -n) 2>/dev/null |\ awk '{ printf("%s", $1); }'`" @@ -459,9 +495,6 @@ ;; esac fi - - # determine domain name - domainname='' if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%d'`" != . ]; then if [ ".$domainname" = . ]; then if [ -f /etc/resolv.conf ]; then @@ -521,6 +554,8 @@ -e "s/%b/${term_norm}/g" \ -e "s/%u/${username}/g" \ -e "s/%U/${userid}/g" \ + -e "s/%g/${groupname}/g" \ + -e "s/%G/${groupid}/g" \ -e "s/%h/${hostname}/g" \ -e "s/%d/${domainname}/g" \ -e "s/%D/${time_day}/g" \ @@ -546,114 +581,144 @@ install ) ## ## install -- Install a program, script or datafile - ## Copyright (c) 1997-2000 Ralf S. Engelschall <rse@engelschall.com> + ## Copyright (c) 1997-2001 Ralf S. Engelschall <rse@engelschall.com> ## Originally written for shtool ## - src="$1" - dst="$2" - - # If destination is a directory, append the input filename - if [ -d $dst ]; then - dst=`echo "$dst" | sed -e 's:/$::'` - dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'` - dst="$dst/$dstfile" - fi + # determine source(s) and destination + argc=$# + srcs="" + while [ $# -gt 1 ]; do + srcs="$srcs $1" + shift + done + dstpath="$1" - # Add a possible extension to src and dst - if [ ".$opt_e" != . ]; then - src="$src$opt_e" - dst="$dst$opt_e" + # type check for destination + dstisdir=0 + if [ -d $dstpath ]; then + dstpath=`echo "$dstpath" | sed -e 's:/$::'` + dstisdir=1 fi - # Check for correct arguments - if [ ".$src" = ".$dst" ]; then - echo "$msgprefix:Error: source and destination are the same" 1>&2 + # consistency check for destination + if [ $argc -gt 2 -a $dstisdir = 0 ]; then + echo "$msgprefix:Error: multiple sources require destination to be directory" 1>&2 exit 1 fi - # Make a temp file name in the destination directory - dstdir=`echo $dst | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;'` - dsttmp="$dstdir/#INST@$$#" + # iterate over all source(s) + for src in $srcs; do + dst=$dstpath + + # if destination is a directory, append the input filename + if [ $dstisdir = 1 ]; then + dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'` + dst="$dst/$dstfile" + fi - # Verbosity - if [ ".$opt_v" = .yes ]; then - echo "$src -> $dst" 1>&2 - fi + # check for correct arguments + if [ ".$src" = ".$dst" ]; then + echo "$msgprefix:Warning: source and destination are the same - skipped" 1>&2 + continue + fi + if [ -d "$src" ]; then + echo "$msgprefix:Warning: source \`$src' is a directory - skipped" 1>&2 + continue + fi - # Copy or move the file name to the temp name - # (because we might be not allowed to change the source) - if [ ".$opt_C" = .yes ]; then - opt_c=yes - fi - if [ ".$opt_c" = .yes ]; then - if [ ".$opt_t" = .yes ]; then - echo "cp $src $dsttmp" 1>&2 + # make a temp file name in the destination directory + dsttmp=`echo $dst |\ + sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;' \ + -e "s;\$;/#INST@$$#;"` + + # verbosity + if [ ".$opt_v" = .yes ]; then + echo "$src -> $dst" 1>&2 + fi + + # copy or move the file name to the temp name + # (because we might be not allowed to change the source) + if [ ".$opt_C" = .yes ]; then + opt_c=yes fi - cp $src $dsttmp || exit $? - else - if [ ".$opt_t" = .yes ]; then - echo "mv $src $dsttmp" 1>&2 + if [ ".$opt_c" = .yes ]; then + if [ ".$opt_t" = .yes ]; then + echo "cp $src $dsttmp" 1>&2 + fi + cp $src $dsttmp || exit $? + else + if [ ".$opt_t" = .yes ]; then + echo "mv $src $dsttmp" 1>&2 + fi + mv $src $dsttmp || exit $? fi - mv $src $dsttmp || exit $? - fi - # Adjust the target file - # (we do chmod last to preserve setuid bits) - if [ ".$opt_s" = .yes ]; then - if [ ".$opt_t" = .yes ]; then - echo "strip $dsttmp" 1>&2 + # adjust the target file + if [ ".$opt_e" != . ]; then + sed='sed' + for e in $opt_e; do + sed="$sed -e '$e'" + done + cp $dsttmp $dsttmp.old + eval "$sed <$dsttmp.old >$dsttmp" || exit $? + rm -f $dsttmp.old fi - strip $dsttmp || exit $? - fi - if [ ".$opt_o" != . ]; then - if [ ".$opt_t" = .yes ]; then - echo "chown $opt_o $dsttmp" 1>&2 + if [ ".$opt_s" = .yes ]; then + if [ ".$opt_t" = .yes ]; then + echo "strip $dsttmp" 1>&2 + fi + strip $dsttmp || exit $? fi - chown $opt_o $dsttmp || exit $? - fi - if [ ".$opt_g" != . ]; then - if [ ".$opt_t" = .yes ]; then - echo "chgrp $opt_g $dsttmp" 1>&2 + if [ ".$opt_o" != . ]; then + if [ ".$opt_t" = .yes ]; then + echo "chown $opt_o $dsttmp" 1>&2 + fi + chown $opt_o $dsttmp || exit $? fi - chgrp $opt_g $dsttmp || exit $? - fi - if [ ".$opt_m" != . ]; then - if [ ".$opt_t" = .yes ]; then - echo "chmod $opt_m $dsttmp" 1>&2 + if [ ".$opt_g" != . ]; then + if [ ".$opt_t" = .yes ]; then + echo "chgrp $opt_g $dsttmp" 1>&2 + fi + chgrp $opt_g $dsttmp || exit $? fi - chmod $opt_m $dsttmp || exit $? - fi - - # Determine whether to do a quick install - # (has to be done _after_ the strip was already done) - quick=no - if [ ".$opt_C" = .yes ]; then - if [ -r $dst ]; then - if cmp -s $src $dst; then - quick=yes + if [ ".$opt_m" != ".-" ]; then + if [ ".$opt_t" = .yes ]; then + echo "chmod $opt_m $dsttmp" 1>&2 fi + chmod $opt_m $dsttmp || exit $? fi - fi - # Finally install the file to the real destination - if [ $quick = yes ]; then - if [ ".$opt_t" = .yes ]; then - echo "rm -f $dsttmp" 1>&2 + # determine whether to do a quick install + # (has to be done _after_ the strip was already done) + quick=no + if [ ".$opt_C" = .yes ]; then + if [ -r $dst ]; then + if cmp -s $src $dst; then + quick=yes + fi + fi fi - rm -f $dsttmp - else - if [ ".$opt_t" = .yes ]; then - echo "rm -f $dst && mv $dsttmp $dst" 1>&2 + + # finally, install the file to the real destination + if [ $quick = yes ]; then + if [ ".$opt_t" = .yes ]; then + echo "rm -f $dsttmp" 1>&2 + fi + rm -f $dsttmp + else + if [ ".$opt_t" = .yes ]; then + echo "rm -f $dst && mv $dsttmp $dst" 1>&2 + fi + rm -f $dst && mv $dsttmp $dst fi - rm -f $dst && mv $dsttmp $dst - fi + done ;; mkdir ) ## ## mkdir -- Make one or more directories - ## Copyright (c) 1996-2000 Ralf S. Engelschall <rse@engelschall.com> + ## Copyright (c) 1996-2001 Ralf S. Engelschall <rse@engelschall.com> ## Originally written for public domain by Noah Friedman <friedman@prep.ai.mit.edu> ## Cleaned up and enhanced for shtool ## @@ -662,7 +727,7 @@ for p in ${1+"$@"}; do # if the directory already exists... if [ -d "$p" ]; then - if [ ".$opt_f" = .no ] && [ ".$opt_p" = .no ]; then + if [ ".$opt_f" = .no -a ".$opt_p" = .no ]; then echo "$msgprefix:Error: directory already exists: $p" 1>&2 errstatus=1 break @@ -676,6 +741,12 @@ echo "mkdir $p" 1>&2 fi mkdir $p || errstatus=$? + if [ ".$opt_m" != . ]; then + if [ ".$opt_t" = .yes ]; then + echo "chmod $opt_m $p" 1>&2 + fi + chmod $opt_m $p || errstatus=$? + fi else # the smart situation set fnord `echo ":$p" |\ Index: php4/ext/ext_skel diff -u php4/ext/ext_skel:1.40 php4/ext/ext_skel:1.41 --- php4/ext/ext_skel:1.40 Tue Jan 8 12:51:08 2002 +++ php4/ext/ext_skel Thu Mar 7 09:17:58 2002 @@ -156,31 +156,17 @@ dnl dnl PHP_SUBST(${EXTNAME}_SHARED_LIBADD) - PHP_EXTENSION($extname, \$ext_shared) + PHP_NEW_EXTENSION($extname, $extname.c, \$ext_shared) fi eof -$ECHO_N " Makefile.in$ECHO_C" -cat >Makefile.in <<eof -# \$Id\$ - -LTLIBRARY_NAME = lib$extname.la -LTLIBRARY_SOURCES = $extname.c -LTLIBRARY_SHARED_NAME = $extname.la -LTLIBRARY_SHARED_LIBADD = \$(${EXTNAME}_SHARED_LIBADD) - -include \$(top_srcdir)/build/dynlib.mk -eof - $ECHO_N " .cvsignore$ECHO_C" cat >.cvsignore <<eof .deps -Makefile *.lo *.la .libs -libs.mk eof $ECHO_N " $extname.c$ECHO_C" Index: php4/ext/aspell/.cvsignore diff -u php4/ext/aspell/.cvsignore:1.6 php4/ext/aspell/.cvsignore:1.7 --- php4/ext/aspell/.cvsignore:1.6 Wed Jun 6 08:43:22 2001 +++ php4/ext/aspell/.cvsignore Thu Mar 7 09:17:59 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/bcmath/.cvsignore diff -u php4/ext/bcmath/.cvsignore:1.8 php4/ext/bcmath/.cvsignore:1.9 --- php4/ext/bcmath/.cvsignore:1.8 Fri Dec 1 07:14:02 2000 +++ php4/ext/bcmath/.cvsignore Thu Mar 7 09:18:00 2002 @@ -5,5 +5,4 @@ *.la .libs .deps -libs.mk COPYING Index: php4/ext/bcmath/config.m4 diff -u php4/ext/bcmath/config.m4:1.13 php4/ext/bcmath/config.m4:1.14 --- php4/ext/bcmath/config.m4:1.13 Fri Nov 30 13:59:26 2001 +++ php4/ext/bcmath/config.m4 Thu Mar 7 09:18:01 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13 2001/11/30 18:59:26 sniper Exp $ +dnl $Id: config.m4,v 1.14 2002/03/07 14:18:01 sas Exp $ dnl PHP_ARG_ENABLE(bcmath, whether to enable bc style precision math functions, @@ -7,8 +7,11 @@ if test "$PHP_BCMATH" != "no"; then AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath]) - PHP_EXTENSION(bcmath, $ext_shared) - PHP_FAST_OUTPUT($ext_builddir/libbcmath/Makefile $ext_builddir/libbcmath/src/Makefile) - LIB_BUILD($ext_builddir/libbcmath,$ext_shared,yes) - LIB_BUILD($ext_builddir/libbcmath/src,$ext_shared,yes) + PHP_NEW_EXTENSION(bcmath, bcmath.c number.c \ +libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ +libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ +libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ +libbcmath/src/rmzero.c libbcmath/src/str2num.c, + $ext_shared,,-I@ext_srcdir@/libbcmath/src) + PHP_ADD_BUILD_DIR($ext_builddir/libbcmath/src) fi Index: php4/ext/bcmath/libbcmath/.cvsignore diff -u php4/ext/bcmath/libbcmath/.cvsignore:1.1 php4/ext/bcmath/libbcmath/.cvsignore:1.2 --- php4/ext/bcmath/libbcmath/.cvsignore:1.1 Tue Nov 28 10:43:06 2000 +++ php4/ext/bcmath/libbcmath/.cvsignore Thu Mar 7 09:18:03 2002 @@ -3,4 +3,3 @@ *.la .libs .deps -libs.mk Index: php4/ext/bcmath/libbcmath/src/.cvsignore diff -u php4/ext/bcmath/libbcmath/src/.cvsignore:1.1 php4/ext/bcmath/libbcmath/src/.cvsignore:1.2 --- php4/ext/bcmath/libbcmath/src/.cvsignore:1.1 Tue Nov 28 10:43:06 2000 +++ php4/ext/bcmath/libbcmath/src/.cvsignore Thu Mar 7 09:18:04 2002 @@ -3,4 +3,3 @@ *.la .libs .deps -libs.mk Index: php4/ext/bz2/.cvsignore diff -u php4/ext/bz2/.cvsignore:1.3 php4/ext/bz2/.cvsignore:1.4 --- php4/ext/bz2/.cvsignore:1.3 Wed Jun 6 08:43:22 2001 +++ php4/ext/bz2/.cvsignore Thu Mar 7 09:18:06 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/calendar/.cvsignore diff -u php4/ext/calendar/.cvsignore:1.3 php4/ext/calendar/.cvsignore:1.4 --- php4/ext/calendar/.cvsignore:1.3 Wed Jun 6 08:43:22 2001 +++ php4/ext/calendar/.cvsignore Thu Mar 7 09:18:09 2002 @@ -3,7 +3,6 @@ .libs *.lo *.la -libs.mk *.plg *.opt *.ncb Index: php4/ext/ccvs/.cvsignore diff -u php4/ext/ccvs/.cvsignore:1.3 php4/ext/ccvs/.cvsignore:1.4 --- php4/ext/ccvs/.cvsignore:1.3 Wed Jun 6 08:43:22 2001 +++ php4/ext/ccvs/.cvsignore Thu Mar 7 09:18:10 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/com/.cvsignore diff -u php4/ext/com/.cvsignore:1.6 php4/ext/com/.cvsignore:1.7 --- php4/ext/com/.cvsignore:1.6 Wed Jun 6 08:43:22 2001 +++ php4/ext/com/.cvsignore Thu Mar 7 09:18:11 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/cpdf/.cvsignore diff -u php4/ext/cpdf/.cvsignore:1.5 php4/ext/cpdf/.cvsignore:1.6 --- php4/ext/cpdf/.cvsignore:1.5 Wed Jun 6 08:43:22 2001 +++ php4/ext/cpdf/.cvsignore Thu Mar 7 09:18:12 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/crack/.cvsignore diff -u php4/ext/crack/.cvsignore:1.2 php4/ext/crack/.cvsignore:1.3 --- php4/ext/crack/.cvsignore:1.2 Wed Jun 6 08:43:23 2001 +++ php4/ext/crack/.cvsignore Thu Mar 7 09:18:14 2002 @@ -2,9 +2,7 @@ *.lo *.la .libs -Makefile.am .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/ctype/.cvsignore diff -u php4/ext/ctype/.cvsignore:1.3 php4/ext/ctype/.cvsignore:1.4 --- php4/ext/ctype/.cvsignore:1.3 Wed Jun 6 08:43:23 2001 +++ php4/ext/ctype/.cvsignore Thu Mar 7 09:18:15 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/curl/.cvsignore diff -u php4/ext/curl/.cvsignore:1.3 php4/ext/curl/.cvsignore:1.4 --- php4/ext/curl/.cvsignore:1.3 Wed Jun 6 08:43:23 2001 +++ php4/ext/curl/.cvsignore Thu Mar 7 09:18:16 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/cybercash/.cvsignore diff -u php4/ext/cybercash/.cvsignore:1.5 php4/ext/cybercash/.cvsignore:1.6 --- php4/ext/cybercash/.cvsignore:1.5 Wed Jun 6 08:43:23 2001 +++ php4/ext/cybercash/.cvsignore Thu Mar 7 09:18:18 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/cybermut/.cvsignore diff -u php4/ext/cybermut/.cvsignore:1.2 php4/ext/cybermut/.cvsignore:1.3 --- php4/ext/cybermut/.cvsignore:1.2 Wed Jun 6 08:43:23 2001 +++ php4/ext/cybermut/.cvsignore Thu Mar 7 09:18:19 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/cyrus/.cvsignore diff -u php4/ext/cyrus/.cvsignore:1.1 php4/ext/cyrus/.cvsignore:1.2 --- php4/ext/cyrus/.cvsignore:1.1 Sun Aug 5 13:43:03 2001 +++ php4/ext/cyrus/.cvsignore Thu Mar 7 09:18:21 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/db/.cvsignore diff -u php4/ext/db/.cvsignore:1.6 php4/ext/db/.cvsignore:1.7 --- php4/ext/db/.cvsignore:1.6 Wed Jun 6 08:43:23 2001 +++ php4/ext/db/.cvsignore Thu Mar 7 09:18:25 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/dba/.cvsignore diff -u php4/ext/dba/.cvsignore:1.6 php4/ext/dba/.cvsignore:1.7 --- php4/ext/dba/.cvsignore:1.6 Wed Jun 6 08:43:23 2001 +++ php4/ext/dba/.cvsignore Thu Mar 7 09:18:25 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/dbase/.cvsignore diff -u php4/ext/dbase/.cvsignore:1.6 php4/ext/dbase/.cvsignore:1.7 --- php4/ext/dbase/.cvsignore:1.6 Wed Jun 6 08:43:23 2001 +++ php4/ext/dbase/.cvsignore Thu Mar 7 09:18:26 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/dbplus/.cvsignore diff -u php4/ext/dbplus/.cvsignore:1.1 php4/ext/dbplus/.cvsignore:1.2 --- php4/ext/dbplus/.cvsignore:1.1 Thu Jul 5 20:04:02 2001 +++ php4/ext/dbplus/.cvsignore Thu Mar 7 09:18:27 2002 @@ -3,4 +3,3 @@ *.lo *.la .libs -libs.mk Index: php4/ext/dbx/.cvsignore diff -u php4/ext/dbx/.cvsignore:1.2 php4/ext/dbx/.cvsignore:1.3 --- php4/ext/dbx/.cvsignore:1.2 Wed Jun 6 08:43:24 2001 +++ php4/ext/dbx/.cvsignore Thu Mar 7 09:18:28 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/dio/.cvsignore diff -u php4/ext/dio/.cvsignore:1.1 php4/ext/dio/.cvsignore:1.2 --- php4/ext/dio/.cvsignore:1.1 Tue Nov 6 07:24:09 2001 +++ php4/ext/dio/.cvsignore Thu Mar 7 09:18:29 2002 @@ -3,4 +3,3 @@ *.lo *.la .libs -libs.mk Index: php4/ext/domxml/.cvsignore diff -u php4/ext/domxml/.cvsignore:1.5 php4/ext/domxml/.cvsignore:1.6 --- php4/ext/domxml/.cvsignore:1.5 Wed Jun 6 08:43:24 2001 +++ php4/ext/domxml/.cvsignore Thu Mar 7 09:18:30 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.33 php4/ext/domxml/config.m4:1.34 --- php4/ext/domxml/config.m4:1.33 Fri Jan 18 02:58:47 2002 +++ php4/ext/domxml/config.m4 Thu Mar 7 09:18:30 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.33 2002/01/18 07:58:47 chregu Exp $ +dnl $Id: config.m4,v 1.34 2002/03/07 14:18:30 sas Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -104,7 +104,7 @@ DIR is the libxslt install directory.]) PHP_ARG_WITH(dom-exslt, for DOM EXSLT support, -[ --with-dom-exslt[=DIR] Include DOM EXSLT support (requires libxslt >= 1.0.3). +[ --with-dom-exslt[=DIR] Include DOM EXSLT support (requires libxslt >= 1.0.3). DIR is the libexslt install directory.]) if test "$PHP_DOM_XSLT" != "no"; then Index: php4/ext/exif/.cvsignore diff -u php4/ext/exif/.cvsignore:1.4 php4/ext/exif/.cvsignore:1.5 --- php4/ext/exif/.cvsignore:1.4 Thu Feb 28 23:01:25 2002 +++ php4/ext/exif/.cvsignore Thu Mar 7 09:18:32 2002 @@ -4,7 +4,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/fbsql/.cvsignore diff -u php4/ext/fbsql/.cvsignore:1.2 php4/ext/fbsql/.cvsignore:1.3 --- php4/ext/fbsql/.cvsignore:1.2 Wed Jun 6 08:43:24 2001 +++ php4/ext/fbsql/.cvsignore Thu Mar 7 09:18:33 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/fdf/.cvsignore diff -u php4/ext/fdf/.cvsignore:1.6 php4/ext/fdf/.cvsignore:1.7 --- php4/ext/fdf/.cvsignore:1.6 Wed Jun 6 08:43:24 2001 +++ php4/ext/fdf/.cvsignore Thu Mar 7 09:18:34 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/filepro/.cvsignore diff -u php4/ext/filepro/.cvsignore:1.6 php4/ext/filepro/.cvsignore:1.7 --- php4/ext/filepro/.cvsignore:1.6 Wed Jun 6 08:43:24 2001 +++ php4/ext/filepro/.cvsignore Thu Mar 7 09:18:35 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/fribidi/.cvsignore diff -u php4/ext/fribidi/.cvsignore:1.2 php4/ext/fribidi/.cvsignore:1.3 --- php4/ext/fribidi/.cvsignore:1.2 Wed Jun 6 08:43:24 2001 +++ php4/ext/fribidi/.cvsignore Thu Mar 7 09:18:36 2002 @@ -2,9 +2,7 @@ *.lo *.la .libs -Makefile.am .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/ftp/.cvsignore diff -u php4/ext/ftp/.cvsignore:1.6 php4/ext/ftp/.cvsignore:1.7 --- php4/ext/ftp/.cvsignore:1.6 Wed Jun 6 08:43:24 2001 +++ php4/ext/ftp/.cvsignore Thu Mar 7 09:18:38 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/gd/.cvsignore diff -u php4/ext/gd/.cvsignore:1.6 php4/ext/gd/.cvsignore:1.7 --- php4/ext/gd/.cvsignore:1.6 Wed Jun 6 08:43:25 2001 +++ php4/ext/gd/.cvsignore Thu Mar 7 09:18:38 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/gettext/.cvsignore diff -u php4/ext/gettext/.cvsignore:1.6 php4/ext/gettext/.cvsignore:1.7 --- php4/ext/gettext/.cvsignore:1.6 Wed Jun 6 08:43:25 2001 +++ php4/ext/gettext/.cvsignore Thu Mar 7 09:18:39 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/gmp/.cvsignore diff -u php4/ext/gmp/.cvsignore:1.3 php4/ext/gmp/.cvsignore:1.4 --- php4/ext/gmp/.cvsignore:1.3 Wed Jun 6 08:43:25 2001 +++ php4/ext/gmp/.cvsignore Thu Mar 7 09:18:40 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/hyperwave/.cvsignore diff -u php4/ext/hyperwave/.cvsignore:1.6 php4/ext/hyperwave/.cvsignore:1.7 --- php4/ext/hyperwave/.cvsignore:1.6 Wed Jun 6 08:43:25 2001 +++ php4/ext/hyperwave/.cvsignore Thu Mar 7 09:18:42 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/icap/.cvsignore diff -u php4/ext/icap/.cvsignore:1.6 php4/ext/icap/.cvsignore:1.7 --- php4/ext/icap/.cvsignore:1.6 Wed Jun 6 08:43:25 2001 +++ php4/ext/icap/.cvsignore Thu Mar 7 09:18:43 2002 @@ -2,7 +2,6 @@ .libs *.lo *.la -libs.mk *.plg *.opt *.ncb Index: php4/ext/iconv/.cvsignore diff -u php4/ext/iconv/.cvsignore:1.2 php4/ext/iconv/.cvsignore:1.3 --- php4/ext/iconv/.cvsignore:1.2 Wed Jun 6 08:43:25 2001 +++ php4/ext/iconv/.cvsignore Thu Mar 7 09:18:47 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/imap/.cvsignore diff -u php4/ext/imap/.cvsignore:1.7 php4/ext/imap/.cvsignore:1.8 --- php4/ext/imap/.cvsignore:1.7 Mon Aug 6 06:19:02 2001 +++ php4/ext/imap/.cvsignore Thu Mar 7 09:18:49 2002 @@ -4,7 +4,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/informix/.cvsignore diff -u php4/ext/informix/.cvsignore:1.6 php4/ext/informix/.cvsignore:1.7 --- php4/ext/informix/.cvsignore:1.6 Wed Jun 6 08:43:25 2001 +++ php4/ext/informix/.cvsignore Thu Mar 7 09:18:50 2002 @@ -4,7 +4,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/ingres_ii/.cvsignore diff -u php4/ext/ingres_ii/.cvsignore:1.3 php4/ext/ingres_ii/.cvsignore:1.4 --- php4/ext/ingres_ii/.cvsignore:1.3 Wed Jun 6 08:43:26 2001 +++ php4/ext/ingres_ii/.cvsignore Thu Mar 7 09:18:50 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/interbase/.cvsignore diff -u php4/ext/interbase/.cvsignore:1.6 php4/ext/interbase/.cvsignore:1.7 --- php4/ext/interbase/.cvsignore:1.6 Wed Jun 6 08:43:26 2001 +++ php4/ext/interbase/.cvsignore Thu Mar 7 09:18:51 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/ircg/.cvsignore diff -u php4/ext/ircg/.cvsignore:1.3 php4/ext/ircg/.cvsignore:1.4 --- php4/ext/ircg/.cvsignore:1.3 Wed Jun 6 08:43:26 2001 +++ php4/ext/ircg/.cvsignore Thu Mar 7 09:18:57 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/ircg/config.m4 diff -u php4/ext/ircg/config.m4:1.9 php4/ext/ircg/config.m4:1.10 --- php4/ext/ircg/config.m4:1.9 Thu Jan 24 07:55:08 2002 +++ php4/ext/ircg/config.m4 Thu Mar 7 09:18:57 2002 @@ -1,12 +1,12 @@ dnl -dnl $Id: config.m4,v 1.9 2002/01/24 12:55:08 sas Exp $ +dnl $Id: config.m4,v 1.10 2002/03/07 14:18:57 sas Exp $ dnl PHP_ARG_WITH(ircg, for IRCG support, [ --with-ircg Include IRCG support]) AC_ARG_WITH(ircg-config, -[ --with-ircg-config IRCG: Path to the ircg-config script], +[ --with-ircg-config=PATH IRCG: Path to the ircg-config script], [ IRCG_CONFIG=$withval ], [ IRCG_CONFIG=ircg-config ]) @@ -26,4 +26,5 @@ fi AC_DEFINE(HAVE_IRCG, 1, [Whether you want IRCG support]) PHP_EXTENSION(ircg, $ext_shared) + PHP_ADD_MAKEFILE_FRAGMENT fi Index: php4/ext/java/.cvsignore diff -u php4/ext/java/.cvsignore:1.7 php4/ext/java/.cvsignore:1.8 --- php4/ext/java/.cvsignore:1.7 Wed Jun 6 08:43:26 2001 +++ php4/ext/java/.cvsignore Thu Mar 7 09:18:59 2002 @@ -7,7 +7,6 @@ .libs net .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/ldap/.cvsignore diff -u php4/ext/ldap/.cvsignore:1.6 php4/ext/ldap/.cvsignore:1.7 --- php4/ext/ldap/.cvsignore:1.6 Wed Jun 6 08:43:26 2001 +++ php4/ext/ldap/.cvsignore Thu Mar 7 09:19:00 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/mbstring/.cvsignore diff -u php4/ext/mbstring/.cvsignore:1.2 php4/ext/mbstring/.cvsignore:1.3 --- php4/ext/mbstring/.cvsignore:1.2 Wed Jun 6 08:43:26 2001 +++ php4/ext/mbstring/.cvsignore Thu Mar 7 09:19:02 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/mcal/.cvsignore diff -u php4/ext/mcal/.cvsignore:1.6 php4/ext/mcal/.cvsignore:1.7 --- php4/ext/mcal/.cvsignore:1.6 Wed Jun 6 08:43:26 2001 +++ php4/ext/mcal/.cvsignore Thu Mar 7 09:19:04 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/mcrypt/.cvsignore diff -u php4/ext/mcrypt/.cvsignore:1.6 php4/ext/mcrypt/.cvsignore:1.7 --- php4/ext/mcrypt/.cvsignore:1.6 Wed Jun 6 08:43:27 2001 +++ php4/ext/mcrypt/.cvsignore Thu Mar 7 09:19:07 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/mhash/.cvsignore diff -u php4/ext/mhash/.cvsignore:1.6 php4/ext/mhash/.cvsignore:1.7 --- php4/ext/mhash/.cvsignore:1.6 Wed Jun 6 08:43:27 2001 +++ php4/ext/mhash/.cvsignore Thu Mar 7 09:19:10 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/ming/.cvsignore diff -u php4/ext/ming/.cvsignore:1.2 php4/ext/ming/.cvsignore:1.3 --- php4/ext/ming/.cvsignore:1.2 Wed Jun 6 08:43:27 2001 +++ php4/ext/ming/.cvsignore Thu Mar 7 09:19:13 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/mnogosearch/.cvsignore diff -u php4/ext/mnogosearch/.cvsignore:1.1 php4/ext/mnogosearch/.cvsignore:1.2 --- php4/ext/mnogosearch/.cvsignore:1.1 Wed Feb 7 05:41:39 2001 +++ php4/ext/mnogosearch/.cvsignore Thu Mar 7 09:19:18 2002 @@ -3,4 +3,3 @@ *.la .libs .deps -libs.mk Index: php4/ext/msession/.cvsignore diff -u php4/ext/msession/.cvsignore:1.1 php4/ext/msession/.cvsignore:1.2 --- php4/ext/msession/.cvsignore:1.1 Sun Sep 30 12:20:04 2001 +++ php4/ext/msession/.cvsignore Thu Mar 7 09:19:19 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/msql/.cvsignore diff -u php4/ext/msql/.cvsignore:1.6 php4/ext/msql/.cvsignore:1.7 --- php4/ext/msql/.cvsignore:1.6 Wed Jun 6 08:43:27 2001 +++ php4/ext/msql/.cvsignore Thu Mar 7 09:19:21 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/mssql/.cvsignore diff -u php4/ext/mssql/.cvsignore:1.7 php4/ext/mssql/.cvsignore:1.8 --- php4/ext/mssql/.cvsignore:1.7 Fri Jan 4 04:50:41 2002 +++ php4/ext/mssql/.cvsignore Thu Mar 7 09:19:21 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/muscat/.cvsignore diff -u php4/ext/muscat/.cvsignore:1.1 php4/ext/muscat/.cvsignore:1.2 --- php4/ext/muscat/.cvsignore:1.1 Wed Jun 6 08:43:27 2001 +++ php4/ext/muscat/.cvsignore Thu Mar 7 09:19:22 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/mysql/.cvsignore diff -u php4/ext/mysql/.cvsignore:1.5 php4/ext/mysql/.cvsignore:1.6 --- php4/ext/mysql/.cvsignore:1.5 Tue Nov 14 09:32:45 2000 +++ php4/ext/mysql/.cvsignore Thu Mar 7 09:19:23 2002 @@ -3,4 +3,3 @@ *.la .libs .deps -libs.mk Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.38 php4/ext/mysql/config.m4:1.39 --- php4/ext/mysql/config.m4:1.38 Fri Nov 30 13:59:45 2001 +++ php4/ext/mysql/config.m4 Thu Mar 7 09:19:23 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.38 2001/11/30 18:59:45 sniper Exp $ +dnl $Id: config.m4,v 1.39 2002/03/07 14:19:23 sas Exp $ dnl sinclude(ext/mysql/libmysql/acinclude.m4) @@ -39,21 +39,32 @@ [ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory. If unspecified, the bundled MySQL library will be used.], yes) +if test "$PHP_MYSQL" = "yes"; then + sources="libmysql/libmysql.c libmysql/errmsg.c libmysql/net.c libmysql/violite.c libmysql/password.c \ + libmysql/my_init.c libmysql/my_lib.c libmysql/my_static.c libmysql/my_malloc.c libmysql/my_realloc.c libmysql/my_create.c \ + libmysql/my_delete.c libmysql/my_tempnam.c libmysql/my_open.c libmysql/mf_casecnv.c libmysql/my_read.c \ + libmysql/my_write.c libmysql/errors.c libmysql/my_error.c libmysql/my_getwd.c libmysql/my_div.c libmysql/mf_pack.c \ + libmysql/my_messnc.c libmysql/mf_dirname.c libmysql/mf_fn_ext.c libmysql/mf_wcomp.c libmysql/typelib.c libmysql/safemalloc.c \ + libmysql/my_alloc.c libmysql/mf_format.c libmysql/mf_path.c libmysql/mf_unixpath.c libmysql/my_fopen.c libmysql/mf_loadpath.c \ + libmysql/my_pthread.c libmysql/my_thr_init.c libmysql/thr_mutex.c libmysql/mulalloc.c libmysql/string.c libmysql/default.c \ + libmysql/my_compress.c libmysql/array.c libmysql/my_once.c libmysql/list.c libmysql/my_net.c libmysql/dbug.c \ + libmysql/strmov.c libmysql/strxmov.c libmysql/strnmov.c libmysql/strmake.c libmysql/strend.c libmysql/strfill.c \ + libmysql/is_prefix.c libmysql/int2str.c libmysql/str2int.c libmysql/strinstr.c \ + libmysql/strcont.c libmysql/strcend.c libmysql/bchange.c libmysql/bmove.c libmysql/bmove_upp.c \ + libmysql/longlong2str.c libmysql/strtoull.c libmysql/strtoll.c libmysql/charset.c libmysql/ctype.c" +else + sources= +fi + if test "$PHP_MYSQL" != "no"; then AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) - PHP_EXTENSION(mysql,$ext_shared) + PHP_NEW_EXTENSION(mysql,php_mysql.c $sources, $ext_shared,,-I@ext_srcdir@/libmysql) fi if test "$PHP_MYSQL" = "yes"; then PHP_MYSQL_SOCK MYSQL_CHECKS - MYSQL_LIBADD=libmysql/libmysql_client.la - MYSQL_SHARED_LIBADD=libmysql/libmysql_client.la - MYSQL_SUBDIRS=libmysql - PHP_SUBST(MYSQL_LIBADD) - PHP_SUBST(MYSQL_SUBDIRS) - LIB_BUILD($ext_builddir/libmysql,$ext_shared,yes) - PHP_ADD_INCLUDE($ext_srcdir/libmysql) + PHP_ADD_BUILD_DIR($ext_builddir/libmysql) MYSQL_MODULE_TYPE=builtin elif test "$PHP_MYSQL" != "no"; then for i in $PHP_MYSQL; do Index: php4/ext/mysql/libmysql/.cvsignore diff -u php4/ext/mysql/libmysql/.cvsignore:1.7 php4/ext/mysql/libmysql/.cvsignore:1.8 --- php4/ext/mysql/libmysql/.cvsignore:1.7 Wed Jun 6 08:43:27 2001 +++ php4/ext/mysql/libmysql/.cvsignore Thu Mar 7 09:19:29 2002 @@ -9,7 +9,6 @@ config.status libmysql_client.la stamp-h -libs.mk *.plg *.opt *.ncb Index: php4/ext/mysql/libmysql/mysql.m4 diff -u php4/ext/mysql/libmysql/mysql.m4:1.2 php4/ext/mysql/libmysql/mysql.m4:1.3 --- php4/ext/mysql/libmysql/mysql.m4:1.2 Tue May 2 17:18:59 2000 +++ php4/ext/mysql/libmysql/mysql.m4 Thu Mar 7 09:19:29 2002 @@ -13,6 +13,4 @@ MYSQL_CHECK_PTHREAD_MUTEX_INIT MYSQL_CHECK_READDIR_R_ARGS MYSQL_CHECK_SIGWAIT_STYLE - -PHP_FAST_OUTPUT($ext_builddir/libmysql/Makefile) ]) Index: php4/ext/ncurses/.cvsignore diff -u php4/ext/ncurses/.cvsignore:1.1 php4/ext/ncurses/.cvsignore:1.2 --- php4/ext/ncurses/.cvsignore:1.1 Mon Jul 30 04:47:21 2001 +++ php4/ext/ncurses/.cvsignore Thu Mar 7 09:19:29 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/notes/.cvsignore diff -u php4/ext/notes/.cvsignore:1.1 php4/ext/notes/.cvsignore:1.2 --- php4/ext/notes/.cvsignore:1.1 Wed Jun 6 08:43:27 2001 +++ php4/ext/notes/.cvsignore Thu Mar 7 09:19:29 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/oci8/.cvsignore diff -u php4/ext/oci8/.cvsignore:1.6 php4/ext/oci8/.cvsignore:1.7 --- php4/ext/oci8/.cvsignore:1.6 Wed Jun 6 08:43:27 2001 +++ php4/ext/oci8/.cvsignore Thu Mar 7 09:19:29 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/odbc/.cvsignore diff -u php4/ext/odbc/.cvsignore:1.6 php4/ext/odbc/.cvsignore:1.7 --- php4/ext/odbc/.cvsignore:1.6 Wed Jun 6 08:43:27 2001 +++ php4/ext/odbc/.cvsignore Thu Mar 7 09:19:29 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/openssl/.cvsignore diff -u php4/ext/openssl/.cvsignore:1.3 php4/ext/openssl/.cvsignore:1.4 --- php4/ext/openssl/.cvsignore:1.3 Wed Jun 6 08:43:28 2001 +++ php4/ext/openssl/.cvsignore Thu Mar 7 09:19:30 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/oracle/.cvsignore diff -u php4/ext/oracle/.cvsignore:1.6 php4/ext/oracle/.cvsignore:1.7 --- php4/ext/oracle/.cvsignore:1.6 Wed Jun 6 08:43:28 2001 +++ php4/ext/oracle/.cvsignore Thu Mar 7 09:19:30 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/overload/.cvsignore diff -u php4/ext/overload/.cvsignore:1.2 php4/ext/overload/.cvsignore:1.3 --- php4/ext/overload/.cvsignore:1.2 Fri Oct 26 10:54:46 2001 +++ php4/ext/overload/.cvsignore Thu Mar 7 09:19:30 2002 @@ -28,7 +28,6 @@ config.guess ltconfig ltmain.sh -libs.mk *.slo *.lo *.la Index: php4/ext/ovrimos/.cvsignore diff -u php4/ext/ovrimos/.cvsignore:1.1 php4/ext/ovrimos/.cvsignore:1.2 --- php4/ext/ovrimos/.cvsignore:1.1 Wed Jun 6 08:43:28 2001 +++ php4/ext/ovrimos/.cvsignore Thu Mar 7 09:19:31 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/pcntl/.cvsignore diff -u php4/ext/pcntl/.cvsignore:1.1 php4/ext/pcntl/.cvsignore:1.2 --- php4/ext/pcntl/.cvsignore:1.1 Tue Jun 12 04:54:25 2001 +++ php4/ext/pcntl/.cvsignore Thu Mar 7 09:19:31 2002 @@ -3,4 +3,3 @@ *.lo *.la .libs -libs.mk Index: php4/ext/pcre/.cvsignore diff -u php4/ext/pcre/.cvsignore:1.6 php4/ext/pcre/.cvsignore:1.7 --- php4/ext/pcre/.cvsignore:1.6 Wed Jun 6 08:43:28 2001 +++ php4/ext/pcre/.cvsignore Thu Mar 7 09:19:31 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/pcre/config.m4 diff -u php4/ext/pcre/config.m4:1.26 php4/ext/pcre/config.m4:1.27 --- php4/ext/pcre/config.m4:1.26 Fri Nov 30 13:59:51 2001 +++ php4/ext/pcre/config.m4 Thu Mar 7 09:19:31 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.26 2001/11/30 18:59:51 sniper Exp $ +dnl $Id: config.m4,v 1.27 2002/03/07 14:19:31 sas Exp $ dnl dnl By default we'll compile and link against the bundled PCRE library @@ -12,16 +12,10 @@ if not using bundled library.],yes) if test "$PHP_PCRE_REGEX" != "no"; then - PHP_EXTENSION(pcre, $ext_shared) if test "$PHP_PCRE_REGEX" = "yes"; then - PCRE_LIBADD=pcrelib/libpcre.la - PCRE_SHARED_LIBADD=pcrelib/libpcre.la - PCRE_SUBDIRS=pcrelib - PHP_SUBST(PCRE_LIBADD) - PHP_SUBST(PCRE_SUBDIRS) + PHP_NEW_EXTENSION(pcre, pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -I@ext_srcdir@/pcrelib) + PHP_ADD_BUILD_DIR($ext_builddir/pcrelib) AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) - PHP_FAST_OUTPUT($ext_builddir/pcrelib/Makefile) - LIB_BUILD($ext_builddir/pcrelib,$ext_shared,yes) else test -f $PHP_PCRE_REGEX/pcre.h && PCRE_INCDIR=$PHP_PCRE_REGEX test -f $PHP_PCRE_REGEX/include/pcre.h && PCRE_INCDIR=$PHP_PCRE_REGEX/include @@ -52,8 +46,8 @@ PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD) - PHP_ADD_INCLUDE($PCRE_INCDIR) AC_DEFINE(HAVE_PCRE, 1, [ ]) + PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -I$PCRE_INCDIR) fi fi PHP_SUBST(PCRE_SHARED_LIBADD) Index: php4/ext/pcre/pcrelib/.cvsignore diff -u php4/ext/pcre/pcrelib/.cvsignore:1.6 php4/ext/pcre/pcrelib/.cvsignore:1.7 --- php4/ext/pcre/pcrelib/.cvsignore:1.6 Wed Jun 6 08:43:28 2001 +++ php4/ext/pcre/pcrelib/.cvsignore Thu Mar 7 09:19:32 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/pcre/pcrelib/doc/.cvsignore diff -u php4/ext/pcre/pcrelib/doc/.cvsignore:1.3 php4/ext/pcre/pcrelib/doc/.cvsignore:1.4 --- php4/ext/pcre/pcrelib/doc/.cvsignore:1.3 Tue Nov 14 09:32:47 2000 +++ php4/ext/pcre/pcrelib/doc/.cvsignore Thu Mar 7 09:19:32 2002 @@ -3,4 +3,3 @@ *.la .libs .deps -libs.mk Index: php4/ext/pcre/pcrelib/testdata/.cvsignore diff -u php4/ext/pcre/pcrelib/testdata/.cvsignore:1.3 php4/ext/pcre/pcrelib/testdata/.cvsignore:1.4 --- php4/ext/pcre/pcrelib/testdata/.cvsignore:1.3 Tue Nov 14 09:32:48 2000 +++ php4/ext/pcre/pcrelib/testdata/.cvsignore Thu Mar 7 09:19:32 2002 @@ -3,4 +3,3 @@ *.la .libs .deps -libs.mk Index: php4/ext/pdf/.cvsignore diff -u php4/ext/pdf/.cvsignore:1.6 php4/ext/pdf/.cvsignore:1.7 --- php4/ext/pdf/.cvsignore:1.6 Wed Jun 6 08:43:28 2001 +++ php4/ext/pdf/.cvsignore Thu Mar 7 09:19:33 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.27 php4/ext/pdf/config.m4:1.28 --- php4/ext/pdf/config.m4:1.27 Mon Dec 3 18:54:09 2001 +++ php4/ext/pdf/config.m4 Thu Mar 7 09:19:33 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.27 2001/12/03 23:54:09 sniper Exp $ +dnl $Id: config.m4,v 1.28 2002/03/07 14:19:33 sas Exp $ dnl PHP_ARG_WITH(pdflib,for PDFlib support, @@ -17,7 +17,8 @@ dnl # libjpeg PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, - [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. (OPTIONAL for PDFlib v4)]) + [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. + (OPTIONAL for PDFlib v4)]) if test "$PHP_JPEG_DIR" != "no"; then PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, @@ -35,7 +36,8 @@ dnl # libpng PHP_ARG_WITH(png-dir, for the location of libpng, - [ --with-png-dir[=DIR] PDFLIB: define libpng install directory. (OPTIONAL for PDFlib v4)]) + [ --with-png-dir[=DIR] PDFLIB: define libpng install directory. + (OPTIONAL for PDFlib v4)]) if test "$PHP_PNG_DIR" != "no"; then PHP_CHECK_LIBRARY(png,png_create_info_struct, @@ -53,7 +55,8 @@ dnl # libtiff PHP_ARG_WITH(tiff-dir, for the location of libtiff, - [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. (OPTIONAL for PDFlib v4)]) + [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. + (OPTIONAL for PDFlib v4)]) if test "$PHP_TIFF_DIR" != "no"; then PHP_CHECK_LIBRARY(tiff,TIFFOpen, Index: php4/ext/pfpro/.cvsignore diff -u php4/ext/pfpro/.cvsignore:1.3 php4/ext/pfpro/.cvsignore:1.4 --- php4/ext/pfpro/.cvsignore:1.3 Wed Jun 6 08:43:28 2001 +++ php4/ext/pfpro/.cvsignore Thu Mar 7 09:19:33 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/pgsql/.cvsignore diff -u php4/ext/pgsql/.cvsignore:1.6 php4/ext/pgsql/.cvsignore:1.7 --- php4/ext/pgsql/.cvsignore:1.6 Wed Jun 6 08:43:28 2001 +++ php4/ext/pgsql/.cvsignore Thu Mar 7 09:19:34 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/posix/.cvsignore diff -u php4/ext/posix/.cvsignore:1.6 php4/ext/posix/.cvsignore:1.7 --- php4/ext/posix/.cvsignore:1.6 Wed Jun 6 08:43:29 2001 +++ php4/ext/posix/.cvsignore Thu Mar 7 09:19:34 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/pspell/.cvsignore diff -u php4/ext/pspell/.cvsignore:1.3 php4/ext/pspell/.cvsignore:1.4 --- php4/ext/pspell/.cvsignore:1.3 Wed Jun 6 08:43:29 2001 +++ php4/ext/pspell/.cvsignore Thu Mar 7 09:19:34 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/qtdom/.cvsignore diff -u php4/ext/qtdom/.cvsignore:1.3 php4/ext/qtdom/.cvsignore:1.4 --- php4/ext/qtdom/.cvsignore:1.3 Wed Jun 6 08:43:29 2001 +++ php4/ext/qtdom/.cvsignore Thu Mar 7 09:19:34 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/readline/.cvsignore diff -u php4/ext/readline/.cvsignore:1.7 php4/ext/readline/.cvsignore:1.8 --- php4/ext/readline/.cvsignore:1.7 Sat Jan 19 20:58:14 2002 +++ php4/ext/readline/.cvsignore Thu Mar 7 09:19:35 2002 @@ -4,7 +4,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/recode/.cvsignore diff -u php4/ext/recode/.cvsignore:1.5 php4/ext/recode/.cvsignore:1.6 --- php4/ext/recode/.cvsignore:1.5 Wed Jun 6 08:43:29 2001 +++ php4/ext/recode/.cvsignore Thu Mar 7 09:19:35 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/session/.cvsignore diff -u php4/ext/session/.cvsignore:1.6 php4/ext/session/.cvsignore:1.7 --- php4/ext/session/.cvsignore:1.6 Wed Jun 6 08:43:30 2001 +++ php4/ext/session/.cvsignore Thu Mar 7 09:19:35 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/session/config.m4 diff -u php4/ext/session/config.m4:1.16 php4/ext/session/config.m4:1.17 --- php4/ext/session/config.m4:1.16 Fri Nov 30 13:59:56 2001 +++ php4/ext/session/config.m4 Thu Mar 7 09:19:36 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.16 2001/11/30 18:59:56 sniper Exp $ +dnl $Id: config.m4,v 1.17 2002/03/07 14:19:36 sas Exp $ dnl PHP_ARG_ENABLE(session, whether to enable PHP sessions, @@ -29,7 +29,7 @@ AC_CHECK_FUNCS(pread pwrite) PHP_MISSING_PWRITE_DECL PHP_MISSING_PREAD_DECL - PHP_EXTENSION(session,$ext_shared) + PHP_NEW_EXTENSION(session, session.c mod_files.c mod_mm.c mod_user.c, $ext_shared) PHP_SUBST(SESSION_SHARED_LIBADD) AC_DEFINE(HAVE_PHP_SESSION,1,[ ]) fi Index: php4/ext/shmop/.cvsignore diff -u php4/ext/shmop/.cvsignore:1.2 php4/ext/shmop/.cvsignore:1.3 --- php4/ext/shmop/.cvsignore:1.2 Wed Jun 6 08:43:30 2001 +++ php4/ext/shmop/.cvsignore Thu Mar 7 09:19:36 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/skeleton/.cvsignore diff -u php4/ext/skeleton/.cvsignore:1.1 php4/ext/skeleton/.cvsignore:1.2 --- php4/ext/skeleton/.cvsignore:1.1 Wed Jun 6 08:43:30 2001 +++ php4/ext/skeleton/.cvsignore Thu Mar 7 09:19:36 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/snmp/.cvsignore diff -u php4/ext/snmp/.cvsignore:1.6 php4/ext/snmp/.cvsignore:1.7 --- php4/ext/snmp/.cvsignore:1.6 Wed Jun 6 08:43:30 2001 +++ php4/ext/snmp/.cvsignore Thu Mar 7 09:19:37 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/sockets/.cvsignore diff -u php4/ext/sockets/.cvsignore:1.3 php4/ext/sockets/.cvsignore:1.4 --- php4/ext/sockets/.cvsignore:1.3 Wed Jun 6 08:43:30 2001 +++ php4/ext/sockets/.cvsignore Thu Mar 7 09:19:38 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/standard/.cvsignore diff -u php4/ext/standard/.cvsignore:1.8 php4/ext/standard/.cvsignore:1.9 --- php4/ext/standard/.cvsignore:1.8 Wed Jun 6 08:43:30 2001 +++ php4/ext/standard/.cvsignore Thu Mar 7 09:19:38 2002 @@ -6,7 +6,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.31 php4/ext/standard/config.m4:1.32 --- php4/ext/standard/config.m4:1.31 Tue Sep 11 22:07:46 2001 +++ php4/ext/standard/config.m4 Thu Mar 7 09:19:38 2002 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.31 2001/09/12 02:07:46 sniper Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.32 2002/03/07 14:19:38 sas Exp $ -*- sh -*- divert(3)dnl @@ -233,4 +233,14 @@ AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function]) fi -PHP_EXTENSION(standard) +PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.c crypt.c cyr_convert.c datetime.c \ + dir.c dl.c dns.c exec.c file.c filestat.c flock_compat.c \ + formatted_print.c fsock.c head.c html.c image.c info.c iptc.c lcg.c \ + link.c mail.c math.c md5.c metaphone.c microtime.c pack.c pageinfo.c \ + parsedate.c quot_print.c rand.c reg.c soundex.c string.c scanf.c \ + syslog.c type.c uniqid.c url.c url_scanner.c var.c versioning.c assert.c \ + strnatcmp.c levenshtein.c incomplete_class.c url_scanner_ex.c \ + ftp_fopen_wrapper.c http_fopen_wrapper.c php_fopen_wrapper.c credits.c \ + var_unserializer.c ftok.c aggregation.c) + +PHP_ADD_MAKEFILE_FRAGMENT Index: php4/ext/swf/.cvsignore diff -u php4/ext/swf/.cvsignore:1.4 php4/ext/swf/.cvsignore:1.5 --- php4/ext/swf/.cvsignore:1.4 Wed Jun 6 08:43:30 2001 +++ php4/ext/swf/.cvsignore Thu Mar 7 09:19:39 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/sybase/.cvsignore diff -u php4/ext/sybase/.cvsignore:1.6 php4/ext/sybase/.cvsignore:1.7 --- php4/ext/sybase/.cvsignore:1.6 Wed Jun 6 08:43:30 2001 +++ php4/ext/sybase/.cvsignore Thu Mar 7 09:19:39 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/sybase_ct/.cvsignore diff -u php4/ext/sybase_ct/.cvsignore:1.6 php4/ext/sybase_ct/.cvsignore:1.7 --- php4/ext/sybase_ct/.cvsignore:1.6 Wed Jun 6 08:43:30 2001 +++ php4/ext/sybase_ct/.cvsignore Thu Mar 7 09:19:40 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/sysvsem/.cvsignore diff -u php4/ext/sysvsem/.cvsignore:1.6 php4/ext/sysvsem/.cvsignore:1.7 --- php4/ext/sysvsem/.cvsignore:1.6 Wed Jun 6 08:43:31 2001 +++ php4/ext/sysvsem/.cvsignore Thu Mar 7 09:19:40 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/sysvshm/.cvsignore diff -u php4/ext/sysvshm/.cvsignore:1.6 php4/ext/sysvshm/.cvsignore:1.7 --- php4/ext/sysvshm/.cvsignore:1.6 Wed Jun 6 08:43:31 2001 +++ php4/ext/sysvshm/.cvsignore Thu Mar 7 09:19:40 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/vpopmail/.cvsignore diff -u php4/ext/vpopmail/.cvsignore:1.2 php4/ext/vpopmail/.cvsignore:1.3 --- php4/ext/vpopmail/.cvsignore:1.2 Wed Jun 6 08:43:31 2001 +++ php4/ext/vpopmail/.cvsignore Thu Mar 7 09:19:40 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/w32api/.cvsignore diff -u php4/ext/w32api/.cvsignore:1.1 php4/ext/w32api/.cvsignore:1.2 --- php4/ext/w32api/.cvsignore:1.1 Wed Nov 7 09:30:56 2001 +++ php4/ext/w32api/.cvsignore Thu Mar 7 09:19:41 2002 @@ -3,7 +3,6 @@ *.lo *.la .libs -libs.mk *.plg *.opt *.ncb Index: php4/ext/wddx/.cvsignore diff -u php4/ext/wddx/.cvsignore:1.6 php4/ext/wddx/.cvsignore:1.7 --- php4/ext/wddx/.cvsignore:1.6 Wed Jun 6 08:43:31 2001 +++ php4/ext/wddx/.cvsignore Thu Mar 7 09:19:41 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/xml/.cvsignore diff -u php4/ext/xml/.cvsignore:1.6 php4/ext/xml/.cvsignore:1.7 --- php4/ext/xml/.cvsignore:1.6 Wed Jun 6 08:43:31 2001 +++ php4/ext/xml/.cvsignore Thu Mar 7 09:19:42 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.33 php4/ext/xml/config.m4:1.34 --- php4/ext/xml/config.m4:1.33 Fri Nov 30 14:00:06 2001 +++ php4/ext/xml/config.m4 Thu Mar 7 09:19:42 2002 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.33 2001/11/30 19:00:06 sniper Exp $ +dnl $Id: config.m4,v 1.34 2002/03/07 14:19:42 sas Exp $ dnl dnl Fallback for --with-xml[=DIR] -AC_ARG_WITH(xml,[],enable_xml=$withval) +dnl PHP_ARG_WITH(xml,[],enable_xml=$withval) AC_C_BIGENDIAN @@ -20,27 +20,15 @@ [ --with-expat-dir=DIR XML: external libexpat install dir]) if test "$PHP_XML" = "yes"; then + AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) if test "$PHP_EXPAT_DIR" = "no"; then - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) AC_DEFINE(HAVE_LIBEXPAT_BUNDLED, 1, [ ]) - XML_CPPFLAGS=-DXML_BYTE_ORDER=$order - EXPAT_INTERNAL_LIBADD=expat/libexpat.la - PHP_SUBST(EXPAT_INTERNAL_LIBADD) - PHP_SUBST(XML_CPPFLAGS) - EXPAT_SUBDIRS=expat - PHP_SUBST(EXPAT_SUBDIRS) - PHP_SUBST(EXPAT_SHARED_LIBADD) - PHP_EXTENSION(xml, $ext_shared) - LIB_BUILD($ext_builddir/expat,$ext_shared,yes) - PHP_ADD_INCLUDE($ext_srcdir/expat) - PHP_FAST_OUTPUT($ext_builddir/expat/Makefile) - + PHP_NEW_EXTENSION(xml, xml.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c, $ext_shared,, -I@ext_srcdir@/expat -DXML_BYTE_ORDER=$order) + PHP_ADD_BUILD_DIR($ext_builddir/expat) else - PHP_EXTENSION(xml, $ext_shared) - PHP_SUBST(EXPAT_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) + PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) for i in $PHP_XML $PHP_EXPAT_DIR; do if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then @@ -54,5 +42,6 @@ PHP_ADD_INCLUDE($EXPAT_DIR/include) PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, EXPAT_SHARED_LIBADD) + PHP_SUBST(EXPAT_SHARED_LIBADD) fi fi Index: php4/ext/xml/expat/.cvsignore diff -u php4/ext/xml/expat/.cvsignore:1.3 php4/ext/xml/expat/.cvsignore:1.4 --- php4/ext/xml/expat/.cvsignore:1.3 Tue Nov 14 09:32:57 2000 +++ php4/ext/xml/expat/.cvsignore Thu Mar 7 09:19:42 2002 @@ -3,4 +3,3 @@ *.lo *.la .deps -libs.mk Index: php4/ext/xmlrpc/.cvsignore diff -u php4/ext/xmlrpc/.cvsignore:1.2 php4/ext/xmlrpc/.cvsignore:1.3 --- php4/ext/xmlrpc/.cvsignore:1.2 Tue Dec 4 08:19:03 2001 +++ php4/ext/xmlrpc/.cvsignore Thu Mar 7 09:19:43 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/xmlrpc/config.m4 diff -u php4/ext/xmlrpc/config.m4:1.8 php4/ext/xmlrpc/config.m4:1.9 --- php4/ext/xmlrpc/config.m4:1.8 Fri Jan 25 14:56:47 2002 +++ php4/ext/xmlrpc/config.m4 Thu Mar 7 09:19:43 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8 2002/01/25 19:56:47 derick Exp $ +dnl $Id: config.m4,v 1.9 2002/03/07 14:19:43 sas Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -15,7 +15,6 @@ if test "$PHP_XMLRPC" != "no"; then - PHP_EXTENSION(xmlrpc, $ext_shared) PHP_SUBST(XMLRPC_SHARED_LIBADD) AC_DEFINE(HAVE_XMLRPC,1,[ ]) @@ -54,13 +53,14 @@ if test "$PHP_XMLRPC" = "yes"; then XMLRPC_CHECKS - XMLRPC_LIBADD=libxmlrpc/libxmlrpc.la - XMLRPC_SHARED_LIBADD=libxmlrpc/libxmlrpc.la - XMLRPC_SUBDIRS=libxmlrpc - PHP_SUBST(XMLRPC_LIBADD) - PHP_SUBST(XMLRPC_SUBDIRS) - LIB_BUILD($ext_builddir/libxmlrpc,$ext_shared,yes) - PHP_ADD_INCLUDE($ext_srcdir/libxmlrpc) + PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c libxmlrpc/base64.c \ + libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ + libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ + libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ + libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ + libxmlrpc/xml_to_soap.c,$ext_shared,, + -I@ext_srcdir@/libxmlrpc -DVERSION="0.50") + PHP_ADD_BUILD_DIR($ext_builddir/libxmlrpc) XMLRPC_MODULE_TYPE=builtin elif test "$PHP_XMLRPC" != "no"; then Index: php4/ext/xmlrpc/libxmlrpc/xmlrpc.m4 diff -u php4/ext/xmlrpc/libxmlrpc/xmlrpc.m4:1.2 php4/ext/xmlrpc/libxmlrpc/xmlrpc.m4:1.3 --- php4/ext/xmlrpc/libxmlrpc/xmlrpc.m4:1.2 Thu Sep 6 05:36:57 2001 +++ php4/ext/xmlrpc/libxmlrpc/xmlrpc.m4 Thu Mar 7 09:19:43 2002 @@ -9,6 +9,4 @@ XMLRPC_HEADER_CHECKS XMLRPC_TYPE_CHECKS XMLRPC_FUNCTION_CHECKS - -PHP_FAST_OUTPUT($ext_builddir/libxmlrpc/Makefile) ]) Index: php4/ext/xslt/.cvsignore diff -u php4/ext/xslt/.cvsignore:1.2 php4/ext/xslt/.cvsignore:1.3 --- php4/ext/xslt/.cvsignore:1.2 Wed Jun 6 08:43:31 2001 +++ php4/ext/xslt/.cvsignore Thu Mar 7 09:19:44 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/yaz/.cvsignore diff -u php4/ext/yaz/.cvsignore:1.2 php4/ext/yaz/.cvsignore:1.3 --- php4/ext/yaz/.cvsignore:1.2 Wed Jun 6 08:43:31 2001 +++ php4/ext/yaz/.cvsignore Thu Mar 7 09:19:44 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/yp/.cvsignore diff -u php4/ext/yp/.cvsignore:1.6 php4/ext/yp/.cvsignore:1.7 --- php4/ext/yp/.cvsignore:1.6 Wed Jun 6 08:43:31 2001 +++ php4/ext/yp/.cvsignore Thu Mar 7 09:19:44 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/zip/.cvsignore diff -u php4/ext/zip/.cvsignore:1.2 php4/ext/zip/.cvsignore:1.3 --- php4/ext/zip/.cvsignore:1.2 Wed Jun 6 08:43:32 2001 +++ php4/ext/zip/.cvsignore Thu Mar 7 09:19:44 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/ext/zlib/.cvsignore diff -u php4/ext/zlib/.cvsignore:1.6 php4/ext/zlib/.cvsignore:1.7 --- php4/ext/zlib/.cvsignore:1.6 Wed Jun 6 08:43:32 2001 +++ php4/ext/zlib/.cvsignore Thu Mar 7 09:19:45 2002 @@ -3,7 +3,6 @@ *.la .libs .deps -libs.mk *.plg *.opt *.ncb Index: php4/pear/.cvsignore diff -u php4/pear/.cvsignore:1.7 php4/pear/.cvsignore:1.8 --- php4/pear/.cvsignore:1.7 Sat Apr 21 21:09:13 2001 +++ php4/pear/.cvsignore Thu Mar 7 09:19:45 2002 @@ -1,5 +1,4 @@ Makefile -Makefile.am .deps phpize run-tests Index: php4/pear/pear.m4 diff -u php4/pear/pear.m4:1.10 php4/pear/pear.m4:1.11 --- php4/pear/pear.m4:1.10 Wed Dec 12 15:26:13 2001 +++ php4/pear/pear.m4 Thu Mar 7 09:19:45 2002 @@ -1,5 +1,8 @@ +dnl This file becomes configure.in for self-contained extensions. -AC_INIT(Makefile.in) +AC_INIT(config.m4) + +PHP_INIT_BUILD_SYSTEM AC_DEFUN(PHP_WITH_PHP_CONFIG,[ AC_ARG_WITH(php-config, @@ -25,6 +28,7 @@ ]) abs_srcdir=`(cd $srcdir && pwd)` +abs_builddir=`pwd` php_always_shared=yes @@ -35,6 +39,8 @@ PHP_WITH_PHP_CONFIG +PHP_BUILD_SHARED + AC_PREFIX_DEFAULT() sinclude(config.m4) @@ -44,14 +50,18 @@ AC_PROG_LIBTOOL -SHARED_LIBTOOL='$(LIBTOOL)' -PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' +all_targets='$(PHP_MODULES)' +install_targets=install-modules phplibdir="`pwd`/modules" CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H" test "$prefix" = "NONE" && prefix="/usr/local" test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)' +PHP_SUBST(PHP_MODULES) +PHP_SUBST(all_targets) +PHP_SUBST(install_targets) + PHP_SUBST(prefix) PHP_SUBST(exec_prefix) PHP_SUBST(libdir) @@ -76,10 +86,8 @@ PHP_SUBST(LIBTOOL) PHP_SUBST(SHELL) -PHP_FAST_OUTPUT(Makefile) - -PHP_GEN_CONFIG_VARS -PHP_GEN_MAKEFILES($PHP_FAST_OUTPUT_FILES) +PHP_GEN_BUILD_DIRS +PHP_GEN_GLOBAL_MAKEFILE test -d modules || mkdir modules touch .deps Index: php4/pear/scripts/phpize.in diff -u php4/pear/scripts/phpize.in:1.1 php4/pear/scripts/phpize.in:1.2 --- php4/pear/scripts/phpize.in:1.1 Tue Jan 9 20:01:59 2001 +++ php4/pear/scripts/phpize.in Thu Mar 7 09:19:46 2002 @@ -3,8 +3,8 @@ prefix='@prefix@' phpdir="$prefix/lib/php/build" builddir="`pwd`" -FILES_BUILD="dynlib.mk fastgen.sh library.mk ltlib.mk mkdep.awk program.mk rules.mk rules_common.mk rules_pear.mk shtool" -FILES="acinclude.m4 dynlib.m4" +FILES_BUILD="mkdep.awk shtool" +FILES="acinclude.m4 Makefile.global scan_makefile_in.awk" if test ! -r config.m4; then echo "Cannot find config.m4. " @@ -16,8 +16,6 @@ (cd $phpdir && cp $FILES_BUILD $builddir/build) (cd $phpdir && cp $FILES $builddir) - -mv build/rules_pear.mk build/rules.mk sed \ -e "s#@prefix@#$prefix#" \ Index: php4/regex/.cvsignore diff -u php4/regex/.cvsignore:1.5 php4/regex/.cvsignore:1.6 --- php4/regex/.cvsignore:1.5 Wed Jun 6 08:43:32 2001 +++ php4/regex/.cvsignore Thu Mar 7 09:19:46 2002 @@ -2,7 +2,6 @@ *.lo *.la .libs -Makefile.am .deps *.plg *.opt Index: php4/sapi/.cvsignore diff -u php4/sapi/.cvsignore:1.3 php4/sapi/.cvsignore:1.4 --- php4/sapi/.cvsignore:1.3 Wed Jun 6 08:43:32 2001 +++ php4/sapi/.cvsignore Thu Mar 7 09:19:46 2002 @@ -1,5 +1,4 @@ Makefile -Makefile.am .deps *.plg *.opt Index: php4/sapi/aolserver/.cvsignore diff -u php4/sapi/aolserver/.cvsignore:1.4 php4/sapi/aolserver/.cvsignore:1.5 --- php4/sapi/aolserver/.cvsignore:1.4 Wed Jun 6 08:43:32 2001 +++ php4/sapi/aolserver/.cvsignore Thu Mar 7 09:19:47 2002 @@ -2,7 +2,6 @@ .libs *.la *.lo -Makefile.am .deps *.plg *.opt Index: php4/sapi/aolserver/config.m4 diff -u php4/sapi/aolserver/config.m4:1.14 php4/sapi/aolserver/config.m4:1.15 --- php4/sapi/aolserver/config.m4:1.14 Fri Nov 30 14:01:28 2001 +++ php4/sapi/aolserver/config.m4 Thu Mar 7 09:19:47 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.14 2001/11/30 19:01:28 sniper Exp $ +dnl $Id: config.m4,v 1.15 2002/03/07 14:19:47 sas Exp $ dnl AC_MSG_CHECKING(for AOLserver support) @@ -24,8 +24,7 @@ PHP_BUILD_THREAD_SAFE PHP_ADD_INCLUDE($PHP_AOLSERVER_SRC/include) AC_DEFINE(HAVE_AOLSERVER,1,[Whether you have AOLserver]) - PHP_SAPI=aolserver - PHP_BUILD_SHARED + PHP_SELECT_SAPI(aolserver, shared, aolserver.c) INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_AOLSERVER/bin/" fi Index: php4/sapi/apache/.cvsignore diff -u php4/sapi/apache/.cvsignore:1.5 php4/sapi/apache/.cvsignore:1.6 --- php4/sapi/apache/.cvsignore:1.5 Wed Jun 6 08:43:32 2001 +++ php4/sapi/apache/.cvsignore Thu Mar 7 09:19:47 2002 @@ -3,7 +3,6 @@ .libs *.la *.lo -Makefile.am .deps Release_TS_inline Release_TS Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.47 php4/sapi/apache/config.m4:1.48 --- php4/sapi/apache/config.m4:1.47 Mon Mar 4 12:46:19 2002 +++ php4/sapi/apache/config.m4 Thu Mar 7 09:19:47 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.47 2002/03/04 17:46:19 derick Exp $ +dnl $Id: config.m4,v 1.48 2002/03/07 14:19:47 sas Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -39,7 +39,7 @@ esac done PHP_ADD_INCLUDE($APXS_INCLUDEDIR) - PHP_SAPI=apache + PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c) # Test whether apxs support -S option $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 @@ -50,7 +50,6 @@ APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php4 $SAPI_SHARED" fi - PHP_BUILD_SHARED if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then PHP_APXS_BROKEN=yes fi @@ -86,7 +85,7 @@ if test -f $withval/src/httpd.h; then APACHE_INCLUDE=-I$withval/src APACHE_TARGET=$withval/src - PHP_SAPI=apache + PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4.c php_apache.c) APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET" PHP_LIBS="-L. -lphp3" AC_MSG_RESULT(yes - Apache 1.2.x) @@ -103,7 +102,7 @@ if test ! -d $APACHE_TARGET; then mkdir $APACHE_TARGET fi - PHP_SAPI=apache + PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4.c php_apache.c) APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4" AC_MSG_RESULT(yes - Apache 2.0.X) @@ -129,7 +128,7 @@ if test ! -d $APACHE_TARGET; then mkdir $APACHE_TARGET fi - PHP_SAPI=apache + PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4.c php_apache.c) APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4" AC_MSG_RESULT(yes - Apache 1.3.x) @@ -155,7 +154,7 @@ if test ! -d $APACHE_TARGET; then mkdir $APACHE_TARGET fi - PHP_SAPI=apache + PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4.c php_apache.c) PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4" APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" AC_MSG_RESULT(yes - Apache 1.3.x) @@ -177,7 +176,7 @@ elif test -f $withval/apache/httpd.h; then APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include" APACHE_TARGET=$withval/apache - PHP_SAPI=apache + PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4.c php_apache.c) PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4" APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET" STRONGHOLD=-DSTRONGHOLD=1 @@ -235,7 +234,6 @@ PHP_TARGET_RDYNAMIC $php_shtool mkdir -p sapi/apache PHP_OUTPUT(sapi/apache/libphp4.module) - PHP_BUILD_STATIC fi if test -n "$APACHE_INSTALL"; then Index: php4/sapi/apache2filter/.cvsignore diff -u php4/sapi/apache2filter/.cvsignore:1.1 php4/sapi/apache2filter/.cvsignore:1.2 --- php4/sapi/apache2filter/.cvsignore:1.1 Wed Jun 6 08:43:32 2001 +++ php4/sapi/apache2filter/.cvsignore Thu Mar 7 09:19:49 2002 @@ -3,7 +3,6 @@ .libs *.la *.lo -Makefile.am .deps *.plg *.opt Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.6 php4/sapi/apache2filter/config.m4:1.7 --- php4/sapi/apache2filter/config.m4:1.6 Fri Nov 30 14:01:30 2001 +++ php4/sapi/apache2filter/config.m4 Thu Mar 7 09:19:50 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.6 2001/11/30 19:01:30 sniper Exp $ +dnl $Id: config.m4,v 1.7 2002/03/07 14:19:50 sas Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -39,10 +39,9 @@ esac done PHP_ADD_INCLUDE($APXS_INCLUDEDIR) - PHP_SAPI=apache2filter INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL" - PHP_BUILD_SHARED PHP_BUILD_THREAD_SAFE + PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c) AC_MSG_RESULT(yes) case $host_alias in *aix*) Index: php4/sapi/caudium/.cvsignore diff -u php4/sapi/caudium/.cvsignore:1.2 php4/sapi/caudium/.cvsignore:1.3 --- php4/sapi/caudium/.cvsignore:1.2 Wed Jun 6 08:43:33 2001 +++ php4/sapi/caudium/.cvsignore Thu Mar 7 09:19:50 2002 @@ -3,7 +3,6 @@ .libs *.la *.lo -Makefile.am .deps *.plg *.opt Index: php4/sapi/caudium/config.m4 diff -u php4/sapi/caudium/config.m4:1.10 php4/sapi/caudium/config.m4:1.11 --- php4/sapi/caudium/config.m4:1.10 Fri Nov 30 14:01:30 2001 +++ php4/sapi/caudium/config.m4 Thu Mar 7 09:19:50 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.10 2001/11/30 19:01:30 sniper Exp $ +dnl $Id: config.m4,v 1.11 2002/03/07 14:19:50 sas Exp $ dnl RESULT=no @@ -82,8 +82,7 @@ fi PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` AC_DEFINE(HAVE_CAUDIUM,1,[Whether to compile with Caudium support]) - PHP_SAPI=caudium - PHP_BUILD_SHARED + PHP_SELECT_SAPI(caudium, shared, caudium.c) INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/lib/$PIKE_VERSION/PHP4.so" RESULT=" *** Pike binary used: $PIKE *** Pike include dir(s) used: $PIKE_INCLUDE_DIR Index: php4/sapi/cgi/.cvsignore diff -u php4/sapi/cgi/.cvsignore:1.4 php4/sapi/cgi/.cvsignore:1.5 --- php4/sapi/cgi/.cvsignore:1.4 Wed Jun 6 08:43:33 2001 +++ php4/sapi/cgi/.cvsignore Thu Mar 7 09:19:50 2002 @@ -2,7 +2,6 @@ .libs *.la *.lo -Makefile.am .deps Release_TS_inline Release_TS Index: php4/sapi/cgi/config.m4 diff -u php4/sapi/cgi/config.m4:1.12 php4/sapi/cgi/config.m4:1.13 --- php4/sapi/cgi/config.m4:1.12 Thu Feb 28 06:48:39 2002 +++ php4/sapi/cgi/config.m4 Thu Mar 7 09:19:51 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.12 2002/02/28 11:48:39 edink Exp $ +dnl $Id: config.m4,v 1.13 2002/03/07 14:19:51 sas Exp $ dnl AC_DEFUN(PHP_TEST_WRITE_STDOUT,[ @@ -31,7 +31,7 @@ fi ]) -if test "$PHP_SAPI" = "cgi"; then +if test "$PHP_SAPI" = "default"; then PHP_TEST_WRITE_STDOUT @@ -61,9 +61,6 @@ fi AC_DEFINE_UNQUOTED(DISCARD_PATH, $DISCARD_PATH, [ ]) -fi - -if test "$PHP_SAPI" = "cgi" ; then INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(INSTALL_ROOT)\$(bindir)/php-cgi" fi Index: php4/sapi/cli/.cvsignore diff -u php4/sapi/cli/.cvsignore:1.2 php4/sapi/cli/.cvsignore:1.3 --- php4/sapi/cli/.cvsignore:1.2 Sat Jan 12 09:51:54 2002 +++ php4/sapi/cli/.cvsignore Thu Mar 7 09:19:51 2002 @@ -2,7 +2,6 @@ .libs *.la *.lo -Makefile.am .deps Release_TS_inline Release_TS Index: php4/sapi/cli/config.m4 diff -u php4/sapi/cli/config.m4:1.3 php4/sapi/cli/config.m4:1.4 --- php4/sapi/cli/config.m4:1.3 Thu Jan 24 12:55:13 2002 +++ php4/sapi/cli/config.m4 Thu Mar 7 09:19:51 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.3 2002/01/24 17:55:13 edink Exp $ +dnl $Id: config.m4,v 1.4 2002/03/07 14:19:51 sas Exp $ dnl AC_MSG_CHECKING(for CLI build) @@ -17,7 +17,8 @@ ) if test "$PHP_SAPI_CLI" != "no"; then - INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 sapi/cli/php \$(INSTALL_ROOT)\$(bindir)/php" + INSTALL_CLI="\$(INSTALL) -m 0755 sapi/cli/php \$(INSTALL_ROOT)\$(bindir)/php" + PHP_SUBST(INSTALL_CLI) else PHP_DISABLE_CLI fi Index: php4/sapi/fastcgi/.cvsignore diff -u php4/sapi/fastcgi/.cvsignore:1.1 php4/sapi/fastcgi/.cvsignore:1.2 --- php4/sapi/fastcgi/.cvsignore:1.1 Wed Jun 6 08:43:33 2001 +++ php4/sapi/fastcgi/.cvsignore Thu Mar 7 09:19:51 2002 @@ -2,7 +2,6 @@ .libs *.la *.lo -Makefile.am .deps *.plg *.opt Index: php4/sapi/fastcgi/config.m4 diff -u php4/sapi/fastcgi/config.m4:1.4 php4/sapi/fastcgi/config.m4:1.5 --- php4/sapi/fastcgi/config.m4:1.4 Fri Nov 30 14:01:30 2001 +++ php4/sapi/fastcgi/config.m4 Thu Mar 7 09:19:51 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.4 2001/11/30 19:01:30 sniper Exp $ +dnl $Id: config.m4,v 1.5 2002/03/07 14:19:51 sas Exp $ dnl AC_MSG_CHECKING(for FastCGI support) @@ -12,7 +12,7 @@ fi test -f "$FASTCGIPATH/lib/libfcgi.a" || AC_MSG_ERROR(Unable to find libfcgi.a in $FASTCGIPATH/lib) test -f "$FASTCGIPATH/include/fastcgi.h" || AC_MSG_ERROR(Unable to find fastcgi.h in $FASTCGIPATH/include) - PHP_SAPI=fastcgi + PHP_SELECT_SAPI(fastcgi, programm, fastcgi.c) PHP_LIBS=$FASTCGIPATH/lib/libfcgi.a PHP_ADD_INCLUDE($FASTCGIPATH/include) EXT_PROGRAM_LDADD="$EXT_PROGRAM_LDADD $FASTCGIPATH/lib/libfcgi.a" Index: php4/sapi/fhttpd/.cvsignore diff -u php4/sapi/fhttpd/.cvsignore:1.2 php4/sapi/fhttpd/.cvsignore:1.3 --- php4/sapi/fhttpd/.cvsignore:1.2 Wed Jun 6 08:43:33 2001 +++ php4/sapi/fhttpd/.cvsignore Thu Mar 7 09:19:51 2002 @@ -2,7 +2,6 @@ .libs *.la *.lo -Makefile.am .deps *.plg *.opt Index: php4/sapi/isapi/.cvsignore diff -u php4/sapi/isapi/.cvsignore:1.4 php4/sapi/isapi/.cvsignore:1.5 --- php4/sapi/isapi/.cvsignore:1.4 Wed Jun 6 08:43:33 2001 +++ php4/sapi/isapi/.cvsignore Thu Mar 7 09:19:52 2002 @@ -2,7 +2,6 @@ .libs *.la *.lo -Makefile.am .deps *.plg *.opt Index: php4/sapi/isapi/config.m4 diff -u php4/sapi/isapi/config.m4:1.13 php4/sapi/isapi/config.m4:1.14 --- php4/sapi/isapi/config.m4:1.13 Fri Nov 30 14:01:31 2001 +++ php4/sapi/isapi/config.m4 Thu Mar 7 09:19:52 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13 2001/11/30 19:01:31 sniper Exp $ +dnl $Id: config.m4,v 1.14 2002/03/07 14:19:52 sas Exp $ dnl RESULT=no @@ -16,8 +16,7 @@ PHP_BUILD_THREAD_SAFE AC_DEFINE(WITH_ZEUS,1,[ ]) PHP_ADD_INCLUDE($ZEUSPATH/web/include) - PHP_SAPI=isapi - PHP_BUILD_SHARED + PHP_SELECT_SAPI(isapi, shared, php4isapi.c) INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$ZEUSPATH/web/bin/" RESULT=yes ]) Index: php4/sapi/nsapi/.cvsignore diff -u php4/sapi/nsapi/.cvsignore:1.5 php4/sapi/nsapi/.cvsignore:1.6 --- php4/sapi/nsapi/.cvsignore:1.5 Wed Jun 6 08:43:33 2001 +++ php4/sapi/nsapi/.cvsignore Thu Mar 7 09:19:52 2002 @@ -2,7 +2,6 @@ .libs *.la *.lo -Makefile.am .deps *.plg *.opt Index: php4/sapi/nsapi/config.m4 diff -u php4/sapi/nsapi/config.m4:1.10 php4/sapi/nsapi/config.m4:1.11 --- php4/sapi/nsapi/config.m4:1.10 Fri Nov 30 14:01:31 2001 +++ php4/sapi/nsapi/config.m4 Thu Mar 7 09:19:53 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.10 2001/11/30 19:01:31 sniper Exp $ +dnl $Id: config.m4,v 1.11 2002/03/07 14:19:53 sas Exp $ dnl AC_MSG_CHECKING(for NSAPI support) @@ -28,8 +28,7 @@ PHP_ADD_INCLUDE($NSAPI_INCLUDE) PHP_BUILD_THREAD_SAFE AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape Server]) - PHP_SAPI=nsapi - PHP_BUILD_SHARED + PHP_SELECT_SAPI(nsapi, shared, nsapi.c) INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_NSAPI/bin/" fi Index: php4/sapi/phttpd/.cvsignore diff -u php4/sapi/phttpd/.cvsignore:1.3 php4/sapi/phttpd/.cvsignore:1.4 --- php4/sapi/phttpd/.cvsignore:1.3 Wed Jun 6 08:43:33 2001 +++ php4/sapi/phttpd/.cvsignore Thu Mar 7 09:19:53 2002 @@ -1,5 +1,4 @@ Makefile -Makefile.am .libs *.la *.lo Index: php4/sapi/phttpd/config.m4 diff -u php4/sapi/phttpd/config.m4:1.6 php4/sapi/phttpd/config.m4:1.7 --- php4/sapi/phttpd/config.m4:1.6 Fri Nov 30 14:01:31 2001 +++ php4/sapi/phttpd/config.m4 Thu Mar 7 09:19:53 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.6 2001/11/30 19:01:31 sniper Exp $ +dnl $Id: config.m4,v 1.7 2002/03/07 14:19:53 sas Exp $ dnl RESULT=no @@ -14,8 +14,7 @@ PHTTPD_DIR=$withval PHP_ADD_INCLUDE($PHTTPD_DIR/include) AC_DEFINE(HAVE_PHTTPD,1,[Whether you have phttpd]) - PHP_SAPI=phttpd - PHP_BUILD_SHARED + PHP_SELECT_SAPI(phttpd, shared, phttpd.c) INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHTTPD_DIR/modules/" RESULT=yes ]) Index: php4/sapi/pi3web/.cvsignore diff -u php4/sapi/pi3web/.cvsignore:1.1 php4/sapi/pi3web/.cvsignore:1.2 --- php4/sapi/pi3web/.cvsignore:1.1 Wed Jun 6 08:43:33 2001 +++ php4/sapi/pi3web/.cvsignore Thu Mar 7 09:19:54 2002 @@ -1,5 +1,4 @@ Makefile -Makefile.am .libs *.la *.lo Index: php4/sapi/pi3web/config.m4 diff -u php4/sapi/pi3web/config.m4:1.5 php4/sapi/pi3web/config.m4:1.6 --- php4/sapi/pi3web/config.m4:1.5 Fri Nov 30 14:01:31 2001 +++ php4/sapi/pi3web/config.m4 Thu Mar 7 09:19:54 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.5 2001/11/30 19:01:31 sniper Exp $ +dnl $Id: config.m4,v 1.6 2002/03/07 14:19:54 sas Exp $ dnl PHP_ARG_WITH(pi3web,for Pi3Web Support, @@ -18,8 +18,7 @@ PHP_ADD_INCLUDE($PI3PATH/Pi2API) PHP_ADD_INCLUDE($PI3PATH/Pi3API) PHP_ADD_INCLUDE($PI3PATH/PHP4) - PHP_SAPI=pi3web - PHP_BUILD_SHARED + PHP_SELECT_SAPI(pi3web, shared, pi3web_sapi.c) INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/" fi Index: php4/sapi/roxen/.cvsignore diff -u php4/sapi/roxen/.cvsignore:1.3 php4/sapi/roxen/.cvsignore:1.4 --- php4/sapi/roxen/.cvsignore:1.3 Wed Jun 6 08:43:33 2001 +++ php4/sapi/roxen/.cvsignore Thu Mar 7 09:19:56 2002 @@ -3,7 +3,6 @@ .libs *.la *.lo -Makefile.am .deps *.plg *.opt Index: php4/sapi/roxen/config.m4 diff -u php4/sapi/roxen/config.m4:1.14 php4/sapi/roxen/config.m4:1.15 --- php4/sapi/roxen/config.m4:1.14 Fri Nov 30 14:01:31 2001 +++ php4/sapi/roxen/config.m4 Thu Mar 7 09:19:58 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.14 2001/11/30 19:01:31 sniper Exp $ +dnl $Id: config.m4,v 1.15 2002/03/07 14:19:58 sas Exp $ dnl RESULT=no @@ -30,8 +30,7 @@ PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR) AC_DEFINE(HAVE_ROXEN,1,[Whether you use Roxen]) - PHP_SAPI=roxen - PHP_BUILD_SHARED + PHP_SELECT_SAPI(roxen, shared, roxen.c) INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP4.so" RESULT="yes Pike binary used: $PIKE Index: php4/sapi/servlet/.cvsignore diff -u php4/sapi/servlet/.cvsignore:1.3 php4/sapi/servlet/.cvsignore:1.4 --- php4/sapi/servlet/.cvsignore:1.3 Wed Jun 6 08:43:34 2001 +++ php4/sapi/servlet/.cvsignore Thu Mar 7 09:19:58 2002 @@ -6,7 +6,6 @@ *.plg .libs net -Makefile.am .deps Release_TS_inline Release_TS Index: php4/sapi/servlet/config.m4 diff -u php4/sapi/servlet/config.m4:1.12 php4/sapi/servlet/config.m4:1.13 --- php4/sapi/servlet/config.m4:1.12 Fri Nov 30 14:01:32 2001 +++ php4/sapi/servlet/config.m4 Thu Mar 7 09:20:00 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.12 2001/11/30 19:01:32 sniper Exp $ +dnl $Id: config.m4,v 1.13 2002/03/07 14:20:00 sas Exp $ dnl AC_MSG_CHECKING(for Servlet support) @@ -37,8 +37,10 @@ INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/sapi/servlet/phpsrvlt.jar \$(libdir)" INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 $SAPI_SHARED \$(libdir)" PHP_SAPI=servlet - PHP_BUILD_SHARED PHP_BUILD_THREAD_SAFE + PHP_SELECT_SAPI(servlet, shared, servlet.c) + PHP_ADD_SOURCES(/sapi/servlet, java.c,,sapi) + PHP_ADD_MAKEFILE_FRAGMENT(sapi/servlet/Makefile.frag) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) Index: php4/sapi/thttpd/.cvsignore diff -u php4/sapi/thttpd/.cvsignore:1.3 php4/sapi/thttpd/.cvsignore:1.4 --- php4/sapi/thttpd/.cvsignore:1.3 Wed Jun 6 08:43:34 2001 +++ php4/sapi/thttpd/.cvsignore Thu Mar 7 09:20:01 2002 @@ -2,7 +2,6 @@ .libs *.la *.lo -Makefile.am .deps Release_TS_inline Release_TS Index: php4/sapi/thttpd/config.m4 diff -u php4/sapi/thttpd/config.m4:1.14 php4/sapi/thttpd/config.m4:1.15 --- php4/sapi/thttpd/config.m4:1.14 Fri Nov 30 14:01:32 2001 +++ php4/sapi/thttpd/config.m4 Thu Mar 7 09:20:01 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.14 2001/11/30 19:01:32 sniper Exp $ +dnl $Id: config.m4,v 1.15 2002/03/07 14:20:01 sas Exp $ dnl AC_ARG_WITH(thttpd, @@ -18,8 +18,7 @@ (cd $THTTPD && patch < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)" PHP_THTTPD="yes, using $THTTPD" PHP_ADD_INCLUDE($THTTPD) - PHP_BUILD_STATIC - PHP_SAPI=thttpd + PHP_SELECT_SAPI(thttpd, static) ],[ PHP_THTTPD=no ]) Index: php4/sapi/tux/.cvsignore diff -u php4/sapi/tux/.cvsignore:1.1 php4/sapi/tux/.cvsignore:1.2 --- php4/sapi/tux/.cvsignore:1.1 Wed Jun 6 08:43:34 2001 +++ php4/sapi/tux/.cvsignore Thu Mar 7 09:20:01 2002 @@ -2,7 +2,6 @@ .libs *.la *.lo -Makefile.am .deps *.plg *.opt Index: php4/sapi/tux/config.m4 diff -u php4/sapi/tux/config.m4:1.2 php4/sapi/tux/config.m4:1.3 --- php4/sapi/tux/config.m4:1.2 Fri Nov 30 14:01:32 2001 +++ php4/sapi/tux/config.m4 Thu Mar 7 09:20:01 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.2 2001/11/30 19:01:32 sniper Exp $ +dnl $Id: config.m4,v 1.3 2002/03/07 14:20:01 sas Exp $ dnl PHP_TUX=no @@ -8,8 +8,7 @@ [ --with-tux=MODULEDIR Build PHP as a TUX module (Linux only)],[ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/php4.tux.so" AC_CHECK_HEADERS(tuxmodule.h,[:],[AC_MSG_ERROR([Cannot find tuxmodule.h])]) - PHP_BUILD_SHARED - PHP_SAPI=tux + PHP_SELECT_SAPI(tux, shared, php_tux.c) PHP_TUX=yes ]) Index: php4/sapi/webjames/.cvsignore diff -u php4/sapi/webjames/.cvsignore:1.1 php4/sapi/webjames/.cvsignore:1.2 --- php4/sapi/webjames/.cvsignore:1.1 Mon Nov 5 07:07:49 2001 +++ php4/sapi/webjames/.cvsignore Thu Mar 7 09:20:02 2002 @@ -2,7 +2,6 @@ .libs *.la *.lo -Makefile.am .deps Release_TS_inline Release_TS Index: php4/sapi/webjames/config.m4 diff -u php4/sapi/webjames/config.m4:1.3 php4/sapi/webjames/config.m4:1.4 --- php4/sapi/webjames/config.m4:1.3 Sun Mar 3 09:25:59 2002 +++ php4/sapi/webjames/config.m4 Thu Mar 7 09:20:02 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.3 2002/03/03 14:25:59 alexwaugh Exp $ +dnl $Id: config.m4,v 1.4 2002/03/07 14:20:02 sas Exp $ dnl AC_ARG_WITH(webjames, @@ -12,8 +12,7 @@ echo 'PHP_CFLAGS = -DPHP \$(COMMON_FLAGS) \$(EXTRA_CFLAGS) -I$abs_srcdir/sapi/webjames' >> $WEBJAMES/build/php;" PHP_WEBJAMES="yes, using $WEBJAMES" PHP_ADD_INCLUDE($WEBJAMES) - PHP_BUILD_STATIC - PHP_SAPI=webjames + PHP_SELECT_SAPI(webjames, static, webjames.c) ],[ PHP_WEBJAMES="no" ]) Index: php4/Makefile.frag +++ php4/Makefile.frag $(builddir)/zend_language_scanner.lo: $(builddir)/zend_language_parser.h $(builddir)/zend_ini_scanner.lo: $(builddir)/zend_ini_parser.h $(builddir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l $(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l $(builddir)/zend_language_parser.h: $(builddir)/zend_language_parser.c $(builddir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y $(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@ $(builddir)/zend_ini_parser.h: $(builddir)/zend_ini_parser.c $(builddir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y $(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@ $(builddir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l $(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l Index: php4/Makefile.global +++ php4/Makefile.global mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 DEFS = -I$(top_builddir)/main -I$(top_srcdir) COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) all: $(all_targets) build-modules: $(PHP_MODULES) libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) -o $@ php: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) -o $@ sapi/cli/php: $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) $(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) $(EXTRA_LIBS) -o $@ install: $(install_targets) install-cli: $(INSTALL_CLI) install-sapi: -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \ for i in 0.0.0 0.0 0; do \ if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \ $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \ break; \ fi; \ done; \ fi $(INSTALL_IT) install-modules: @test -d modules && \ $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \ echo "installing shared modules into $(EXTENSION_DIR)" && \ rm -f modules/*.la && \ cp modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true install-tester: @echo "Installing regression tester" @$(mkinstalldirs) $(PEAR_INSTALLDIR) @$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR) install-su: install-pear install-tester test: php TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) \ $(top_builddir)/php -C -q $(top_srcdir)/run-tests.php \ $(top_srcdir) clean: find . -name \*.lo -o -name \*.o -o -name \*.la -o -name \*.a| xargs rm -f find . -name .libs -a -type d|xargs rm -rf rm -f libphp4.la php sapi/cli/php modules/* libs/* distclean: clean rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php4.spec sapi/apache/libphp4.module buildmk.stamp find . -name Makefile | xargs rm -f PHONY: all clean install distclean test NOEXPORT: Index: php4/TODO.BUILDv5 +++ php4/TODO.BUILDv5 - fix phpize - clean up .cvsignores - purge Makefile.ins and replace PHP_EXTENSION in config.m4s with appropiate calls to PHP_NEW_EXTENSION Index: php4/scan_makefile_in.awk +++ php4/scan_makefile_in.awk BEGIN { mode=0 sources="" } mode == 0 && /^LTLIBRARY_SOURCES.*\\$/ { if (match($0, "[^=]*$")) { sources=substr($0, RSTART, RLENGTH-1) } mode=1 next } mode == 0 && /^LTLIBRARY_SOURCES.*/ { if (match($0, "[^=]*$")) { sources=substr($0, RSTART, RLENGTH) } } mode == 1 && /.*\\$/ { sources=sources substr($0, 0, length - 1) next } mode == 1 { sources=sources $0 mode=0 } END { print sources } Index: php4/ext/informix/Makefile.frag +++ php4/ext/informix/Makefile.frag $(builddir)/ifx.c: $(srcdir)/ifx.ec $(builddir)/libphpifx.a (if test -d $(INFORMIXDIR); then \ THREADLIB=POSIX $(INFORMIXDIR)/bin/esql -e $(IFX_ESQL_FLAGS) $(srcdir)/ifx.ec; mv ifx.c $@; \ else \ touch $@; \ fi) $(builddir)/libphpifx.a: $(LINK) $(IFX_LIBOBJS) Index: php4/ext/ircg/Makefile.frag +++ php4/ext/ircg/Makefile.frag $(srcdir)/ircg_scanner.c: $(srcdir)/ircg_scanner.re re2c -b $(srcdir)/ircg_scanner.re > $@ Index: php4/ext/standard/Makefile.frag +++ php4/ext/standard/Makefile.frag $(srcdir)/parsedate.c: $(srcdir)/parsedate.y $(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re re2c -b $(srcdir)/var_unserializer.re > $@ $(srcdir)/url_scanner_ex.c: $(srcdir)/url_scanner_ex.re re2c -b $(srcdir)/url_scanner_ex.re > $@ Index: php4/pear/Makefile.frag +++ php4/pear/Makefile.frag pear_install_targets = \ install-data-local \ install-headers \ install-build \ install-programs peardir=$(PEAR_INSTALLDIR) PEAR_SUBDIRS = \ Archive \ Console \ Crypt \ Date \ DB \ File \ HTML \ HTTP \ Image \ Mail \ Net \ PEAR \ Schedule \ XML PEAR_FILES = \ Archive/Tar.php \ Console/Getopt.php \ Crypt/CBC.php \ Crypt/HCEMD5.php \ Date/Calc.php \ Date/Human.php \ DB.php \ DB/common.php \ DB/fbsql.php \ DB/ibase.php \ DB/ifx.php \ DB/msql.php \ DB/mssql.php \ DB/mysql.php \ DB/oci8.php \ DB/odbc.php \ DB/pgsql.php \ DB/storage.php \ DB/sybase.php \ File/Find.php \ File/Passwd.php \ File/SearchReplace.php \ HTML/Common.php \ HTML/Form.php \ HTML/IT.php \ HTML/ITX.php \ HTML/IT_Error.php \ HTML/Page.php \ HTML/Processor.php \ HTML/Select.php \ HTML/Table.php \ HTTP.php \ HTTP/Compress.php \ Mail.php \ Mail/RFC822.php \ Mail/sendmail.php \ Mail/smtp.php \ Net/Curl.php \ Net/Dig.php \ Net/SMTP.php \ Net/Socket.php \ PEAR.php \ PEAR/Autoloader.php \ PEAR/Common.php \ PEAR/Config.php \ PEAR/Dependency.php \ PEAR/Installer.php \ PEAR/Packager.php \ PEAR/Registry.php \ PEAR/Remote.php \ PEAR/Uploader.php \ Schedule/At.php \ System.php \ XML/Parser.php PEAR_COMMAND_LIBS = \ pearcmd-common.php \ pearcmd-help.php \ pearcmd-info.php \ pearcmd-install.php \ pearcmd-list.php \ pearcmd-package.php \ pearcmd-remote-list.php \ pearcmd-show-config.php \ pearcmd-uninstall.php install-data-local: @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ for i in $(PEAR_SUBDIRS); do \ $(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/$$i; \ done; \ for i in $(PEAR_FILES); do \ echo "Installing $$i"; \ dir=`echo $$i|sed 's%[^/][^/]*$$%%'`; \ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(peardir)/$$dir; \ done; \ else \ cat $(srcdir)/install-pear.txt; \ exit 5; \ fi phpincludedir = $(includedir)/php phpbuilddir = $(prefix)/lib/php/build BUILD_FILES = \ pear/pear.m4 \ build/mkdep.awk \ build/shtool \ Makefile.global \ scan_makefile_in.awk \ acinclude.m4 bin_SCRIPTS = phpize php-config pear pear-get pearize phptar install-build: @echo "Installing build environment" @$(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \ (cd $(top_srcdir) && cp $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir)) install-programs: @for prog in $(bin_SCRIPTS); do \ echo "Installing program: $$prog"; \ $(INSTALL) -m 755 $(builddir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ done; \ for prog in phpextdist; do \ echo "Installing program: $$prog"; \ $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ done; \ for lib in $(PEAR_COMMAND_LIBS); do \ echo "Installing program library: $$lib"; \ $(INSTALL) -m 644 $(srcdir)/scripts/$$lib $(INSTALL_ROOT)$(bindir)/$$lib; \ done HEADER_DIRS = \ / \ Zend \ TSRM \ ext/standard \ ext/session \ ext/xml \ ext/xml/expat/xmlparse \ ext/xml/expat/xmltok \ main \ regex install-headers: -@for i in $(HEADER_DIRS); do \ paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \ done; \ $(mkinstalldirs) $$paths && \ echo "Installing header files" && \ for i in $(HEADER_DIRS); do \ (cd $(top_srcdir)/$$i && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \ cd $(top_builddir)/$$i && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \ done $(builddir)/scripts/pear: $(srcdir)/scripts/pear.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) $(builddir)/scripts/pear-get: $(srcdir)/scripts/pear-get.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) $(builddir)/scripts/phpize: $(srcdir)/scripts/phpize.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) $(builddir)/scripts/phptar: $(srcdir)/scripts/phptar.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) $(builddir)/scripts/pearize: $(srcdir)/scripts/pearize.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) $(builddir)/scripts/php-config: $(srcdir)/scripts/php-config.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) Index: php4/sapi/servlet/Makefile.frag +++ php4/sapi/servlet/Makefile.frag $(builddir)/java.c : $(srcdir)/../../ext/java/java.c @cp $(srcdir)/../../ext/java/java.c $(builddir) $(builddir)/phpsrvlt.jar : $(srcdir)/servlet.java $(srcdir)/../../ext/java/reflect.java $(mkinstalldirs) $(builddir)/net/php @echo library=php4 > $(builddir)/net/php/reflect.properties @echo library=php4 > $(builddir)/net/php/servlet.properties @cp $(builddir)/formatter.java $(builddir)/net/php @cp $(builddir)/servlet.java $(builddir)/net/php @cp $(srcdir)/../../ext/java/reflect.java $(builddir)/net/php cd $(builddir) && javac net/php/reflect.java @test ! -f $(builddir)/reflect.class || mv $(builddir)/reflect.class $(builddir)/net/php # bug in KJC javac javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH) $(builddir)/net/php/servlet.java @test ! -f $(builddir)/servlet.class || mv $(builddir)/servlet.class $(builddir)/net/php # bug in KJC javac javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH) $(builddir)/net/php/formatter.java @test ! -f $(builddir)/formatter.class || mv $(builddir)/formatter.class $(builddir)/net/php # bug in KJC javac cd $(builddir)/ && $(JAVA_JAR) phpsrvlt.jar net/php/*.class net/php/*.properties @rm -rf $(builddir)/net