Re: configure.in changes

[James Henstridge <james jamesh id au>]

Owen Taylor wrote:

>So, if people want to test out what is in CVS now I'd appreciate it, 
>especially for those deviating from the central stream of 
>Linux+recent X.org.
>  
>
I hit a compile problem, and committed the attached patch to fix it.  If
$X_PACKAGES contained any pkg-config package names, the package names
were being added to $GDK_DEP_CFLAGS, rather than the cflags
corresponding to those packages.

James.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.6955
diff -u -p -r1.6955 ChangeLog
--- ChangeLog	10 Aug 2005 02:40:09 -0000	1.6955
+++ ChangeLog	10 Aug 2005 03:35:28 -0000
@@ -1,3 +1,8 @@
+2005-08-10  James Henstridge  <james jamesh id au>
+
+	* configure.in: fix definition of GDK_DEP_CFLAGS so that it
+	doesn't cause build failures if $X_PACKAGES is not empty.
+
 2005-08-09  Owen Taylor  <otaylor redhat com>
 
 	* gdk/gdkwindow.c (gdk_window_ref_cairo_surface): Remove superfluous
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtk+/configure.in,v
retrieving revision 1.461
diff -u -p -r1.461 configure.in
--- configure.in	10 Aug 2005 02:31:50 -0000	1.461
+++ configure.in	10 Aug 2005 03:35:28 -0000
@@ -1377,7 +1377,7 @@ LDFLAGS="$saved_ldflags"
 
 GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES"
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $X_PACKAGES $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $X_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need