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

diff --git a/0b/65f559c2b26aa8f6ed310af08cb430dbeb722d b/0b/65f559c2b26aa8f6ed310af08cb430dbeb722d
new file mode 100644 (file)
index 0000000..65a7ca0
--- /dev/null
+++ b/0b/65f559c2b26aa8f6ed310af08cb430dbeb722d
@@ -0,0 +1,107 @@
+Return-Path: <sojkam1@fel.cvut.cz>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 35F164196F4\r
+       for <notmuch@notmuchmail.org>; Mon, 29 Mar 2010 01:43:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.001\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.001 tagged_above=-999 required=5\r
+       tests=[BAYES_20=-0.001] autolearn=ham\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 0C7iEg3lbb3G for <notmuch@notmuchmail.org>;\r
+       Mon, 29 Mar 2010 01:43:16 -0700 (PDT)\r
+Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3491D4196F3\r
+       for <notmuch@notmuchmail.org>; Mon, 29 Mar 2010 01:43:16 -0700 (PDT)\r
+Received: from localhost (unknown [192.168.200.4])\r
+       by max.feld.cvut.cz (Postfix) with ESMTP id D4C4819F33FA;\r
+       Mon, 29 Mar 2010 10:43:14 +0200 (CEST)\r
+X-Virus-Scanned: IMAP AMAVIS\r
+Received: from max.feld.cvut.cz ([192.168.200.1])\r
+       by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new,\r
+       port 10044)\r
+       with ESMTP id DfwwjoMc-Se2; Mon, 29 Mar 2010 10:43:11 +0200 (CEST)\r
+Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34])\r
+       by max.feld.cvut.cz (Postfix) with ESMTP id 8191A19F339D;\r
+       Mon, 29 Mar 2010 10:43:11 +0200 (CEST)\r
+Received: from steelpick.2x.cz (k335-30.felk.cvut.cz [147.32.86.30])\r
+       (Authenticated sender: sojkam1)\r
+       by imap.feld.cvut.cz (Postfix) with ESMTPSA id 0348FFA003;\r
+       Mon, 29 Mar 2010 10:43:11 +0200 (CEST)\r
+Received: from wsh by steelpick.2x.cz with local (Exim 4.71)\r
+       (envelope-from <sojkam1@fel.cvut.cz>)\r
+       id 1NwAYw-0002j3-RU; Mon, 29 Mar 2010 10:43:10 +0200\r
+From: Michal Sojka <sojkam1@fel.cvut.cz>\r
+To: Bhaskara Marthi <bhaskara@gmail.com>, notmuch@notmuchmail.org,\r
+       cworth@cworth.org\r
+In-Reply-To: <330356ae1003282354s639a0ff5p34a6a29bbe145ed5@mail.gmail.com>\r
+References: <330356ae1003282354s639a0ff5p34a6a29bbe145ed5@mail.gmail.com>\r
+Date: Mon, 29 Mar 2010 10:43:10 +0200\r
+Message-ID: <87ljdbh61t.fsf@steelpick.2x.cz>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Subject: [notmuch] [PATCH] Fix compilation when getline is not available\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 29 Mar 2010 08:43:17 -0000\r
+\r
+On Mon, 29 Mar 2010, Bhaskara Marthi wrote:\r
+> Hi all, I'm trying to build notmuch on os x (master branch from today).  I\r
+> got the ports for gmime and xapian, and installed talloc from source, with\r
+> some minor hitches (just getting talloc alone from samba failed on autoconf\r
+> due to lack of libreplace.m4, so I installed all of samba from a port; a\r
+> pkg-config file for talloc was not put in the right place after that,\r
+> though, so I had to make one).\r
+> \r
+> Anyway, now compilation runs into the following error.  Looks like an issue\r
+> with the makefile given that getline is in fact defined in compat/.  How\r
+> should I fix this?\r
+\r
+The following patch should fix it.\r
+---\r
+ Makefile              |    2 +-\r
+ compat/Makefile.local |    2 +-\r
+ 2 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/Makefile b/Makefile\r
+index 46f001c..93c6b2b 100644\r
+--- a/Makefile\r
++++ b/Makefile\r
+@@ -46,7 +46,7 @@ subdirs = compat emacs lib\r
+ global_deps = Makefile Makefile.config Makefile.local \\r
+       $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)\r
+ \r
+-include Makefile.config Makefile.local $(subdirs:%=%/Makefile.local)\r
++include Makefile.config $(subdirs:%=%/Makefile.local) Makefile.local\r
+ \r
+ # The user has not set any verbosity, default to quiet mode and inform the\r
+ # user how to enable verbose compiles.\r
+diff --git a/compat/Makefile.local b/compat/Makefile.local\r
+index 17b4514..9f84c5f 100644\r
+--- a/compat/Makefile.local\r
++++ b/compat/Makefile.local\r
+@@ -1,7 +1,7 @@\r
+ dir := compat\r
+ extra_cflags += -I$(dir)\r
+ \r
+-notmuch_compat_srcs =\r
++notmuch_compat_srcs :=\r
+ \r
+ ifneq ($(HAVE_GETLINE),1)\r
+ notmuch_compat_srcs += $(dir)/getline.c $(dir)/getdelim.c\r
+-- \r
+1.7.0.2\r