From 6b49c23aa8bbf3f62f62d5d87e1557b5d9dab54e Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Wed, 30 Oct 2013 08:38:14 +0100
Subject: [PATCH] Build: ensure that we do not try to build the dynamic lib
 after compiling non-pic objects. Remove configure from source control

---
 .hgignore         | 2 ++
 src/Makefile.in   | 5 ++++-
 src/configure.ac  | 2 --
 src/lib/mkMake.in | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.hgignore b/.hgignore
index c421def9..7c6d22fd 100644
--- a/.hgignore
+++ b/.hgignore
@@ -13,6 +13,7 @@ src/common/autoconfig.h
 src/common/rclversion.h
 src/config.log
 src/config.status
+src/configure
 src/desktop/unity-lens-recoll/Makefile
 src/desktop/unity-lens-recoll/autom4te.cache
 src/desktop/unity-lens-recoll/bin/unity-recoll-daemon
@@ -83,6 +84,7 @@ src/kde/kioslave/kio_recoll/builddir
 src/lib/alldeps
 src/lib/librecoll.a
 src/lib/librecoll.so*
+src/lib/mkMake
 src/mk/localdefs
 src/mk/sysconf
 src/python/recoll/build
diff --git a/src/Makefile.in b/src/Makefile.in
index 35348f78..bf5ff925 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -12,7 +12,10 @@ mandir = @mandir@
 QMAKE = @QMAKE@
 QTGUI = @QTGUI@
 
+RCLLIBVERSION=@RCLLIBVERSION@
+
 all: mk/sysconf 
+	(cd lib; sh mkMake)
 	${MAKE} -C lib
 	${MAKE} -C index depend recollindex
 	@NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro)
@@ -62,7 +65,7 @@ distclean: clean
 	   qtgui/recoll.pro \
 	   config.log config.status \
 	   recollinstall \
-	   lib/*.dep common/autoconfig.h
+	   lib/*.dep lib/mkMake lib/Makefile common/autoconfig.h
 	rm -f common/rclversion.h
 	rm -f index/alldeps lib/alldeps query/alldeps \
             bincimapmime/alldeps common/alldeps internfile/alldeps utils/alldeps
diff --git a/src/configure.ac b/src/configure.ac
index 0fff9cf4..bac858bb 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -604,8 +604,6 @@ do
     cp -f /dev/null $d/alldeps
 done
 
-(cd lib;RCLLIBVERSION=$RCLLIBVERSION sh mkMake)
-
 AC_OUTPUT
 
 if cmp -s mk/localdefs mk/localdefs.new ; then
diff --git a/src/lib/mkMake.in b/src/lib/mkMake.in
index db2d493a..0ea9418c 100755
--- a/src/lib/mkMake.in
+++ b/src/lib/mkMake.in
@@ -118,13 +118,14 @@ defs=\$\(depth\)/mk/localdefs
 test -f $mk && chmod +w $mk
 
 NODYNLIB=@NODYNLIB@
+RCLLIBVERSION=@RCLLIBVERSION@
   
 cat > $mk <<EOF
 # DONT EDIT BY HAND: created by script mkMake
 depth = ${depth}
 include \$(depth)/mk/sysconf
 
-LIBRECOLL=librecoll.so.\$(RCLLIBVERSION)
+LIBRECOLL=librecoll.so.${RCLLIBVERSION}
 LIBS = librecoll.a
 ${NODYNLIB}LIBS = librecoll.a \$(LIBRECOLL)