Makefile: Fix notmuch binary to directly link against Xapian and GMime.

Without this, trying to link with the gold linker would fail, (which meant
that notmuch could not be compiled out of the box on recent Fedora, nor
even on Debian when the binutils-gold package is installed).

diff --git a/Makefile.local b/Makefile.local
index ade84121fcb887e6c017bc977f063c17c52c0a8f..971ddd523f5d9272461ed02531c10cbd0a72d49e 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -31,7 +31,7 @@ GPG_FILE=$(SHA1_FILE).asc
 # Smash together user's values with our extra values
 FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
 FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch
+FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
 FINAL_NOTMUCH_LINKER = CC
 ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
 FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)

diff --git a/TODO b/TODO
index 08f0882bcc1a8e9e0bd6015ada0a91c4156056d1..995ffd9a2dd8e6937ba39700510cb9c08e14a394 100644 (file)
--- a/TODO
+++ b/TODO
@@ -247,8 +247,3 @@ database for the same corpus of email.
 
 Makefile should print message teaching user about LD_LIBRARY_PATH (or
 similar) if libdir is not set to a directory examined by ldconfig.
-
-Fix notmuch build system to work with gold, (apt-get
-binutils-gold). Need the notmuch binary to explicitly link againsts
-libraries it depends on, (rather than just getting them via
-libnotmuch).