[mapserver-commits] r13068 - trunk/mapserver

svn at osgeo.org svn at osgeo.org
Mon Feb 6 15:20:46 EST 2012


Author: tbonfort
Date: 2012-02-06 12:20:46 -0800 (Mon, 06 Feb 2012)
New Revision: 13068

Modified:
   trunk/mapserver/configure
   trunk/mapserver/configure.in
   trunk/mapserver/mapimageio.c
Log:
allow to disable GIF symbol support with --without-gif


Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2012-02-06 20:20:12 UTC (rev 13067)
+++ trunk/mapserver/configure	2012-02-06 20:20:46 UTC (rev 13068)
@@ -16503,18 +16503,18 @@
 GIF_INC=''
 GIF_ENABLED=''
 
+if test "$withval" != "no" ; then
+   if test -n "$GIF_DIR" -a "GIF_DIR" != "yes" ; then
+       test -f $GIF_DIR/lib/libgif.a -o -f $GIF_DIR/lib/libgif.so -o -f $GIF_DIR/lib/libgif.sl -o -f $GIF_DIR/lib/libgif.dylib && GIF_LIBDIR="$GIF_DIR/lib"
+       test -f $GIF_DIR/lib64/libgif.a -o -f $GIF_DIR/lib64/libgif.so -o -f $GIF_DIR/lib64/libgif.sl -o -f $GIF_DIR/libgif.dylib && GIF_LIBDIR="$GIF_DIR/lib64"
+       test -f $GIF_DIR/libgif.a -o -f $GIF_DIR/libgif.so -o -f $GIF_DIR/libgif.sl -o -f $GIF_DIR/libgif.dylib && GIF_LIBDIR="$GIF_DIR"
+       test -f $GIF_DIR/include/gif_lib.h && GIF_INCLUDE="$GIF_DIR/include"
+       test -f $GIF_DIR/lib/gif_lib.h && GIF_INCLUDE="$GIF_DIR/lib"
+       test -f $GIF_DIR/gif_lib.h && GIF_INCLUDE="$GIF_DIR"
 
-if test -n "$GIF_DIR" -a "GIF_DIR" != "yes" ; then
-    test -f $GIF_DIR/lib/libgif.a -o -f $GIF_DIR/lib/libgif.so -o -f $GIF_DIR/lib/libgif.sl -o -f $GIF_DIR/lib/libgif.dylib && GIF_LIBDIR="$GIF_DIR/lib"
-    test -f $GIF_DIR/lib64/libgif.a -o -f $GIF_DIR/lib64/libgif.so -o -f $GIF_DIR/lib64/libgif.sl -o -f $GIF_DIR/libgif.dylib && GIF_LIBDIR="$GIF_DIR/lib64"
-    test -f $GIF_DIR/libgif.a -o -f $GIF_DIR/libgif.so -o -f $GIF_DIR/libgif.sl -o -f $GIF_DIR/libgif.dylib && GIF_LIBDIR="$GIF_DIR"
-    test -f $GIF_DIR/include/gif_lib.h && GIF_INCLUDE="$GIF_DIR/include"
-    test -f $GIF_DIR/lib/gif_lib.h && GIF_INCLUDE="$GIF_DIR/lib"
-    test -f $GIF_DIR/gif_lib.h && GIF_INCLUDE="$GIF_DIR"
-
-    if test -n "$GIF_LIBDIR" ; then
-      GIF_LIB="-L$GIF_LIBDIR -lgif"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result:         using libgif from $GIF_LIB" >&5
+       if test -n "$GIF_LIBDIR" ; then
+         GIF_LIB="-L$GIF_LIBDIR -lgif"
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result:         using libgif from $GIF_LIB" >&5
 $as_echo "        using libgif from $GIF_LIB" >&6; }
 
   if test ""$GIF_LIBDIR"" != "/usr/lib"; then
@@ -16538,29 +16538,29 @@
 
   fi
 
-    else
-      as_fn_error $? "cannot find gif lib in $GIF_DIR" "$LINENO" 5
-    fi
+       else
+         as_fn_error $? "cannot find gif lib in $GIF_DIR. To disable gif support run with --without-gif." "$LINENO" 5
+       fi
 
