[PATCH] Bug #32333 - Unable to perform command line build with Ingres extension
| From: | Croker, Grant | Date: | Wed, 16 Mar 2005 13:35:56 +0000 |
| Subject: | [PATCH] Bug #32333 - Unable to perform command line build with Ingres extension | ||
| Groups: | php.internals | ||
| Request: | Send a blank email to internals+get-15464@lists.php.net to get a copy of this message | ||
Hi,
Attached is a new file, config.w32, needed to build the Ingres extension
with the command line build on Windows. Using this patch you should be
able to use the following combination of flags:
--with-ingres
--with-ingres=somepath
--with-ingres=shared
--with-ingres=shared,somepath
In addition the following change needed to be made to
ext\ingres_ii\php_ii.h, also attached:
Index: ingres_ii/php_ii.h
===================================================================
RCS file: /repository/php-src/ext/ingres_ii/php_ii.h,v
retrieving revision 1.12
diff -u -b -w -B -d -r1.12 php_ii.h
--- ingres_ii/php_ii.h 8 Jan 2004 17:32:14 -0000 1.12
+++ ingres_ii/php_ii.h 16 Mar 2005 13:24:11 -0000
@@ -28,6 +28,7 @@
extern zend_module_entry ingres_ii_module_entry;
#define phpext_ingres_ii_ptr &ingres_ii_module_entry
+#define phpext_ingres_ptr &ingres_ii_module_entry
#ifdef PHP_WIN32
#define PHP_II_API __declspec(dllexport)
thanks
grant
// $Id$ // vim:ft=javascript ts=4 sw=4 ARG_WITH("ingres", "Ingres support", "no"); if (PHP_INGRES != "no") { if ( PHP_INGRES == "yes" ) { // no path was supplied to --with-ingres // Find Ingres header files and libaries through %II_SYSTEM% var ii_system=WshShell.Environment("Process").Item("II_SYSTEM"); if ( ii_system != "" ) { if (CHECK_HEADER_ADD_INCLUDE("iiapi.h", "CFLAGS_INGRES", ii_system + "\\ingres\\files;" + PHP_INGRES) && CHECK_LIB("iilibapi.lib", "ingres", ii_system + "\\ingres\\lib;" + PHP_INGRES)) { AC_DEFINE('HAVE_II', 1); EXTENSION("ingres","ii.c"); } else { // ingres is missing files WARNING("Ingres not enabled; libraries and headers not found in " + ii_system); } } else { // %II_SYSTEM% is not set WARNING("Ingres not enabled; %II_SYSTEM% has not been defined"); } } else { // path supplied to --with-ingres if (CHECK_HEADER_ADD_INCLUDE("iiapi.h", "CFLAGS_INGRES", PHP_INGRES + "\\ingres\\files;") && CHECK_LIB("iilibapi.lib", "ingres", PHP_INGRES + "\\ingres\\lib;")) { AC_DEFINE('HAVE_II', 1); EXTENSION("ingres","ii.c"); } else { // cannot find files in supplied path WARNING("Ingres not enabled; libraries and headers not found"); } } } Index: ext/ingres_ii/php_ii.h =================================================================== RCS file: /repository/php-src/ext/ingres_ii/php_ii.h,v retrieving revision 1.12 diff -u -b -w -B -d -r1.12 php_ii.h --- ext/ingres_ii/php_ii.h 8 Jan 2004 17:32:14 -0000 1.12 +++ ext/ingres_ii/php_ii.h 16 Mar 2005 13:24:11 -0000 @@ -28,6 +28,7 @@ extern zend_module_entry ingres_ii_module_entry; #define phpext_ingres_ii_ptr &ingres_ii_module_entry +#define phpext_ingres_ptr &ingres_ii_module_entry #ifdef PHP_WIN32 #define PHP_II_API __declspec(dllexport)
// $Id$ // vim:ft=javascript ts=4 sw=4 ARG_WITH("ingres", "Ingres support", "no"); if (PHP_INGRES != "no") { if ( PHP_INGRES == "yes" ) { // no path was supplied to --with-ingres // Find Ingres header files and libaries through %II_SYSTEM% var ii_system=WshShell.Environment("Process").Item("II_SYSTEM"); if ( ii_system != "" ) { if (CHECK_HEADER_ADD_INCLUDE("iiapi.h", "CFLAGS_INGRES", ii_system + "\\ingres\\files;" + PHP_INGRES) && CHECK_LIB("iilibapi.lib", "ingres", ii_system + "\\ingres\\lib;" + PHP_INGRES)) { AC_DEFINE('HAVE_II', 1); EXTENSION("ingres","ii.c"); } else { // ingres is missing files WARNING("Ingres not enabled; libraries and headers not found in " + ii_system); } } else { // %II_SYSTEM% is not set WARNING("Ingres not enabled; %II_SYSTEM% has not been defined"); } } else { // path supplied to --with-ingres if (CHECK_HEADER_ADD_INCLUDE("iiapi.h", "CFLAGS_INGRES", PHP_INGRES + "\\ingres\\files;") && CHECK_LIB("iilibapi.lib", "ingres", PHP_INGRES + "\\ingres\\lib;")) { AC_DEFINE('HAVE_II', 1); EXTENSION("ingres","ii.c"); } else { // cannot find files in supplied path WARNING("Ingres not enabled; libraries and headers not found"); } } } Index: ext/ingres_ii/php_ii.h =================================================================== RCS file: /repository/php-src/ext/ingres_ii/php_ii.h,v retrieving revision 1.12 diff -u -b -w -B -d -r1.12 php_ii.h --- ext/ingres_ii/php_ii.h 8 Jan 2004 17:32:14 -0000 1.12 +++ ext/ingres_ii/php_ii.h 16 Mar 2005 13:24:11 -0000 @@ -28,6 +28,7 @@ extern zend_module_entry ingres_ii_module_entry; #define phpext_ingres_ii_ptr &ingres_ii_module_entry +#define phpext_ingres_ptr &ingres_ii_module_entry #ifdef PHP_WIN32 #define PHP_II_API __declspec(dllexport)