[PATCH] Fix OS X linking issue.

diff --git a/4c/cb2742aed626ab94e03f97efb59c1a9a0dabe3 b/4c/cb2742aed626ab94e03f97efb59c1a9a0dabe3
new file mode 100644 (file)
index 0000000..57d140a
--- /dev/null
+++ b/4c/cb2742aed626ab94e03f97efb59c1a9a0dabe3
@@ -0,0 +1,81 @@
+Return-Path: <tgray@protozoic.com>\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 6BD94431FB6\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Apr 2011 00:03:42 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 RIdqx9elk-nW for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Apr 2011 00:03:41 -0700 (PDT)\r
+Received: from mxout-08.mxes.net (mxout-08.mxes.net [216.86.168.183])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6CF96431FB5\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Apr 2011 00:03:41 -0700 (PDT)\r
+Received: from selenium.local (unknown [72.94.160.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by smtp.mxes.net (Postfix) with ESMTPSA id 694C4509ED\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Apr 2011 03:03:36 -0400 (EDT)\r
+Date: Sun, 3 Apr 2011 03:03:33 -0400\r
+From: Tim Gray <tgray@protozoic.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Fix OS X linking issue.\r
+Message-ID: <20110403070333.GA71620@selenium.125px.com>\r
+Mail-Followup-To: notmuch@notmuchmail.org\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii; format=flowed\r
+Content-Disposition: inline\r
+User-Agent: Mutt/1.5.21+23 (f7160c94ff70) (2010-12-30)\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: Sun, 03 Apr 2011 07:03:42 -0000\r
+\r
+The libnotmuch file was given an installed_name using a relative path.  I \r
+don't think OS X can follow up on this, so I changed the installed_name to the \r
+actual installed path.\r
+---\r
+  \r
+I can't claim that I actually know what I'm doing, but it doesn't seem like \r
+many on the list are using OS X, so I'll do my best.  notmuch is building \r
+without errors and notmuch-shared is able to be run from the build directory.  \r
+However, once it's moved, it loses track of libnotmuch.1.dylib since it is \r
+linked against the library with a relative path.  All I did was add the rest \r
+of the installed path in the makefile for linking.  I think.\r
+  \r
+  lib/Makefile.local |    2 +-\r
+  1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/lib/Makefile.local b/lib/Makefile.local\r
+index d02a515..28b842f 100644\r
+--- a/lib/Makefile.local\r
++++ b/lib/Makefile.local\r
+@@ -30,7 +30,7 @@ LIBRARY_SUFFIX = dylib\r
+  LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)\r
+  SONAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBRARY_SUFFIX)\r
+  LIBNAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE).$(LIBRARY_SUFFIX)\r
+-LIBRARY_LINK_FLAG = -dynamiclib -install_name $(SONAME) -compatibility_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR) -current_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)\r
++LIBRARY_LINK_FLAG = -dynamiclib -install_name $(libdir)/$(SONAME) -compatibility_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR) -current_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)\r
+  else\r
+  LIBRARY_SUFFIX = so\r
+  LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)\r
+-- \r
+1.7.4.2\r
+\r