summaryrefslogtreecommitdiff
path: root/autogen
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-10-10 06:17:41 -0400
committerGlenn Morris <rgm@gnu.org>2013-10-10 06:17:41 -0400
commita18180b9993af6579c0347360fb053c50a8b4c04 (patch)
treec779f88c86d6098e83803d0200bac367e09abf72 /autogen
parent6bbe6da82dd61d050a773602f272dc4750291302 (diff)
downloademacs-a18180b9993af6579c0347360fb053c50a8b4c04.tar.gz
Auto-commit of generated files.
Diffstat (limited to 'autogen')
-rwxr-xr-xautogen/configure45
1 files changed, 43 insertions, 2 deletions
diff --git a/autogen/configure b/autogen/configure
index 9c699c7254b..d57fae081f3 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -14103,8 +14103,47 @@ elif test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \
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" = x""yes; then :
# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
-# Earlier versions can crash Emacs.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
+# Earlier versions can crash Emacs, but version 5.0 removes EGifPutExtensionLast.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GifMakeMapObject in -lgif" >&5
+$as_echo_n "checking for GifMakeMapObject in -lgif... " >&6; }
+if test "${ac_cv_lib_gif_GifMakeMapObject+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgif $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char GifMakeMapObject ();
+int
+main ()
+{
+return GifMakeMapObject ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_gif_GifMakeMapObject=yes
+else
+ ac_cv_lib_gif_GifMakeMapObject=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_GifMakeMapObject" >&5
+$as_echo "$ac_cv_lib_gif_GifMakeMapObject" >&6; }
+if test "x$ac_cv_lib_gif_GifMakeMapObject" = x""yes; then :
+ HAVE_GIF=yes
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
$as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
$as_echo_n "(cached) " >&6
@@ -14148,6 +14187,8 @@ fi
fi
+fi
+
if test "$HAVE_GIF" = yes; then