[mapserver-commits] r11587 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-04-15 07:49:16 -0700 (Fri, 15 Apr 2011)
New Revision: 11587

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Fix configure output for 'WFS Client' (was reporting WMS info, #3842)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-15 14:32:09 UTC (rev 11586)
+++ trunk/mapserver/HISTORY.TXT	2011-04-15 14:49:16 UTC (rev 11587)
@@ -15,8 +15,11 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
-- KML: latlon bbox for raster layers could end up being wrong for non-square requests (#3840)
+- Fix configure output for "WFS Client" (was reporting WMS info, #3842)
 
+- KML: latlon bbox for raster layers could end up being wrong for non-square
+  requests (#3840)
+
 Version 6.0.0-beta6 (2011-04-13)
 --------------------------------
 

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2011-04-15 14:32:09 UTC (rev 11586)
+++ trunk/mapserver/configure	2011-04-15 14:49:16 UTC (rev 11587)
@@ -9808,6 +9808,7 @@
   fi
 
   test -f $FTGL_DIR/lib/libftgl.so && FTGL_LIBDIR="$FTGL_DIR/lib"
+  test -f $FTGL_DIR/lib/libftgl.dylib && FTGL_LIBDIR="$FTGL_DIR/lib"
   test -f $FTGL_DIR/lib64/libftgl.so && FTGL_LIBDIR="$FTGL_DIR/lib64"
 
   if test -z "$FTGL_LIBDIR" ; then
@@ -9908,6 +9909,7 @@
   fi
 
   test -f $OGL_DIR/lib/libGL.so -a -f $OGL_DIR/lib/libGLU.so && OGL_LIBDIR="$OGL_DIR/lib"
+  test -f $OGL_DIR/lib/libGL.dylib -a -f $OGL_DIR/lib/libGLU.dylib && OGL_LIBDIR="$OGL_DIR/lib"
   test -f $OGL_DIR/lib64/libGL.so -a -f $OGL_DIR/lib64/libGLU.so && OGL_LIBDIR="$OGL_DIR/lib64"
 
   if test -z "$OGL_LIBDIR" ; then
@@ -15368,8 +15370,8 @@
 echo "${ECHO_T}  WMS Client:                ${WMS_LYR_ENABLED}" >&6
 echo "$as_me:$LINENO: result:   WFS Server:                ${WFS_SVR_ENABLED}" >&5
 echo "${ECHO_T}  WFS Server:                ${WFS_SVR_ENABLED}" >&6
-echo "$as_me:$LINENO: result:   WFS Client:                ${WMS_LYR_ENABLED}" >&5
-echo "${ECHO_T}  WFS Client:                ${WMS_LYR_ENABLED}" >&6
+echo "$as_me:$LINENO: result:   WFS Client:                ${WFS_LYR_ENABLED}" >&5
+echo "${ECHO_T}  WFS Client:                ${WFS_LYR_ENABLED}" >&6
 echo "$as_me:$LINENO: result:   WCS Server:                ${WCS_SVR_ENABLED}" >&5
 echo "${ECHO_T}  WCS Server:                ${WCS_SVR_ENABLED}" >&6
 echo "$as_me:$LINENO: result:   SOS Server:                ${SOS_SVR_ENABLED}" >&5

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2011-04-15 14:32:09 UTC (rev 11586)
+++ trunk/mapserver/configure.in	2011-04-15 14:49:16 UTC (rev 11587)
@@ -2885,7 +2885,7 @@
 AC_MSG_RESULT([  WMS Server:                ${WMS_SVR_ENABLED}])
 AC_MSG_RESULT([  WMS Client:                ${WMS_LYR_ENABLED}])
 AC_MSG_RESULT([  WFS Server:                ${WFS_SVR_ENABLED}])
-AC_MSG_RESULT([  WFS Client:                ${WMS_LYR_ENABLED}])
+AC_MSG_RESULT([  WFS Client:                ${WFS_LYR_ENABLED}])
 AC_MSG_RESULT([  WCS Server:                ${WCS_SVR_ENABLED}])
 AC_MSG_RESULT([  SOS Server:                ${SOS_SVR_ENABLED}])
 AC_MSG_RESULT()