[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: |
Tue, 12 Jun 2007 08:12:52 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/06/12 08:12:52
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -b -r1.451 -r1.452
--- configure.in 11 Jun 2007 17:47:44 -0000 1.451
+++ configure.in 12 Jun 2007 08:12:52 -0000 1.452
@@ -110,7 +110,7 @@
AC_ARG_WITH(tiff,
[ --with-tiff use -ltiff for displaying TIFF images])
AC_ARG_WITH(gif,
-[ --with-gif use -lungif for displaying GIF images])
+[ --with-gif use -lungif (or -lgif) for displaying GIF images])
AC_ARG_WITH(png,
[ --with-png use -lpng for displaying PNG images])
AC_ARG_WITH(gpm,
@@ -2527,18 +2527,30 @@
fi
fi
-### Use -lgif if available, unless `--with-gif=no'.
+### Use -lgif or -lungif if available, unless `--with-gif=no'.
HAVE_GIF=no
-if test "${HAVE_X11}" = "yes"; then
- if test "${with_gif}" != "no"; then
+if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
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))
+ AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes, try_libgif=yes))
+
+ if test "$HAVE_GIF" = yes; then
+ ac_gif_lib_name="-lungif"
+ 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 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"
+ fi
fi
if test "${HAVE_GIF}" = "yes"; then
- AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have the ungif library
(-lungif).])
+ AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif library (default
-lungif; otherwise specify with LIBGIF).])
fi
fi
@@ -3311,7 +3323,7 @@
echo " Does Emacs use -lXpm? ${HAVE_XPM}"
echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
-echo " Does Emacs use -lungif? ${HAVE_GIF}"
+echo " Does Emacs use a gif library? ${HAVE_GIF}
$ac_gif_lib_name"
echo " Does Emacs use -lpng? ${HAVE_PNG}"
echo " Does Emacs use -lgpm? ${HAVE_GPM}"
echo " Does Emacs use X toolkit scroll bars?
${USE_TOOLKIT_SCROLL_BARS}"
- [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 <=
- [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, 2007/06/20
- [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