--- imlib-1.9.14/configure.in.orig	2002-03-22 06:51:24.000000000 -0800
+++ imlib-1.9.14/configure.in	2006-05-21 03:07:33.000000000 -0700
@@ -8,7 +8,7 @@
 
 AM_INIT_AUTOMAKE(imlib, 1.9.14)
 AC_PROG_CC
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
@@ -25,20 +25,20 @@
 AC_MSG_CHECKING(whether to build gmodulized imlib)
 
 AC_ARG_ENABLE(modules, [  --disable-modules       Disables dynamic module loading],[
-	if test x$withval = xyes; then 
-	    with_modules=yes
+	if test "x$withval" = "xyes"; then 
+	    with_modules="yes"
         else
-            with_modules=no
+            with_modules="no"
 	fi
 ])
 
-dynworks=false
-if test x$with_modules = xno; then
+dynworks="false"
+if test "x$with_modules" = "xno"; then
 	AC_MSG_RESULT(no)
 else 
 	AC_MSG_RESULT(yes)
 
-if test "x$GDK_IMLIB" != x; then
+if test "x$GDK_IMLIB" != "x"; then
   oLIBS="$LIBS"
   oCFLAGS="$CFLAGS"
   LIBS="$LIBS `glib-config --libs gmodule`"
@@ -53,14 +53,14 @@
     else
         exit (1);
 }
-], dynworks=true)
+], dynworks="true")
   LIBS="$oLIBS"
   CFLAGS="$oCFLAGS"
 fi
 
 dnl Now we check to see if our libtool supports shared lib deps
 dnl (in a rather ugly way even)
