diff options
author | Glenn Morris <rgm@gnu.org> | 2007-06-20 07:54:01 +0000 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2007-06-20 07:54:01 +0000 |
commit | 63175cd2c976cfc0408b5dffc34fc5c5be184386 (patch) | |
tree | 6be4c3aad414bda5fca5d0ca11e3783096057e7b /configure | |
parent | 31840c4328c71dde916c233a1f43c6ec1985df3a (diff) | |
download | emacs-63175cd2c976cfc0408b5dffc34fc5c5be184386.tar.gz |
Regenerate, with magic shell function message patch.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/configure b/configure index b60013c2d5f..99119cd64cf 100755 --- a/configure +++ b/configure @@ -1337,7 +1337,7 @@ Optional Packages: --with-xpm use -lXpm for displaying XPM images --with-jpeg use -ljpeg for displaying JPEG images --with-tiff use -ltiff for displaying TIFF images - --with-gif use -lungif (or -lgif) for displaying GIF images + --with-gif use -lgif (or -lungif) for displaying GIF images --with-png use -lpng for displaying PNG images --with-gpm use -lgpm for mouse support on a GNU/Linux console --with-gtk use GTK (same as --with-x-toolkit=gtk) @@ -13880,13 +13880,13 @@ fi if test $ac_cv_header_gif_lib_h = yes; then # EGifPutExtensionLast only exists from version libungif-4.1.0b1. # Earlier versions can crash Emacs. - { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5 -echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; } -if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then + { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5 +echo $ECHO_N "checking for EGifPutExtensionLast in -lgif... $ECHO_C" >&6; } +if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lungif $LIBS" +LIBS="-lgif $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13927,24 +13927,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_ungif_EGifPutExtensionLast=yes + ac_cv_lib_gif_EGifPutExtensionLast=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ungif_EGifPutExtensionLast=no + ac_cv_lib_gif_EGifPutExtensionLast=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 -echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; } -if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5 +echo "${ECHO_T}$ac_cv_lib_gif_EGifPutExtensionLast" >&6; } +if test $ac_cv_lib_gif_EGifPutExtensionLast = yes; then HAVE_GIF=yes else - try_libgif=yes + try_libungif=yes fi fi @@ -13952,18 +13952,18 @@ fi 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 - { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5 -echo $ECHO_N "checking for EGifPutExtensionLast in -lgif... $ECHO_C" >&6; } -if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then +# If gif_lib.h but no libgif, try libungif. + if test x"$try_libungif" = xyes; then + { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5 +echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; } +if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgif $LIBS" +LIBS="-lungif $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14004,21 +14004,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_gif_EGifPutExtensionLast=yes + ac_cv_lib_ungif_EGifPutExtensionLast=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_gif_EGifPutExtensionLast=no + ac_cv_lib_ungif_EGifPutExtensionLast=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5 -echo "${ECHO_T}$ac_cv_lib_gif_EGifPutExtensionLast" >&6; } -if test $ac_cv_lib_gif_EGifPutExtensionLast = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 +echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; } +if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then HAVE_GIF=yes fi @@ -14026,10 +14026,10 @@ fi if test "$HAVE_GIF" = yes; then cat >>confdefs.h <<\_ACEOF -#define LIBGIF -lgif +#define LIBGIF -lungif _ACEOF - ac_gif_lib_name="-lgif" + ac_gif_lib_name="-lungif" fi fi |