Imported Upstream version 5.2.6upstream/5.2.6

13 files changed, 32 insertions, 24 deletions

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 2a6a20f30..5f7cb0674 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8 2007/07/26 22:45:59 jani Exp $
+// $Id: confutils.js,v 1.60.2.1.2.10 2008/01/17 21:17:29 cellog Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -429,7 +429,7 @@ can be built that way. \
 
 	STDOUT.WriteLine("Saving configure options to config.nice.bat");
 	var nicefile = FSO.CreateTextFile("config.nice.bat", true);
-	nicefile.WriteLine(nice);
+	nicefile.WriteLine(nice +  " %*");
 	nicefile.Close();
 
 	AC_DEFINE('CONFIGURE_COMMAND', nice);
@@ -1009,6 +1009,14 @@ function ADD_EXTENSION_DEP(extname, dependson, optional)
 		ADD_FLAG("LDFLAGS_" + EXT, "/libpath:$(BUILD_DIR)");
 		ADD_FLAG("LIBS_" + EXT, "php_" + dependson + ".lib");
 		ADD_FLAG("DEPS_" + EXT, "$(BUILD_DIR)\\php_" + dependson + ".lib");
+	} else {
+		if (dep_present == "no") {
+			if (ext_shared) {
+				WARNING(extname + " has a missing dependency: " + dependson);
+			} else {
+				ERROR("Cannot build " + extname + "; " + dependson + " not enabled");
+			}
+		}
 	}
 }
 
diff --git a/win32/build/deplister.c b/win32/build/deplister.c
index bbc3527a8..c28ee692d 100644
--- a/win32/build/deplister.c
+++ b/win32/build/deplister.c
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: deplister.c,v 1.3.2.1.2.1 2007/01/01 09:36:13 sebastian Exp $ */
+/* $Id: deplister.c,v 1.3.2.1.2.2 2007/12/31 07:20:17 sebastian Exp $ */
 
 /* This little application will list the DLL dependencies for a PE
  * module to it's stdout for use by distro/installer building tools */
diff --git a/win32/crypt_win32.h b/win32/crypt_win32.h
index a0c4bc9c4..26ea53a79 100644
--- a/win32/crypt_win32.h
+++ b/win32/crypt_win32.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/win32/globals.c b/win32/globals.c
index ed4fd29d9..da41b8de8 100755
--- a/win32/globals.c
+++ b/win32/globals.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: globals.c,v 1.5.2.1.2.3 2007/01/01 09:36:13 sebastian Exp $ */
+/* $Id: globals.c,v 1.5.2.1.2.4 2007/12/31 07:20:17 sebastian Exp $ */
 
 #include "php.h"
 #include "php_win32_globals.h"
diff --git a/win32/grp.h b/win32/grp.h
index c937e48a6..2f5921093 100644
--- a/win32/grp.h
+++ b/win32/grp.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: grp.h,v 1.7.2.1.2.1 2007/01/01 09:36:13 sebastian Exp $ */
+/* $Id: grp.h,v 1.7.2.1.2.2 2007/12/31 07:20:17 sebastian Exp $ */
 
 struct group {
 	char *gr_name;			
diff --git a/win32/md5crypt.c b/win32/md5crypt.c
index d07dd16a0..10f08cb29 100644
--- a/win32/md5crypt.c
+++ b/win32/md5crypt.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: md5crypt.c,v 1.6.2.1.2.1 2007/01/01 09:36:13 sebastian Exp $ */
+/* $Id: md5crypt.c,v 1.6.2.1.2.2 2007/12/31 07:20:17 sebastian Exp $ */
 
 /*
  * ----------------------------------------------------------------------------
diff --git a/win32/md5crypt.h b/win32/md5crypt.h
index 30233b031..3e1e78f7b 100644
--- a/win32/md5crypt.h
+++ b/win32/md5crypt.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: md5crypt.h,v 1.5.2.1.2.1 2007/01/01 09:36:13 sebastian Exp $ */
+/* $Id: md5crypt.h,v 1.5.2.1.2.2 2007/12/31 07:20:17 sebastian Exp $ */
 #ifndef _MD5CRYPT_H_
 #define _MD5CRYPT_H_
 
diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h
index ea2f1bcdd..2bb851687 100755
--- a/win32/php_win32_globals.h
+++ b/win32/php_win32_globals.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_win32_globals.h,v 1.4.2.1.2.3 2007/01/01 09:36:13 sebastian Exp $ */
+/* $Id: php_win32_globals.h,v 1.4.2.1.2.4 2007/12/31 07:20:17 sebastian Exp $ */
 
 #ifndef PHP_WIN32_GLOBALS_H
 #define PHP_WIN32_GLOBALS_H
diff --git a/win32/select.c b/win32/select.c
index de43dd77f..2dd380dcd 100644
--- a/win32/select.c
+++ b/win32/select.c
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -21,7 +21,7 @@
 
 #ifdef PHP_WIN32
 
-/* $Id: select.c,v 1.10.2.2.2.2 2007/04/16 08:09:56 dmitry Exp $ */
+/* $Id: select.c,v 1.10.2.2.2.3 2007/12/31 07:20:17 sebastian Exp $ */
 
 /* Win32 select() will only work with sockets, so we roll our own implementation here.
  * - If you supply only sockets, this simply passes through to winsock select().
diff --git a/win32/select.h b/win32/select.h
index 44c483e36..56920161d 100644
--- a/win32/select.h
+++ b/win32/select.h
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: select.h,v 1.4.2.1.2.1 2007/01/01 09:36:13 sebastian Exp $ */
+/* $Id: select.h,v 1.4.2.1.2.2 2007/12/31 07:20:17 sebastian Exp $ */
 
 PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv);
 
diff --git a/win32/syslog.h b/win32/syslog.h
index 20c5e137c..27c5464c1 100644
--- a/win32/syslog.h
+++ b/win32/syslog.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: syslog.h,v 1.10.2.1.2.1 2007/01/01 09:36:13 sebastian Exp $ */
+/* $Id: syslog.h,v 1.10.2.1.2.2 2007/12/31 07:20:17 sebastian Exp $ */
 
 #ifndef SYSLOG_H
 #define	SYSLOG_H
diff --git a/win32/winutil.c b/win32/winutil.c
index 49621f978..dd9cbd397 100644
--- a/win32/winutil.c
+++ b/win32/winutil.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: winutil.c,v 1.16.2.1.2.1 2007/01/01 09:36:13 sebastian Exp $ */
+/* $Id: winutil.c,v 1.16.2.1.2.2 2007/12/31 07:20:17 sebastian Exp $ */
 
 #include "php.h"
 
diff --git a/win32/winutil.h b/win32/winutil.h
index 4915a15ec..d20218278 100644
--- a/win32/winutil.h
+++ b/win32/winutil.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |