From e5543b144f9d350589b6d19a682abbdec178ca8d Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Tue, 29 Jan 2013 12:36:41 +0100
Subject: [PATCH] freebsd shlib build fixes

---
 src/common/autoconfig.h.in | 2 +-
 src/lib/Makefile           | 2 +-
 src/lib/mkMake             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/autoconfig.h.in b/src/common/autoconfig.h.in
index e6b04112..aaca9445 100644
--- a/src/common/autoconfig.h.in
+++ b/src/common/autoconfig.h.in
@@ -117,7 +117,7 @@
 
 /* The __FreeBSD_kernel__ thing is for debian/kfreebsd. */
 #if _FILE_OFFSET_BITS == 64 || defined(__APPLE__) || defined(__OpenBSD__) ||\
-    defined(__FreeBSD_kernel__)
+    defined(__FreeBSD_kernel__) || (defined(__FreeBSD__) && __FreeBSD__ >= 9)
 #define OFFTPC "%lld"
 #else
 #define OFFTPC "%ld"
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 51988c7a..c30ac932 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -19,7 +19,7 @@ librecoll.a : $(DEPS) $(OBJS)
 # no effort whatsoever to maintain any kind of ABI compat in this lib. Only
 # programs or modules from the same Recoll release can be compatible.
 $(LIBRECOLL): $(DEPS) $(OBJS)
-	g++ -shared -Wl,--no-undefined           -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS)            -lxapian -lz -lX11 -lpthread -ldl
+	g++ -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols           -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS)            $(LIBXAPIAN) $(LIBICONV) $(X_LIBX11) $(LIBSYS)
 	rm -f librecoll.so
 	ln -s $(LIBRECOLL) librecoll.so
 
diff --git a/src/lib/mkMake b/src/lib/mkMake
index 4fe2040a..b61bb57c 100755
--- a/src/lib/mkMake
+++ b/src/lib/mkMake
@@ -139,9 +139,9 @@ librecoll.a : \$(DEPS) \$(OBJS)
 # no effort whatsoever to maintain any kind of ABI compat in this lib. Only
 # programs or modules from the same Recoll release can be compatible.
 \$(LIBRECOLL): \$(DEPS) \$(OBJS)
-	g++ -shared -Wl,--no-undefined \
+	g++ -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \
           -Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \
-           -lxapian -lz -lX11 -lpthread -ldl
+           \$(LIBXAPIAN) \$(LIBICONV) \$(X_LIBX11) \$(LIBSYS)
 	rm -f librecoll.so
 	ln -s \$(LIBRECOLL) librecoll.so