aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac8
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 82a94cd46..0083cf3d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1344,9 +1344,11 @@ LIBS=$SAVE_LIBS
1344LDFLAGS=$SAVE_LDFLAGS 1344LDFLAGS=$SAVE_LDFLAGS
1345CPPFLAGS=$SAVE_CPPFLAGS 1345CPPFLAGS=$SAVE_CPPFLAGS
1346 1346
1347# TODO: should this test for "or" not "and"?
1348# TODO: Add postgres?
1347AS_IF([test "$sqlite" = 0 -a "$mysql" = 0], 1349AS_IF([test "$sqlite" = 0 -a "$mysql" = 0],
1348[ 1350[
1349 AC_MSG_ERROR([GNUnet requires SQLite or MySQL]) 1351 AC_MSG_ERROR([GNUnet requires SQLite or MySQL / MariaDB.])
1350]) 1352])
1351 1353
1352# libmicrohttpd 1354# libmicrohttpd
@@ -2013,7 +2015,9 @@ AS_IF([test x$gnutls != xtrue],
2013 gnutls_msg="yes (without DANE support)"], 2015 gnutls_msg="yes (without DANE support)"],
2014 [gnutls_msg="yes (with DANE support)"])]) 2016 [gnutls_msg="yes (with DANE support)"])])
2015# -- databases 2017# -- databases
2016AS_IF([test $mysqlfail = true] 2018# TODO: this always returns true, the check might
2019# TODO: not be working as intended (for msqlfail).
2020AS_IF([test x$mysqlfail = "true"]
2017 [AC_MSG_NOTICE([WARNING: optional MySQL not found (or too old)])]) 2021 [AC_MSG_NOTICE([WARNING: optional MySQL not found (or too old)])])
2018AS_IF([test "$mysql" = true], 2022AS_IF([test "$mysql" = true],
2019 [features_msg="$features_msg mysql" 2023 [features_msg="$features_msg mysql"