-    if test -n "$GIF_INCLUDE" ; then
-      as_ac_Header=`$as_echo "ac_cv_header_$GIF_INCLUDE/gif_lib.h" | $as_tr_sh`
+       if test -n "$GIF_INCLUDE" ; then
+         as_ac_Header=`$as_echo "ac_cv_header_$GIF_INCLUDE/gif_lib.h" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$GIF_INCLUDE/gif_lib.h" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   GIF_INC=-I$GIF_INCLUDE
 else
-  as_fn_error $? "cannot find gif headers" "$LINENO" 5
+  as_fn_error $? "cannot find gif headers. To disable gif support run with --without-gif." "$LINENO" 5
 fi
 
 
-      ALL_INC="$GIF_INC $ALL_INC"
-    else
-        as_fn_error $? "cannot find gif headers in $GIF_DIR" "$LINENO" 5
-    fi
-    GIF_ENABLED="-DUSE_GIF"
-else
+         ALL_INC="$GIF_INC $ALL_INC"
+       else
+           as_fn_error $? "cannot find gif headers in $GIF_DIR. To disable gif support run with --without-gif." "$LINENO" 5
+       fi
+       GIF_ENABLED="-DUSE_GIF"
+   else
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifOpenFileHandle in -lgif" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifOpenFileHandle in -lgif" >&5
 $as_echo_n "checking for DGifOpenFileHandle in -lgif... " >&6; }
 if ${ac_cv_lib_gif_DGifOpenFileHandle+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16600,21 +16600,22 @@
   GIF_LIB="-lgif"
 fi
 
-  ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
+     ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
 if test "x$ac_cv_header_gif_lib_h" = xyes; then :
 
 else
-  as_fn_error $? "cannot find gif headers in system path" "$LINENO" 5
+  as_fn_error $? "cannot find gif headers in system path. To disable gif support run with --without-gif." "$LINENO" 5
 fi
 
 
-  if test -n "$GIF_LIB" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result:         using libgif from system libs." >&5
+     if test -n "$GIF_LIB" ; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result:         using libgif from system libs." >&5
 $as_echo "        using libgif from system libs." >&6; }
-  else
-    as_fn_error $? "GIF (libgif) library cannot be found. install or reconfigure with --with-gif=DIR" "$LINENO" 5
-  fi
-  GIF_ENABLED="-DUSE_GIF"
+     else
+       as_fn_error $? "GIF (libgif) library cannot be found. install or reconfigure with --with-gif=DIR.  To disable gif support run with --without-gif." "$LINENO" 5
+     fi
+     GIF_ENABLED="-DUSE_GIF"
+   fi
 fi
 
 ALL_ENABLED="$GIF_ENABLED $ALL_ENABLED"

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2012-02-06 20:20:12 UTC (rev 13067)
+++ trunk/mapserver/configure.in	2012-02-06 20:20:46 UTC (rev 13068)
@@ -358,44 +358,45 @@
 GIF_INC=''
 GIF_ENABLED=''
 
-
-if test -n "$GIF_DIR" -a "GIF_DIR" != "yes" ; then
-    test -f $GIF_DIR/lib/libgif.a -o -f $GIF_DIR/lib/libgif.so -o -f $GIF_DIR/lib/libgif.sl -o -f $GIF_DIR/lib/libgif.dylib && GIF_LIBDIR="$GIF_DIR/lib"
-    test -f $GIF_DIR/lib64/libgif.a -o -f $GIF_DIR/lib64/libgif.so -o -f $GIF_DIR/lib64/libgif.sl -o -f $GIF_DIR/libgif.dylib && GIF_LIBDIR="$GIF_DIR/lib64"
-    test -f $GIF_DIR/libgif.a -o -f $GIF_DIR/libgif.so -o -f $GIF_DIR/libgif.sl -o -f $GIF_DIR/libgif.dylib && GIF_LIBDIR="$GIF_DIR"
-    test -f $GIF_DIR/include/gif_lib.h && GIF_INCLUDE="$GIF_DIR/include"
-    test -f $GIF_DIR/lib/gif_lib.h && GIF_INCLUDE="$GIF_DIR/lib"
-    test -f $GIF_DIR/gif_lib.h && GIF_INCLUDE="$GIF_DIR"
-    
-    if test -n "$GIF_LIBDIR" ; then   
-      GIF_LIB="-L$GIF_LIBDIR -lgif"
-      AC_MSG_RESULT([        using libgif from $GIF_LIB])
-      AC_ADD_RUNPATH("$GIF_LIBDIR")
-    else
-      AC_MSG_ERROR([cannot find gif lib in $GIF_DIR])
-    fi
-    
-    if test -n "$GIF_INCLUDE" ; then
-      AC_CHECK_HEADER([$GIF_INCLUDE/gif_lib.h],GIF_INC=-I$GIF_INCLUDE,
-        [AC_MSG_ERROR([cannot find gif headers])])
-      ALL_INC="$GIF_INC $ALL_INC"
-    else
-        AC_MSG_ERROR([cannot find gif headers in $GIF_DIR])
-    fi
-    GIF_ENABLED="-DUSE_GIF"
-else
-
-  dnl check for gif in system locations
-
-  AC_CHECK_LIB(gif, DGifOpenFileHandle, GIF_LIB="-lgif",,)
-  AC_CHECK_HEADER([gif_lib.h],,
-        [AC_MSG_ERROR([cannot find gif headers in system path])])
-  if test -n "$GIF_LIB" ; then
-    AC_MSG_RESULT([        using libgif from system libs.])
-  else
-    AC_MSG_ERROR([GIF (libgif) library cannot be found. install or reconfigure with --with-gif=DIR])
-  fi
-  GIF_ENABLED="-DUSE_GIF"
+if test "$withval" != "no" ; then
+   if test -n "$GIF_DIR" -a "GIF_DIR" != "yes" ; then
+       test -f $GIF_DIR/lib/libgif.a -o -f $GIF_DIR/lib/libgif.so -o -f $GIF_DIR/lib/libgif.sl -o -f $GIF_DIR/lib/libgif.dylib && GIF_LIBDIR="$GIF_DIR/lib"
+       test -f $GIF_DIR/lib64/libgif.a -o -f $GIF_DIR/lib64/libgif.so -o -f $GIF_DIR/lib64/libgif.sl -o -f $GIF_DIR/libgif.dylib && GIF_LIBDIR="$GIF_DIR/lib64"
+       test -f $GIF_DIR/libgif.a -o -f $GIF_DIR/libgif.so -o -f $GIF_DIR/libgif.sl -o -f $GIF_DIR/libgif.dylib && GIF_LIBDIR="$GIF_DIR"
+       test -f $GIF_DIR/include/gif_lib.h && GIF_INCLUDE="$GIF_DIR/include"
+       test -f $GIF_DIR/lib/gif_lib.h && GIF_INCLUDE="$GIF_DIR/lib"
+       test -f $GIF_DIR/gif_lib.h && GIF_INCLUDE="$GIF_DIR"
+       
+       if test -n "$GIF_LIBDIR" ; then   
+         GIF_LIB="-L$GIF_LIBDIR -lgif"
+         AC_MSG_RESULT([        using libgif from $GIF_LIB])
+         AC_ADD_RUNPATH("$GIF_LIBDIR")
+       else
+         AC_MSG_ERROR([cannot find gif lib in $GIF_DIR. To disable gif support run with --without-gif.])
+       fi
+       
+       if test -n "$GIF_INCLUDE" ; then
+         AC_CHECK_HEADER([$GIF_INCLUDE/gif_lib.h],GIF_INC=-I$GIF_INCLUDE,
+           [AC_MSG_ERROR([cannot find gif headers. To disable gif support run with --without-gif.])])
+         ALL_INC="$GIF_INC $ALL_INC"
+       else
+           AC_MSG_ERROR([cannot find gif headers in $GIF_DIR. To disable gif support run with --without-gif.])
+       fi
+       GIF_ENABLED="-DUSE_GIF"
+   else
+   
+     dnl check for gif in system locations
+   
+     AC_CHECK_LIB(gif, DGifOpenFileHandle, GIF_LIB="-lgif",,)
+     AC_CHECK_HEADER([gif_lib.h],,
+           [AC_MSG_ERROR([cannot find gif headers in system path. To disable gif support run with --without-gif.])])
+     if test -n "$GIF_LIB" ; then
+       AC_MSG_RESULT([        using libgif from system libs.])
+     else
+       AC_MSG_ERROR([GIF (libgif) library cannot be found. install or reconfigure with --with-gif=DIR].  To disable gif support run with --without-gif.)
+     fi
+     GIF_ENABLED="-DUSE_GIF"
+   fi
 fi
 
 ALL_ENABLED="$GIF_ENABLED $ALL_ENABLED"

Modified: trunk/mapserver/mapimageio.c
===================================================================
--- trunk/mapserver/mapimageio.c	2012-02-06 20:20:12 UTC (rev 13067)
+++ trunk/mapserver/mapimageio.c	2012-02-06 20:20:46 UTC (rev 13068)
@@ -1241,12 +1241,14 @@
     if(png_sig_cmp(signature,0,8) == 0) {
         ret = readPNG(path,rb);
     }
+    else if (!strncmp((char*)signature,"GIF",3)) {
 #ifdef USE_GIF
-    else if (!strncmp((char*)signature,"GIF",3)) {
-
         ret = readGIF(path,rb);
+#else
+        msSetError(MS_MISCERR,"pixmap %s seems to be GIF formatted, but this server is compiled without GIF support","readImage()",path);
+        return MS_FAILURE;
+#endif
     }
-#endif
     else {
         msSetError(MS_MISCERR,"unsupported pixmap format","readImage()");
         return MS_FAILURE;



More information about the mapserver-commits mailing list