[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/configure,v |
Date: |
Wed, 20 Jun 2007 07:54:02 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/06/20 07:54:02
Index: configure
===================================================================
RCS file: /sources/emacs/emacs/configure,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -b -r1.216 -r1.217
--- configure 14 Jun 2007 06:56:48 -0000 1.216
+++ configure 20 Jun 2007 07:54:01 -0000 1.217
@@ -1337,7 +1337,7 @@
--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 @@
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 @@
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 @@
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 @@
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 @@
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
- [Emacs-diffs] Changes to emacs/configure,v, Glenn Morris, 2007/06/09
- [Emacs-diffs] Changes to emacs/configure,v, Jan Djärv, 2007/06/11
- [Emacs-diffs] Changes to emacs/configure,v, Glenn Morris, 2007/06/13
- [Emacs-diffs] Changes to emacs/configure,v, Chong Yidong, 2007/06/13
- [Emacs-diffs] Changes to emacs/configure,v, Jan Djärv, 2007/06/13
- [Emacs-diffs] Changes to emacs/configure,v, Jan Djärv, 2007/06/14
- [Emacs-diffs] Changes to emacs/configure,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/configure,v, Jan Djärv, 2007/06/20