From 5f61c2edffd319d2776788a65ddf1d88c42c3e27 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Fri, 4 Jan 2013 14:15:34 +0100
Subject: [PATCH] use static linking on macosx

---
 src/configure                 |  7 ++++---
 src/lib/Makefile              |  3 ++-
 src/lib/mkMake                |  8 +++++++-
 src/mk/Darwin                 |  2 ++
 src/mk/commondefs             |  2 +-
 src/qtgui/recoll.pro.in       | 13 +++++++++++--
 tests/badsuffs1/badsuffs1.txt |  8 ++++----
 7 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/configure b/src/configure
index 83da9090..ba19c543 100755
--- a/src/configure
+++ b/src/configure
@@ -4341,9 +4341,10 @@ _ACEOF
    fi
 fi
 
-# Enable use of file extended attributes.
-# Not by default as extended attributes are little used for now, and
-# looking for them is not completely trivial
+# Enable use of file extended attributes.  Not by default as extended
+# attributes are little used for now, and looking for them is not
+# completely trivial: we have to use ctime instead of mtime to detect
+# changes.
 # Check whether --enable-xattr was given.
 if test "${enable_xattr+set}" = set; then :
   enableval=$enable_xattr; xattrEnabled=$enableval
diff --git a/src/lib/Makefile b/src/lib/Makefile
index a8571840..140116ea 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -3,7 +3,8 @@ depth = ..
 include $(depth)/mk/sysconf
 
 LIBRECOLL=librecoll.so.$(RCLLIBVERSION)
-LIBS = librecoll.a $(LIBRECOLL)
+LIBS = librecoll.a
+@NODYNLIB@LIBS = librecoll.a $(LIBRECOLL)
 
 all: $(LIBS) 
 
diff --git a/src/lib/mkMake b/src/lib/mkMake
index e2974b7e..fbe33a17 100755
--- a/src/lib/mkMake
+++ b/src/lib/mkMake
@@ -2,6 +2,7 @@
 
 mk=Makefile
 depth=${depth:-..}
+sys=`uname`
 
 SRC_CPP="\
 ${depth}/aspell/rclaspell.cpp \
@@ -110,13 +111,18 @@ defs=\$\(depth\)/mk/localdefs
 
 test -f $mk && chmod +w $mk
 
+if test $sys = "Darwin";then
+  NODYNLIB='#'
+fi
+  
 cat > $mk <<EOF
 # DONT EDIT BY HAND: created by script mkMake
 depth = ${depth}
 include \$(depth)/mk/sysconf
 
 LIBRECOLL=librecoll.so.\$(RCLLIBVERSION)
-LIBS = librecoll.a \$(LIBRECOLL)
+LIBS = librecoll.a
+${NODYNLIB}LIBS = librecoll.a \$(LIBRECOLL)
 
 all: \$(LIBS) 
 
diff --git a/src/mk/Darwin b/src/mk/Darwin
index 09ea31ad..a1fc31dd 100644
--- a/src/mk/Darwin
+++ b/src/mk/Darwin
@@ -3,5 +3,7 @@ include $(depth)/mk/localdefs
 
 ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS)
 
+LIBRECOLL = -L$(depth)/lib -lrecoll
+
 RANLIB = ranlib
 LIBSYS = 
diff --git a/src/mk/commondefs b/src/mk/commondefs
index 9c208ffe..4d9ab24d 100644
--- a/src/mk/commondefs
+++ b/src/mk/commondefs
@@ -15,7 +15,7 @@ COMMONCXXFLAGS = -I. \
 # the sys file or localdefs
 SYSPICFLAGS = -fPIC -DPIC
 
-LIBRECOLL = -L $(depth)/lib -lrecoll -Wl,-rpath=$(libdir)/recoll
+LIBRECOLL = -L$(depth)/lib -lrecoll -Wl,-rpath=$(libdir)/recoll
 
 RANLIB = test -f
 AR=ar
diff --git a/src/qtgui/recoll.pro.in b/src/qtgui/recoll.pro.in
index 484df53e..b0e2d2ed 100644
--- a/src/qtgui/recoll.pro.in
+++ b/src/qtgui/recoll.pro.in
@@ -83,8 +83,13 @@ unix {
   # Note: libdir may be substituted with sthing like $(exec_prefix)/lib
   # at this point and will go as such in the Makefile. Expansion will be
   # completed at make time.
-  LIBS += $(BSTATIC) -L../lib -lrecoll -Wl,-rpath=@libdir@/recoll \
-       @LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \
+  LIBS += $(BSTATIC) -L../lib -lrecoll
+
+  !macx {
+    LIBS += -Wl,-rpath=@libdir@/recoll
+  }
+
+  LIBS +=  @LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \
        @LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz
 
   INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
@@ -103,6 +108,10 @@ contains( UNAME, SunOS ) {
           LIBS += -ldl
 }
 
+macx {
+    ICON = images/recoll.icns
+}
+
 TRANSLATIONS = \
 	     i18n/recoll_cs.ts \
 	     i18n/recoll_de.ts \
diff --git a/tests/badsuffs1/badsuffs1.txt b/tests/badsuffs1/badsuffs1.txt
index 7086c2bb..62d2cb5b 100644
--- a/tests/badsuffs1/badsuffs1.txt
+++ b/tests/badsuffs1/badsuffs1.txt
@@ -1,7 +1,7 @@
 6 results
-	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.log.gz]	[badsufffilename.log.gz]	19	bytes	
-	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.md5]	[badsufffilename.md5]	19	bytes	
 application/x-tar	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.bz2]	[badsufffilename.tar.bz2]	19	bytes	
-application/x-tar	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.gz]	[badsufffilename.tar.gz]	19	bytes	
-application/x-tar	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tbz]	[badsufffilename.tbz]	19	bytes	
 application/x-tar	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tgz]	[badsufffilename.tgz]	19	bytes	
+	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.log.gz]	[badsufffilename.log.gz]	19	bytes	
+application/x-tar	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tbz]	[badsufffilename.tbz]	19	bytes	
+	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.md5]	[badsufffilename.md5]	19	bytes	
+application/x-tar	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.gz]	[badsufffilename.tar.gz]	19	bytes