Sawfish building patch

[Chema Celorio <chema ximian com>]

Here is a patch for sawfish gnome-2 branch that does not require
imlib.m4 to be present to compile. It also fixes a path problem with the
capplet-widget.h file.

regards,
Chema

-- 
"Please don't think that what we need are good ideas or new projects,
what we really need is to finish our old ideas and current projects"

==============================================================
Chema Celorio                           chema ximian com
                                        http://www.gnome.org/~chema
Ximian Inc.                             http://www.ximian.com

? sawfish_gnome_2_build_patch.diff
Index: configure.in
===================================================================
RCS file: /cvs/gnome/sawfish/configure.in,v
retrieving revision 1.126.2.2
diff -u -5 -r1.126.2.2 configure.in
--- configure.in	2002/01/30 07:59:17	1.126.2.2
+++ configure.in	2002/02/10 07:17:19
@@ -129,43 +129,20 @@
 else
   AC_MSG_ERROR([You need X11 for sawfish])
 fi
 
 dnl Check for image handling libraries
-AC_ARG_WITH(gdk-pixbuf,
- [  --with-gdk-pixbuf	  Use gdk-pixbuf for image management
-  --without-gdk-pixbuf	  Use Imlib1 instead], [],
- [with_gdk_pixbuf=yes])
-if test "$with_gdk_pixbuf" != "no"; then
-  AC_MSG_CHECKING([for gdk_pixbuf (xlib version)])
-    PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-xlib-2.0 >= 1.3.12)
-    GDK_PIXBUF_VERSION=`pkg-config --modversion gdk-pixbuf-xlib-2.0`
-    AC_SUBST(GDK_PIXBUF_VERSION)
-    AC_SUBST(GDK_PIXBUF_CFLAGS)
-    AC_SUBST(GDK_PIXBUF_LIBS)
-    AC_DEFINE(HAVE_GDK_PIXBUF,1)
-    AC_DEFINE(NEED_PIXMAP_CACHE,1)
-    IMAGE_LIBS='${GDK_PIXBUF_LIBS}'
-    IMAGE_CFLAGS='${GDK_PIXBUF_CFLAGS}'
-    with_gdk_pixbuf=yes
-  else
-    AC_MSG_RESULT(no)
-    if test "$with_gdk_pixbuf" = "yes"; then
-      AC_MSG_ERROR([can't locate gdk-pixbuf-xlib library])
-    else
-      with_gdk_pixbuf=no
-    fi
-fi
-if test "$with_gdk_pixbuf" = "no"; then
-  AM_PATH_IMLIB
-  if $IMLIB_CONFIG --libs | grep " -lpng" >/dev/null 2>&1; then true; else
-    AC_MSG_ERROR([imlib must be built with support for png images])
-  fi
-  AC_DEFINE(HAVE_IMLIB,1)
-  IMAGE_LIBS='${IMLIB_LIBS}'
-  IMAGE_CFLAGS='${IMLIB_CFLAGS}'
-fi
+AC_MSG_CHECKING([for gdk_pixbuf (xlib version)])
+PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-xlib-2.0 >= 1.3.12)
+GDK_PIXBUF_VERSION=`pkg-config --modversion gdk-pixbuf-xlib-2.0`
+AC_SUBST(GDK_PIXBUF_VERSION)
+AC_SUBST(GDK_PIXBUF_CFLAGS)
+AC_SUBST(GDK_PIXBUF_LIBS)
+AC_DEFINE(HAVE_GDK_PIXBUF,1)
+AC_DEFINE(NEED_PIXMAP_CACHE,1)
+IMAGE_LIBS='${GDK_PIXBUF_LIBS}'
+IMAGE_CFLAGS='${GDK_PIXBUF_CFLAGS}'
 AC_SUBST(IMAGE_LIBS)
 AC_SUBST(IMAGE_CFLAGS)
 
 AM_PATH_GTK_2_0(1.3.12)
 
@@ -201,10 +178,12 @@
   if test $? -ne 0; then
     AC_MSG_RESULT([no])
     AC_MSG_WARN([Can't run "gnome-config capplet", not building capplet])
   else
     AC_MSG_RESULT([yes])
+    GNOME_CC_CFLAGS="`gnome-config --cflags gnome capplet`"
+    GNOME_CC_LIBS="`gnome-config --libs gnome capplet`"
     AC_SUBST(GNOME_CC_CFLAGS)
     AC_SUBST(GNOME_CC_LIBS)
     add_subdir "capplet"
   fi
 fi
@@ -345,12 +324,10 @@
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
 AC_SUBST(X_CFLAGS)
 AC_SUBST(X_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
-AC_SUBST(IMLIB_CFLAGS)
-AC_SUBST(IMLIB_LIBS)
 
 dnl Build all files
 AC_OUTPUT(${output_files})
 
 dnl If it doesn't look like GNU Make is being used, give a friendly warning