aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile.local2
-rw-r--r--TODO5
2 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.local b/Makefile.local
index ade84121..971ddd52 100644
--- 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 08f0882b..995ffd9a 100644
--- 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).