diff -Nur gimageview-0.2.1-bak/configure.in gimageview-0.2.1/configure.in
--- gimageview-0.2.1-bak/configure.in	Sun May  5 03:22:46 2002
+++ gimageview-0.2.1/configure.in	Tue May 14 02:16:04 2002
@@ -97,17 +97,27 @@
 AM_PATH_GDK_IMLIB($IMLIB_REQUIRED, [have_imlib=yes], [have_imlib=no])
 AM_PATH_GDK_PIXBUF($GDK_PIXBUF_REQUIRED, [have_gdk_pixbuf=yes], [have_gdk_pixbuf=no])
 
+GIMV_IMAGELIB_CFLAGS=""
+GIMV_IMAGELIB_LIBS=""
+
 if test "$disable_gdk_pixbuf" = no -a "$have_gdk_pixbuf" = yes;then
+   GIMV_IMAGELIB_CFLAGS=${GDK_PIXBUF_CFLAGS}
+   GIMV_IMAGELIB_LIBS=${GDK_PIXBUF_LIBS}
    AC_DEFINE(HAVE_GDK_PIXBUF)
    AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "$have_gdk_pixbuf" = yes)
 else
    if test "$disable_imlib" = no -a "$have_imlib" = yes;then
+      GIMV_IMAGELIB_CFLAGS=${GDK_PIXBUF_CFLAGS}
+      GIMV_IMAGELIB_LIBS=${GDK_PIXBUF_LIBS}
       AC_DEFINE(HAVE_GDK_IMLIB)
       AM_CONDITIONAL(HAVE_GDK_IMLIB, test "$have_gdk_imlib" = yes)
    else
       AC_MSG_ERROR(*** No image libraries are enabled. GImageView needs Imlib or gdk-pixbuf. ***)
    fi
 fi
+
+AC_SUBST(GIMV_IMAGELIB_CFLAGS)
+AC_SUBST(GIMV_IMAGELIB_LIBS)
 
 
 dnl ********************
diff -Nur gimageview-0.2.1-bak/src/Makefile.am gimageview-0.2.1/src/Makefile.am
--- gimageview-0.2.1-bak/src/Makefile.am	Tue Apr  9 18:17:38 2002
+++ gimageview-0.2.1/src/Makefile.am	Tue May 14 02:16:16 2002
@@ -84,15 +84,13 @@
 
 INCLUDES =			\
 	$(GTK_CFLAGS)		\
-	$(GDK_IMLIB_CFLAGS)	\
-	$(GDK_PIXBUF_CFLAGS)	\
+	$(GIMV_IMAGELIB_CFLAGS)	\
 	-I$(top_srcdir)
 
 gimv_LDADD = 			\
         $(INTLLIBS)		\
 	$(GTK_LIBS) 		\
-	$(GDK_IMLIB_LIBS)	\
-	$(GDK_PIXBUF_LIBS)	\
+	$(GIMV_IMAGELIB_LIBS)	\
 	$(LIBPNG)		\
 	$(LIBICONV)		\
 	$(LIBCHARSET)		\