From ffef692701fecea5dada6fde3351b371a12ca163 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Sat, 7 Jan 2017 11:25:48 +0100
Subject: [PATCH] Windows: switch back to Xapian 1.2 because of the NEAR search
 issues in 1.4

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

diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh
index 8bd6a9d9..5062d728 100644
--- a/src/windows/mkinstdir.sh
+++ b/src/windows/mkinstdir.sh
@@ -35,8 +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.4.1/.libs/libxapian-30.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
diff --git a/src/windows/qmkrecoll/librecoll.pro b/src/windows/qmkrecoll/librecoll.pro
index 693f0041..05c80884 100644
--- a/src/windows/qmkrecoll/librecoll.pro
+++ b/src/windows/qmkrecoll/librecoll.pro
@@ -123,11 +123,16 @@ windows {
     contains(QMAKE_CC, cl){
         # Visual Studio
     }
-  LIBS += c:/temp/xapian-core-1.4.1/.libs/libxapian-30.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.4.1/include
+
+  LIBS += c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll \
        c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32
 
   INCLUDEPATH += ../../windows \
-            C:/temp/xapian-core-1.4.1/include
+            C:/temp/xapian-core-1.2.21/include
 }
 
 unix {