[PHP-CVS] cvs: php4 /main config.w32.h.in

2002-12-02 Thread Moriyoshi Koizumi 
moriyoshi   Mon Dec  2 15:12:00 2002 EDT

  Modified files:  
/php4/main  config.w32.h.in 
  Log:
  Reverted wrong part of the commit made in 1.24
  
  
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.24 php4/main/config.w32.h.in:1.25
--- php4/main/config.w32.h.in:1.24  Sun Dec  1 16:37:13 2002
+++ php4/main/config.w32.h.in   Mon Dec  2 15:11:59 2002
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
 
-   $Id: config.w32.h.in,v 1.24 2002/12/01 21:37:13 shane Exp $
+   $Id: config.w32.h.in,v 1.25 2002/12/02 20:11:59 moriyoshi Exp $
 */
 
 /* Default PHP / PEAR directories */
@@ -42,13 +42,13 @@
 #define HAVE_FTP 1
 
 /* Enable / Disable MBSTRING extension (default: disabled) */
-#define HAVE_MBSTRING 0 
-#define HAVE_MBREGEX  0 
-#define HAVE_MBSTR_CN 0 
-#define HAVE_MBSTR_JA 0 
-#define HAVE_MBSTR_KR 0 
-#define HAVE_MBSTR_RU 0 
-#define HAVE_MBSTR_TW 0 
+/* #define HAVE_MBSTRING 0 */ 
+/* #define HAVE_MBREGEX  0 */ 
+/* #define HAVE_MBSTR_CN 0 */ 
+/* #define HAVE_MBSTR_JA 0 */ 
+/* #define HAVE_MBSTR_KR 0 */
+/* #define HAVE_MBSTR_RU 0 */
+/* #define HAVE_MBSTR_TW 0 */ 
 
 /* Enable / Disable MySQL extension (default: enabled) */
 #define HAVE_MYSQL 1



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main config.w32.h.in win95nt.h /sapi/cgi cgi_main.c /sapi/cgi/libfcgi fcgiapp.c /sapi/cgi/libfcgi/include fcgiapp.h

2002-12-01 Thread Shane Caraveo 
shane   Sun Dec  1 16:37:14 2002 EDT

  Modified files:  
/php4/main  config.w32.h.in win95nt.h 
/php4/sapi/cgi  cgi_main.c 
/php4/sapi/cgi/libfcgi  fcgiapp.c 
/php4/sapi/cgi/libfcgi/include  fcgiapp.h 
  Log:
  Fix CGI to match cgi spec.
  This patch properly fixes support for CGI in PHP.  For backwards compatible
  broken behaviour, cgi.fix_pathinfo can be set to zero in php.ini.
  CGI failed to work under apache at all, either using the cgi-script directive
  or as a ScriptAlias setup. Typicaly it would try to parse itself.  This will
  still happen if you dissable fix_pathinfo, and set DISCARD_PATH. 
  This also fixes PATH_INFO, and finally we can run pres2 under cgi or fastcgi.
  This patch has been tested under Apache 1.3, 2.0, IIS, as both cgi and fastcgi,
  on Windows and OSX.  A followup patch with build stuff for linux will follow.
  
  
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.23 php4/main/config.w32.h.in:1.24
--- php4/main/config.w32.h.in:1.23  Wed Nov 13 16:28:16 2002
+++ php4/main/config.w32.h.in   Sun Dec  1 16:37:13 2002
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
 
-   $Id: config.w32.h.in,v 1.23 2002/11/13 21:28:16 edink Exp $
+   $Id: config.w32.h.in,v 1.24 2002/12/01 21:37:13 shane Exp $
 */
 
 /* Default PHP / PEAR directories */
@@ -42,13 +42,13 @@
 #define HAVE_FTP 1
 
 /* Enable / Disable MBSTRING extension (default: disabled) */
