[mapserver-commits] r9364 - in trunk/mapserver: . mapscript/php3

[svn at osgeo.org]

Author: dmorissette
Date: 2009-10-01 14:14:36 -0400 (Thu, 01 Oct 2009)
New Revision: 9364

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
   trunk/mapserver/mapscript/php3/Makefile.in
Log:
Fixed issue with PHP_REGEX_INC in mapscript/php3/Makefile.in (#3078)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-01 17:47:42 UTC (rev 9363)
+++ trunk/mapserver/HISTORY.TXT	2009-10-01 18:14:36 UTC (rev 9364)
@@ -33,6 +33,9 @@
 - Use http://www.mapserver.org/mapserver namespace URI in XML mapfile 
   schema (#3142)
 
+- Fixed issue with PHP_REGEX_INC in mapscript/php3/Makefile.in (#3078)
+
+
 Version 5.6.0-beta1 (2009-09-23):
 ---------------------------------
 

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2009-10-01 17:47:42 UTC (rev 9363)
+++ trunk/mapserver/configure	2009-10-01 18:14:36 UTC (rev 9364)
@@ -12973,7 +12973,7 @@
             test -f "$PHP_SRC_DIR/regex/regex_extra.h" && PHP_NO_SOURCE="1"
         if test -n "$PHP_NO_SOURCE" ; then
                     USE_PHP_REGEX="-DUSE_PHP_REGEX"
-          PHP_REGEX_INC="$PHP_SRC_DIR/"
+          PHP_REGEX_INC="-I$PHP_SRC_DIR"
           PHP_REGEX_OBJ=php_regex.o
           echo "$as_me:$LINENO: result:         found regex_extra.h - building PHP MapScript with PHP's bundled regex " >&5
 echo "${ECHO_T}        found regex_extra.h - building PHP MapScript with PHP's bundled regex " >&6
@@ -12981,7 +12981,7 @@
                     test -f "$PHP_SRC_DIR/ext/ereg/regex/regex.h" && PHP_NO_SOURCE="1"
           if test -n "$PHP_NO_SOURCE" ; then
                     USE_PHP_REGEX="-DUSE_PHP_REGEX"
-          PHP_REGEX_INC="$PHP_SRC_DIR/ext/ereg/"
+          PHP_REGEX_INC="-I$PHP_SRC_DIR/ext/ereg/"
           PHP_REGEX_OBJ=php_regex.o
           echo "$as_me:$LINENO: result:         found regex.h - building PHP MapScript with PHP's bundled regex " >&5
 echo "${ECHO_T}        found regex.h - building PHP MapScript with PHP's bundled regex " >&6

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2009-10-01 17:47:42 UTC (rev 9363)
+++ trunk/mapserver/configure.in	2009-10-01 18:14:36 UTC (rev 9364)
@@ -2493,7 +2493,7 @@
         if test -n "$PHP_NO_SOURCE" ; then
           dnl Found regex_extra.h
           USE_PHP_REGEX="-DUSE_PHP_REGEX"
-          PHP_REGEX_INC="$PHP_SRC_DIR/"
+          PHP_REGEX_INC="-I$PHP_SRC_DIR"
           PHP_REGEX_OBJ=php_regex.o
           AC_MSG_RESULT([        found regex_extra.h - building PHP MapScript with PHP's bundled regex ])
         else
@@ -2502,7 +2502,7 @@
           if test -n "$PHP_NO_SOURCE" ; then
           dnl Found regex.h
           USE_PHP_REGEX="-DUSE_PHP_REGEX"
-          PHP_REGEX_INC="$PHP_SRC_DIR/ext/ereg/"
+          PHP_REGEX_INC="-I$PHP_SRC_DIR/ext/ereg/"
           PHP_REGEX_OBJ=php_regex.o
           AC_MSG_RESULT([        found regex.h - building PHP MapScript with PHP's bundled regex ])
           else

Modified: trunk/mapserver/mapscript/php3/Makefile.in
===================================================================
--- trunk/mapserver/mapscript/php3/Makefile.in	2009-10-01 17:47:42 UTC (rev 9363)
+++ trunk/mapserver/mapscript/php3/Makefile.in	2009-10-01 18:14:36 UTC (rev 9364)
@@ -54,7 +54,7 @@
 # uses the same version of the REGEX library that PHP was compiled with:
 #
 PHP_REGEX_OBJ=@PHP_REGEX_OBJ@
-PHP_REGEX_INC=-I at PHP_REGEX_INC@
+PHP_REGEX_INC=@PHP_REGEX_INC@
 
 
 #