cluster: STABLE3 - askant: Fix linking with libgfs2

cluster: STABLE3 - askant: Fix linking with libgfs2

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c8d278b7b6ba74d6bf491b7994ab4b25b5841207
Commit:        c8d278b7b6ba74d6bf491b7994ab4b25b5841207
Parent:        47f32bf33ad1f7981d34df8aeadc3abfdd0272be
Author:        Andrew Price <andy@andrewprice.me.uk>
AuthorDate:    Tue Jan 27 22:45:29 2009 +0000
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Feb 19 10:59:57 2009 +0100

askant: Fix linking with libgfs2

While -lgfs2 was being handled in the Makefile it was being added to the
gcc commandline too early and libgfs2.a wasn't being linked in properly.

This moves the handling of -lgfs2 back into setup.py so that it gets
used in the correct place.

Signed-off-by: Andrew Price <andy@andrewprice.me.uk>
---
 contrib/askant/Makefile |    2 +-
 contrib/askant/setup.py |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/askant/Makefile b/contrib/askant/Makefile
index 3773349..9ba53df 100644
--- a/contrib/askant/Makefile
+++ b/contrib/askant/Makefile
@@ -7,7 +7,7 @@ include $(OBJDIR)/make/clean.mk
 CFLAGS += -I$(SRCDIR)/gfs2/libgfs2
 CFLAGS += -I$(SRCDIR)/gfs2/include
 
-LDFLAGS += -L$(OBJDIR)/gfs2/libgfs2 -lgfs2
+LDFLAGS += -L$(OBJDIR)/gfs2/libgfs2
 
 build:
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" python $(S)/setup.py build
diff --git a/contrib/askant/setup.py b/contrib/askant/setup.py
index 3c971bc..26c5ca1 100644
--- a/contrib/askant/setup.py
+++ b/contrib/askant/setup.py
@@ -11,5 +11,6 @@ setup(name="askant",
 	  url="http://andrewprice.me.uk/projects/askant",
 	  packages = ['askant','askant.fs'],
 	  ext_modules = [Extension("askant.fs.gfs2",
-		  sources = ["fsplugins/gfs2/gfs2module.c","fsplugins/gfs2/gfs2.c"])],
+		  sources = ["fsplugins/gfs2/gfs2module.c","fsplugins/gfs2/gfs2.c"],
+		  libraries = ["gfs2"])],
 	  scripts = ['scripts/askant'])