--- gdk-pixbuf-0.22.0/configure.in.orig	2006-05-24 22:06:59.000000000 -0700
+++ gdk-pixbuf-0.22.0/configure.in	2006-05-24 22:19:17.000000000 -0700
@@ -16,7 +16,7 @@
 AC_SUBST(GDK_PIXBUF_MINOR)
 AC_SUBST(GDK_PIXBUF_MICRO)
 AC_SUBST(GDK_PIXBUF_VERSION)
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 AC_PROG_CC
 AC_ISC_POSIX
@@ -37,11 +37,11 @@
 STRIP_BEGIN=
 STRIP_END=
 if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
-	STRIP_BEGIN='$(strip $(STRIP_DUMMY)'
-	STRIP_END=')'
-	AC_MSG_RESULT(yes)
+    STRIP_BEGIN='$(strip $(STRIP_DUMMY)'
+    STRIP_END=')'
+    AC_MSG_RESULT(yes)
 else
-	AC_MSG_RESULT(no)
+    AC_MSG_RESULT(no)
 fi
 STRIP_DUMMY=
 AC_SUBST(STRIP_DUMMY)
@@ -49,17 +49,17 @@
 AC_SUBST(STRIP_END)
 
 AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
-if test x$GNOME_CONFIG != xno; then
-	echo "Building the GnomeCanvasPixbuf library"
-	GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui`
-	GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui`
-	BUILD_CANVAS=yes
+if test "x$GNOME_CONFIG" != "xno"; then
+    echo "Building the GnomeCanvasPixbuf library"
+    GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui`
+    GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui`
+    BUILD_CANVAS="yes"
 else
-	echo "Not building GnomeCanvasPixbuf library"
-	BUILD_CANVAS=no
+    echo "Not building GnomeCanvasPixbuf library"
+    BUILD_CANVAS="no"
 fi       
 
-AM_CONDITIONAL(BUILD_CANVAS_ITEM, test $BUILD_CANVAS = yes)
+AM_CONDITIONAL(BUILD_CANVAS_ITEM, test "$BUILD_CANVAS" = "yes")
 
 AC_SUBST(GNOME_LIBS)
 AC_SUBST(GNOME_CFLAGS)
@@ -67,16 +67,16 @@
 AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)
 
 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
-	fi
+            with_modules="no"
+    fi
 ])
 
 dynworks=false
 deps=
-if test x$with_modules = xno; then
+if test "x$with_modules" = "xno"; then
     AC_MSG_RESULT(no)
 else
     AC_MSG_RESULT(yes)
