[mapserver-commits] r12653 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-10-10 03:09:51 -0700 (Mon, 10 Oct 2011)
New Revision: 12653

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
remove default compiler search paths from the GD CFLAGS/LDFLAGS (#4046)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-10-09 11:08:15 UTC (rev 12652)
+++ trunk/mapserver/HISTORY.TXT	2011-10-10 10:09:51 UTC (rev 12653)
@@ -14,6 +14,7 @@
 
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 -------------------------------------------------
+- remove default compiler search paths from the GD CFLAGS/LDFLAGS (#4046)
 
 - Fixed Python Mapscript does not write COLOR to reference map (#4042)
 

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2011-10-09 11:08:15 UTC (rev 12652)
+++ trunk/mapserver/configure	2011-10-10 10:09:51 UTC (rev 12653)
@@ -7995,33 +7995,11 @@
     fi
 
     if test -n "$GD_INCLUDE" -a -n "$GD_LIBDIR" -a "$IS_GD2" = "true"; then
-      GD_INC=-I$GD_INCLUDE
-      GD_LIB="-L$GD_LIBDIR -lgd"
+      GD_INC=
+      GD_LIB="-lgd"
       GD_XTRA_LIBS="$GD_XTRA_LIBS $GD_NEED_ICONV_LIB"
       echo "$as_me:$LINENO: result:         using libgd 2.0.28 (or higher) from system libs ($GD_LIB $GD_XTRA_LIBS)." >&5
 echo "${ECHO_T}        using libgd 2.0.28 (or higher) from system libs ($GD_LIB $GD_XTRA_LIBS)." >&6
-
-  if test ""$GD_LIBDIR"" != "/usr/lib"; then
-
-  if test -z ""$GD_LIBDIR"" || echo ""$GD_LIBDIR"" | grep '^/' >/dev/null ; then
-    ai_p=""$GD_LIBDIR""
-  else
-    ai_p="`pwd`/"$GD_LIBDIR""
-  fi
-
-
-  unique=`echo $ac_n "$ai_p$ac_c" | tr -c -d a-zA-Z0-9`
-  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
-  if test -n "$unique" && test "`eval $cmd`" = "" ; then
-    eval "LIBPATH$unique=set"
-
-      EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-        RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
-
-  fi
-
-  fi
-
       FOUND_GD="true"
       break;
     fi

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2011-10-09 11:08:15 UTC (rev 12652)
+++ trunk/mapserver/configure.in	2011-10-10 10:09:51 UTC (rev 12653)
@@ -691,11 +691,10 @@
     fi
 
     if test -n "$GD_INCLUDE" -a -n "$GD_LIBDIR" -a "$IS_GD2" = "true"; then
-      GD_INC=-I$GD_INCLUDE
-      GD_LIB="-L$GD_LIBDIR -lgd"
+      GD_INC=
+      GD_LIB="-lgd"
       GD_XTRA_LIBS="$GD_XTRA_LIBS $GD_NEED_ICONV_LIB"
       AC_MSG_RESULT([        using libgd 2.0.28 (or higher) from system libs ($GD_LIB $GD_XTRA_LIBS).])
-      AC_ADD_RUNPATH("$GD_LIBDIR")
       FOUND_GD="true"
       break;
     fi