From: Glenn Morris <rgm@gnu.org>
Date: Tue, 12 Jun 2007 08:16:04 +0000 (+0000)
Subject: (HAVE_GIF): Doc fix.
X-Git-Tag: emacs-pretest-23.0.90~12358
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a9a50d8fc9ff9802ab5f75e5f55ca0b0f42a287;p=emacs.git

(HAVE_GIF): Doc fix.
(LIBGIF): New (already used by Makefile.in).
---

diff --git a/ChangeLog b/ChangeLog
index 597fc8692ba..891d660fe7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-12  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in (HAVE_GIF): If -lungif fails, try -lgif.
+
 2007-06-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* configure.in: Change wording about yes/gtk and lucid/athena being
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5c9dfb6a197..856544ff4fd 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-12  Glenn Morris  <rgm@gnu.org>
+
+	* NEWS: Change bug address.  Add back +++/--- note.
+	Use present tense for X-toolkit entry.  Mention libgif.
+
 2007-06-07  Mark H. Weaver  <mhw@netris.org>  (tiny change)
 
 	* NEWS (set-mark-command-repeat-pop): Fix duplicate entry.
diff --git a/src/config.in b/src/config.in
index 5fe340ba546..020fc6295c8 100644
--- a/src/config.in
+++ b/src/config.in
@@ -228,7 +228,8 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `get_current_dir_name' function. */
 #undef HAVE_GET_CURRENT_DIR_NAME
 
-/* Define to 1 if you have the ungif library (-lungif). */
+/* Define to 1 if you have a gif library (default -lungif; otherwise
+   specify with LIBGIF). */
 #undef HAVE_GIF
 
 /* Define to 1 if you have the gpm library (-lgpm). */
@@ -768,6 +769,9 @@ Boston, MA 02110-1301, USA.  */
    Solaris, for example). */
 #undef LD_SWITCH_X_SITE_AUX
 
+/* Define to compiler option to link with gif library, if not -lungif. */
+#undef LIBGIF
+
 /* Define to 1 if localtime caches TZ. */
 #undef LOCALTIME_CACHE