Ticket #231: xapian-pcre-detection.diff
| File xapian-pcre-detection.diff, 1.8 kB (added by tv+xapian.org, 11 months ago) |
|---|
-
debian/control.in
2 2 Section: web 3 3 Priority: optional 4 4 Maintainer: Olly Betts <olly@survex.com> 5 Build-Depends: @BUILD_DEPS@ autotools-dev 5 Build-Depends: @BUILD_DEPS@ autotools-dev, libpcre3-dev 6 6 Standards-Version: 3.7.3 7 7 Homepage: http://www.xapian.org/ 8 8 -
configure.ac
271 271 test -z "$RST2HTML" && AC_MSG_ERROR([rst2html is required to build documentation]) 272 272 fi 273 273 274 AC_PATH_PROG(PCRE_CONFIG_PATH, pcre-config) 275 if test -n "$PCRE_CONFIG_PATH" ; then 276 AC_DEFINE(HAVE_PCRE,, [Define if libpcre is available.]) 277 AC_MSG_CHECKING([libpcre flags]) 278 PCRE_CFLAGS="`$PCRE_CONFIG_PATH --cflags`" 279 PCRE_LIBS="`$PCRE_CONFIG_PATH --libs`" 280 AC_MSG_RESULT([include $PCRE_CFLAGS libs $PCRE_LIBS]) 281 fi 282 AC_SUBST(PCRE_CFLAGS) 283 AC_SUBST(PCRE_LIBS) 284 274 285 dnl Disabled XML stuff as we don't currently build omindex-config 275 286 dnl dnl Check for libxml or libxml2. We do this by looking for xml-config. 276 287 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\ 95 95 cdb_init.cc cdb_find.cc cdb_hash.cc cdb_unpack.cc loadfile.cc\ 96 96 utf8convert.cc datematchdecider.cc 97 omega_LDADD = $(XAPIAN_LIBS) # -lpcre 97 omega_LDADD = $(XAPIAN_LIBS) $(PCRE_LIBS) 98 omega_INCLUDES = $(PCRE_CFLAGS) 98 99 99 100 omindex_SOURCES = omindex.cc myhtmlparse.cc htmlparse.cc\ 100 101 common/getopt.cc commonhelp.cc utils.cc hashterm.cc loadfile.cc md5.cc\
