[mapserver-commits] r7884 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2008-08-25 13:32:17 -0400 (Mon, 25 Aug 2008)
New Revision: 7884

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Added support for static linking with the lib gd in configure script


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-08-22 19:51:38 UTC (rev 7883)
+++ trunk/mapserver/HISTORY.TXT	2008-08-25 17:32:17 UTC (rev 7884)
@@ -12,6 +12,9 @@
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
 
+- Added support for static linking with the lib gd in configure 
+  script (#2696)
+
 - Support OpenLayer's ol:opacity extension to OGC Web Map Context docs (#2746)
 
 - Added MS_VERSION_NUM for use with #if statements in code based on 

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2008-08-22 19:51:38 UTC (rev 7883)
+++ trunk/mapserver/configure	2008-08-25 17:32:17 UTC (rev 7884)
@@ -6891,7 +6891,7 @@
 
   if test "$GD_STATIC" = "yes" ; then
             GD_CHECKLIB=c
-    GD_LIB=""
+    GD_LIB=$GD_LIBDIR/libgd.a
     GD_STATIC=$GD_LIBDIR/libgd.a
     { echo "$as_me:$LINENO: result: static linkage of $GD_STATIC requested... testing supported formats..." >&5
 echo "${ECHO_T}static linkage of $GD_STATIC requested... testing supported formats..." >&6; }

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2008-08-22 19:51:38 UTC (rev 7883)
+++ trunk/mapserver/configure.in	2008-08-25 17:32:17 UTC (rev 7884)
@@ -619,7 +619,7 @@
     dnl To test against static GD, do AC_CHECK_LIB calls against -lc and
     dnl include libgd.a in GD_LIB param
     GD_CHECKLIB=c
-    GD_LIB=""
+    GD_LIB=$GD_LIBDIR/libgd.a
     GD_STATIC=$GD_LIBDIR/libgd.a
     AC_MSG_RESULT([static linkage of $GD_STATIC requested... testing supported formats...])
   else