From a3a42b9358ebb5c005ecd5b375340ff8daba1f3d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 11 Dec 2009 20:29:28 -0600
Subject: Fixing the build system to link everything all happy like.

---
 configure.ac       | 6 +++---
 python/Makefile.am | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4fa8675..ad85399 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,6 @@ AC_SUBST(DBUSSERVICEDIR)
 ###########################
 
 PYGTK_REQUIRED=2.14.0
-APPAPPINDICATOR_REQUIRED=0.0.2
 PYGOBJECT_REQUIRED=0.22
 
 AM_PATH_PYTHON(2.3.5)
@@ -92,8 +91,9 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 
 PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
                   [
-                   pygtk-2.0 >= $PYGTK_REQUIRED
-								   pygobject-2.0 >= $PYGOBJECT_REQUIRED
+					pygtk-2.0 >= $PYGTK_REQUIRED
+					gtk+-2.0 >= $GTK_REQUIRED_VERSION
+					pygobject-2.0 >= $PYGOBJECT_REQUIRED
                   ])
 AC_SUBST(APPINDICATOR_PYTHON_CFLAGS)
 AC_SUBST(APPINDICATOR_PYTHON_LIBS)
diff --git a/python/Makefile.am b/python/Makefile.am
index 6d19723..0b606db 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -3,6 +3,7 @@ defs_DATA = appindicator.defs
 
 #CFLAGS = -Wall -Werror
 INCLUDES = \
+		-I$(top_srcdir)/src \
         -DG_LOG_DOMAIN=\"appindicator-python\" \
         -DDATADIR=\"$(datadir)\" \
         -DLIBDIR=\"$(libdir)\" \
@@ -19,7 +20,7 @@ appindicatordir = $(pkgpyexecdir)/appindicator
 appindicator_LTLIBRARIES = _appindicator.la
 
 _appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator -lpyglib-2.0-python2.6
-_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) 
+_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator
 _appindicator_la_SOURCES = appindicatormodule.c
 nodist__appindicator_la_SOURCES = appindicator.c
 
-- 
cgit v1.2.3