gdk-pixbuf stable parallel fixes

[Havoc Pennington <hp redhat com>]

Hi,

Trivial patch, I'll commit shortly if no objections.

Havoc

Index: configure.in
===================================================================
RCS file: /cvs/gnome/gdk-pixbuf/configure.in,v
retrieving revision 1.54
diff -u -p -u -r1.54 configure.in
--- configure.in	2001/07/16 21:17:43	1.54
+++ configure.in	2001/10/08 16:43:40
@@ -231,7 +231,7 @@ AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG"
 AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
 
 GDK_PIXBUF_LIBDIR='-L${libdir}'
-GDK_PIXBUF_INCLUDEDIR="-I${includedir} $GTK_CFLAGS"
+GDK_PIXBUF_INCLUDEDIR="-I${includedir}/gdk-pixbuf-1.0 $GTK_CFLAGS"
 GDK_PIXBUF_LIBS="$GLIB_LIBS -lgdk_pixbuf $GTK_LIBS"
 AC_SUBST(STATIC_LIB_DEPS)
 STATIC_LIB_DEPS="$deps"
Index: gdk-pixbuf-config.in
===================================================================
RCS file: /cvs/gnome/gdk-pixbuf/gdk-pixbuf-config.in,v
retrieving revision 1.4
diff -u -p -u -r1.4 gdk-pixbuf-config.in
--- gdk-pixbuf-config.in	2000/04/11 07:03:21	1.4
+++ gdk-pixbuf-config.in	2001/10/08 16:43:40
@@ -39,9 +39,7 @@ while test $# -gt 0; do
       echo @GDK_PIXBUF_VERSION@
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes=-I includedir@
-      fi
+      includes=-I includedir@/gdk-pixbuf-1.0
       echo $includes `gtk-config --cflags`
       ;;
     --libs)
Index: gdk-pixbuf/Makefile.am
===================================================================
RCS file: /cvs/gnome/gdk-pixbuf/gdk-pixbuf/Makefile.am,v
retrieving revision 1.73
diff -u -p -u -r1.73 Makefile.am
--- gdk-pixbuf/Makefile.am	2001/07/16 21:17:44	1.73
+++ gdk-pixbuf/Makefile.am	2001/10/08 16:43:40
@@ -175,7 +175,7 @@ GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIB
 # The GdkPixBuf library
 #
 
-libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf
+libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf-1.0/gdk-pixbuf
 
 libgdk_pixbuf_la_SOURCES =		\
 	gdk-pixbuf.c			\

_______________________________________________
gnome-hackers mailing list
gnome-hackers gnome org
http://mail.gnome.org/mailman/listinfo/gnome-hackers