From 82bc28361ec34326e78cfee98675414aed5fa9b2 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@imendio.com>
Date: Wed, 28 May 2008 16:18:27 +0000
Subject: [PATCH] add G_DISABLE_SINGLE_INCLUDES to CPPFLAGS globally.

2008-05-28  Michael Natterer  <mitch@imendio.com>

	* configure.in: add G_DISABLE_SINGLE_INCLUDES to CPPFLAGS
	globally.

	* glib/tests/option-context.c
	* glib/tests/testing.c
	* tests/testingbase64.c: don't include <glib/gtestutils.h>


svn path=/trunk/; revision=6955
---
 ChangeLog                   | 9 +++++++++
 configure.in                | 2 ++
 glib/tests/option-context.c | 3 ++-
 glib/tests/testing.c        | 4 +++-
 tests/testingbase64.c       | 3 ++-
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb5ae7f..1d44e32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-28  Michael Natterer  <mitch@imendio.com>
+
+	* configure.in: add G_DISABLE_SINGLE_INCLUDES to CPPFLAGS
+	globally.
+
+	* glib/tests/option-context.c
+	* glib/tests/testing.c
+	* tests/testingbase64.c: don't include <glib/gtestutils.h>
+
 2008-05-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/configure.in b/configure.in
index c8207c8..b21ec45 100644
--- a/configure.in
+++ b/configure.in
@@ -487,6 +487,8 @@ if test "x$GCC" = "xyes"; then
   esac
 fi
 
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES"
+
 if test "$glib_native_win32" = "yes"; then
   if test x$enable_static = xyes -a x$enable_shared = xyes; then
     AC_MSG_ERROR([Can not build both shared and static at the same time on Windows.])
diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c
index 29b9991..c3caad6 100644
--- a/glib/tests/option-context.c
+++ b/glib/tests/option-context.c
@@ -19,7 +19,8 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
+#include <glib.h>
 
 #include <stdlib.h>
 
diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index b73f2cf..561d5e6 100644
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -19,7 +19,9 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
+#include <glib.h>
+
 #include <stdlib.h>
 
 /* test assertion variants */
diff --git a/tests/testingbase64.c b/tests/testingbase64.c
index ccf2332..3e64d1a 100644
--- a/tests/testingbase64.c
+++ b/tests/testingbase64.c
@@ -18,7 +18,8 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestutils.h>
+
+#include <glib.h>
 #include <stdlib.h>
 #include <glib.h>
 #include <string.h>
-- 
2.7.4