Apply patch by Packz Enoch to allow more flexible champlain installation paths

diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index ba3b675abd869434d4a666af4aaeb1b68a30dd9a..49fa3d387f40587093e8fa86cc220eb7dc2aeaf6 100644 (file)
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -16,7 +16,7 @@ libchamplain_gtk_0_2_la_SOURCES = $(CHAMPLAIN_GTK_MARSHAL_LIST) \
 
 noinst_HEADERS = champlainviewembed.h
 
-libchamplain_gtk_0_2_la_LIBADD = $(DEPS_LIBS)
+libchamplain_gtk_0_2_la_LIBADD = $(DEPS_LIBS) $(CPLAIN_DEPS_LIBS)
 
 champlain-gtk-marshal.h: $(CHAMPLAIN_GTK_MARSHAL_LIST)
        @GLIB_GENMARSHAL@ --header --prefix=champlain_gtk_marshal $< > $(CHAMPLAIN_GTK_MARSHAL).h 
@@ -29,7 +29,7 @@ libchamplain_include_HEADERS = champlain-gtk.h champlainviewembed.h
 
 libchamplain_gtk_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
 
-AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
-AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.*
+AM_CPPFLAGS = $(DEPS_CFLAGS) $(CPLAIN_DEPS_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
+AM_LDFLAGS = $(DEPS_LIBS) $(CPLAIN_DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.*
 
 EXTRA_DIST = $(CHAMPLAIN_GTK_MARSHAL_LIST)

diff --git a/configure.ac b/configure.ac
index 3eff9253690c87ba05184795d0dae3d52d1a144e..66331d77b245117f6f0507b53d9fffd72023e1bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(libchamplain-gtk, 0.2.6, pierre-luc@pierlux.com)
+AC_INIT(libchamplain-gtk, 0.2.8, pierre-luc@pierlux.com)
 AC_CONFIG_SRCDIR([champlain-gtk/champlainviewembed.h])
 AC_CONFIG_HEADER([config.h])
 
@@ -28,10 +28,16 @@ AC_SUBST(DEPS_LIBS)
 PKG_CHECK_MODULES(DEPS,
   [   gtk+-2.0 >= 2.2,
       clutter-0.8 >= 0.8,
-      clutter-gtk-0.8 >= 0.8,
-      champlain-0.2 >= 0.2
+      clutter-gtk-0.8 >= 0.8
   ]
 )
+
+
+AC_SUBST(CPLAIN_DEPS_CFLAGS)
+AC_SUBST(CPLAIN_DEPS_LIBS)
+
+PKG_CHECK_MODULES(CPLAIN_DEPS,[champlain-0.2 >= 0.2])
+
 # check for gtk-doc
 GTK_DOC_CHECK(1.9)
 

diff --git a/demos/Makefile.am b/demos/Makefile.am
index fb48351d66e78e40fb9b1f8f7a423d9a40e8d9b5..d37ac13e8824f428fe8c42ed5ded1f243d661bce 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -2,8 +2,8 @@ noinst_PROGRAMS = launcher
 
 INCLUDES = -I$(top_srcdir)
 
-AM_CPPFLAGS = $(DEPS_CFLAGS) 
-AM_LDFLAGS = $(DEPS_LIBS) 
+AM_CPPFLAGS = $(DEPS_CFLAGS) $(CPLAIN_DEPS_CFLAGS)
+AM_LDFLAGS = $(DEPS_LIBS) $(CPLAIN_DEPS_LIBS)
 
 launcher_SOURCES = launcher.c
-launcher_LDADD = $(DEPS_LIBS) ../champlain-gtk/libchamplain-gtk-0.2.la
+launcher_LDADD = $(DEPS_LIBS) $(CPLAIN_DEPS_LIBS) ../champlain-gtk/libchamplain-gtk-0.2.la