[geocode-glib] server: Fix pkg-config usage

[Bastien Nocera <hadess src gnome org>]

commit 5979a82c2bc5bfa41273b243872272f7ee6df404
Author: Bastien Nocera <hadess hadess net>
Date:   Sun Jan 13 21:15:02 2013 +0100

    server: Fix pkg-config usage
    
    We cannot aggregate CFLAGS or LIBS like that, we need to pass
    all the needed modules to pkg-config which will take care of removing
    duplicates and ordering correctly.

 configure.ac                               |    5 ++++-
 geocode-glib/geocode-ip-server/Makefile.am |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bfa06ad..558e9a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,8 +61,11 @@ PKG_CHECK_MODULES(GEOCODE,
 		  json-glib-1.0 >= 0.14
 		  libsoup-2.4)
 
-# apart from the above GEOCODE packages, the server requires the following packages
+# Requires for the server
 PKG_CHECK_MODULES(GEOCODE_SERVER,
+		  gio-2.0 >= 2.34
+		  json-glib-1.0 >= 0.14
+		  libsoup-2.4
                   geoip)
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
diff --git a/geocode-glib/geocode-ip-server/Makefile.am b/geocode-glib/geocode-ip-server/Makefile.am
index 2de1265..c0b494c 100644
--- a/geocode-glib/geocode-ip-server/Makefile.am
+++ b/geocode-glib/geocode-ip-server/Makefile.am
@@ -2,12 +2,12 @@ include $(top_srcdir)/Makefile.decl
 
 BUILT_GIRSOURCES =
 
-AM_CFLAGS = -I$(top_srcdir) $(GEOCODE_CFLAGS) $(GEOCODE_SERVER_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
+AM_CFLAGS = -I$(top_srcdir) $(GEOCODE_SERVER_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 TEST_PROGS += geoip-lookup
 noinst_PROGRAMS = $(TEST_PROGS)
 
-geoip_lookup_LDADD = $(GEOCODE_LIBS) $(GEOCODE_SERVER_LIBS)
+geoip_lookup_LDADD = $(GEOCODE_SERVER_LIBS)
 
 MAINTAINERCLEANFILES = Makefile.in