diff options
| author | Sascha Schumann <sas@php.net> | 2000-05-02 14:46:20 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-05-02 14:46:20 +0000 |
| commit | fca9539d63bc60ae9621c690eadb5a662d987a75 (patch) | |
| tree | 113f043695ecc07181af1c9c6a8edb9e37a895cd | |
| parent | 8eb698a847912735fa471ec8142ec95c4e33d598 (diff) | |
| download | php-git-fca9539d63bc60ae9621c690eadb5a662d987a75.tar.gz | |
Preset extension_dir to the installation directory of PHP modules.
This effectively means that dl() will work without having an installed
configuration file.
| -rw-r--r-- | build-defs.h.in | 1 | ||||
| -rw-r--r-- | build/rules.mk | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | main/main.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/build-defs.h.in b/build-defs.h.in index cd6f2260e2..c48f22cce0 100644 --- a/build-defs.h.in +++ b/build-defs.h.in @@ -88,3 +88,4 @@ #define PHP_LDAP_LIBS "" #define PHP_VELOCIS_INCLUDE "" #define PHP_VELOCIS_LIBS "" +#define PHP_EXTENSION_DIR "@EXTENSION_DIR@" diff --git a/build/rules.mk b/build/rules.mk index 9e389efc21..4345a68d07 100644 --- a/build/rules.mk +++ b/build/rules.mk @@ -36,7 +36,7 @@ INSTALL_DATA = $(INSTALL) -m 644 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 diff --git a/configure.in b/configure.in index bf4df29262..b5a328a6eb 100644 --- a/configure.in +++ b/configure.in @@ -646,11 +646,12 @@ fi 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(CPPFLAGS) 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) diff --git a/main/main.c b/main/main.c index 55424ac738..d5867655bd 100644 --- a/main/main.c +++ b/main/main.c @@ -209,7 +209,7 @@ PHP_INI_BEGIN() 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) |