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.in Sun 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/#define ZEND_MODULE_API_NO //'`
+if test "$PHP_DEBUG" = "1"; then
+ extbasedir="${extbasedir}-debug"
+fi
if test -z "$PEAR_INSTALLDIR"; then
- PEAR_INSTALLDIR="$prefix/lib/php"
+ PEAR_INSTALLDIR="\${datadir}/pear"
fi
-
-EXTENSION_DIR="${PEAR_INSTALLDIR}/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO"
+if test -z "$EXTENSION_DIR"; then
+ EXTENSION_DIR="\${libdir}/$extbasedir"
+fi
-INCLUDE_PATH=".:${PEAR_INSTALLDIR}"
+old_prefix="$prefix"
+old_exec_prefix="$exec_prefix"
+old_libdir="$libdir"
+old_datadir="$datadir"
+prefix=`eval echo $prefix`
+exec_prefix=`eval echo $exec_prefix`
+libdir=`eval echo $libdir`
+datadir=`eval echo $datadir`
+EXPANDED_PEAR_INSTALLDIR=`eval echo $PEAR_INSTALLDIR`
+EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR`
+EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir`
+INCLUDE_PATH=".:$EXPANDED_PEAR_INSTALLDIR"
+if test "$PHP_CONFIG_FILE_PATH" != "no"; then
+ EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
+ AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "$EXPANDED_PHP_CONFIG_FILE_PATH",[ ])
+ AC_DEFINE(USE_CONFIG_FILE, 1, [ ])
+else
+ AC_DEFINE(CONFIGURATION_FILE_PATH, 0, [ ])
+ AC_DEFINE(USE_CONFIG_FILE, 0, [ ])
+fi
+prefix="$old_prefix"
+exec_prefix="$old_exec_prefix"
+libdir="$old_libdir"
+datadir="$old_datadir"
+AC_SUBST(EXPANDED_PEAR_INSTALLDIR)
+AC_SUBST(EXPANDED_EXTENSION_DIR)
+AC_SUBST(EXPANDED_LOCALSTATEDIR)
PHP_BUILD_RPATH
@@ -744,6 +766,7 @@
PHP_SUBST(phptempdir)
PHP_SUBST(prefix)
PHP_SUBST(localstatedir)
+PHP_SUBST(datadir)
PHP_SUBST(AWK)
PHP_SUBST(CC)
Index: php4/main/build-defs.h.in
diff -u php4/main/build-defs.h.in:1.2 php4/main/build-defs.h.in:1.3
--- php4/main/build-defs.h.in:1.2 Sun Feb 25 22:07:31 2001
+++ php4/main/build-defs.h.in Sun Apr 8 15:30:17 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: build-defs.h.in,v 1.2 2001/02/26 06:07:31 andi Exp $ */
+/* $Id: build-defs.h.in,v 1.3 2001/04/08 22:30:17 ssb Exp $ */
#define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
#define PHP_ADA_INCLUDE ""
@@ -27,7 +27,6 @@
#define PHP_FHTTPD_INCLUDE ""
#define PHP_FHTTPD_LIB ""
#define PHP_FHTTPD_TARGET ""
-#define PHP_BINNAME "@BINNAME@"
#define PHP_CFLAGS "@CFLAGS@"
#define PHP_DBASE_LIB ""
#define PHP_BUILD_DEBUG "@DEBUG_CFLAGS@"
@@ -39,7 +38,6 @@
#define PHP_IFX_INCLUDE ""
#define PHP_IFX_LFLAGS ""
#define PHP_IFX_LIBS ""
-#define PHP_INSTALL_IT "@INSTALL_IT@"
#define PHP_IODBC_INCLUDE ""
#define PHP_IODBC_LFLAGS ""
#define PHP_IODBC_LIBS ""
@@ -50,14 +48,9 @@
#define PHP_MYSQL_LFLAGS ""
#define PHP_MYSQL_LIBS ""
#define PHP_ODBC_TYPE "@ODBC_TYPE@"
-#define PHP_ODBC_INCLUDE "@ODBC_INCLUDE@"
-#define PHP_ODBC_LFLAGS "@ODBC_LFLAGS@"
-#define PHP_ODBC_LIBS "@ODBC_LIBS@"
#define PHP_OCI8_SHARED_LIBADD "@OCI8_SHARED_LIBADD@"
#define PHP_OCI8_DIR "@OCI8_DIR@"
#define PHP_OCI8_VERSION "@OCI8_VERSION@"
-#define PHP_ORACLE_SHARED_LIBADD "@ORACLE_SHARED_LIBADD@"
-#define PHP_ORACLE_DIR "@ORACLE_DIR@"
#define PHP_ORACLE_VERSION "@ORACLE_VERSION@"
#define PHP_PGSQL_INCLUDE ""
#define PHP_PGSQL_LFLAGS ""
@@ -78,5 +71,5 @@
#define PHP_LDAP_LIBS ""
#define PHP_VELOCIS_INCLUDE ""
#define PHP_VELOCIS_LIBS ""
-#define PHP_EXTENSION_DIR "@EXTENSION_DIR@"
-#define PHP_INCLUDE_PATH "@INCLUDE_PATH@"
+#define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@"
+#define PHP_INCLUDE_PATH "@EXPANDED_INCLUDE_PATH@"
Index: php4/pear/PEAR.php.in
diff -u php4/pear/PEAR.php.in:1.18 php4/pear/PEAR.php.in:1.19
--- php4/pear/PEAR.php.in:1.18 Mon Apr 2 20:12:49 2001
+++ php4/pear/PEAR.php.in Sun Apr 8 15:30:17 2001
@@ -17,7 +17,7 @@
// | Stig Bakken <[EMAIL PROTECTED]> |
// +----------------------------------------------------------------------+
//
-// $Id: PEAR.php.in,v 1.18 2001/04/03 03:12:49 jon Exp $
+// $Id: PEAR.php.in,v 1.19 2001/04/08 22:30:17 ssb Exp $
//
define('PEAR_ERROR_RETURN', 1);
@@ -27,8 +27,19 @@
define('PEAR_ERROR_CALLBACK', 16);
define('PHP_BINDIR', '@prefix@/bin');
-define('PEAR_INSTALL_DIR', '@PEAR_INSTALLDIR@');
-define('PEAR_EXTENSION_DIR', '@EXTENSION_DIR@');
+define('PEAR_INSTALL_DIR', '@EXPANDED_PEAR_INSTALLDIR@');
+define('PEAR_EXTENSION_DIR', '@EXPANDED_EXTENSION_DIR@');
+define('PHP_LOCALSTATEDIR', '@EXPANDED_LOCALSTATEDIR@');
+
+if (substr(php_uname(), 0, 7) == 'Windows') {
+ define('OS_WINDOWS', true);
+ define('OS_UNIX', false);
+ define('PEAR_OS', 'Windows');
+} else {
+ define('OS_WINDOWS', false);
+ define('OS_UNIX', true);
+ define('PEAR_OS', 'Unix'); // not exactly true, but...
+}
$_PEAR_default_error_mode = PEAR_ERROR_RETURN;
$_PEAR_default_error_options = E_USER_NOTICE;
Index: php4/sapi/Makefile.in
diff -u php4/sapi/Makefile.in:1.5 php4/sapi/Makefile.in:1.6
--- php4/sapi/Makefile.in:1.5 Mon May 1 15:38:36 2000
+++ php4/sapi/Makefile.in Sun Apr 8 15:30:17 2001
@@ -1,4 +1,4 @@
-SUBDIRS = $(PHP_SAPI)
+SUBDIRS = $(CGI_DIR) $(PHP_SAPI)
include $(top_srcdir)/build/rules.mk
Index: php4/sapi/cgi/config.m4
diff -u php4/sapi/cgi/config.m4:1.7 php4/sapi/cgi/config.m4:1.8
--- php4/sapi/cgi/config.m4:1.7 Tue Apr 3 13:59:46 2001
+++ php4/sapi/cgi/config.m4 Sun Apr 8 15:30:17 2001
@@ -29,9 +29,18 @@
fi
+# Always build and install the CGI binary
+INSTALL_CGI="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(INSTALL_ROOT)\$(bindir)/$SAPI_CGI"
if test "$PHP_SAPI" = "cgi" ; then
- INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(INSTALL_ROOT)\$(bindir)/$SAPI_CGI"
+ CGI_DIR=""
+ CGI_LDADD=""
+ INSTALL_IT=""
+else
+ CGI_DIR="cgi"
+ CGI_LDADD="sapi/cgi/libsapi.la"
fi
+PHP_SUBST(CGI_DIR)
+PHP_SUBST(CGI_LDADD)
AC_MSG_CHECKING(for fhttpd module support)
AC_ARG_WITH(fhttpd,
--
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]
