fix definition of GDK_DEP_CFLAGS so that it doesn't cause build failures

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.

diff --git a/ChangeLog b/ChangeLog
index 620562dc4fddbe70172e0b3dfc41ee3d9a4af146..dd16a53203e5a71c72bb528c99afc304a4269bea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 620562dc4fddbe70172e0b3dfc41ee3d9a4af146..dd16a53203e5a71c72bb528c99afc304a4269bea 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 620562dc4fddbe70172e0b3dfc41ee3d9a4af146..dd16a53203e5a71c72bb528c99afc304a4269bea 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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

diff --git a/configure.in b/configure.in
index 46a8c27395f732527ef2505deee2fed5aee1f895..3d7cbb75043bbe33c2abbaae0a2b62b2dd03a022 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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