Makefile: Incorporate getline implementation into the build.

It's unconditional for a very short time. We expect to soon be
building it only if necessary.

Makefile

@@ -32,9 +32,11 @@ override LDFLAGS += \
 	$(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
 	$(shell xapian-config --libs)
 
-# Include our local Makefile.local first so that its first target is default
+all: notmuch notmuch.1.gz
-include Makefile.local
+
 include lib/Makefile.local
+include compat/Makefile.local
+include Makefile.local
 
 # And get user settings from the output of configure
 Makefile.config: configure

Makefile.local

@@ -1,8 +1,7 @@
-all: notmuch notmuch.1.gz
-
 emacs: notmuch.elc
 
 notmuch_client_srcs =		\
+	$(notmuch_compat_srcs)	\
 	debugger.c		\
 	gmime-filter-reply.c	\
 	notmuch.c		\

TODO

@@ -41,8 +41,6 @@ Portability
 -----------
 Fix configure script to test each compiler warning we want to use.
 
-Implement getline locally, (look at gnulib).
-
 Completion
 ----------
 Fix bash completion to complete multiple search options (both --first

compat/Makefile

@@ -0,0 +1,5 @@
+all:
+	$(MAKE) -C .. all
+
+clean:
+	$(MAKE) -C .. clean

compat/Makefile.local

@@ -0,0 +1,8 @@
+dir=compat
+extra_cflags += -I$(dir)
+
+notmuch_compat_srcs =
+
+ifneq ($(HAVE_GETLINE),1)
+notmuch_compat_srcs += $(dir)/getline.c $(dir)/getdelim.c
+endif

lib/notmuch-private.h

@@ -26,6 +26,8 @@
 #endif
 #include <stdio.h>
 
+#include "compat.h"
+
 #include "notmuch.h"
 
 NOTMUCH_BEGIN_DECLS

notmuch-client.h

@@ -21,12 +21,13 @@
 #ifndef NOTMUCH_CLIENT_H
 #define NOTMUCH_CLIENT_H
 
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* for getline */
 #endif
 #include <stdio.h>
 
+#include "compat.h"
+
 #include <gmime/gmime.h>
 
 #include "notmuch.h"