[evolution-activesync] Explicitly link gconf.

[David Woodhouse <dwmw2 src gnome org>]

commit 4ab6b003e4eb2297ad8688f506a92ebba4be777c
Author: David Woodhouse <David Woodhouse intel com>
Date:   Wed May 8 13:47:52 2013 +0100

    Explicitly link gconf.
    
    It might not be pulled in automatically by newer evo libraries.
    
    And in fact we ought to migrate to dconf ourselves too.

 configure.ac                    |    2 +-
 eas-daemon/libeas/Makefile.am   |    2 ++
 eplugin/Makefile.am             |    2 ++
 libeasaccount/src/Makefile.am   |    2 ++
 libeasaccount/tests/Makefile.am |   10 +++++-----
 5 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2214917..830f1e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ PKG_CHECK_MODULES(WBXML, libwbxml2 >= 0.11)
 PKG_CHECK_MODULES(LIBICAL, libical)
 PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2)
 PKG_CHECK_MODULES(LIBEBACKEND, libebackend-1.2)
-#PKG_CHECK_MODULES(GCONF, gconf-2.0)
+PKG_CHECK_MODULES(GCONF, gconf-2.0)
 
 
 if $PKG_CONFIG --atleast-version=3.0 libedataserver-1.2; then
diff --git a/eas-daemon/libeas/Makefile.am b/eas-daemon/libeas/Makefile.am
index 5f86458..f3f8b0e 100644
--- a/eas-daemon/libeas/Makefile.am
+++ b/eas-daemon/libeas/Makefile.am
@@ -13,6 +13,7 @@ libeas_la_CPPFLAGS =                  \
                $(SOUP_CFLAGS)          \
                $(WBXML_CFLAGS)         \
                $(LIBICAL_CFLAGS)       \
+               $(GCONF_CFLAGS)         \
                $(LIBEBOOK_CFLAGS)      \
                $(GNOMEKEYRING_CFLAGS)  \
                -DG_LOG_DOMAIN=\"libeas\" \
@@ -27,6 +28,7 @@ libeas_la_LDFLAGS =                   \
                $(SOUP_LIBS)            \
                $(WBXML_LIBS)           \
                $(LIBICAL_LIBS)     \
+               $(GCONF_LIBS) \
                $(LIBEBOOK_LIBS)     \
                $(GNOMEKEYRING_LIBS)
 
diff --git a/eplugin/Makefile.am b/eplugin/Makefile.am
index 5af9a0d..353e7a0 100644
--- a/eplugin/Makefile.am
+++ b/eplugin/Makefile.am
@@ -26,6 +26,7 @@ liborg_gnome_evolution_activesync_la_CPPFLAGS = \
        $(EVOLUTION_SHELL_CFLAGS) \
        $(EVOLUTION_MAIL_CFLAGS) \
        $(LDAP_CFLAGS)          \
+       $(GCONF_CFLAGS)         \
        $(SYNCEVOLUTION_DBUS_CFLAGS) \
        -I$(top_srcdir)/libeasaccount/src -I$(top_srcdir)/libeasclient -I$(top_srcdir)/camel 
-I$(top_srcdir)/libevoeas
 
@@ -44,6 +45,7 @@ liborg_gnome_evolution_activesync_la_LIBADD = \
        $(EVOLUTION_SHELL_LIBS) \
        $(EVOLUTION_MAIL_LIBS) \
        $(LDAP_LIBS) \
+       $(GCONF_LIBS) \
        $(SYNCEVOLUTION_DBUS_LIBS) \
        $(DNS_LIBS)
 
diff --git a/libeasaccount/src/Makefile.am b/libeasaccount/src/Makefile.am
index 7e04ca4..fe55ae4 100644
--- a/libeasaccount/src/Makefile.am
+++ b/libeasaccount/src/Makefile.am
@@ -7,10 +7,12 @@ libeasaccount_la_CFLAGS = $(WARNING_FLAGS)
 
 libeasaccount_la_CPPFLAGS =                    \
                $(GLIB_CFLAGS)          \
+               $(GCONF_CFLAGS) \
                $(EDATASERVER_CFLAGS)
 
 libeasaccount_la_LDFLAGS =                     \
                $(GLIB_LIBS)            \
+               $(GCONF_LIBS) \
                $(EDATASERVER_LIBS)
 
 
diff --git a/libeasaccount/tests/Makefile.am b/libeasaccount/tests/Makefile.am
index 7ad4d98..d50fc66 100644
--- a/libeasaccount/tests/Makefile.am
+++ b/libeasaccount/tests/Makefile.am
@@ -6,13 +6,13 @@ bin_PROGRAMS = libeasaccount_test
 libeasaccount_test_CPPFLAGS =                  \
                $(GLIB_CFLAGS)                  \
                $(EDATASERVER_CFLAGS)   \
-               $(GCONF)
-               
+               $(GCONF_CFLAGS)
+
 libeasaccount_test_LDFLAGS =                   \
                $(GLIB_LIBS)            \
                $(EDATASERVER_LIBS) \
-               $(GCONF)
-               
+               $(GCONF_LIBS)
+
 AM_CFLAGS = $(INTI_CFLAGS)
 AM_CFLAGS += -g $(WARNING_FLAGS)
 
@@ -20,4 +20,4 @@ libeasaccount_test_SOURCES =libeasaccount_test.c
 
 libeasaccount_test_LDADD =../src/libeasaccount.la $(INTI_LIBS)
 
-CLEANFILES =$(BUILT_SOURCES)
\ No newline at end of file
+CLEANFILES =$(BUILT_SOURCES)