[mapserver-commits] r9528 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2009-11-06 16:13:19 -0500 (Fri, 06 Nov 2009)
New Revision: 9528

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
fastcgi includes sometimes live in a subdirectory (#3200)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-11-05 16:03:13 UTC (rev 9527)
+++ trunk/mapserver/HISTORY.TXT	2009-11-06 21:13:19 UTC (rev 9528)
@@ -16,6 +16,9 @@
 
 - Fixed buffer overflow in oracle spatial driver with large sql data (#2694)
 
+- Improve FastCGI include file finding logic (#3200)
+
+
 Version 5.6.0-beta5 (2009-11-04):
 ---------------------------------
 

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2009-11-05 16:03:13 UTC (rev 9527)
+++ trunk/mapserver/configure	2009-11-06 21:13:19 UTC (rev 9528)
@@ -12274,7 +12274,7 @@
     FASTCGI_INC=""
     FASTCGI_LIB="-lfcgi"
   else
-    FASTCGI_INC="-I$with_fastcgi/include"
+    FASTCGI_INC="-I$with_fastcgi/include -I$with_fastcgi/include/fastcgi"
     FASTCGI_LIB="-L$with_fastcgi/lib -lfcgi"
   fi
 

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2009-11-05 16:03:13 UTC (rev 9527)
+++ trunk/mapserver/configure.in	2009-11-06 21:13:19 UTC (rev 9528)
@@ -2156,7 +2156,7 @@
     FASTCGI_INC=""
     FASTCGI_LIB="-lfcgi"
   else
-    FASTCGI_INC="-I$with_fastcgi/include"
+    FASTCGI_INC="-I$with_fastcgi/include -I$with_fastcgi/include/fastcgi"
     FASTCGI_LIB="-L$with_fastcgi/lib -lfcgi"
   fi