[PATCH] Fix OS X linking issue.

2011-04-03 Thread Tim Gray
The libnotmuch file was given an installed_name using a relative path.  I 
don't think OS X can follow up on this, so I changed the installed_name to the 
actual installed path.
---

I can't claim that I actually know what I'm doing, but it doesn't seem like 
many on the list are using OS X, so I'll do my best.  notmuch is building 
without errors and notmuch-shared is able to be run from the build directory.  
However, once it's moved, it loses track of libnotmuch.1.dylib since it is 
linked against the library with a relative path.  All I did was add the rest 
of the installed path in the makefile for linking.  I think.

  lib/Makefile.local |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/Makefile.local b/lib/Makefile.local
index d02a515..28b842f 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -30,7 +30,7 @@ LIBRARY_SUFFIX = dylib
  LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
  SONAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBRARY_SUFFIX)
  LIBNAME = 
libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE).$(LIBRARY_SUFFIX)
-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)
+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)
  else
  LIBRARY_SUFFIX = so
  LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
-- 
1.7.4.2



[PATCH] Fix OS X linking issue.

2011-04-03 Thread Tim Gray
The libnotmuch file was given an installed_name using a relative path.  I 
don't think OS X can follow up on this, so I changed the installed_name to the 
actual installed path.

---
 
I can't claim that I actually know what I'm doing, but it doesn't seem like 
many on the list are using OS X, so I'll do my best.  notmuch is building 
without errors and notmuch-shared is able to be run from the build directory.  
However, once it's moved, it loses track of libnotmuch.1.dylib since it is 
linked against the library with a relative path.  All I did was add the rest 
of the installed path in the makefile for linking.  I think.
 
 lib/Makefile.local |2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/Makefile.local b/lib/Makefile.local
index d02a515..28b842f 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -30,7 +30,7 @@ LIBRARY_SUFFIX = dylib
 LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
 SONAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBRARY_SUFFIX)
 LIBNAME = 
libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE).$(LIBRARY_SUFFIX)
-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)
+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)
 else
 LIBRARY_SUFFIX = so
 LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
--
1.7.4.2

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch