[evolution-data-server/murrayc-with-glib-gdbus-codegen: 2/3] Allow use of gdbus-codegen from glib instead of standalone gdbus-codegen

[Murray Cumming <murrayc src gnome org>]

commit b943e8e485dd22b99fa91534ca67e0450fd5830f
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jun 17 14:45:20 2011 +0200

    Allow use of gdbus-codegen from glib instead of standalone gdbus-codegen

 configure.ac                         |    6 +++---
 mail/libegdbus/e-gdbus-emailfolder.h |    6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 46bb13c..f7538c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,8 +164,7 @@ dnl ******************************
 dnl Compiler Warning Flags
 dnl ******************************
 AS_COMPILER_FLAGS(WARNING_FLAGS,
-	"-DG_DISABLE_DEPRECATED
-	-DPANGO_DISABLE_DEPRECATED
+	"-DPANGO_DISABLE_DEPRECATED
 	-DGDK_PIXBUF_DISABLE_DEPRECATED
 	-DGTK_DISABLE_DEPRECATED
 	-DG_DISABLE_SINGLE_INCLUDES
@@ -1238,7 +1237,8 @@ PKG_CHECK_MODULES([GIO_WITH_GDBUS_CODEGEN], [gio-2.0 >= 2.29.3],
   [],
   [PKG_CHECK_MODULES([GDBUS_CODEGEN], [gdbus-codegen])
   GDBUS_CODEGEN_STATIC=" `$PKG_CONFIG --variable=libdir gdbus-codegen`/libgdbus-codegen.a "
-  AC_SUBST(GDBUS_CODEGEN_STATIC)]
+  AC_SUBST([GDBUS_CODEGEN_STATIC])]
+  AC_DEFINE([HAVE_STANDALONE_GDBUS_CODEGEN], 1, [Whether we are using the standalone gdbus-codgen instead of the one in gio >= 2.29.3])
 )
 
 PKG_CHECK_MODULES(FFI, libffi)
diff --git a/mail/libegdbus/e-gdbus-emailfolder.h b/mail/libegdbus/e-gdbus-emailfolder.h
index 670126c..88b8d2e 100644
--- a/mail/libegdbus/e-gdbus-emailfolder.h
+++ b/mail/libegdbus/e-gdbus-emailfolder.h
@@ -6,12 +6,18 @@
 #define __E_GDBUS_EMAILFOLDER_H__
 
 #include <gio/gio.h>
+
+/* This ifdef block was added by hand.
+ * You'll need to re-add it if you regenerate this file from the standalone gdbus-codegen.
+ */
+#ifdef HAVE_STANDALONE_GDBUS_CODEGEN
 #include <gdbusinterface.h>
 #include <gdbusobjectproxy.h>
 #include <gdbusproxymanager.h>
 #include <gdbusobject.h>
 #include <gdbusobjectmanager.h>
 #include <gdbuscodegen-enumtypes.h>
+#endif
 
 G_BEGIN_DECLS