wez Fri Dec 19 15:39:04 2003 EDT
Added files:
/php-src/sapi/aolserver config.w32
/php-src/sapi/apache_hooks config.w32
/php-src/sapi/pi3web config.w32
Modified files:
/php-src/sapi/apache config.w32
/php-src/sapi/nsapi config.w32
/php-src/win32/build config.w32 confutils.js mkdist.php
Log:
More things for the new build system.
Pi3Web and aolserver build untested (no headers and libs for those here)
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.5 php-src/sapi/apache/config.w32:1.6
--- php-src/sapi/apache/config.w32:1.5 Thu Dec 4 08:38:45 2003
+++ php-src/sapi/apache/config.w32 Fri Dec 19 15:39:01 2003
@@ -1,27 +1,24 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.5 2003/12/04 13:38:45 wez Exp $
+// $Id: config.w32,v 1.6 2003/12/19 20:39:01 wez Exp $
ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'no');
ARG_WITH('apache-includes', 'Where to find Apache 1.3 headers', null);
ARG_WITH('apache-libs', 'Where to find Apache 1.3 libraries', null);
-if (PHP_APACHE == "yes") {
-
- if (!CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE",
php_usual_include_suspects +
- ";" + PROGRAM_FILES + "\\Apache Group\\Apache\\include" +
- ";..\\php_build\\apache\\src\\include")) {
- ERROR("Could not find apache headers");
- }
-
- if (!CHECK_LIB("ApacheCore.lib", "apache", php_usual_lib_suspects +
- ';' + PROGRAM_FILES + '\\Apache Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
- ERROR("Could not find apache libraries");
+if (PHP_APACHE != "no") {
+ if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE",
php_usual_include_suspects +
+ ";" + PROGRAM_FILES + "\\Apache
Group\\Apache\\include" +
+ ";..\\php_build\\apache\\src\\include") &&
+ CHECK_LIB("ApacheCore.lib", "apache", php_usual_lib_suspects +
+ ';' + PROGRAM_FILES + '\\Apache
Group\\Apache\\libexec' +
+ ';..\\php_build\\apache\\src\\corer')) {
+ // We need to play tricks to get our readdir.h used by apache
+ // headers
+ SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
+ 'php' + PHP_VERSION + 'apache.dll',
+ '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
+ } else {
+ WARNING("Could not find apache libraries/headers");
}
- // We need to play tricks to get our readdir.h used by apache
- // headers
- SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
- 'php' + PHP_VERSION + 'apache.dll',
- '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
}
Index: php-src/sapi/nsapi/config.w32
diff -u php-src/sapi/nsapi/config.w32:1.2 php-src/sapi/nsapi/config.w32:1.3
--- php-src/sapi/nsapi/config.w32:1.2 Thu Dec 4 21:40:59 2003
+++ php-src/sapi/nsapi/config.w32 Fri Dec 19 15:39:01 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2003/12/05 02:40:59 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/19 20:39:01 wez Exp $
ARG_ENABLE('nsapi', 'Build NSAPI for Netscape/iPlanet/SunONE webservers', 'no');
@@ -7,20 +7,14 @@
ARG_WITH('nsapi-libs', 'Where to find NSAPI libraries', null);
if (PHP_NSAPI != "no") {
-
if (PHP_ZTS == "no") {
- ERROR("NSAPI module requires an --enable-zts build of PHP");
- }
-
- if (!CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI",
- PHP_NSAPI + ';' + PHP_NSAPI_INCLUDES)) {
- ERROR("Could not find NSAPI headers");
- }
-
- if (!CHECK_LIB("ns-httpd40.lib;ns-httpd36.lib;ns-httpd35.lib;ns-httpd30.lib",
+ WARNING("NSAPI module requires an --enable-zts build of PHP");
+ } else if (CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI",
+ PHP_NSAPI + ';' + PHP_NSAPI_INCLUDES) &&
+
CHECK_LIB("ns-httpd40.lib;ns-httpd36.lib;ns-httpd35.lib;ns-httpd30.lib",
"nsapi", PHP_NSAPI + ";" + PHP_NSAPI_LIBS)) {
- ERROR("Could not find NSAPI libraries");
+ SAPI('nsapi', 'nsapi.c', 'php' + PHP_VERSION + 'nsapi.dll', '/D
XP_WIN32 ');
+ } else {
+ WARNING("Could not find NSAPI headers/libraries");
}
-
- SAPI('nsapi', 'nsapi.c', 'php' + PHP_VERSION + 'nsapi.dll', '/D XP_WIN32 ');
}
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.15 php-src/win32/build/config.w32:1.16
--- php-src/win32/build/config.w32:1.15 Fri Dec 19 07:50:11 2003
+++ php-src/win32/build/config.w32 Fri Dec 19 15:39:02 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.15 2003/12/19 12:50:11 wez Exp $
+// $Id: config.w32,v 1.16 2003/12/19 20:39:02 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -8,6 +8,9 @@
PATH_PROG('cl');
PATH_PROG('link');
PATH_PROG('nmake');
+// we don't want to define LIB, as that will override the default library path
+// that is set in that env var
+PATH_PROG('lib', null, 'MAKE_LIB');
PATH_PROG('bison');
PATH_PROG('flex');
PATH_PROG('re2c');
@@ -38,7 +41,7 @@
/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS");
// General link flags
-DEFINE("LDFLAGS", "/nologo /libpath:$(PHP_BUILD)\\lib /version:" +
+DEFINE("LDFLAGS", "/nologo /version:" +
PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION);
// General DLL link flags
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.21 php-src/win32/build/confutils.js:1.22
--- php-src/win32/build/confutils.js:1.21 Fri Dec 19 11:55:59 2003
+++ php-src/win32/build/confutils.js Fri Dec 19 15:39:02 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.21 2003/12/19 16:55:59 wez Exp $
+// $Id: confutils.js,v 1.22 2003/12/19 20:39:02 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -398,7 +398,7 @@
return place;
}
-function PATH_PROG(progname, additional_paths)
+function PATH_PROG(progname, additional_paths, symbol)
{
var exe;
var place;
@@ -421,13 +421,23 @@
}
if (place) {
- DEFINE(progname.toUpperCase(), place);
+ if (symbol == null) {
+ symbol = progname.toUpperCase();
+ }
+ DEFINE(symbol, place);
}
return place;
}
function CHECK_LIB(libnames, target, path_to_check)
{
+ if (target == null) {
+ target = "";
+ } else {
+ target = "_" + target.toUpperCase();
+ }
+
+
if (path_to_check == null) {
path_to_check = php_usual_lib_suspects;
} else {
@@ -444,11 +454,11 @@
p = search_paths(libname, path_to_check, "LIB");
if (typeof(p) == "string") {
- ADD_FLAG("LDFLAGS_" + target.toUpperCase(), '/libpath:"' + p +
'" ');
- ADD_FLAG("LIBS_" + target.toUpperCase(), libname);
+ ADD_FLAG("LDFLAGS" + target, '/libpath:"' + p + '" ');
+ ADD_FLAG("LIBS" + target, libname);
have = 1;
} else if (p == true) {
- ADD_FLAG("LIBS_" + target.toUpperCase(), libname);
+ ADD_FLAG("LIBS" + target, libname);
have = 1;
} else {
/* not found in the defaults or the explicit paths,
@@ -457,7 +467,7 @@
* already have it covered, but we need to add the lib
* to LIBS_XXX */
if (false != search_paths(libname, PHP_EXTRA_LIBS, null)) {
- ADD_FLAG("LIBS_" + target.toUpperCase(), libname);
+ ADD_FLAG("LIBS" + target, libname);
have = 1;
}
}
@@ -569,6 +579,7 @@
var SAPI = sapiname.toUpperCase();
var ldflags;
var resname;
+ var ld = "$(LD)";
STDOUT.WriteLine("Enabling SAPI " + configure_module_dirname);
@@ -594,11 +605,14 @@
if (makefiletarget.match(new RegExp("\\.dll$"))) {
ldflags = "/dll $(LDFLAGS)";
+ } else if (makefiletarget.match(new RegExp("\\.lib$"))) {
+ ldflags = "$(LDFLAGS)";
+ ld = "$(MAKE_LIB)";
} else {
ldflags = "$(LDFLAGS)";
}
- MFO.WriteLine("\t$(LD) /nologo /out:$(BUILD_DIR)\\" + makefiletarget + " " +
ldflags + " $(" + SAPI + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LDFLAGS_" + SAPI +
") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
+ MFO.WriteLine("\t" + ld + " /nologo /out:$(BUILD_DIR)\\" + makefiletarget + "
" + ldflags + " $(" + SAPI + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LDFLAGS_" + SAPI
+ ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')');
ADD_FLAG("SAPI_TARGETS", makefiletarget);
@@ -951,7 +965,12 @@
value = '""';
}
var item = new Array(value, comment);
- configure_hdr.Add(name, item);
+ if (configure_hdr.Exists(name)) {
+ var orig_item = configure_hdr.Item(name);
+ STDOUT.WriteLine("AC_DEFINE[" + name + "]=" + value + ": is already
defined to " + item[0]);
+ } else {
+ configure_hdr.Add(name, item);
+ }
}
function ERROR(msg)
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.2 php-src/win32/build/mkdist.php:1.3
--- php-src/win32/build/mkdist.php:1.2 Fri Dec 19 07:50:11 2003
+++ php-src/win32/build/mkdist.php Fri Dec 19 15:39:02 2003
@@ -1,4 +1,4 @@
-<?php # $Id: mkdist.php,v 1.2 2003/12/19 12:50:11 wez Exp $
+<?php # $Id: mkdist.php,v 1.3 2003/12/19 20:39:02 wez Exp $
/* piece together a windows binary distro */
$build_dir = $argv[1];
@@ -30,11 +30,21 @@
'advapi32.dll', 'comdlg32.dll', 'gdi32.dll', 'kernel32.dll',
'ntdll.dll',
'odbc32.dll', 'ole32.dll', 'oleaut32.dll', 'rpcrt4.dll',
'shell32.dll', 'shlwapi.dll', 'user32.dll', 'ws2_32.dll',
'ws2help.dll',
- 'comctl32.dll', 'winmm.dll', 'wsock32.dll',
+ 'comctl32.dll', 'winmm.dll', 'wsock32.dll', 'winspool.drv',
'msasn1.dll',
+ 'secur32.dll', 'netapi32.dll',
/* apache */
'apachecore.dll',
+ /* nsapi */
+ 'ns-httpd30.dll', 'ns-httpd35.dll', 'ns-httpd36.dll', 'ns-httpd40.dll',
+
+ /* oracle */
+ 'oci.dll', 'ociw32.dll',
+
+ /* sybase */
+ 'libcs.dll', 'libct.dll',
+
/* visual C++; mscvrt.dll is present on everyones system,
* but the debug version (msvcrtd.dll) and those from visual studio.net
* (msvcrt7x.dll) are not */
@@ -89,7 +99,7 @@
echo "Copying $item from $source_dir to $dest_dir\n";
copy($source_dir . DIRECTORY_SEPARATOR . $item, $dest_dir .
DIRECTORY_SEPARATOR . $item);
if ($is_debug) {
- $itemdb = preg_replace("/\.(exe|dll)$/i", ".pdb", $item);
+ $itemdb = preg_replace("/\.(exe|dll|lib)$/i", ".pdb", $item);
if (file_exists("$source_dir/$itemdb")) {
copy("$source_dir/$itemdb", "$dist_dir/dev/$itemdb");
}
Index: php-src/sapi/aolserver/config.w32
+++ php-src/sapi/aolserver/config.w32
// vim:ft=javascript
// $Id: config.w32,v 1.1 2003/12/19 20:39:02 wez Exp $
ARG_WITH('aolserver', 'Build AOLserver support', 'no');
if (PHP_AOLSERVER != "no") {
if (PHP_ZTS == "no") {
WARNING("AOLSERVER module requires an --enable-zts build of PHP");
} else {
if (CHECK_HEADER_ADD_INCLUDE("ns.h", "CFLAGS_AOLSERVER",
PHP_AOLSERVER) && CHECK_LIB("nsd.lib", "aolserver", PHP_AOLSERVER)) {
SAPI('aolserver', 'aolserver.c', 'php' + PHP_VERSION +
'aolserver.so', '/D XP_WIN32 ');
} else {
WARNING("sapi/aolserver not enabled: Could not find
libraries/headers");
}
}
}
Index: php-src/sapi/apache_hooks/config.w32
+++ php-src/sapi/apache_hooks/config.w32
// vim:ft=javascript
// $Id: config.w32,v 1.1 2003/12/19 20:39:03 wez Exp $
ARG_WITH('apache-hooks', 'Build Apache 1.3.x (hooks) version of PHP', 'no');
if (PHP_APACHE_HOOKS != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE_HOOKS",
php_usual_include_suspects +
";" + PROGRAM_FILES + "\\Apache
Group\\Apache\\include" +
";..\\php_build\\apache\\src\\include") &&
CHECK_LIB("ApacheCore.lib", "apache_hooks",
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache
Group\\Apache\\libexec' +
';..\\php_build\\apache\\src\\corer')) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache_hooks', 'mod_php4.c sapi_apache.c php_apache.c',
'php' + PHP_VERSION + 'apache_hooks.dll',
'/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
} else {
WARNING("Could not find apache libraries/headers");
}
}
Index: php-src/sapi/pi3web/config.w32
+++ php-src/sapi/pi3web/config.w32
// vim:ft=javascript
// $Id: config.w32,v 1.1 2003/12/19 20:39:04 wez Exp $
ARG_WITH('pi3web', 'Pi3Web', 'no');
if (PHP_PI3WEB != "no") {
if (CHECK_HEADER_ADD_INCLUDE('PiAPI/PiAPI.h', 'CFLAGS_PI3WEB', PHP_PI3WEB) &&
CHECK_LIB('piapi.lib', 'pi3web') &&
CHECK_LIB('pi2api.lib', 'pi3web') &&
CHECK_LIB('pi3api.lib', 'pi3web')) {
SAPI('pi3web', 'pi3web_sapi.c', 'php' + PHP_VERSION + 'pi3web.dll',
'/D PHP4PI3WEB_EXPORTS');
AC_DEFINE('WITH_PI3WEB', 1);
} else {
WARNING('Pi3Web not enabled; headers/libraries not found');
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
