From 860ef3c3d251bf63a11798a74ae6ec30a2a0f74d Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Tue, 15 Nov 2016 16:43:05 +0100
Subject: [PATCH] Windows: use xapian 1.4

---
 src/windows/mkinstdir.sh            | 4 +++-
 src/windows/qmkrecoll/librecoll.pro | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh
index 60b9a7f1..8bd6a9d9 100644
--- a/src/windows/mkinstdir.sh
+++ b/src/windows/mkinstdir.sh
@@ -35,7 +35,8 @@ UNRTF=c:/unrtf
 ANTIWORD=c:/recolldeps/antiword
 PYXSLT=C:/recolldeps/pyxslt
 PYEXIV2=C:/recolldeps/pyexiv2
-LIBXAPIAN=c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll
+#LIBXAPIAN=c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll
+LIBXAPIAN=c:/temp/xapian-core-1.4.1/.libs/libxapian-30.dll
 MUTAGEN=C:/temp/mutagen-1.32/
 EPUB=C:/temp/epub-0.5.2
 ZLIB=c:/temp/zlib-1.2.8
@@ -81,6 +82,7 @@ FILTERS=$DESTDIR/Share/filters
 # checkcopy. 
 chkcp()
 {
+    echo "Copying $@"
     cp $@ || fatal cp $@ failed
 }
 
diff --git a/src/windows/qmkrecoll/librecoll.pro b/src/windows/qmkrecoll/librecoll.pro
index a1bb7153..693f0041 100644
--- a/src/windows/qmkrecoll/librecoll.pro
+++ b/src/windows/qmkrecoll/librecoll.pro
@@ -123,11 +123,11 @@ windows {
     contains(QMAKE_CC, cl){
         # Visual Studio
     }
-  LIBS += c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll \
+  LIBS += c:/temp/xapian-core-1.4.1/.libs/libxapian-30.dll \
        c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32
 
   INCLUDEPATH += ../../windows \
-            C:/temp/xapian-core-1.2.21/include
+            C:/temp/xapian-core-1.4.1/include
 }
 
 unix {