[mapserver-commits] r10511 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2010-09-22 17:43:46 +0000 (Wed, 22 Sep 2010)
New Revision: 10511

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Set dependency on libxml2 when building --with-wfs (#3512)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-09-20 15:25:06 UTC (rev 10510)
+++ trunk/mapserver/HISTORY.TXT	2010-09-22 17:43:46 UTC (rev 10511)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Set dependency on libxml2 when building --with-wfs (#3512)
+
 - Fixed TRUE is undefined in shptreevis (#3545)
 
 - shptreevis: bug truncates visualization shapefile if there are more

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2010-09-20 15:25:06 UTC (rev 10510)
+++ trunk/mapserver/configure	2010-09-22 17:43:46 UTC (rev 10511)
@@ -12156,6 +12156,14 @@
 echo "${ECHO_T}      If unavailable disable using --without-xml2-config," >&6
     echo "$as_me:$LINENO: result:       but WCS 1.1 support will be disabled." >&5
 echo "${ECHO_T}      but WCS 1.1 support will be disabled." >&6
+   elif test "x$WFS_SVR_ENABLED" != "x" ; then
+    with_xml2_config=yes
+    echo "$as_me:$LINENO: result: libxml2 requested for WCS Server." >&5
+echo "${ECHO_T}libxml2 requested for WFS Server." >&6
+    echo "$as_me:$LINENO: result:       If unavailable disable using --without-xml2-config," >&5
+echo "${ECHO_T}      If unavailable disable using --without-xml2-config," >&6
+    echo "$as_me:$LINENO: result:       but WFS 1.1 support will be disabled." >&5
+echo "${ECHO_T}      but WFS 1.1 support will be disabled." >&6
   else
     with_xml2_config=no
     echo "$as_me:$LINENO: result: libxml2 not required." >&5

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2010-09-20 15:25:06 UTC (rev 10510)
+++ trunk/mapserver/configure.in	2010-09-22 17:43:46 UTC (rev 10511)
@@ -1934,6 +1934,11 @@
     AC_MSG_RESULT([libxml2 requested for WCS Server.])
     AC_MSG_RESULT([      If unavailable disable using --without-xml2-config,])
     AC_MSG_RESULT([      but WCS 1.1 support will be disabled.])
+  elif test "x$WFS_SVR_ENABLED" != "x" ; then 
+    with_xml2_config=yes
+    AC_MSG_RESULT([libxml2 requested for WFS Server.])
+    AC_MSG_RESULT([      If unavailable disable using --without-xml2-config,])
+    AC_MSG_RESULT([      but WFS 1.1 support will be disabled.])
   else
     with_xml2_config=no
     AC_MSG_RESULT([libxml2 not required.])