diff options
| author | Sebastian Bergmann <sebastian@php.net> | 2002-10-16 14:53:34 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@php.net> | 2002-10-16 14:53:34 +0000 |
| commit | 9f158fc9c0c6bc85b622f759d731c1178131d7d6 (patch) | |
| tree | f45cd8379bda5b9289d99df8ab1fbbc0f6ed17ea | |
| parent | 6f465484126b1ab83f90e32a8d1d03eec556b44a (diff) | |
| download | php-git-9f158fc9c0c6bc85b622f759d731c1178131d7d6.tar.gz | |
Revert. Again.
| -rw-r--r-- | main/config.w32.h.in | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/main/config.w32.h.in b/main/config.w32.h.in index f4c24d3273..a7a6948532 100644 --- a/main/config.w32.h.in +++ b/main/config.w32.h.in @@ -5,21 +5,19 @@ $Id$ */ -#define CONDENV(ev,def) (getenv(ev)!=NULL?getenv(ev):def) - /* Default PHP / PEAR directories */ -#define CONFIGURATION_FILE_PATH "php.ini" -#define PEAR_INSTALLDIR CONDENV("PEAR_INSTALLDIR", "c:\\php4\\pear") -#define PHP_BINDIR CONDENV("PHP_BINDIR", "c:\\php4") -#define PHP_CONFIG_FILE_PATH CONDENV("SystemRoot", "") -#define PHP_CONFIG_FILE_SCAN_DIR CONDENV("PHP_CONFIG_FILE_SCAN_DIR", "") -#define PHP_DATADIR CONDENV("PHP_DATADIR", "c:\\php4") -#define PHP_EXTENSION_DIR "c:\\php4" -#define PHP_INCLUDE_PATH ".;c:\\php4\\pear" -#define PHP_LIBDIR CONDENV("PHP_LIBDIR", "c:\\php4") -#define PHP_LOCALSTATEDIR CONDENV("PHP_LOCALSTATEDIR", "c:\\php4") -#define PHP_PREFIX CONDENV("PHP_PREFIX", "c:\\php4") -#define PHP_SYSCONFDIR CONDENV("PHP_SYSCONFDIR", "c:\\php4") +#define CONFIGURATION_FILE_PATH "php.ini" +#define PEAR_INSTALLDIR "c:\\php4\\pear" +#define PHP_BINDIR "c:\\php4" +#define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):"" +#define PHP_CONFIG_FILE_SCAN_DIR "" +#define PHP_DATADIR "c:\\php4" +#define PHP_EXTENSION_DIR "c:\\php4" +#define PHP_INCLUDE_PATH ".;c:\\php4\\pear" +#define PHP_LIBDIR "c:\\php4" +#define PHP_LOCALSTATEDIR "c:\\php4" +#define PHP_PREFIX "c:\\php4" +#define PHP_SYSCONFDIR "c:\\php4" /* Enable / Disable BCMATH extension (default: enabled) */ #define WITH_BCMATH 1 @@ -170,4 +168,3 @@ /* Win32 supports strcoll */ #define HAVE_STRCOLL 1 - |