[osm-gps-map] 09/153: Correctly link the python binding to our library

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository osm-gps-map.

commit 68a54bd20a8c73df5a6816e302da8727eea0659b
Author: David Paleino <dapal at debian.org>
Date:   Sun Dec 13 17:36:47 2009 +0100

    Correctly link the python binding to our library
---
 debian/patches/02-fix_python_library_linking.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/patches/02-fix_python_library_linking.patch b/debian/patches/02-fix_python_library_linking.patch
index e3069e4..006dcde 100644
--- a/debian/patches/02-fix_python_library_linking.patch
+++ b/debian/patches/02-fix_python_library_linking.patch
@@ -3,18 +3,20 @@ Subject: use the local dynamic library instead of the static one
 Forwarded: no
 
 ---
- python/configure.ac |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ python/configure.ac |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 --- osm-gps-map.orig/python/configure.ac
 +++ osm-gps-map/python/configure.ac
-@@ -50,7 +50,8 @@ if test -f ../src/libosmgpsmap.la; then
+@@ -49,8 +49,9 @@ if test -f ../src/libosmgpsmap.la; then
+ 	PKG_CHECK_MODULES(OSMGPSMAP, [gtk+-2.0 libsoup-2.4])
  
  	#and we must link to the static lib
- 	OSMGPSMAP_CFLAGS="$OSMGPSMAP_CFLAGS -I../src"
+-	OSMGPSMAP_CFLAGS="$OSMGPSMAP_CFLAGS -I../src"
 -	OSMGPSMAP_LIBS="$OSMGPSMAP_LIBS ../src/libosmgpsmap.la"
++	OSMGPSMAP_CFLAGS="$OSMGPSMAP_CFLAGS -I../src/"
 +#	OSMGPSMAP_LIBS="$OSMGPSMAP_LIBS ../src/libosmgpsmap.la"
-+	OSMGPSMAP_LIBS="$OSMGPSMAP_LIBS ../src/.libs/libosmgpsmap.so"
++	OSMGPSMAP_LIBS="$OSMGPSMAP_LIBS -L../src/.libs/ -losmgpsmap"
  else
  	PKG_CHECK_MODULES(OSMGPSMAP, osmgpsmap)
  fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-gps-map.git