Make the test for the sync extension more robust. (#347315, Tommi

2006-07-16  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Make the test for the sync extension
	more robust.  (#347315, Tommi Komulainen)

diff --git a/ChangeLog b/ChangeLog
index 7b4ea3b769127e45aaf4cdca8ae915c9b86121dc..38b07cc392e5785a17985644a747c9bcee584eb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-16  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Make the test for the sync extension
+       more robust.  (#347315, Tommi Komulainen)
+
+       * gtk/gtktextiter.c: Declare GtkTextRealIter as a type that 
+       may alias.  (#347585, Ed Catmur)
+
 2006-07-13  Michael Emmel  <mike.emmel@gmail.com>
 
        * gdk/directfb/gdkdrawable-directfb.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7b4ea3b769127e45aaf4cdca8ae915c9b86121dc..38b07cc392e5785a17985644a747c9bcee584eb9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-07-16  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Make the test for the sync extension
+       more robust.  (#347315, Tommi Komulainen)
+
+       * gtk/gtktextiter.c: Declare GtkTextRealIter as a type that 
+       may alias.  (#347585, Ed Catmur)
+
 2006-07-13  Michael Emmel  <mike.emmel@gmail.com>
 
        * gdk/directfb/gdkdrawable-directfb.c

diff --git a/configure.in b/configure.in
index 5c8eeea4e81158cbd11775ca7247be6026588acb..cc25445f15940e880d98d81908d7ddf0144c31e5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1192,12 +1192,16 @@ if test "x$gdktarget" = "xx11"; then
       AC_DEFINE(HAVE_SHAPE_EXT))
 
   # X SYNC check
+  gtk_save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $x_cflags"
   
   AC_CHECK_FUNC(XSyncQueryExtension,
       [AC_CHECK_HEADER(X11/extensions/sync.h,
          AC_DEFINE(HAVE_XSYNC, 1, Have the SYNC extension library),
          :, [#include <X11/Xlib.h>])])
 
+  CFLAGS="$gtk_save_CFLAGS"
+
   # Xshm checks
 
   if test "x$enable_shm" = "xyes"; then