diff --git a/ChangeLog b/ChangeLog
index 7c2c78b8b..384b006d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-10  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac: Check for libgib if libungif is not found.
+	Fixes Bug #14454.
+
 2005-08-25  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSView.m: ([_viewDidMoveToWindow]) Implemented and used to
diff --git a/configure b/configure
index ac77de1e5..1d9a401f0 100755
--- a/configure
+++ b/configure
@@ -5873,6 +5873,7 @@ if test "${enable_libgif}" = yes; then
   enable_ungif=no
 fi
 
+have_ungif=no
 if test "${enable_ungif}" = yes; then
 
 echo "$as_me:$LINENO: checking for DGifOpen in -lungif" >&5
@@ -5948,6 +5949,9 @@ _ACEOF
 
 fi
 
+  if test "${ac_cv_lib_ungif_DGifOpen}" = yes; then
+    have_ungif=yes
+  fi
 
   if test "${with_x}" != no && test "${ac_cv_lib_ungif_DGifOpen}" = no; then
     orig_CPPFLAGS="${CPPFLAGS}"
@@ -6050,11 +6054,12 @@ fi
 echo "$as_me: -gui will be linked against -lX11 to support ungif images" >&6;}
       GRAPHIC_CFLAGS="-I${ac_x_includes} $GRAPHIC_CFLAGS"
       GRAPHIC_LFLAGS="-L${ac_x_libraries} $GRAPHIC_LFLAGS"
+      have_ungif=yes
     fi
   fi
 fi
 
-if test "${enable_libgif}" = yes; then
+if test "$have_ungif" = no -o "${enable_libgif}" = yes; then
 
 echo "$as_me:$LINENO: checking for DGifOpen in -lgif" >&5
 echo $ECHO_N "checking for DGifOpen in -lgif... $ECHO_C" >&6
diff --git a/configure.ac b/configure.ac
index 6f0f42789..b24cb5936 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,8 +232,12 @@ if test "${enable_libgif}" = yes; then
   enable_ungif=no
 fi
 
+have_ungif=no
 if test "${enable_ungif}" = yes; then
   AC_CHECK_LIB(ungif, DGifOpen)
+  if test "${ac_cv_lib_ungif_DGifOpen}" = yes; then
+    have_ungif=yes
+  fi
 
   if test "${with_x}" != no && test "${ac_cv_lib_ungif_DGifOpen}" = no; then
     orig_CPPFLAGS="${CPPFLAGS}"
@@ -261,11 +265,12 @@ if test "${enable_ungif}" = yes; then
       AC_MSG_NOTICE([-gui will be linked against -lX11 to support ungif images])
       GRAPHIC_CFLAGS="-I${ac_x_includes} $GRAPHIC_CFLAGS"
       GRAPHIC_LFLAGS="-L${ac_x_libraries} $GRAPHIC_LFLAGS"
+      have_ungif=yes
     fi
   fi
 fi
 
-if test "${enable_libgif}" = yes; then
+if test "$have_ungif" = no -o "${enable_libgif}" = yes; then
   AC_CHECK_LIB(gif, DGifOpen)
 
   if test "${with_x}" != no && test "${ac_cv_lib_gif_DGifOpen}" = no; then