[mapserver-commits] r7873 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2008-08-20 14:33:32 -0400 (Wed, 20 Aug 2008)
New Revision: 7873

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Fixed the configure script: failed to detect php5 on ubuntu. (#2365)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-08-20 12:31:56 UTC (rev 7872)
+++ trunk/mapserver/HISTORY.TXT	2008-08-20 18:33:32 UTC (rev 7873)
@@ -12,6 +12,8 @@
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
 
+- Fixed the configure script: failed to detect php5 on ubuntu. (#2365)
+
 - Fixed a memory leak associated with not deleting the lexer buffer
   before parsing certain types of strings. (#2729)
 

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2008-08-20 12:31:56 UTC (rev 7872)
+++ trunk/mapserver/configure	2008-08-20 18:33:32 UTC (rev 7873)
@@ -12721,6 +12721,8 @@
 
     test -f "$PHP_SRC_DIR/include/php/main/php_config.h" && PHP_SRC_DIR="$PHP_SRC_DIR/include/php/" && PHP_CONFIG_H="$PHP_SRC_DIR/main/php_config.h"
 
+    test -f "$PHP_SRC_DIR/include/php5/main/php_config.h" && PHP_SRC_DIR="$PHP_SRC_DIR/include/php5/" && PHP_CONFIG_H="$PHP_SRC_DIR/main/php_config.h"
+
   if test -n "$PHP_CONFIG_H" ; then
     { echo "$as_me:$LINENO: result: $PHP_CONFIG_H" >&5
 echo "${ECHO_T}$PHP_CONFIG_H" >&6; }

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2008-08-20 12:31:56 UTC (rev 7872)
+++ trunk/mapserver/configure.in	2008-08-20 18:33:32 UTC (rev 7873)
@@ -2290,6 +2290,9 @@
   dnl If php was installed, then the headers are under $prefix/include/php/*
   test -f "$PHP_SRC_DIR/include/php/main/php_config.h" && PHP_SRC_DIR="$PHP_SRC_DIR/include/php/" && PHP_CONFIG_H="$PHP_SRC_DIR/main/php_config.h"
 
+  dnl In PHP 5, few distributions use "/usr/include/php5" directory
+  test -f "$PHP_SRC_DIR/include/php5/main/php_config.h" && PHP_SRC_DIR="$PHP_SRC_DIR/include/php5/" && PHP_CONFIG_H="$PHP_SRC_DIR/main/php_config.h"
+
   if test -n "$PHP_CONFIG_H" ; then
     AC_MSG_RESULT([$PHP_CONFIG_H])
   else