[patch] Patch to correct xapian support for xapian 1.3

doxygen-1.8.5-xapian.patch (text/plain), 2.59 KB, created by James Reynolds on 2014-04-28 12:12:14 UTC

diff -r -u doxygen-1.8.5-old/addon/doxysearch/doxyindexer.pro.in doxygen-1.8.5-new/addon/doxysearch/doxyindexer.pro.in
--- doxygen-1.8.5-old/addon/doxysearch/doxyindexer.pro.in	2013-05-19 16:12:31.000000000 +0100
+++ doxygen-1.8.5-new/addon/doxysearch/doxyindexer.pro.in	2014-04-28 12:52:50.534482213 +0100
@@ -2,7 +2,7 @@
 CONFIG       =	console warn_on static release
 HEADERS      =	
 SOURCES      =	doxyindexer.cpp
-LIBS        += -L../../lib -lxapian -lqtools
+LIBS        += -L../../lib -lxapian-1.3 -lqtools
 DESTDIR      = 
 OBJECTS_DIR  = ../../objects
 TARGET       = ../../bin/doxyindexer
diff -r -u doxygen-1.8.5-old/addon/doxysearch/doxysearch.pro.in doxygen-1.8.5-new/addon/doxysearch/doxysearch.pro.in
--- doxygen-1.8.5-old/addon/doxysearch/doxysearch.pro.in	2013-05-19 16:12:31.000000000 +0100
+++ doxygen-1.8.5-new/addon/doxysearch/doxysearch.pro.in	2014-04-28 12:52:58.917951561 +0100
@@ -2,7 +2,7 @@
 CONFIG       =	console warn_on debug
 HEADERS      =	
 SOURCES      =	doxysearch.cpp
-LIBS        += -lxapian 
+LIBS        += -lxapian-1.3
 DESTDIR      = 
 OBJECTS_DIR  = ../../objects
 TARGET       = ../../bin/doxysearch.cgi
diff -r -u doxygen-1.8.5-old/configure doxygen-1.8.5-new/configure
--- doxygen-1.8.5-old/configure	2013-08-23 14:40:49.000000000 +0100
+++ doxygen-1.8.5-new/configure	2014-04-28 13:05:48.314331898 +0100
@@ -330,18 +330,26 @@
 #- check for xapian -----------------------------------------------------------
 
 if test "$f_search" = YES; then
-  if test -z "$XAPIAN"; then
-    printf "  Checking for Xapian..."
-    for d in /usr /usr/local /opt/local; do
-      if test -e "$d/include/xapian.h"; then
-        XAPIAN=$d
-      fi
-    done
-  fi
-  if test -z "$XAPIAN"; then
-    echo "XAPIAN not set and xapian.h not found at standard locations!"
+  printf "  Checking for Xapian..."
+  for d in /usr /usr/local /opt/local $XAPIAN; do
+    if test -e "$d/include/xapian.h"; then
+      XAPIAN=$d/include
+    fi
+    if test -e "$d/xapian.h"; then
+      XAPIAN=$d
+    fi
+    if test -e "$d/xapian-1.3/xapian.h"; then
+      XAPIAN=$d/xapian-1.3
+    fi
+    if test -e "$d/include/xapian-1.3/xapian.h"; then
+      XAPIAN=$d/include/xapian-1.3
+    fi
+  done
+  if ! test -e "$XAPIAN/xapian.h"; then
+    echo "xapian.h not found at standard locations or in path specified by XAPIAN."
     exit 2;
   fi
+  echo "  using ${XAPIAN}"
 fi
    
 # - check for make ------------------------------------------------------------
@@ -738,7 +746,7 @@
 if test "$f_search" = YES; then
   cat >> .tmakeconfig <<EOF
 LIBS += -L$XAPIAN/lib
-INCLUDEPATH += $XAPIAN/include
+INCLUDEPATH += $XAPIAN
 EOF
 fi