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

diff --git a/ChangeLog b/ChangeLog
index bb5ae7f8290c8a2829c6a89398502a6c10bb2813..1d44e322d90faebfa32a9a8874eae261dcd8b48d 100644 (file)
--- 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 c8207c87514e9a7e961942713c1196c6c7c7cb9e..b21ec45e5754f450c855f43b8c7754be9e3aa9e3 100644 (file)
--- 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 29b9991ed35ba9aa578c3f91e673093070c4fe4e..c3caad655504ef0ee46692b56aeac586c01bbd4b 100644 (file)
--- 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 b73f2cfe3a52e28e93852fc159c12a6c8cc77c9c..561d5e639917d19a5d6000d28ea8e2483efe16a2 100644 (file)
--- 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 ccf2332743e327a853c4a4cf789e13a69f1d2cd9..3e64d1a0bbf25db7bc85819d6ed6f70b57959d8a 100644 (file)
--- 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>