Attachment #375938 for bug #508962

Lines 2-8 Link Here

(-)doxygen-1.8.5-old/addon/doxysearch/doxyindexer.pro.in (-1 / +1 lines)
2	CONFIG = console warn_on static release	2	CONFIG = console warn_on static release
3	HEADERS =	3	HEADERS =
4	SOURCES = doxyindexer.cpp	4	SOURCES = doxyindexer.cpp
5	LIBS += -L../../lib -lxapian -lqtools	5	LIBS += -L../../lib -lxapian-1.3 -lqtools
6	DESTDIR =	6	DESTDIR =
7	OBJECTS_DIR = ../../objects	7	OBJECTS_DIR = ../../objects
8	TARGET = ../../bin/doxyindexer	8	TARGET = ../../bin/doxyindexer

Lines 2-8 Link Here

(-)doxygen-1.8.5-old/addon/doxysearch/doxysearch.pro.in (-1 / +1 lines)
2	CONFIG = console warn_on debug	2	CONFIG = console warn_on debug
3	HEADERS =	3	HEADERS =
4	SOURCES = doxysearch.cpp	4	SOURCES = doxysearch.cpp
5	LIBS += -lxapian	5	LIBS += -lxapian-1.3
6	DESTDIR =	6	DESTDIR =
7	OBJECTS_DIR = ../../objects	7	OBJECTS_DIR = ../../objects
8	TARGET = ../../bin/doxysearch.cgi	8	TARGET = ../../bin/doxysearch.cgi




#- check for xapian -----------------------------------------------------------

if test "$f_search" = YES; then
  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 ------------------------------------------------------------

if test "$f_search" = YES; then
  cat >> .tmakeconfig <<EOF
LIBS += -L$XAPIAN/lib
INCLUDEPATH += $XAPIAN
EOF
fi


Return to bug 508962

Lines 330-347 Link Here

(-)doxygen-1.8.5-old/configure (-11 / +19 lines)
330	#- check for xapian -----------------------------------------------------------	330	#- check for xapian -----------------------------------------------------------
331		331
332	if test "$f_search" = YES; then	332	if test "$f_search" = YES; then
333	if test -z "$XAPIAN"; then	333	printf " Checking for Xapian..."
334	printf " Checking for Xapian..."	334	for d in /usr /usr/local /opt/local $XAPIAN; do
335	for d in /usr /usr/local /opt/local; do	335	if test -e "$d/include/xapian.h"; then
336	if test -e "$d/include/xapian.h"; then	336	XAPIAN=$d/include
337	XAPIAN=$d	337	fi
338	fi	338	if test -e "$d/xapian.h"; then
339	done	339	XAPIAN=$d
340	fi	340	fi
341	if test -z "$XAPIAN"; then	341	if test -e "$d/xapian-1.3/xapian.h"; then
342	echo "XAPIAN not set and xapian.h not found at standard locations!"	342	XAPIAN=$d/xapian-1.3
		343	fi
		344	if test -e "$d/include/xapian-1.3/xapian.h"; then
		345	XAPIAN=$d/include/xapian-1.3
		346	fi
		347	done
		348	if ! test -e "$XAPIAN/xapian.h"; then
		349	echo "xapian.h not found at standard locations or in path specified by XAPIAN."
343	exit 2;	350	exit 2;
344	fi	351	fi
		352	echo " using ${XAPIAN}"
345	fi	353	fi
346		354
347	# - check for make ------------------------------------------------------------	355	# - check for make ------------------------------------------------------------
Lines 738-744 Link Here
738	if test "$f_search" = YES; then	746	if test "$f_search" = YES; then
739	cat >> .tmakeconfig <<EOF	747	cat >> .tmakeconfig <<EOF
740	LIBS += -L$XAPIAN/lib	748	LIBS += -L$XAPIAN/lib
741	INCLUDEPATH += $XAPIAN/include	749	INCLUDEPATH += $XAPIAN
742	EOF	750	EOF
743	fi	751	fi
744		752