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

[svn at osgeo.org]

Author: tbonfort
Date: 2012-02-06 09:26:25 -0800 (Mon, 06 Feb 2012)
New Revision: 13055

Modified:
   trunk/mapserver/mapcache/configure
   trunk/mapserver/mapcache/configure.in
Log:
fix stray -ltiff in lib checks


Modified: trunk/mapserver/mapcache/configure
===================================================================
--- trunk/mapserver/mapcache/configure	2012-02-06 17:21:15 UTC (rev 13054)
+++ trunk/mapserver/mapcache/configure	2012-02-06 17:26:25 UTC (rev 13055)
@@ -13003,14 +13003,13 @@
         test -f $TIFF_DIR/tiffio.h && TIFF_INCLUDE="$TIFF_DIR"
 
         if test -n "$TIFF_LIBDIR" ; then
-          TIFF_LIB="-L$TIFF_LIBDIR -ltiff"
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFReadScanline in -ltiff" >&5
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFReadScanline in -ltiff" >&5
 $as_echo_n "checking for TIFFReadScanline in -ltiff... " >&6; }
 if ${ac_cv_lib_tiff_TIFFReadScanline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltiff "$TIFF_LIB" $LIBS"
+LIBS="-ltiff -L$TIFF_LIBDIR -ltiff $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13041,12 +13040,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFReadScanline" >&5
 $as_echo "$ac_cv_lib_tiff_TIFFReadScanline" >&6; }
 if test "x$ac_cv_lib_tiff_TIFFReadScanline" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTIFF 1
-_ACEOF
-
-  LIBS="-ltiff $LIBS"
-
+  TIFF_LIB=-L$TIFF_LIBDIR -ltiff
 else
   as_fn_error $? "failed to link against libtiff" "$LINENO" 5
 fi

Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in	2012-02-06 17:21:15 UTC (rev 13054)
+++ trunk/mapserver/mapcache/configure.in	2012-02-06 17:26:25 UTC (rev 13055)
@@ -716,10 +716,9 @@
         test -f $TIFF_DIR/tiffio.h && TIFF_INCLUDE="$TIFF_DIR"
         
         if test -n "$TIFF_LIBDIR" ; then   
-          TIFF_LIB="-L$TIFF_LIBDIR -ltiff"
-          AC_CHECK_LIB(tiff, TIFFReadScanline,,
+                    AC_CHECK_LIB(tiff, TIFFReadScanline,[TIFF_LIB=[-L$TIFF_LIBDIR -ltiff]],
                        AC_MSG_ERROR([failed to link against libtiff]),
-                       "$TIFF_LIB")
+                       [-L$TIFF_LIBDIR -ltiff])
           AC_MSG_RESULT([        using libtiff from $TIFF_LIB])
         else
           AC_MSG_WARN([cannot find tiff lib in $TIFF_DIR])