From: Tom Prince <tom.prince@ualberta.net>
Date: Sun, 13 Nov 2011 17:05:03 +0000 (-0500)
Subject: Link libutil using filenmae, rather than using -l.
X-Git-Tag: 0.10_rc1~15
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=74f16571e8d9514d0bdc6eef0990da5f161020e4

Link libutil using filenmae, rather than using -l.

glibc includes a libutil, so if the wrong -L options get passed, we
will pick up glibc's version, rather than our own.
---

diff --git a/lib/Makefile.local b/lib/Makefile.local
index d58552c4..57dca702 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -70,7 +70,7 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
 	$(call quiet,AR) rcs $@ $^
 
 $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym
-	$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ -L$(srcdir)/util -lutil
+	$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libutil.a
 
 notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules)
 	sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@