-/* #define HAVE_MBSTRING 0 */
-/* #define HAVE_MBREGEX  0 */
-/* #define HAVE_MBSTR_CN 0 */
-/* #define HAVE_MBSTR_JA 0 */
-/* #define HAVE_MBSTR_KR 0 */
-/* #define HAVE_MBSTR_RU 0 */
-/* #define HAVE_MBSTR_TW 0 */
+#define HAVE_MBSTRING 0 
+#define HAVE_MBREGEX  0 
+#define HAVE_MBSTR_CN 0 
+#define HAVE_MBSTR_JA 0 
+#define HAVE_MBSTR_KR 0 
+#define HAVE_MBSTR_RU 0 
+#define HAVE_MBSTR_TW 0 
 
 /* Enable / Disable MySQL extension (default: enabled) */
 #define HAVE_MYSQL 1
@@ -82,6 +82,7 @@
 #define MAGIC_QUOTES 0
 #define USE_CONFIG_FILE 1
 #define DEFAULT_SHORT_OPEN_TAG 1
+#define ENABLE_PATHINFO_CHECK 1
 
 /* Platform-Specific Configuration. Should not be changed. */
 #define PHP_SIGCHILD 0
Index: php4/main/win95nt.h
diff -u php4/main/win95nt.h:1.14 php4/main/win95nt.h:1.15
--- php4/main/win95nt.h:1.14Wed Aug 14 20:41:35 2002
+++ php4/main/win95nt.h Sun Dec  1 16:37:13 2002
@@ -18,6 +18,9 @@
 #define S_IFIFO_IFIFO
 #define S_IFBLK_IFBLK
 #defineS_IFLNK _IFLNK
+#ifndef S_ISREG 
+#define S_ISREG(m) (((m)  S_IFMT) == S_IFREG)
+#endif
 #define chdir(path) SetCurrentDirectory(path)
 #define mkdir(a, b)_mkdir(a)
 #define rmdir(a)   _rmdir(a)
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.198 php4/sapi/cgi/cgi_main.c:1.199
--- php4/sapi/cgi/cgi_main.c:1.198  Tue Nov 26 00:57:03 2002
+++ php4/sapi/cgi/cgi_main.cSun Dec  1 16:37:13 2002
@@ -119,6 +119,24 @@
 extern char *ap_php_optarg;
 extern int ap_php_optind;
 
+#if ENABLE_PATHINFO_CHECK
+/* true global.  this is retreived once only, even for fastcgi */
+int fix_pathinfo=1;
+#endif
+
+#ifdef PHP_WIN32
+#define TRANSLATE_SLASHES(path) \
+   { \
+   char *tmp = path; \
+   while (*tmp) { \
+   if (*tmp == '\\') *tmp = '/'; \
+   tmp++; \
+   } \
+   }
+#else
+#define TRANSLATE_SLASHES(path)
+#endif
+
 #define OPTSTRING aCc:d:ef:g:hilmnqsw?vz:
 
 static int print_module_info(zend_module_entry *module, void *arg TSRMLS_DC)
@@ -330,14 +348,8 @@
   of a request.  So we have to do our own lookup to get env
   vars.  This could probably be faster somehow.  */
if (!FCGX_IsCGI()) {
-   int cgi_env_size = 0;
FCGX_Request *request = (FCGX_Request *)SG(server_context);
-   while( request-envp[ cgi_env_size ] ) { 
-   if (strncasecmp(name,request-envp[cgi_env_size],name_len) == 
0) {
-   return (request-envp[cgi_env_size])+name_len+1;
-   }
-   cgi_env_size++; 
-   }
+   return FCGX_GetParam(name,request-envp);
}
 #endif
