[mapserver-commits] r11371 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-03-29 16:04:11 -0700 (Tue, 29 Mar 2011)
New Revision: 11371

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Fixed compilation error with opengl support (#3769)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-29 21:55:31 UTC (rev 11370)
+++ trunk/mapserver/HISTORY.TXT	2011-03-29 23:04:11 UTC (rev 11371)
@@ -15,8 +15,10 @@
 Current Version (SVN trunk):
 ----------------------------
 
-- add support for gml:Box for spatail filters (#3789)
+- Fixed compilation error with opengl support (#3769)
 
+- add support for gml:Box for spatial filters (#3789)
+
 - fix query map generation error introduced in beta2 when output format 
   initialized was made as needed. 
 

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2011-03-29 21:55:31 UTC (rev 11370)
+++ trunk/mapserver/configure	2011-03-29 23:04:11 UTC (rev 11371)
@@ -9884,9 +9884,7 @@
 fi
 if test -n "$with_opengl" -a "$with_opengl" != "no" ; then
 
-  if test -n "$FTGL_LIB" ; then
-     FT_INC=`$FTGL_LIB --cflags`
-  else
+  if test -z "$FTGL_LIB" ; then
      { { echo "$as_me:$LINENO: error: FTGL required for opengl support - please configure --with-ftgl." >&5
 echo "$as_me: error: FTGL required for opengl support - please configure --with-ftgl." >&2;}
    { (exit 1); exit 1; }; }

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2011-03-29 21:55:31 UTC (rev 11370)
+++ trunk/mapserver/configure.in	2011-03-29 23:04:11 UTC (rev 11371)
@@ -935,9 +935,7 @@
 fi
 if test -n "$with_opengl" -a "$with_opengl" != "no" ; then
 
-  if test -n "$FTGL_LIB" ; then
-     FT_INC=`$FTGL_LIB --cflags`
-  else
+  if test -z "$FTGL_LIB" ; then
      AC_MSG_ERROR([FTGL required for opengl support - please configure --with-ftgl.])
   fi