From bf0922c737e17f9ec414afaa585d768d2dba988f Mon Sep 17 00:00:00 2001
From: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
Date: Mon, 13 Apr 2009 11:15:54 +0200
Subject: [PATCH] Change dependencies checking

---
 configure.ac     | 16 ++++++++++++++--
 src/Makefile.am  |  8 ++++----
 test/Makefile.am |  5 +++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0af77887..95aac3e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,14 +48,26 @@ AM_WITH_EXPAT
 # Curl
 LIBCURL_CHECK_CONFIG([yes],[],[],[AC_MSG_ERROR([libcurl is needed but not found])])
 
+# gdk-pixbuf-csource
 AC_CHECK_PROG([GDK_PIXBUF_CSOURCE],gdk-pixbuf-csource,[yes])
 if test $GDK_PIXBUF_CSOURCE != "yes"
 then
   AC_MSG_ERROR([gdk-pixbuf-csource is needed but not found])
 fi
 
-# Checks for libraries.
-AM_PATH_GTK_2_0(2.2.0,,AC_MSG_ERROR(needs GTK+ 2.2.0),gthread)
+dnl  ------------------
+dnl | Pkgconfig checks |---------------------------------------
+dnl  ------------------
+
+PKG_CHECK_MODULES(PACKAGE, [
+        glib-2.0          >= 2.12
+        gthread-2.0       >= 2.2
+        gtk+-2.0          >= 2.8
+])
+
+AC_SUBST(PACKAGE_CFLAGS)
+AC_SUBST(PACKAGE_LIBS)
+
 
 # Options
 AC_ARG_ENABLE(alphabetized-trw, AC_HELP_STRING([--enable-alphabetized-trw],
diff --git a/src/Makefile.am b/src/Makefile.am
index af98ec1f..52925122 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -108,13 +108,13 @@ endif
 
 viking_SOURCES = main.c
 
-INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
-LDADD           = libviking.a @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
+LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
 if REALTIME_GPS_TRACKING
 LDADD           += -lgps
 endif
-#LDADD           = -lz @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
-AM_CFLAGS		= -Wall -g -D_GNU_SOURCE
+AM_CFLAGS		= -Wall -g -D_GNU_SOURCE \
+	$(PACKAGE_CFLAGS) \
+	@EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 65e192b0..74f39e1c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,6 @@
-INCLUDES        = -I$(top_srcdir)/src @GTK_CFLAGS@
-LDADD           = @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ $(top_builddir)/src/icons/libicons.a
+AM_CFLAGS        = -I$(top_srcdir)/src \
+	$(PACKAGE_CFLAGS)
+LDADD           = $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ $(top_builddir)/src/icons/libicons.a
 if REALTIME_GPS_TRACKING
 LDADD           += -lgps
 endif
-- 
2.39.5