[notmuch] [PATCH] Fix compilation when getline is not available

[Michal Sojka]

On Mon, 29 Mar 2010, Bhaskara Marthi wrote:
> Hi all, I'm trying to build notmuch on os x (master branch from today).  I
> got the ports for gmime and xapian, and installed talloc from source, with
> some minor hitches (just getting talloc alone from samba failed on autoconf
> due to lack of libreplace.m4, so I installed all of samba from a port; a
> pkg-config file for talloc was not put in the right place after that,
> though, so I had to make one).
> 
> Anyway, now compilation runs into the following error.  Looks like an issue
> with the makefile given that getline is in fact defined in compat/.  How
> should I fix this?

The following patch should fix it.
---
 Makefile              |    2 +-
 compat/Makefile.local |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 46f001c..93c6b2b 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ subdirs = compat emacs lib
 global_deps = Makefile Makefile.config Makefile.local \
 	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
-include Makefile.config Makefile.local $(subdirs:%=%/Makefile.local)
+include Makefile.config $(subdirs:%=%/Makefile.local) Makefile.local
 
 # The user has not set any verbosity, default to quiet mode and inform the
 # user how to enable verbose compiles.
diff --git a/compat/Makefile.local b/compat/Makefile.local
index 17b4514..9f84c5f 100644
--- a/compat/Makefile.local
+++ b/compat/Makefile.local
@@ -1,7 +1,7 @@
 dir := compat
 extra_cflags += -I$(dir)
 
-notmuch_compat_srcs =
+notmuch_compat_srcs :=
 
 ifneq ($(HAVE_GETLINE),1)
 notmuch_compat_srcs += $(dir)/getline.c $(dir)/getdelim.c
-- 
1.7.0.2