-if $dynworks; then
+if "$dynworks" = "true"; then
    imlib_libtool_config="$srcdir/libtool --config"
    imlib_deplibs_check=`$imlib_libtool_config | \
       grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
@@ -68,11 +68,11 @@
    if test "x$imlib_deplibs_check" = "xnone" || \
       test "x$imlib_deplibs_check" = "xunknown" || \
       test "x$imlib_deplibs_check" = "x"; then
-      dynworks=false
+      dynworks="false"
    fi
 fi
 
-if $dynworks; then
+if "$dynworks" = "true"; then
    AC_DEFINE(USE_GMODULE)
    GMODULE_LIBS="`glib-config --libs gmodule`"
    GMODULE_FLAGS="`glib-config --cflags gmodule`"
@@ -124,9 +124,9 @@
   AC_CHECK_LIB(Xext, XShmAttach, 
       X_LIBS="-lXext $X_LIBS", 
       # On AIX, it is in XextSam instead, but we still need -lXext
-      AC_CHECK_LIB(XextSam, XShmAttach, 
+      [AC_CHECK_LIB(XextSam, XShmAttach, 
           X_LIBS="-lXextSam -lXext $X_LIBS", 
-          no_xshm_ext=yes, $X_LIBS),
+          no_xshm_ext="yes", $X_LIBS)],
       $X_LIBS)
 fi
 
@@ -193,95 +193,88 @@
   if test "x$no_xext_lib" = "xyes"; then
     # If we couldn't find XShmAttach earlier, don't use the header
     AC_MSG_RESULT(no)
-    no_xshm=yes
+    no_xshm="yes"
   else
     if test -f "$x_includes/X11/extensions/XShm.h"; then
       AC_MSG_RESULT(yes)
       AC_DEFINE(HAVE_XSHM_H)
     else
       AC_MSG_RESULT(no)
-      no_xshm=yes
+      no_xshm="yes"
     fi
   fi
 fi
 
 dnl Test for libjpeg
 AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-  jpeg_ok=yes,
-  jpeg_ok=no
-  AC_MSG_ERROR(*** JPEG library not found ***), $GX_LIBS)
-if test "$jpeg_ok" = yes; then
-  AC_MSG_CHECKING([for jpeglib.h])
-  AC_TRY_CPP(
-[#include <stdio.h>
-#undef PACKAGE
-#undef VERSION
-#include <jpeglib.h>],
-    jpeg_ok=yes,
-    jpeg_ok=no)
-  AC_MSG_RESULT($jpeg_ok)
-  if test "$jpeg_ok" = yes; then 
-    JPEGLIBS="-ljpeg"
-    SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; AC_DEFINE(HAVE_LIBJPEG)
-  else
-    AC_MSG_ERROR(*** JPEG header file not found ***)
-  fi
-fi
+	[AC_CHECK_HEADER(jpeglib.h,
+    	JPEGLIBS="-ljpeg"
+			SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"
+			AC_DEFINE(HAVE_LIBJPEG),
+			AC_MSG_ERROR(*** JPEG header file not found ***))],
+	AC_MSG_ERROR(*** GIF library file not found ***),$GX_LIBS)
 
 dnl Test for libtiff
 AC_CHECK_LIB(tiff, TIFFReadScanline,
-  AC_CHECK_HEADER(tiffio.h,
+  [AC_CHECK_HEADER(tiffio.h,
     TIFFLIBS="-ltiff"
-    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; AC_DEFINE(HAVE_LIBTIFF),
-    AC_MSG_ERROR(*** TIFF header files not found ***)),
-  AC_CHECK_LIB(tiff, TIFFWriteScanline,
-    AC_CHECK_HEADER(tiffio.h,
-      TIFFLIBS="-ltiff -ljpeg -lz"
-      SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"; AC_DEFINE(HAVE_LIBTIFF),
-      AC_MSG_ERROR(*** TIFF header files not found ***)),
-    AC_CHECK_LIB(tiff34, TIFFFlushData,
-      AC_CHECK_HEADER(tiffio.h,
-        TIFFLIBS="-ltiff34 -ljpeg -lz"
-        SUPPORT_LIBS="$SUPPORT_LIBS -ltiff34 -ljpeg -lz"; AC_DEFINE(HAVE_LIBTIFF),
-        AC_MSG_ERROR(*** TIFF header files not found ***)),
-    AC_MSG_ERROR(*** TIFF library not found ***), -ljpeg -lz $GX_LIBS), -ljpeg -lz $GX_LIBS), $GX_LIBS)
+    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"
+		AC_DEFINE(HAVE_LIBTIFF),
+    AC_MSG_ERROR(*** TIFF header files not found ***))],
+  [AC_CHECK_LIB(tiff, TIFFWriteScanline,
+		[AC_CHECK_HEADER(tiffio.h,
+     	TIFFLIBS="-ltiff -ljpeg -lz"
+			SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"
+			AC_DEFINE(HAVE_LIBTIFF),
+			AC_MSG_ERROR(*** TIFF header files not found ***))],
+		[AC_CHECK_LIB(tiff34, TIFFFlushData,
+			[AC_CHECK_HEADER(tiffio.h,
+				TIFFLIBS="-ltiff34 -ljpeg -lz"
+				SUPPORT_LIBS="$SUPPORT_LIBS -ltiff34 -ljpeg -lz"
+				AC_DEFINE(HAVE_LIBTIFF),
+				AC_MSG_ERROR(*** TIFF header files not found ***))],
+    	AC_MSG_ERROR(*** TIFF library not found ***),
+		-ljpeg -lz $GX_LIBS)],
+	-ljpeg -lz $GX_LIBS)],
+$GX_LIBS)
 
 
 AC_CHECK_HEADER(gif_lib.h,
-  AC_CHECK_LIB(ungif, DGifOpenFileName,
+  [AC_CHECK_LIB(ungif, DGifOpenFileName,
     GIFLIBS="-lungif"
-    SUPPORT_LIBS="$SUPPORT_LIBS -lungif"; AC_DEFINE(HAVE_LIBGIF),
-    AC_CHECK_LIB(gif, DGifOpenFileName,
+    SUPPORT_LIBS="$SUPPORT_LIBS -lungif"
+		AC_DEFINE(HAVE_LIBGIF),
+    [AC_CHECK_LIB(gif, DGifOpenFileName,
       GIFLIBS="-lgif"
       SUPPORT_LIBS="$SUPPORT_LIBS -lgif"
-      AC_DEFINE(HAVE_LIBGIF),
-      AC_SUBST(GIFLIBS)
+      AC_DEFINE(HAVE_LIBGIF)
+      AC_SUBST(GIFLIBS),
       AC_MSG_ERROR(*** GIF library file not found ***), 
-      $GX_LIBS),
-    $GX_LIBS),
+      $GX_LIBS)],
+    $GX_LIBS)],
   AC_MSG_ERROR(*** GIF header not found ***))
 
 AC_CHECK_LIB(png, png_read_info,
-  AC_CHECK_HEADER(png.h,
-    png_ok=yes,
-    png_ok=no),
+  [AC_CHECK_HEADER(png.h,png_ok="yes",png_ok="no")],
   AC_MSG_ERROR(*** PNG library not found ***), -lz -lm $GX_LIBS)
-if test "$png_ok" = yes; then
+if test "$png_ok" = "yes"; then
   AC_MSG_CHECKING([for png_structp in png.h])
-  AC_TRY_COMPILE([#include <png.h>],
-    [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct
-; png_set_IHDR;],
-    png_ok=yes,
-    png_ok=no)
+  AC_TRY_COMPILE(
+		[#include <png.h>
+		png_structp pp;
+		png_infop info;
+		png_colorp cmap;
+		png_create_read_struct;
+		png_set_IHDR;],png_ok="yes",png_ok="no")
   AC_MSG_RESULT($png_ok)
-  if test "$png_ok" = no; then
+  if test "$png_ok" = "no"; then
     AC_MSG_ERROR(*** PNG library is too old ***)
   fi
 else
   AC_MSG_ERROR(*** PNG header file not found ***)
 fi
 
-if test "$png_ok" = yes; then
+if test "$png_ok" = "yes"; then
 	PNGLIBS="-lpng -lz"
 	AC_SUBST(HAVE_LIBPNG)
 	SUPPORT_LIBS="$SUPPORT_LIBS -lpng -lz"; AC_DEFINE(HAVE_LIBPNG)
@@ -290,7 +283,7 @@
 SUPPORT_LIBS="$SUPPORT_LIBS -lm"
 GDK_SUPPORT_LIBS="$SUPPORT_LIBS"
 
-if test $dynworks = false; then
+if test "$dynworks" = "false"; then
    GIFLIBS=
    TIFFLIBS=
    PNGLIBS=
@@ -299,10 +292,10 @@
    GDK_SUPPORT_LIBS=
 fi
 
-AM_CONDITIONAL(HAVE_GIF, test "x$GIFLIBS" != x)
-AM_CONDITIONAL(HAVE_TIFF, test "x$TIFFLIBS" != x)
-AM_CONDITIONAL(HAVE_PNG, test "x$PNGLIBS" != x)
-AM_CONDITIONAL(HAVE_JPEG, test "x$JPEGLIBS" != x)
+AM_CONDITIONAL(HAVE_GIF, test "x$GIFLIBS" != "x")
+AM_CONDITIONAL(HAVE_TIFF, test "x$TIFFLIBS" != "x")
+AM_CONDITIONAL(HAVE_PNG, test "x$PNGLIBS" != "x")
+AM_CONDITIONAL(HAVE_JPEG, test "x$JPEGLIBS" != "x")
 
 AC_SUBST(SUPPORT_LIBS)
 AC_SUBST(GDK_SUPPORT_LIBS)
--- imlib-1.9.14/imlib-config.in.orig	2006-05-19 05:51:40.000000000 -0700
+++ imlib-1.9.14/imlib-config.in	2006-05-19 06:19:53.000000000 -0700
@@ -53,7 +53,7 @@
       ;;
     --libs)
       libdirs=-L@libdir@
-      echo $libdirs -lImlib @LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
+      echo $libdirs -lImlib $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
       ;;
     --libs-gdk)
       libdirs=-L@libdir@
--- imlib-1.9.14/gdk_imlib/Makefile.am.orig	2006-05-19 06:04:05.000000000 -0700
+++ imlib-1.9.14/gdk_imlib/Makefile.am		2006-05-19 06:08:03.000000000 -0700
@@ -83,7 +83,7 @@
 
 libgdk_imlib_la_LDFLAGS = -version-info 10:14:9
 libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) $(X_PRE_LIBS) \
-			 $(X_LIBS) $(X_EXTRA_LIBS)
+			 $(X_LIBS) $(X_EXTRA_LIBS) -lgdk
 
 
 include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h