@@ -90,19 +90,19 @@
     #include <gmodule.h>
     main ()
     {
-    	if (g_module_supported ())
-    	    exit (0);
-    	else
-    	    exit (1);
+        if (g_module_supported ())
+            exit (0);
+        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 test "$dynworks" = "true"; then
    pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config"
    pixbuf_deplibs_check=`$pixbuf_libtool_config | \
       grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
@@ -110,11 +110,11 @@
    if test "x$pixbuf_deplibs_check" = "xnone" || \
       test "x$pixbuf_deplibs_check" = "xunknown" || \
       test "x$pixbuf_deplibs_check" = "x"; then
-      dynworks=false
+      dynworks="false"
    fi
 fi
 
-if $dynworks; then
+if test "$dynworks" = "true"; then
    AC_DEFINE(USE_GMODULE)
    GMODULE_LIBS="`glib-config --libs gmodule`"
    GMODULE_FLAGS="`glib-config --cflags gmodule`"
@@ -144,73 +144,64 @@
 AC_MSG_RESULT([$path_rgb_txt])
 AC_DEFINE_UNQUOTED(PATH_RGB_TXT,"$path_rgb_txt")
 
-dnl Test for libtiff
-  if test -z "$LIBTIFF"; then
-    AC_CHECK_LIB(tiff, TIFFReadScanline,
-      AC_CHECK_HEADER(tiffio.h,
-        TIFF='tiff'; LIBTIFF='-ltiff',
-        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
-      AC_CHECK_LIB(tiff, TIFFWriteScanline,
-        AC_CHECK_HEADER(tiffio.h,
-          TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
-          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
-        AC_CHECK_LIB(tiff34, TIFFFlushData,
-          AC_CHECK_HEADER(tiffio.h,
-            TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
-            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
-        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)
-  fi
+if test -z "$LIBTIFF"; then
+  AC_CHECK_LIB(tiff, TIFFReadScanline,
+    [AC_CHECK_HEADER(tiffio.h,
+      TIFF="tiff"
+      LIBTIFF="-ltiff",
+      AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+    [AC_CHECK_LIB(tiff, TIFFWriteScanline,
+      [AC_CHECK_HEADER(tiffio.h,
+        TIFF="tiff"
+        LIBTIFF="-ltiff -ljpeg -lz",
+        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+      [AC_CHECK_LIB(tiff34, TIFFFlushData,
+        [AC_CHECK_HEADER(tiffio.h,
+          TIFF="tiff"
+          LIBTIFF="-ltiff34 -ljpeg -lz",
+          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+      AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***),
+      -ljpeg -lz -lm)],
+    -ljpeg -lz -lm)],
+  -lm)
+fi
 
 dnl Test for libjpeg
-  if test -z "$LIBJPEG"; then
-    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-      jpeg_ok=yes,
-      jpeg_ok=no
-      AC_MSG_WARN(*** JPEG loader will not be built (JPEG library not found) ***))
-    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
-        LIBJPEG='-ljpeg'
-        AC_CHECK_LIB(jpeg, jpeg_simple_progression,     
-          AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
-          AC_MSG_WARN(JPEG library does not support progressive saving.))
-      else
-          AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
-      fi
-    fi
-  fi
+if test -z "$LIBJPEG"; then
+  AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+    [AC_CHECK_HEADER(jpeglib.h,
+      [LIBJPEG="-ljpeg"
+      AC_CHECK_LIB(jpeg,jpeg_simple_progression,       
+      AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
+      AC_MSG_WARN(JPEG library does not support progressive saving.))],
+    AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***))],
+  AC_MSG_WARN(*** JPEG loader will not be built (JPEG library not found) ***))
+fi
 
 dnl Test for libpng
-  if test -z "$LIBPNG"; then
-    AC_CHECK_LIB(png, png_read_info,
-      AC_CHECK_HEADER(png.h,
-        png_ok=yes,
-        png_ok=no),
-      AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
-    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_ok=yes,
-        png_ok=no)
-      AC_MSG_RESULT($png_ok)
-      if test "$png_ok" = yes; then
-        PNG='png'; LIBPNG='-lpng -lz'
-      else
-        AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
-      fi
+if test -z "$LIBPNG"; then
+   AC_CHECK_LIB(png, png_read_info,
+    [AC_CHECK_HEADER(png.h,
+      png_ok="yes",
+      png_ok="no")],
+    AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
+  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_ok="yes",
+      png_ok="no")
+    AC_MSG_RESULT($png_ok)
+    if test "$png_ok" = "yes"; then
+      PNG="png"
+      LIBPNG="-lpng -lz"
     else
-     AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
+      AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
     fi
+  else
+    AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
   fi
+fi
 
 deps="$LIBTIFF $LIBJPEG $LIBPNG"
 
@@ -226,9 +217,9 @@
 
 AC_TYPE_SIGNAL
 
-AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
-AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
-AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
+AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != "x")
+AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != "x")
+AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != "x")
 
 GDK_PIXBUF_LIBDIR='-L${libdir}'
 GDK_PIXBUF_INCLUDEDIR="-I${includedir}/gdk-pixbuf-1.0 $GTK_CFLAGS"
@@ -265,7 +256,7 @@
 if test "x$with_html_dir" = "x" ; then
   HTML_DIR='${datadir}/gnome/html'
 else
-  HTML_DIR=$with_html_dir
+  HTML_DIR="$with_html_dir"
 fi
 
 AC_SUBST(HTML_DIR)
@@ -273,7 +264,7 @@
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
 
 gtk_doc_min_version=0.6
-if $GTKDOC ; then 
+if test "$GTKDOC" = "true" ; then 
     gtk_doc_version=`gtkdoc-mkdb --version`
     AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
     if perl <<EOF ; then
@@ -283,7 +274,7 @@
       AC_MSG_RESULT(yes)
    else
       AC_MSG_RESULT(no)
-      GTKDOC=false
+      GTKDOC="false"
    fi
 fi
 
@@ -296,17 +287,17 @@
 dnl Let people disable the gtk-doc stuff.
 AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
 
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
+if test "x$enable_gtk_doc" = "xauto" ; then
+  if test "x$GTKDOC" = "xtrue" ; then
+    enable_gtk_doc="yes"
   else
-    enable_gtk_doc=no 
+    enable_gtk_doc="no" 
   fi
 fi
 
 dnl NOTE: We need to use a separate automake conditional for this
 dnl       to make this work with the tarballs.
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+AM_CONDITIONAL(ENABLE_GTK_DOC, test "x$enable_gtk_doc" = "xyes")
 
 #
 # Checks to see if we should compile in MMX support (there will be
@@ -321,47 +312,47 @@
 AC_MSG_CHECKING(for x86 platform)
   case $host_cpu in
     i386|i486|i586|i686|i786|k6|k7)
-	use_x86_asm=yes
-	;;
+    use_x86_asm="yes"
+    ;;
     *)
-  	use_x86_asm=no
+    use_x86_asm="no"
   esac
 AC_MSG_RESULT($use_x86_asm)
 
 dnl Are we going to use MMX extensions
-use_mmx_asm=no
+use_mmx_asm="no"
 
 AC_MSG_CHECKING(compiler support for MMX)
 
-if test x$enable_mmx = xauto ; then
-  if test $use_x86_asm = yes; then
-    save_ac_ext=$ac_ext
-    ac_ext=S
+if test "x$enable_mmx" = "xauto" ; then
+  if test "$use_x86_asm" = "yes"; then
+    save_ac_ext="$ac_ext"
+    ac_ext="S"
     
     cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
     if AC_TRY_EVAL(ac_compile); then
-        use_mmx_asm=yes
+        use_mmx_asm="yes"
     fi
     dnl rm -f conftest.[oS]
 
-    ac_ext=$save_ac_ext
+    ac_ext="$save_ac_ext"
   fi
 
 dnl Enforce usage of MMX extensions
-elif test x$enable_mmx = xyes ; then
-    use_mmx_asm=yes
+elif test "x$enable_mmx" = "xyes" ; then
+    use_mmx_asm="yes"
 else
-    use_mmx_asm=no
+    use_mmx_asm="no"
 fi
 
-if test $use_mmx_asm = yes; then
+if test "$use_mmx_asm" = "yes"; then
   AC_DEFINE(USE_MMX)
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
 fi
 
-AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
+AM_CONDITIONAL(USE_MMX, test "x$use_mmx_asm" = "xyes")
 
 # Output files
 
--- gdk-pixbuf-0.22.0/gdk-pixbuf/Makefile.am.orig	2006-05-24 22:31:50.000000000 -0700
+++ gdk-pixbuf-0.22.0/gdk-pixbuf/Makefile.am	2006-05-24 22:35:11.000000000 -0700
@@ -16,6 +16,7 @@
 	libgdk_pixbuf_xlib.la	\
 	$(CANVAS_PIXBUF_LIB)
 
+libgnomecanvaspixbuf_la_DEPENDENCIES = libgdk_pixbuf.la
 libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS)
 libgnomecanvaspixbuf_la_LIBADD = libgdk_pixbuf.la
 
@@ -191,6 +192,7 @@
 	gdk-pixbuf-parse-color.c	\
 	$(extra_sources)
 
+libgdk_pixbuf_xlib_la_DEPENDENCIES =  pixops/libpixops.la libgdk_pixbuf.la
 libgdk_pixbuf_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(GTK_LIBS)
 libgdk_pixbuf_la_LIBADD = pixops/libpixops.la