[evolution-data-server/meego-eds: 8/47] Link statically to gdbus-codegen.

[Srinivasa Ragavan <sragavan src gnome org>]

commit ed5838e9b604362d3dbc951dac96926aee84e450
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Wed Apr 13 18:45:45 2011 +0530

    Link statically to gdbus-codegen.

 configure.ac               |   17 +++++++++++++++--
 mail/daemon/Makefile.am    |   10 ++++++++--
 mail/libegdbus/Makefile.am |    4 +++-
 3 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 12559c0..d101a6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1225,12 +1225,25 @@ AC_SUBST(E_BACKEND_LIBS)
 dnl ******************************
 dnl Email daemon
 dnl ******************************
-PKG_CHECK_MODULES(E_MAIL_FACTORY, glib-2.0 gtk+-2.0 gdbus-codegen libffi)
+PKG_CHECK_MODULES(E_MAIL_FACTORY, glib-2.0 gtk+-2.0)
 
 AC_SUBST(E_MAIL_FACTORY_CFLAGS)
 AC_SUBST(E_MAIL_FACTORY_LIBS)
 
-PKG_CHECK_MODULES(E_MAIL_GDBUS_UTILS, glib-2.0 gtk+-2.0  gdbus-codegen libffi)
+PKG_CHECK_MODULES(GDBUS_CODEGEN, gdbus-codegen )
+
+AC_SUBST(GDBUS_CODEGEN_CFLAGS)
+AC_SUBST(GDBUS_CODEGEN_LIBS)
+
+GDBUS_CODEGEN_STATIC=" `$PKG_CONFIG --variable=libdir gdbus-codegen`/libgdbus-codegen.a "
+AC_SUBST(GDBUS_CODEGEN_STATIC)
+
+PKG_CHECK_MODULES(FFI, libffi)
+
+AC_SUBST(FFI_CFLAGS)
+AC_SUBST(FFI_LIBS)
+
+PKG_CHECK_MODULES(E_MAIL_GDBUS_UTILS, glib-2.0 gtk+-2.0)
 AC_SUBST(E_MAIL_GDBUS_UTILS_CFLAGS)
 AC_SUBST(E_MAIL_GDBUS_UTILS_LIBS)
 
diff --git a/mail/daemon/Makefile.am b/mail/daemon/Makefile.am
index 880960c..0bbab9a 100644
--- a/mail/daemon/Makefile.am
+++ b/mail/daemon/Makefile.am
@@ -36,6 +36,8 @@ test_email_client_CPPFLAGS = \
 		$(E_MAIL_FACTORY_CFLAGS)	\
 		$(GNOME_PLATFORM_CFLAGS)	\
 		$(CAMEL_CFLAGS)			\
+		$(GDBUS_CODEGEN_CFLAGS)		\
+		$(FFI_CFLAGS)			\
 		-Wall -g3 -O0 -ggdb -DPKGDATADIR="\"$(pkgdatadir)\""	\
 		-I$(top_srcdir)/mail/					\
 		-I$(top_srcdir)/mail/libemailutils				\
@@ -50,10 +52,11 @@ test_email_client_LDADD = \
 		$(top_builddir)/camel/libcamel-provider-1.2.la		\
 		$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 		$(top_builddir)/libedataserverui/libedataserverui-1.2.la	\
+		$(GDBUS_CODEGEN_STATIC)					\
 		$(E_MAIL_FACTORY_LIBS)				\
 		$(GNOME_PLATFORM_LIBS)	\
 		$(CAMEL_LIBS)			\
-		-lffi
+		$(FFI_LIBS)			
 
 
 #desktopentry_DATA = e-mail-factory.desktop
@@ -67,6 +70,8 @@ e_mail_factory_CPPFLAGS = \
 		$(E_MAIL_FACTORY_CFLAGS)	\
 		$(CAMEL_CFLAGS)			\
 		$(GNOME_PLATFORM_CFLAGS)	\
+		$(GDBUS_CODEGEN_CFLAGS)		\
+		$(FFI_CFLAGS)			\
 		-Wall -g3 -O0 -ggdb -DPKGDATADIR="\"$(pkgdatadir)\""	\
 		-I$(top_srcdir)/mail/					\
 		-I$(top_srcdir)/mail/libemailutils				\
@@ -84,7 +89,8 @@ e_mail_factory_LDADD = \
 		$(top_builddir)/mail/libemailutils/libemail-utils.la	\
 		$(top_builddir)/mail/libegdbus/libegdbus-mail.la	\
 		$(E_MAIL_FACTORY_LIBS)				\
-		-lffi
+		$(GDBUS_CODEGEN_STATIC)				\
+		$(FFI_LIBS)
 
 service_in_files = org.gnome.evolution.dataserver.Mail.service.in
 servicedir = $(datadir)/dbus-1/services
diff --git a/mail/libegdbus/Makefile.am b/mail/libegdbus/Makefile.am
index 7ee20e4..5b53d5a 100644
--- a/mail/libegdbus/Makefile.am
+++ b/mail/libegdbus/Makefile.am
@@ -17,7 +17,9 @@ libegdbus_mail_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)				\
 	$(CAMEL_CFLAGS)				\
 	-DG_LOG_DOMAIN=\"libegdbus-mail\"	\
-	$(E_MAIL_GDBUS_UTILS_CFLAGS)
+	$(E_MAIL_GDBUS_UTILS_CFLAGS)		\
+	$(GDBUS_CODEGEN_CFLAGS)			\
+	$(FFI_CFLAGS)		
 
 libegdbus_mail_la_SOURCES =			\
 	e-gdbus-emailfolder.h			\