summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2003-12-19 23:19:19 +0000
committerWez Furlong <wez@php.net>2003-12-19 23:19:19 +0000
commitdeb3bff21afe9ab805e13edcbcdae231caccf160 (patch)
tree9c390959b5091cbb4958c23cad08d08a1fa5f3c0
parent4084ed9edf620deccddc21a2fc543fcc18ac7158 (diff)
downloadphp-git-deb3bff21afe9ab805e13edcbcdae231caccf160.tar.gz
Forgot to add embed config.w32, and tweak version resource when CREDITS file is missing.
-rw-r--r--sapi/embed/config.w328
-rw-r--r--win32/build/confutils.js4
2 files changed, 10 insertions, 2 deletions
diff --git a/sapi/embed/config.w32 b/sapi/embed/config.w32
new file mode 100644
index 0000000000..8ea0781ed3
--- /dev/null
+++ b/sapi/embed/config.w32
@@ -0,0 +1,8 @@
+// vim:ft=javascript
+// $Id$
+
+ARG_ENABLE('embed', 'Embedded SAPI library', 'no');
+
+if (PHP_EMBED != "no") {
+ SAPI('embed', 'php_embed.c', 'php' + PHP_VERSION + 'embed.lib');
+}
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 15310f91b8..7cb4f2ec93 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.22 2003-12-19 20:39:02 wez Exp $
+// $Id: confutils.js,v 1.23 2003-12-19 23:19:18 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -541,7 +541,7 @@ function generate_version_info_resource(makefiletarget, creditspath)
var res_desc = "PHP " + makefiletarget;
var res_prod_name = res_desc;
var credits;
- var thanks = null;
+ var thanks = "";
var logo = "";
if (FSO.FileExists(creditspath + '/CREDITS')) {