Re: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi config.m4
On Sun, 08 Apr 2001, Stig Bakken wrote: > ssb Sun Apr 8 15:30:18 2001 EDT > > Modified files: > /php4 Makefile.in configure.in > /php4/mainbuild-defs.h.in > /php4/pearPEAR.php.in > /php4/sapiMakefile.in > /php4/sapi/cgiconfig.m4 > Log: > * CGI version is always installed! Yes! -Andrei * Anything will fit if you push hard enough * -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi config.m4
On Sun, 8 Apr 2001, Stig Bakken wrote: > ssb Sun Apr 8 15:30:18 2001 EDT > > Modified files: > /php4 Makefile.in configure.in > /php4/mainbuild-defs.h.in > /php4/pearPEAR.php.in > /php4/sapiMakefile.in > /php4/sapi/cgiconfig.m4 > Log: This patch breaks not only vpath builds, it won't work on any clean checkout. Stig, please test your patches before committing them. I really wonder why you had to commit it almost instantly after requesting comments on php-dev. - Sascha Experience IRCG http://schumann.cx/http://schumann.cx/ircg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi config.m4
Looks like CGI certainly did get dissabled :-) -I think the makefile has been swiped. Build under FreeBSD 3.4: ---cut--- Making all in sapi Making all in cgi make: don't know how to make all. Stop *** Error code 1 Stop. *** Error code 1 ---paste--- BJ ""Stig Bakken"" <[EMAIL PROTECTED]> wrote in message cvsssb986769018@cvsserver">news:cvsssb986769018@cvsserver... > ssb Sun Apr 8 15:30:18 2001 EDT > > Modified files: > /php4 Makefile.in configure.in > /php4/main build-defs.h.in > /php4/pear PEAR.php.in > /php4/sapi Makefile.in > /php4/sapi/cgi config.m4 > Log: > * CGI version is always installed! > * replaced --disable-pear with --with-pear=DIR (or --without-pear), > is backwards compatible > * use --datadir, --libdir and --sysconfdir configure options to determine > where PEAR files, shared extensions and php.ini goes > * simplified the extension version directory name > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > To contact the list administrators, e-mail: [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
RE: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi config.m4
Sorry: ./configure --with-apxs=/usr/local/etc/httpd/bin/apxs --with-mysql > -Original Message- > From: Sean R. Bright [mailto:[EMAIL PROTECTED]] > Sent: Sunday, April 08, 2001 8:21 PM > To: 'Stig Bakken'; [EMAIL PROTECTED] > Subject: RE: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main > build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi > config.m4 > > > After "cvs update -dAP": > > Making all in sapi > gmake[1]: Entering directory `/home/kroot/php4/sapi' > Making all in cgi > gmake[2]: Entering directory `/home/kroot/php4/sapi/cgi' > gmake[2]: *** No rule to make target `all'. Stop. > gmake[2]: Leaving directory `/home/kroot/php4/sapi/cgi' > gmake[1]: *** [all-recursive] Error 1 > gmake[1]: Leaving directory `/home/kroot/php4/sapi' > gmake: *** [all-recursive] Error 1 > > > -Original Message- > > From: Stig Bakken [mailto:[EMAIL PROTECTED]] > > Sent: Sunday, April 08, 2001 6:30 PM > > To: [EMAIL PROTECTED] > > Subject: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main > > build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi > > config.m4 > > > > > > ssb Sun Apr 8 15:30:18 2001 EDT > > > > Modified files: > > /php4 Makefile.in configure.in > > /php4/main build-defs.h.in > > /php4/pear PEAR.php.in > > /php4/sapi Makefile.in > > /php4/sapi/cgi config.m4 > > Log: > > * CGI version is always installed! > > * replaced --disable-pear with --with-pear=DIR (or > --without-pear), > > is backwards compatible > > * use --datadir, --libdir and --sysconfdir configure > > options to determine > > where PEAR files, shared extensions and php.ini goes > > * simplified the extension version directory name > > > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > To contact the list administrators, e-mail: > [EMAIL PROTECTED] > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
RE: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi config.m4
After "cvs update -dAP": Making all in sapi gmake[1]: Entering directory `/home/kroot/php4/sapi' Making all in cgi gmake[2]: Entering directory `/home/kroot/php4/sapi/cgi' gmake[2]: *** No rule to make target `all'. Stop. gmake[2]: Leaving directory `/home/kroot/php4/sapi/cgi' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/home/kroot/php4/sapi' gmake: *** [all-recursive] Error 1 > -Original Message- > From: Stig Bakken [mailto:[EMAIL PROTECTED]] > Sent: Sunday, April 08, 2001 6:30 PM > To: [EMAIL PROTECTED] > Subject: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main > build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi > config.m4 > > > ssb Sun Apr 8 15:30:18 2001 EDT > > Modified files: > /php4 Makefile.in configure.in > /php4/mainbuild-defs.h.in > /php4/pearPEAR.php.in > /php4/sapiMakefile.in > /php4/sapi/cgiconfig.m4 > Log: > * CGI version is always installed! > * replaced --disable-pear with --with-pear=DIR (or --without-pear), > is backwards compatible > * use --datadir, --libdir and --sysconfdir configure > options to determine > where PEAR files, shared extensions and php.ini goes > * simplified the extension version directory name > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi config.m4
Derick Rethans wrote: > On Sun, 8 Apr 2001, Stig Bakken wrote: > > > * CGI version is always installed! > > Do we want this? I don't actually. It would be nice if the cgi build > could be disabled. With PEAR maturing, it'll be pretty useful to have it installed by default; an option to disable it would definitely be good however. Anil -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 / Makefile.in configure.in /main build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi config.m4
On Sun, 8 Apr 2001, Stig Bakken wrote: > * CGI version is always installed! Do we want this? I don't actually. It would be nice if the cgi build could be disabled. Regards, Derick Rethans - PHP: Scripting the Web - www.php.net - [EMAIL PROTECTED] SRM: Site Resource Manager - www.vl-srm.net - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 / Makefile.in configure.in /main build-defs.h.in /pear PEAR.php.in /sapi Makefile.in /sapi/cgi config.m4
ssb Sun Apr 8 15:30:18 2001 EDT Modified files: /php4 Makefile.in configure.in /php4/main build-defs.h.in /php4/pear PEAR.php.in /php4/sapi Makefile.in /php4/sapi/cgi config.m4 Log: * CGI version is always installed! * replaced --disable-pear with --with-pear=DIR (or --without-pear), is backwards compatible * use --datadir, --libdir and --sysconfdir configure options to determine where PEAR files, shared extensions and php.ini goes * simplified the extension version directory name Index: php4/Makefile.in diff -u php4/Makefile.in:1.97 php4/Makefile.in:1.98 --- php4/Makefile.in:1.97 Tue Apr 3 13:59:44 2001 +++ php4/Makefile.inSun Apr 8 15:30:16 2001 @@ -18,7 +18,7 @@ PROGRAM_NAME = php PROGRAM_SOURCES = stub.c -PROGRAM_LDADD= libphp4.la $(EXT_PROGRAM_LDADD) +PROGRAM_LDADD= $(CGI_LDADD) libphp4.la $(EXT_PROGRAM_LDADD) PROGRAM_LDFLAGS = -export-dynamic PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) @@ -41,6 +41,7 @@ fi; \ done; \ fi + $(INSTALL_CGI) $(INSTALL_IT) install-modules: @@ -50,7 +51,13 @@ rm -f modules/*.la && \ cp modules/* $(INSTALL_ROOT)$(moduledir) >/dev/null 2>&1 || true -install-su: install-modules +install-tester: + -$(mkinstalldirs) $(bindir) + $(INSTALL) -m 755 $(srcdir)/run-tests.php $(PEAR_INSTALLDIR)/. + +install-pear: install-modules (cd pear && $(MAKE) install) + +install-su: install-pear install-tester .NOEXPORT: Index: php4/configure.in diff -u php4/configure.in:1.230 php4/configure.in:1.231 --- php4/configure.in:1.230 Fri Apr 6 09:01:20 2001 +++ php4/configure.in Sun Apr 8 15:30:16 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.230 2001/04/06 16:01:20 jon Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.231 2001/04/08 22:30:16 ssb Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -461,24 +461,11 @@ divert(4) - - -PHP_ARG_WITH(config-file-path,whether to use a configuration file, +PHP_ARG_WITH(config-file-path, path to configuration file, [ --with-config-file-path=PATH Sets the path in which to look for php.ini. - defaults to /usr/local/lib], yes) - -if test "$PHP_CONFIG_FILE_PATH" = "yes"; then - PHP_CONFIG_FILE_PATH="/usr/local/lib" -fi - -if test "$PHP_CONFIG_FILE_PATH" != "no"; then - AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "$PHP_CONFIG_FILE_PATH",[ ]) - AC_DEFINE(USE_CONFIG_FILE, 1, [ ]) -else - AC_DEFINE(CONFIGURATION_FILE_PATH, 0, [ ]) - AC_DEFINE(USE_CONFIG_FILE, 0, [ ]) -fi + defaults to --sysconfdir, set to "none" to disable], + $sysconfdir) PHP_ARG_ENABLE(debug, whether to include debugging symbols, [ --enable-debug Compile with debugging symbols.], no) @@ -525,6 +512,23 @@ AC_MSG_RESULT(/usr/local/php/bin) ]) + +# compatibility +if test "x$with_pear" = "x" -a "x$enable_pear" = "no"; then +with_pear="no" +fi + +PHP_ARG_WITH(pear, [whether to install PEAR, and where], +[ --with-pear=DIR Install PEAR files in DIR (default \$datadir/php/pear) + --without-pear Do not install PEAR],yes) + +if test "$PHP_PEAR" != "no"; then + PEAR_DIR=pear + if test "$PHP_PEAR" != "yes"; then +PEAR_INSTALLDIR="$PHP_PEAR" + fi +fi + PHP_ARG_WITH(openssl,for OpenSSL support, [ --with-openssl[=DIR]Include OpenSSL support (requires OpenSSL >= 0.9.5) ]) if test "$PHP_OPENSSL" = "yes"; then @@ -592,14 +596,6 @@ CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK" fi -PHP_ARG_ENABLE(pear,whether to install PEAR, -[ --disable-pear Do not install PEAR],yes) - -if test "$PHP_PEAR" = "yes"; then - PEAR_DIR=pear -fi - - divert(5) PHP_CONFIGURE_PART(Configuring extensions) @@ -644,15 +640,8 @@ ;; esac -if test "$PHP_SAPI" = "cgi"; then - PHP_PROGRAM=php -fi - -if test "$PHP_SAPI" = "fastcgi"; then - PHP_PROGRAM=php -fi +PHP_PROGRAM=php - PHP_REGEX PHP_CONFIGURE_PART(Configuring Zend) @@ -695,31 +684,64 @@ phptempdir="`pwd`/libs" test "$prefix" = "NONE" && prefix="/usr/local" -test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)' +test "$exec_prefix" = "NONE" && exec_prefix='${prefix}' +case $libdir in +*/php) ;; +*) libdir="$libdir/php";; +esac +case $datadir in +*/php) ;; +*) datadir="$datadir/php";; +esac dnl Build extension directory path -if test "$PHP_DEBUG" = "1"; then - PART1=debug -else - PART1=no-debug -fi +ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' +$srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'` + +extbasedir="$ZEND_MODULE_API_NO" if test "$enable_experimental_zts" = "yes"; then - PART2=zts -else - PART2=non-zts + extbasedir="${extbasedir}-zts" fi -ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#defi