Changeset: 72a91e83fbc9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72a91e83fbc9
Modified Files:
configure.ag
Branch: embedded
Log Message:
Removing libxml2 dependency
diffs (62 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2087,11 +2087,11 @@ AC_SUBST(UUID_LIBS)
dnl OpenSSL library
dnl required for MonetDB5 (and SQL), optional otherwise
-# in embedded mode, we ship the bison-generated files
-if test "x$enable_embedded" = xno; then
- PKG_CHECK_MODULES([openssl], [openssl],
+PKG_CHECK_MODULES([openssl], [openssl],
[have_openssl=yes],
[have_openssl=no; why_have_openssl="(OpenSSL library not
found)"])
+# in embedded mode, we do not need OpenSSL
+if test "x$enable_embedded" = xno; then
case "$enable_monetdb5-$have_openssl" in
yes-no)
AC_MSG_ERROR([OpenSSL library not found but required for
MonetDB5])
@@ -2131,7 +2131,7 @@ if test "x$enable_embedded" = xno; then
AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have the OpenSSL
library])
fi
else
- AC_MSG_WARN([Not considering OpenSSL in embedded configuration])
+ AC_MSG_WARN([Not requiring OpenSSL in embedded configuration])
fi
dnl PCRE library
@@ -2172,18 +2172,22 @@ esac
PKG_CHECK_MODULES([libxml2], [libxml-2.0], [have_libxml2="yes"],
[have_libxml2="no"; why_have_libxml2="(libxml2 not found)"])
-case "$enable_monetdb5-$have_libxml2" in
-yes-no)
- AC_MSG_ERROR([libxml2 library not found but required for MonetDB5])
- ;;
-auto-no)
- enable_monetdb5=no
- if test "x$disable_monetdb5" = x; then
- disable_monetdb5="(libxml2 library not found but required for
MonetDB5)"
- fi
- ;;
-esac
-
+# in embedded mode, we do not want this libxml2 dependency
+if test "x$enable_embedded" = xno; then
+ case "$enable_monetdb5-$have_libxml2" in
+ yes-no)
+ AC_MSG_ERROR([libxml2 library not found but required for
MonetDB5])
+ ;;
+ auto-no)
+ enable_monetdb5=no
+ if test "x$disable_monetdb5" = x; then
+ disable_monetdb5="(libxml2 library not found but
required for MonetDB5)"
+ fi
+ ;;
+ esac
+else
+ AC_MSG_WARN([Not requiring libxml2 in embedded configuration])
+fi
PKG_CHECK_MODULES([curl], [libcurl], [have_curl="yes"], [have_curl="no";
why_have_curl="(libcurl not found)"])
if test x"$have_curl" = x"yes" ; then
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
