--- imlib-1.9.15/configure.in	2007-03-27 15:02:59.000000000 +0100
+++ imlib-1.9.15/configure.in	2007-03-27 16:18:49.000000000 +0100
@@ -204,16 +204,12 @@
 
 
 AC_CHECK_HEADER(gif_lib.h,
-  [AC_CHECK_LIB(ungif, DGifOpenFileName,
-    [GIFLIBS="-lungif"
-     SUPPORT_LIBS="$SUPPORT_LIBS -lungif"; AC_DEFINE(HAVE_LIBGIF, 1, [ ])],
     [AC_CHECK_LIB(gif, DGifOpenFileName,
       [GIFLIBS="-lgif"
       SUPPORT_LIBS="$SUPPORT_LIBS -lgif"
        AC_DEFINE(HAVE_LIBGIF, 1, [ ])],
       [AC_MSG_ERROR(*** GIF library file not found ***)], 
       $GX_LIBS)],
-    $GX_LIBS)],
   [AC_MSG_ERROR(*** GIF header not found ***)])
 
 AC_CHECK_LIB(png, png_read_info,
@@ -237,9 +237,9 @@
 fi
 
 if test "$png_ok" = yes; then
-	PNGLIBS="-lpng -lz"
+	PNGLIBS="-lpng"
 	AC_SUBST(HAVE_LIBPNG)
-	SUPPORT_LIBS="$SUPPORT_LIBS -lpng -lz"; AC_DEFINE(HAVE_LIBPNG, 1, [ ])
+	SUPPORT_LIBS="$SUPPORT_LIBS -lpng"; AC_DEFINE(HAVE_LIBPNG, 1, [ ])
 fi
 
 SUPPORT_LIBS="$SUPPORT_LIBS -lm"
--- imlib-1.9.15/Imlib/Makefile.am	2007-03-27 17:45:17.000000000 +0100
+++ imlib-1.9.15/Imlib/Makefile.am	2007-03-27 17:45:46.000000000 +0100
@@ -32,8 +32,7 @@
 
 libImlib_la_LDFLAGS    = -version-info 11:0:0
 #libImlib_la_LDDADD     = $(SUPPORT_LIBS)
-libImlib_la_LIBADD     = $(SUPPORT_LIBS) $(X_PRE_LIBS) \
-			 $(X_LIBS) $(X_EXTRA_LIBS)
+libImlib_la_LIBADD     = $(SUPPORT_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
 
 DEFS =  -DSYSTEM_IMRC=\"$(sysconfdir)/imrc\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
--- imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 18:45:24.000000000 +0100
+++ imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 18:48:05.000000000 +0100
@@ -20,11 +20,11 @@
 
 libimlib_tiff_la_SOURCES = io-tiff.c
 libimlib_tiff_la_LDFLAGS = $(common_ldflags)
-libimlib_tiff_la_LIBADD  = $(TIFFLIBS) libgdk_imlib.la
+libimlib_tiff_la_LIBADD  = $(TIFFLIBS)
 
 libimlib_ps_la_SOURCES = io-ps.c
 libimlib_ps_la_LDFLAGS = $(common_ldflags)
-libimlib_ps_la_LIBADD = libgdk_imlib.la
+libimlib_ps_la_LIBADD =
 
 libimlib_bmp_la_SOURCES = io-bmp.c
 libimlib_bmp_la_LDFLAGS = $(common_ldflags)
@@ -32,7 +32,7 @@
 
 libimlib_xpm_la_SOURCES = io-xpm.c
 libimlib_xpm_la_LDFLAGS = $(common_ldflags)
-libimlib_xpm_la_LIBADD = libgdk_imlib.la
+libimlib_xpm_la_LIBADD = -lgdk_imlib -lX11
 
 libimlib_ppm_la_SOURCES = io-ppm.c
 libimlib_ppm_la_LDFLAGS = $(common_ldflags)