From: Dave Love <fx@gnu.org>
Date: Mon, 8 Jul 2002 22:14:11 +0000 (+0000)
Subject: Check safe/working versions of libjpeg and
X-Git-Tag: emacs-pretest-21.2.91~188
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c7e1b381e7b7570d250c23f4081e412c216f518;p=emacs.git

Check safe/working versions of libjpeg and
libungif.
---

diff --git a/configure.in b/configure.in
index 9dabbc2a0c7..e9440a39d45 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl To rebuild the `configure' script from this, execute the command
 dnl 	autoconf
 dnl in the directory containing this script.
 dnl
-dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001
+dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002
 dnl  Free Software Foundation, Inc.
 dnl
 dnl  This file is part of GNU Emacs.
@@ -1854,6 +1854,16 @@ if test "${HAVE_X11}" = "yes"; then
 
   if test "${HAVE_JPEG}" = "yes"; then
     AC_DEFINE(HAVE_JPEG)
+    AC_EGREP_CPP(
+changequote({, })dnl avoid leadingspace on the next line
+{version= *(6[2-9]|[7-9][0-9])},
+changequote([, ])dnl
+        [#include <jpeglib.h>
+	 version=JPEG_LIB_VERSION
+],    
+        AC_DEFINE(HAVE_JPEG),
+        [AC_MSG_WARN([libjpeg found, but not version 6b or later])
+        HAVE_JPEG=no])
   fi
 fi
   
@@ -1891,7 +1901,9 @@ HAVE_GIF=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_gif}" != "no"; then
     AC_CHECK_HEADER(gif_lib.h,
-      AC_CHECK_LIB(ungif, DGifOpen, HAVE_GIF=yes))
+# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
+# Earlier versions can crash Emacs.
+      AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes))
   fi
 
   if test "${HAVE_GIF}" = "yes"; then