diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/build-defs.h.in | 13 | ||||
| -rw-r--r-- | main/main.c | 9 | ||||
| -rw-r--r-- | main/php_ini.c | 12 |
3 files changed, 27 insertions, 7 deletions
diff --git a/main/build-defs.h.in b/main/build-defs.h.in index 27deeeb9ff..347e75d476 100644 --- a/main/build-defs.h.in +++ b/main/build-defs.h.in @@ -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@" @@ -50,9 +49,6 @@ #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@" @@ -78,5 +74,12 @@ #define PHP_LDAP_LIBS "" #define PHP_VELOCIS_INCLUDE "" #define PHP_VELOCIS_LIBS "" -#define PHP_EXTENSION_DIR "@EXTENSION_DIR@" +#define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@" #define PHP_INCLUDE_PATH "@INCLUDE_PATH@" +#define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@" +#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@" diff --git a/main/main.c b/main/main.c index fd3e61c27d..7a8cd97226 100644 --- a/main/main.c +++ b/main/main.c @@ -852,6 +852,15 @@ int php_module_startup(sapi_module_struct *sf) REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION, sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS", php_os, strlen(php_os), CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("DEFAULT_INCLUDE_PATH", PHP_INCLUDE_PATH, sizeof(PHP_INCLUDE_PATH)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PEAR_INSTALL_DIR", PEAR_INSTALLDIR, sizeof(PEAR_INSTALLDIR)-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_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); php_output_register_constants(); if (php_startup_ticks(PLS_C) == FAILURE) { diff --git a/main/php_ini.c b/main/php_ini.c index 86e03b55b6..fe3121cf77 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -18,13 +18,13 @@ #include "php.h" +#include "build-defs.h" #include "ext/standard/info.h" #include "zend_ini.h" #include "php_ini.h" #include "ext/standard/dl.h" #include "zend_extensions.h" - typedef struct _php_extension_lists { zend_llist engine; zend_llist functions; @@ -210,7 +210,7 @@ int php_init_config(char *php_ini_path_override) } free_default_location=1; #else - default_location = CONFIGURATION_FILE_PATH; + default_location = PHP_CONFIG_FILE_PATH; free_default_location=0; #endif php_ini_search_path = (char *) emalloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1); @@ -332,3 +332,11 @@ PHPAPI int cfg_get_string(char *varname, char **result) *result = tmp->value.str.val; return SUCCESS; } + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + */ |