# HG changeset patch # User Glenn Morris # Date 1182325843 0 # Node ID 6410d179cb23ec29669448df6ae7fc083cb9b06e # Parent 7e1dbc158dfc1f3cf4f3afcf54cc39fe8bb183d5 Prefer libgif over libungif. diff -r 7e1dbc158dfc -r 6410d179cb23 configure.in --- a/configure.in Wed Jun 20 07:50:24 2007 +0000 +++ b/configure.in Wed Jun 20 07:50:43 2007 +0000 @@ -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