Ticket #231: xapian-pcre-detection.diff

debian/control.in

@@ -2 +2 @@
 Section: web
 Priority: optional
 Maintainer: Olly Betts <olly@survex.com>
-Build-Depends: @BUILD_DEPS@ autotools-dev
+Build-Depends: @BUILD_DEPS@ autotools-dev, libpcre3-dev
 Standards-Version: 3.7.3
 Homepage: http://www.xapian.org/
 

configure.ac

@@ -271 +271 @@
   test -z "$RST2HTML" && AC_MSG_ERROR([rst2html is required to build documentation])
 fi
 
+AC_PATH_PROG(PCRE_CONFIG_PATH, pcre-config)
+if test -n "$PCRE_CONFIG_PATH" ; then
+   AC_DEFINE(HAVE_PCRE,, [Define if libpcre is available.])
+   AC_MSG_CHECKING([libpcre flags])
+   PCRE_CFLAGS="`$PCRE_CONFIG_PATH --cflags`"
+   PCRE_LIBS="`$PCRE_CONFIG_PATH --libs`"
+   AC_MSG_RESULT([include $PCRE_CFLAGS libs $PCRE_LIBS])
+fi
+AC_SUBST(PCRE_CFLAGS)
+AC_SUBST(PCRE_LIBS)
+
 dnl Disabled XML stuff as we don't currently build omindex-config
 dnl dnl Check for libxml or libxml2.  We do this by looking for xml-config.
 dnl AC_PATH_PROG(XML_CONFIG_PATH, xml2-config)

Makefile.am

@@ -94 +94 @@
 omega_SOURCES = omega.cc query.cc cgiparam.cc utils.cc configfile.cc date.cc\
  cdb_init.cc cdb_find.cc cdb_hash.cc cdb_unpack.cc loadfile.cc\
  utf8convert.cc datematchdecider.cc
-omega_LDADD = $(XAPIAN_LIBS) # -lpcre
+omega_LDADD = $(XAPIAN_LIBS) $(PCRE_LIBS)
+omega_INCLUDES = $(PCRE_CFLAGS)
 
 omindex_SOURCES = omindex.cc myhtmlparse.cc htmlparse.cc\
  common/getopt.cc commonhelp.cc utils.cc hashterm.cc loadfile.cc md5.cc\