cvs: /php4 build-defs.h.in configure.in main.c /php4/build rules.mk

sas Tue May 2 07:46:21 2000 EDT Modified files: /php4 build-defs.h.in configure.in main.c /php4/build rules.mk Log: Preset extension_dir to the installation directory of PHP modules. This effectively means that dl() will work without having an installed configuration file. Index: php4/build-defs.h.in diff -u php4/build-defs.h.in:1.10 php4/build-defs.h.in:1.11 --- php4/build-defs.h.in:1.10 Sat Mar 11 12:48:44 2000 +++ php4/build-defs.h.in Tue May 2 07:46:20 2000 @@ -88,3 +88,4 @@ #define PHP_LDAP_LIBS "" #define PHP_VELOCIS_INCLUDE "" #define PHP_VELOCIS_LIBS "" +#define PHP_EXTENSION_DIR "@EXTENSION_DIR@" Index: php4/configure.in diff -u php4/configure.in:1.115 php4/configure.in:1.116 --- php4/configure.in:1.115 Sun Apr 30 19:41:32 2000 +++ php4/configure.in Tue May 2 07:46:20 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.115 2000/05/01 02:41:32 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.116 2000/05/02 14:46:20 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -646,11 +646,12 @@ phplibdir="pwd/modules" test -d $phplibdir || mkdir $phplibdir phptempdir="pwd/libs" +EXTENSION_DIR="$prefix/lib/php/modules" AC_BUILD_RPATH EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" - + PHP_BUILD_DATE=date '+%Y-%m-%d' AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE") PHP_UNAME=uname -a @@ -678,6 +679,7 @@ PHP_SUBST(CXX) PHP_SUBST(DEBUG_CFLAGS) PHP_SUBST(DEFS) +PHP_SUBST(EXTENSION_DIR) PHP_SUBST(EXTRA_LDFLAGS) PHP_SUBST(EXTRA_LIBS) PHP_SUBST(INCLUDES) Index: php4/main.c diff -u php4/main.c:1.241 php4/main.c:1.242 --- php4/main.c:1.241 Fri Apr 28 06:03:12 2000 +++ php4/main.c Tue May 2 07:46:20 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.241 2000/04/28 13:03:12 zeev Exp $ */ +/* $Id: main.c,v 1.242 2000/05/02 14:46:20 sas Exp $ */ #include <stdio.h> @@ -209,7 +209,7 @@ STD_PHP_INI_ENTRY("default_charset", SAPI_DEFAULT_CHARSET, PHP_INI_ALL, OnUpdateString, default_charset, sapi_globals_struct,sapi_globals) STD_PHP_INI_ENTRY("default_mimetype",SAPI_DEFAULT_MIMETYPE, PHP_INI_ALL, OnUpdateString, default_mimetype, sapi_globals_struct,sapi_globals) STD_PHP_INI_ENTRY("error_log", NULL, PHP_INI_ALL, OnUpdateString, error_log, php_core_globals, core_globals) - STD_PHP_INI_ENTRY("extension_dir", NULL, PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir, php_core_globals, core_globals) + STD_PHP_INI_ENTRY("extension_dir", PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir, php_core_globals, core_globals) STD_PHP_INI_ENTRY("gpc_order", "GPC", PHP_INI_ALL, OnUpdateStringUnempty, gpc_order, php_core_globals, core_globals) STD_PHP_INI_ENTRY("include_path", NULL, PHP_INI_ALL, OnUpdateStringUnempty, include_path, php_core_globals, core_globals) STD_PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnUpdateInt, max_execution_time, php_core_globals, core_globals) Index: php4/build/rules.mk diff -u php4/build/rules.mk:1.10 php4/build/rules.mk:1.11 --- php4/build/rules.mk:1.10 Sun Apr 30 19:41:33 2000 +++ php4/build/rules.mk Tue May 2 07:46:20 2000 @@ -21,7 +21,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ############################################################################## -# $Id: rules.mk,v 1.10 2000/05/01 02:41:33 sas Exp $ +# $Id: rules.mk,v 1.11 2000/05/02 14:46:20 sas Exp $ # include $(top_builddir)/config_vars.mk @@ -36,7 +36,7 @@ SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< && touch $@ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir) -moduledir = $(libdir)/php/modules +moduledir = $(EXTENSION_DIR) .SUFFIXES: .SUFFIXES: .slo .c .lo .o .s .y .l