[mapserver-commits] r12690 - trunk/mapserver/mapcache

[svn at osgeo.org]

Author: tbonfort
Date: 2011-10-24 04:29:28 -0700 (Mon, 24 Oct 2011)
New Revision: 12690

Modified:
   trunk/mapserver/mapcache/configure
   trunk/mapserver/mapcache/configure.in
Log:
fix geotiff ac_check_lib call


Modified: trunk/mapserver/mapcache/configure
===================================================================
--- trunk/mapserver/mapcache/configure	2011-10-23 15:54:45 UTC (rev 12689)
+++ trunk/mapserver/mapcache/configure	2011-10-24 11:29:28 UTC (rev 12690)
@@ -5249,12 +5249,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_geotiff_XTIFFClientOpen" >&5
 $as_echo "$ac_cv_lib_geotiff_XTIFFClientOpen" >&6; }
 if test "x$ac_cv_lib_geotiff_XTIFFClientOpen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGEOTIFF 1
-_ACEOF
-
-  LIBS="-lgeotiff $LIBS"
-
+  GEOTIFF_LIB="-L$with_geotiff/lib -lgeotiff"
 else
   as_fn_error $? "failed to link with libgeotiff. Specify path" "$LINENO" 5
 fi

Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in	2011-10-23 15:54:45 UTC (rev 12689)
+++ trunk/mapserver/mapcache/configure.in	2011-10-24 11:29:28 UTC (rev 12690)
@@ -659,7 +659,7 @@
 elif test "$with_geotiff" != "no" ; then
 
    GEOTIFF_LIB="-L$with_geotiff/lib -lgeotiff"
-   AC_CHECK_LIB(geotiff,XTIFFClientOpen,,
+   AC_CHECK_LIB(geotiff,XTIFFClientOpen,GEOTIFF_LIB="-L$with_geotiff/lib -lgeotiff",
                  AC_MSG_ERROR([failed to link with libgeotiff. Specify path]),
                  "$GEOTIFF_LIB")
    if test -r $with_geotiff/include/geotiff.h ; then