/*  if cgi, or fastcgi and not found in fcgi env
@@ -345,9 +357,40 @@
return getenv(name);
 }
 
+static int _sapi_cgibin_putenv(char *name, char *value TSRMLS_DC)
+{
+   int len=0;
+   char *buf = NULL;
+   if (!name) return -1;
+   len = strlen(name) + (value?strlen(value):0) + sizeof(=) + 2;
+   buf = (char *)emalloc(len);
+   if (value) {
+   snprintf(buf,len-1,%s=%s, name, value);
+   } else {
+   snprintf(buf,len-1,%s=, name);
+   }
+#if PHP_FASTCGI
+   /* when php is started by mod_fastcgi, no regular environment
+  is provided to PHP.  It is always sent to PHP at the start
+  of a request.  So

Re: [PHP-CVS] cvs: php4 /main config.w32.h.in win95nt.h /sapi/cgicgi_main.c /sapi/cgi/libfcgi fcgiapp.c /sapi/cgi/libfcgi/include fcgiapp.h

2002-12-01 Thread Adam Maccabee Trachtenberg 
On Sun, 1 Dec 2002, Shane Caraveo wrote:

 shane Sun Dec  1 16:37:14 2002 EDT
 
   Modified files:  
 /php4/mainconfig.w32.h.in win95nt.h 
 /php4/sapi/cgicgi_main.c 
 /php4/sapi/cgi/libfcgifcgiapp.c 
 /php4/sapi/cgi/libfcgi/includefcgiapp.h 

 Index: php4/main/config.w32.h.in
 diff -u php4/main/config.w32.h.in:1.23 php4/main/config.w32.h.in:1.24
 --- php4/main/config.w32.h.in:1.23Wed Nov 13 16:28:16 2002
 +++ php4/main/config.w32.h.in Sun Dec  1 16:37:13 2002
 
 @@ -42,13 +42,13 @@
  #define HAVE_FTP 1
  
  /* Enable / Disable MBSTRING extension (default: disabled) */
 -/* #define HAVE_MBSTRING 0 */
 -/* #define HAVE_MBREGEX  0 */
 -/* #define HAVE_MBSTR_CN 0 */
 -/* #define HAVE_MBSTR_JA 0 */
 -/* #define HAVE_MBSTR_KR 0 */
 -/* #define HAVE_MBSTR_RU 0 */
 -/* #define HAVE_MBSTR_TW 0 */
 +#define HAVE_MBSTRING 0 
 +#define HAVE_MBREGEX  0 
 +#define HAVE_MBSTR_CN 0 
 +#define HAVE_MBSTR_JA 0 
 +#define HAVE_MBSTR_KR 0 
 +#define HAVE_MBSTR_RU 0 
 +#define HAVE_MBSTR_TW 0 

Did you mean to uncomment these?

-adam



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main config.w32.h.in

2002-11-13 Thread Edin Kadribasic 
edink   Wed Nov 13 16:28:16 2002 EDT

  Modified files:  
/php4/main  config.w32.h.in 
  Log:
  Allow mbstring defines to be somewhere else without warnings.
  
  
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.22 php4/main/config.w32.h.in:1.23
--- php4/main/config.w32.h.in:1.22  Wed Nov 13 01:47:43 2002
+++ php4/main/config.w32.h.in   Wed Nov 13 16:28:16 2002
 -2,7 +2,7 
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
 
-   $Id: config.w32.h.in,v 1.22 2002/11/13 06:47:43 sebastian Exp $
+   $Id: config.w32.h.in,v 1.23 2002/11/13 21:28:16 edink Exp $
 */
 
 /* Default PHP / PEAR directories */
 -42,13 +42,13 
 #define HAVE_FTP 1
 
 /* Enable / Disable MBSTRING extension (default: disabled) */
-#define HAVE_MBSTRING 0
-#define HAVE_MBREGEX 0
-#define HAVE_MBSTR_CN 0
-#define HAVE_MBSTR_JA 0
-#define HAVE_MBSTR_KR 0
-#define HAVE_MBSTR_RU 0
-#define HAVE_MBSTR_TW 0
+/* #define HAVE_MBSTRING 0 */
+/* #define HAVE_MBREGEX  0 */
+/* #define HAVE_MBSTR_CN 0 */
+/* #define HAVE_MBSTR_JA 0 */
+/* #define HAVE_MBSTR_KR 0 */
+/* #define HAVE_MBSTR_RU 0 */
+/* #define HAVE_MBSTR_TW 0 */
 
 /* Enable / Disable MySQL extension (default: enabled) */
 #define HAVE_MYSQL 1



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main config.w32.h.in

