@New constants: PHP_PREFIX and PHP_SHLIB_SUFFIX (Stig)

diff --git a/configure.in b/configure.in
index 68ce50c993af9d0865a7b2d72c81b9646df623cd..51bb09adf18c7e5a84f6f7c715a1e31c7bdbf2fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1039,6 +1039,7 @@ PHP_SUBST(TSRM_DIR)
 PHP_SUBST(TSRM_LIB)
 PHP_SUBST(WARNING_LEVEL)
 PHP_SUBST_OLD(YACC)
+PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
 
 old_CC=$CC
 

diff --git a/main/build-defs.h.in b/main/build-defs.h.in
index 7a3dd02b829e99208bb8724da98f3a2a3abd7512..8e87150dc4c4c4a0ef5fbfc6f66c4916ddeebec8 100644 (file)
--- a/main/build-defs.h.in
+++ b/main/build-defs.h.in
@@ -80,9 +80,11 @@
 #define PEAR_INSTALLDIR         "@EXPANDED_PEAR_INSTALLDIR@"
 #define PHP_INCLUDE_PATH       "@INCLUDE_PATH@"
 #define PHP_EXTENSION_DIR       "@EXPANDED_EXTENSION_DIR@"
+#define PHP_PREFIX              "@prefix@"
 #define PHP_BINDIR              "@EXPANDED_BINDIR@"
 #define PHP_LIBDIR              "@EXPANDED_LIBDIR@"
 #define PHP_DATADIR             "@EXPANDED_DATADIR@"
 #define PHP_SYSCONFDIR          "@EXPANDED_SYSCONFDIR@"
 #define PHP_LOCALSTATEDIR       "@EXPANDED_LOCALSTATEDIR@"
 #define PHP_CONFIG_FILE_PATH    "@EXPANDED_PHP_CONFIG_FILE_PATH@"
+#define PHP_SHLIB_SUFFIX        "@SHLIB_SUFFIX_NAME@"

diff --git a/main/main.c b/main/main.c
index 5dd53b4c258b739f72be32456b4aeec0135b4d38..a906f97f9b8f3ad2614085ed4f20f60510a7e09b 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -960,12 +960,14 @@ int php_module_startup(sapi_module_struct *sf)
        REGISTER_MAIN_STRINGL_CONSTANT("PEAR_INSTALL_DIR", PEAR_INSTALLDIR, sizeof(PEAR_INSTALLDIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PEAR_EXTENSION_DIR", PHP_EXTENSION_DIR, sizeof(PHP_EXTENSION_DIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTENSION_DIR", PHP_EXTENSION_DIR, sizeof(PHP_EXTENSION_DIR)-1, CONST_PERSISTENT | CONST_CS);
+       REGISTER_MAIN_STRINGL_CONSTANT("PHP_PREFIX", PHP_PREFIX, sizeof(PHP_PREFIX)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINDIR", PHP_BINDIR, sizeof(PHP_BINDIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_LIBDIR", PHP_LIBDIR, sizeof(PHP_LIBDIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR, sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR, sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_LOCALSTATEDIR", PHP_LOCALSTATEDIR, sizeof(PHP_LOCALSTATEDIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH, sizeof(PHP_CONFIG_FILE_PATH)-1, CONST_PERSISTENT | CONST_CS);
+       REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
        php_output_register_constants(TSRMLS_C);
 
        if (php_startup_ticks(TSRMLS_C) == FAILURE) {