Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 35F164196F4 for ; Mon, 29 Mar 2010 01:43:17 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.001 X-Spam-Level: X-Spam-Status: No, score=-0.001 tagged_above=-999 required=5 tests=[BAYES_20=-0.001] autolearn=ham Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0C7iEg3lbb3G for ; Mon, 29 Mar 2010 01:43:16 -0700 (PDT) Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) by olra.theworths.org (Postfix) with ESMTP id 3491D4196F3 for ; Mon, 29 Mar 2010 01:43:16 -0700 (PDT) Received: from localhost (unknown [192.168.200.4]) by max.feld.cvut.cz (Postfix) with ESMTP id D4C4819F33FA; Mon, 29 Mar 2010 10:43:14 +0200 (CEST) X-Virus-Scanned: IMAP AMAVIS Received: from max.feld.cvut.cz ([192.168.200.1]) by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new, port 10044) with ESMTP id DfwwjoMc-Se2; Mon, 29 Mar 2010 10:43:11 +0200 (CEST) Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) by max.feld.cvut.cz (Postfix) with ESMTP id 8191A19F339D; Mon, 29 Mar 2010 10:43:11 +0200 (CEST) Received: from steelpick.2x.cz (k335-30.felk.cvut.cz [147.32.86.30]) (Authenticated sender: sojkam1) by imap.feld.cvut.cz (Postfix) with ESMTPSA id 0348FFA003; Mon, 29 Mar 2010 10:43:11 +0200 (CEST) Received: from wsh by steelpick.2x.cz with local (Exim 4.71) (envelope-from ) id 1NwAYw-0002j3-RU; Mon, 29 Mar 2010 10:43:10 +0200 From: Michal Sojka To: Bhaskara Marthi , notmuch@notmuchmail.org, cworth@cworth.org In-Reply-To: <330356ae1003282354s639a0ff5p34a6a29bbe145ed5@mail.gmail.com> References: <330356ae1003282354s639a0ff5p34a6a29bbe145ed5@mail.gmail.com> Date: Mon, 29 Mar 2010 10:43:10 +0200 Message-ID: <87ljdbh61t.fsf@steelpick.2x.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [notmuch] [PATCH] Fix compilation when getline is not available X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2010 08:43:17 -0000 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