Changeset: a555d27bc40c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a555d27bc40c
Modified Files:
configure.ag
testing/Mtest.py.in
Branch: default
Log Message:
(re-)added HAVE_PCRE conditional for pathfinder tests
diffs (30 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -657,6 +657,7 @@
fi
AC_DEFINE(HAVE_LIBPCRE, 1, [Define if you have the pcre library])
fi
+AM_CONDITIONAL(HAVE_PCRE, test x"$have_pcre" != xno)
case "$enable_monetdb5-$have_pcre" in
yes-no)
AC_MSG_ERROR([PCRE library not found but required for MonetDB5])
@@ -666,6 +667,7 @@
;;
esac
+
PKG_CHECK_EXISTS([libxml-2.0], [have_libxml2="yes"], [have_libxml2="no"])
if test x"$have_libxml2" = x"yes" ; then
PKG_CHECK_MODULES([libxml2], [libxml-2.0])
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -228,6 +228,7 @@
'HAVE_NETCDF' : "@HAVE_NETCDF_FALSE@",
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
'HAVE_PATHFINDER' : "@HAVE_PATHFINDER_FALSE@",
+ 'HAVE_PCRE' : "@HAVE_PCRE_FALSE@",
'HAVE_PFTIJAH' : "@HAVE_PFTIJAH_FALSE@",
'HAVE_PROBXML' : "@HAVE_PROBXML_FALSE@",
'HAVE_RAPTOR' : "@HAVE_RAPTOR_FALSE@",
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
