aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-06-20 07:50:43 +0000
committerGlenn Morris2007-06-20 07:50:43 +0000
commit12d9c91d50463a4e8cc5c41df050a674268c0876 (patch)
tree050e87cee17a90d7a1495b6d44a767fd1e28827a
parent7adaaf724d9163455cdd167ba4e86a51a33a6cd4 (diff)
downloademacs-12d9c91d50463a4e8cc5c41df050a674268c0876.tar.gz
emacs-12d9c91d50463a4e8cc5c41df050a674268c0876.zip
Prefer libgif over libungif.
-rw-r--r--configure.in18
1 files changed, 9 insertions, 9 deletions
diff --git a/configure.in b/configure.in
index 493d5b58eec..f4d6aa1a5ab 100644
--- a/configure.in
+++ b/configure.in
@@ -105,7 +105,7 @@ AC_ARG_WITH(jpeg,
105AC_ARG_WITH(tiff, 105AC_ARG_WITH(tiff,
106[ --with-tiff use -ltiff for displaying TIFF images]) 106[ --with-tiff use -ltiff for displaying TIFF images])
107AC_ARG_WITH(gif, 107AC_ARG_WITH(gif,
108[ --with-gif use -lungif (or -lgif) for displaying GIF images]) 108[ --with-gif use -lgif (or -lungif) for displaying GIF images])
109AC_ARG_WITH(png, 109AC_ARG_WITH(png,
110[ --with-png use -lpng for displaying PNG images]) 110[ --with-png use -lpng for displaying PNG images])
111AC_ARG_WITH(gpm, 111AC_ARG_WITH(gpm,
@@ -2528,24 +2528,24 @@ if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
2528 AC_CHECK_HEADER(gif_lib.h, 2528 AC_CHECK_HEADER(gif_lib.h,
2529# EGifPutExtensionLast only exists from version libungif-4.1.0b1. 2529# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
2530# Earlier versions can crash Emacs. 2530# Earlier versions can crash Emacs.
2531 AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes, try_libgif=yes)) 2531 AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, try_libungif=yes))
2532 2532
2533 if test "$HAVE_GIF" = yes; then 2533 if test "$HAVE_GIF" = yes; then
2534 ac_gif_lib_name="-lungif" 2534 ac_gif_lib_name="-lgif"
2535 fi 2535 fi
2536 2536
2537# If gif_lib.h but no libungif, try libgif. 2537# If gif_lib.h but no libgif, try libungif.
2538 if test x"$try_libgif" = xyes; then 2538 if test x"$try_libungif" = xyes; then
2539 AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes) 2539 AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes)
2540 2540
2541 if test "$HAVE_GIF" = yes; then 2541 if test "$HAVE_GIF" = yes; then
2542 AC_DEFINE(LIBGIF, -lgif, [Compiler option to link with the gif library (if not -lungif).]) 2542 AC_DEFINE(LIBGIF, -lungif, [Compiler option to link with the gif library (if not -lgif).])
2543 ac_gif_lib_name="-lgif" 2543 ac_gif_lib_name="-lungif"
2544 fi 2544 fi
2545 fi 2545 fi
2546 2546
2547 if test "${HAVE_GIF}" = "yes"; then 2547 if test "${HAVE_GIF}" = "yes"; then
2548 AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif library (default -lungif; otherwise specify with LIBGIF).]) 2548 AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif library (default -lgif; otherwise specify with LIBGIF).])
2549 fi 2549 fi
2550fi 2550fi
2551 2551