[mapserver-commits] r11618 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-04-27 08:06:17 -0700 (Wed, 27 Apr 2011)
New Revision: 11618

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Fix build issue related to unnecessary use of gdal-config --dep-libs (#3316)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-27 13:20:18 UTC (rev 11617)
+++ trunk/mapserver/HISTORY.TXT	2011-04-27 15:06:17 UTC (rev 11618)
@@ -15,7 +15,7 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
-- ...
+- Fix build issue related to unnecessary use of gdal-config --dep-libs (#3316)
 
 Version 6.0.0-beta7 (2011-04-20)
 --------------------------------

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2011-04-27 13:20:18 UTC (rev 11617)
+++ trunk/mapserver/configure	2011-04-27 15:06:17 UTC (rev 11618)
@@ -11764,7 +11764,7 @@
 
 if test -n "$GDAL_ENABLED" -o "$OGR_ENABLED"; then
 
-  GDAL_LIB=`$GDAL_CONFIG --libs`' '`$GDAL_CONFIG --dep-libs`
+  GDAL_LIB=`$GDAL_CONFIG --libs`
   GDAL_INC=`$GDAL_CONFIG --cflags`
 
 fi

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2011-04-27 13:20:18 UTC (rev 11617)
+++ trunk/mapserver/configure.in	2011-04-27 15:06:17 UTC (rev 11618)
@@ -1448,7 +1448,7 @@
 
 if test -n "$GDAL_ENABLED" -o "$OGR_ENABLED"; then
 
-  GDAL_LIB=`$GDAL_CONFIG --libs`' '`$GDAL_CONFIG --dep-libs`
+  GDAL_LIB=`$GDAL_CONFIG --libs`
   GDAL_INC=`$GDAL_CONFIG --cflags`
 
 fi