[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Wed, 20 Jun 2007 07:50:43 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/06/20 07:50:43
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -b -r1.455 -r1.456
--- configure.in 14 Jun 2007 06:56:14 -0000 1.455
+++ configure.in 20 Jun 2007 07:50:43 -0000 1.456
@@ -105,7 +105,7 @@
AC_ARG_WITH(tiff,
[ --with-tiff use -ltiff for displaying TIFF images])
AC_ARG_WITH(gif,
-[ --with-gif use -lungif (or -lgif) for displaying GIF images])
+[ --with-gif use -lgif (or -lungif) for displaying GIF images])
AC_ARG_WITH(png,
[ --with-png use -lpng for displaying PNG images])
AC_ARG_WITH(gpm,
@@ -2528,24 +2528,24 @@
AC_CHECK_HEADER(gif_lib.h,
# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
# Earlier versions can crash Emacs.
- AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes, try_libgif=yes))
+ AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, try_libungif=yes))
if test "$HAVE_GIF" = yes; then
- ac_gif_lib_name="-lungif"
+ ac_gif_lib_name="-lgif"
fi
-# If gif_lib.h but no libungif, try libgif.
- if test x"$try_libgif" = xyes; then
- AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes)
+# If gif_lib.h but no libgif, try libungif.
+ if test x"$try_libungif" = xyes; then
+ AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes)
if test "$HAVE_GIF" = yes; then
- AC_DEFINE(LIBGIF, -lgif, [Compiler option to link with the gif library
(if not -lungif).])
- ac_gif_lib_name="-lgif"
+ AC_DEFINE(LIBGIF, -lungif, [Compiler option to link with the gif library
(if not -lgif).])
+ ac_gif_lib_name="-lungif"
fi
fi
if test "${HAVE_GIF}" = "yes"; then
- AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif library (default
-lungif; otherwise specify with LIBGIF).])
+ AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif library (default
-lgif; otherwise specify with LIBGIF).])
fi
fi
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2007/06/07
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2007/06/07
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2007/06/11
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2007/06/12
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2007/06/13
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2007/06/13
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2007/06/14
- [Emacs-diffs] Changes to emacs/configure.in,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2007/06/20
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2007/06/21