2002-11-12 Thread Sebastian Bergmann 
sebastian   Wed Nov 13 01:47:43 2002 EDT

  Modified files:  
/php4/main  config.w32.h.in 
  Log:
  Disable mbstring (and sync behaviour with *NIX per Andrei's commit).
  
  
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.21 php4/main/config.w32.h.in:1.22
--- php4/main/config.w32.h.in:1.21  Thu Oct 31 22:25:21 2002
+++ php4/main/config.w32.h.in   Wed Nov 13 01:47:43 2002
 -2,7 +2,7 
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
 
-   $Id: config.w32.h.in,v 1.21 2002/11/01 03:25:21 iliaa Exp $
+   $Id: config.w32.h.in,v 1.22 2002/11/13 06:47:43 sebastian Exp $
 */
 
 /* Default PHP / PEAR directories */
 -41,14 +41,14 
 /* Enable / Disable FTP extension (default: enabled) */
 #define HAVE_FTP 1
 
-/* Enable / Disable MBSTRING extension (default: enabled) */
-#define HAVE_MBSTRING 1
-#define HAVE_MBREGEX 1
-#define HAVE_MBSTR_CN 1
-#define HAVE_MBSTR_JA 1
-#define HAVE_MBSTR_KR 1
-#define HAVE_MBSTR_RU 1
-#define HAVE_MBSTR_TW 1
+/* Enable / Disable MBSTRING extension (default: disabled) */
+#define HAVE_MBSTRING 0
+#define HAVE_MBREGEX 0
+#define HAVE_MBSTR_CN 0
+#define HAVE_MBSTR_JA 0
+#define HAVE_MBSTR_KR 0
+#define HAVE_MBSTR_RU 0
+#define HAVE_MBSTR_TW 0
 
 /* Enable / Disable MySQL extension (default: enabled) */
 #define HAVE_MYSQL 1



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main config.w32.h.in

2002-10-31 Thread Ilia Alshanetsky 
iliaa   Thu Oct 31 19:57:54 2002 EDT

  Modified files:  
/php4/main  config.w32.h.in 
  Log:
  Possible fix for #20014. Suggested by [EMAIL PROTECTED]
  
  
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.19 php4/main/config.w32.h.in:1.20
--- php4/main/config.w32.h.in:1.19  Wed Oct 16 10:53:34 2002
+++ php4/main/config.w32.h.in   Thu Oct 31 19:57:54 2002
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
 
-   $Id: config.w32.h.in,v 1.19 2002/10/16 14:53:34 sebastian Exp $
+   $Id: config.w32.h.in,v 1.20 2002/11/01 00:57:54 iliaa Exp $
 */
 
 /* Default PHP / PEAR directories */
@@ -40,6 +40,9 @@
 
 /* Enable / Disable FTP extension (default: enabled) */
 #define HAVE_FTP 1
+
+/* Enable / Disable OpenSSL extension (default: enabled) */
+#define HAVE_OPENSSL_EXT 1
 
 /* Enable / Disable MBSTRING extension (default: enabled) */
 #define HAVE_MBSTRING 1



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main config.w32.h.in

2002-10-31 Thread Ilia Alshanetsky 
iliaa   Thu Oct 31 22:25:21 2002 EDT

  Modified files:  
/php4/main  config.w32.h.in 
  Log:
  Reverting previous OpenSSL patch.
  
  
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.20 php4/main/config.w32.h.in:1.21
--- php4/main/config.w32.h.in:1.20  Thu Oct 31 19:57:54 2002
+++ php4/main/config.w32.h.in   Thu Oct 31 22:25:21 2002
 -2,7 +2,7 
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
 
-   $Id: config.w32.h.in,v 1.20 2002/11/01 00:57:54 iliaa Exp $
+   $Id: config.w32.h.in,v 1.21 2002/11/01 03:25:21 iliaa Exp $
 */
 
 /* Default PHP / PEAR directories */
 -40,9 +40,6 
 
 /* Enable / Disable FTP extension (default: enabled) */
 #define HAVE_FTP 1
-
-/* Enable / Disable OpenSSL extension (default: enabled) */
-#define HAVE_OPENSSL_EXT 1
 
 /* Enable / Disable MBSTRING extension (default: enabled) */
 #define HAVE_MBSTRING 1



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main config.w32.h.in

2002-10-16 Thread Sebastian Bergmann 

sebastian   Wed Oct 16 03:37:28 2002 EDT

  Modified files:  
/php4/main  config.w32.h.in 
  Log:
  Patch by Urs Gehrig [EMAIL PROTECTED].
  
  
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.17 php4/main/config.w32.h.in:1.18
--- php4/main/config.w32.h.in:1.17  Fri Oct 11 05:20:38 2002
+++ php4/main/config.w32.h.in   Wed Oct 16 03:37:28 2002
@@ -2,22 +2,24 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
 
-   $Id: config.w32.h.in,v 1.17 2002/10/11 09:20:38 edink Exp $
+   $Id: config.w32.h.in,v 1.18 2002/10/16 07:37:28 sebastian Exp $
 */
 
+#define CONDENV(ev,def) (getenv(ev)!=NULL?getenv(ev):def)
+
 /* Default PHP / PEAR directories */
-#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
+#define CONFIGURATION_FILE_PATH   php.ini
+#define PEAR_INSTALLDIR   CONDENV(PEAR_INSTALLDIR, c:\\php4\\pear)
+#define PHP_BINDIRCONDENV(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_LIBDIRCONDENV(PHP_LIBDIR, c:\\php4)
+#define PHP_LOCALSTATEDIR CONDENV(PHP_LOCALSTATEDIR, c:\\php4)
+#define PHP_PREFIXCONDENV(PHP_PREFIX, c:\\php4)
+#define PHP_SYSCONFDIRCONDENV(PHP_SYSCONFDIR, c:\\php4)
 
 /* Enable / Disable BCMATH extension (default: enabled) */
 #define WITH_BCMATH 1



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4 /main config.w32.h.in

2002-10-16 Thread Markus Fischer 

Unless you fix the rest of the occurences of these symbolic
defines this patch (which is the same Stig commited) is a bit
problematic and will not work properly.

Take a look at
http://lxr.php.net/source/php4/main/main.c#1100
and see how PEAR_INSTALL_DIR is registered; sizeof() doesn't
work as you might expect with the CONDENV construct.

Please test before commit:


C:\cygwin\home\mfischer\isrc\cvs\php4\Debug_TSphp test.php

Warning: String is not zero-terminated (c:\php4\pear) (source: 
c:\cygwin\home\mfischer\isrc\cvs\php4\zend\zend_constants .c:239) in 
C:\cygwin\home\mfischer\isrc\cvs\php4\Debug_TS\test.php on line 2
string(3) c:\


C:\cygwin\home\mfischer\isrc\cvs\php4\Debug_TSset PEAR_INSTALLDIR=whatever

C:\cygwin\home\mfischer\isrc\cvs\php4\Debug_TSphp test.php

Warning: String is not zero-terminated (whatever) (source: 
c:\cygwin\home\mfischer\isrc\cvs\php4\zend\zend_constants.c:2 39) in 
C:\cygwin\home\mfischer\isrc\cvs\php4\Debug_TS\test.php on line 2
string(3) wha

- Markus


On Wed, Oct 16, 2002 at 07:37:28AM -, Sebastian Bergmann wrote : 
 sebastian Wed Oct 16 03:37:28 2002 EDT
 
   Modified files:  
 /php4/mainconfig.w32.h.in 
   Log:
   Patch by Urs Gehrig [EMAIL PROTECTED].
   
   
 Index: php4/main/config.w32.h.in
 diff -u php4/main/config.w32.h.in:1.17 php4/main/config.w32.h.in:1.18
 --- php4/main/config.w32.h.in:1.17Fri Oct 11 05:20:38 2002
 +++ php4/main/config.w32.h.in Wed Oct 16 03:37:28 2002
 @@ -2,22 +2,24 @@
   Build Configuration for Win32.
   This has only been tested with MS VisualC++ 6 (and later).
  
 - $Id: config.w32.h.in,v 1.17 2002/10/11 09:20:38 edink Exp $
 + $Id: config.w32.h.in,v 1.18 2002/10/16 07:37:28 sebastian Exp $
  */
  
 +#define CONDENV(ev,def) (getenv(ev)!=NULL?getenv(ev):def)
 +
  /* Default PHP / PEAR directories */
 -#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
 +#define CONFIGURATION_FILE_PATH   php.ini
 +#define PEAR_INSTALLDIR   CONDENV(PEAR_INSTALLDIR, c:\\php4\\pear)
 +#define PHP_BINDIRCONDENV(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_LIBDIRCONDENV(PHP_LIBDIR, c:\\php4)
 +#define PHP_LOCALSTATEDIR CONDENV(PHP_LOCALSTATEDIR, c:\\php4)
 +#define PHP_PREFIXCONDENV(PHP_PREFIX, c:\\php4)
 +#define PHP_SYSCONFDIRCONDENV(PHP_SYSCONFDIR, c:\\php4)
  
  /* Enable / Disable BCMATH extension (default: enabled) */
  #define WITH_BCMATH 1
 
 
 
 -- 
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php

-- 
GnuPG Key: http://guru.josefine.at/~mfischer/C2272BD0.asc
rei_ Derick, while ($xml) $ass-get_new_ideas();
[James] Markus: IE on_user_fart()
-- People doesn't seem to like the new XHTML2 specs :) --

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main config.w32.h.in

2002-10-07 Thread Stig Bakken 

ssb Mon Oct  7 21:04:52 2002 EDT

  Modified files:  
/php4/main  config.w32.h.in 
  Log:
  * make these variables configurable from environment on Windows:
PEAR_INSTALLDIR   PHP_BINDIR  PHP_CONFIG_FILE_PATH
PHP_CONFIG_FILE_SCAN_DIR  PHP_DATADIR PHP_EXTENSION_DIR
PHP_INCLUDE_PATH  PHP_LIBDIR  PHP_LOCALSTATEDIR
PHP_PREFIXPHP_SYSCONFDIR
  
  
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.13 php4/main/config.w32.h.in:1.14
--- php4/main/config.w32.h.in:1.13  Fri Oct  4 01:22:13 2002
+++ php4/main/config.w32.h.in   Mon Oct  7 21:04:52 2002
 -2,22 +2,24 
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
 
-   $Id: config.w32.h.in,v 1.13 2002/10/04 05:22:13 sebastian Exp $
+   $Id: config.w32.h.in,v 1.14 2002/10/08 01:04:52 ssb Exp $
 */
 
 /* Default PHP / PEAR directories */
+#define CONDENV(ev,def) (getenv(ev)!=NULL?getenv(ev):def)
+
 #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
+#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_DIRCONDENV(PHP_EXTENSION_DIR, c:\\php4)
+#define PHP_INCLUDE_PATH CONDENV(PHP_INCLUDE_PATH, .;c:\\php4\\pear)
+#define PHP_LIBDIR   CONDENV(PHP_LIBDIR, c:\\php4)
+#define PHP_LOCALSTATEDIRCONDENV(PHP_LOCALSTATEDIR, c:\\php4)
+#define PHP_PREFIX   CONDENV(PHP_PREFIX, c:\\php4)
+#define PHP_SYSCONFDIR   CONDENV(PHP_SYSCONFDIR, c:\\php4)
 
 /* Enable / Disable BCMATH extension (default: enabled) */
 #define WITH_BCMATH 1



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php