[PATCH v2 2/9] test/Makefile.local: Use $(XAPIAN_LDFLAGS) for symbol-test

diff --git a/41/bccc82376e60611d03f48cea1f03eca6e237c9 b/41/bccc82376e60611d03f48cea1f03eca6e237c9
new file mode 100644 (file)
index 0000000..8ad7904
--- /dev/null
+++ b/41/bccc82376e60611d03f48cea1f03eca6e237c9
@@ -0,0 +1,91 @@
+Return-Path: <pioto@pioto.org>\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 CF059431FC7\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:55 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\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 WF3mqqd6Vh40 for <notmuch@notmuchmail.org>;\r
+       Wed, 30 May 2012 00:02:55 -0700 (PDT)\r
+Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com\r
+       [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id DFF9A431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:54 -0700 (PDT)\r
+Received: by vbbfc26 with SMTP id fc26so4786695vbb.26\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:54 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :x-gm-message-state;\r
+       bh=s84hMjSJve4oswCmrc+wMuDiJfZ5ENc4YAAF+VKDqps=;\r
+       b=WILmiNrGwBA6RaZDrSLbSbiUAmCFhCGe/1vJqS4fMsiKfrpSboRstrjQse/Xvml/op\r
+       cVrzbTLxafTFtuj8ISUaeTGHeNkCwTfiaivbSvKJnLbMMDTbbRzmh9srO29KTUamoxUN\r
+       qcWtUC6bXVDp05WXFC0BH9qpSf4Ywc7IoWcWoZoJBdQjxV7nMmzBx0UWcbYeVn0YFSFH\r
+       MKiqXbhRH8O3GFsA/jX50N6oipRCIvheoRZ/kdfLra+mKmB8j4Y+OEm5mds6utd6Aj6/\r
+       psTYdteuxPpQ/95YXUtLNAbaPzMmd9T0NLzE440tsD9fMuOEKeSAi5bDT4oOvvaTunxI\r
+       fyhQ==\r
+Received: by 10.220.241.135 with SMTP id le7mr16013238vcb.63.1338361374178;\r
+       Wed, 30 May 2012 00:02:54 -0700 (PDT)\r
+Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.\r
+       [71.182.155.97])\r
+       by mx.google.com with ESMTPS id by3sm28311820vdc.17.2012.05.30.00.02.53\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 30 May 2012 00:02:53 -0700 (PDT)\r
+Received: by nas.home.pioto.org (Postfix, from userid 1001)\r
+       id BECD4287E0; Wed, 30 May 2012 03:02:51 -0400 (EDT)\r
+From: Mike Kelly <pioto@pioto.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/9] test/Makefile.local: Use $(XAPIAN_LDFLAGS) for\r
+       symbol-test\r
+Date: Wed, 30 May 2012 03:01:57 -0400\r
+Message-Id: <1338361324-57289-3-git-send-email-pioto@pioto.org>\r
+X-Mailer: git-send-email 1.7.10.2\r
+In-Reply-To: <1338361324-57289-1-git-send-email-pioto@pioto.org>\r
+References: <1338361324-57289-1-git-send-email-pioto@pioto.org>\r
+X-Gm-Message-State:\r
+ ALoCoQkVyBt9ftvRRVcxhY3eZvkyh429bmhiZ3blvdpHfIBSlE/sE7uTRJZSTsy9BMpnKdONl7Es\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: Wed, 30 May 2012 07:02:56 -0000\r
+\r
+On FreeBSD, and probably anywhere else someone installed xapian to\r
+some other prefix, we need to use XAPIAN_LDFLAGS to make the linker can\r
+actually find libxapian.\r
+---\r
+ test/Makefile.local |    2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index 4a6a4b1..c071aee 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -17,7 +17,7 @@ $(dir)/smtp-dummy: $(smtp_dummy_modules)\r
+       $(call quiet,CC) $^ -o $@\r
+ \r
+ $(dir)/symbol-test: $(dir)/symbol-test.o\r
+-      $(call quiet,CXX) $^ -o $@ -Llib -lnotmuch -lxapian\r
++      $(call quiet,CXX) $^ -o $@ -Llib -lnotmuch $(XAPIAN_LDFLAGS)\r
+ \r
+ .PHONY: test check\r
+ \r
+-- \r
+1.7.10.2\r
+\r