summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-10-27 13:28:46 +0000
committerng0 <ng0@n0.is>2019-10-27 13:28:46 +0000
commit097f287acb1f2372607d1adbf475a040ca219edd (patch)
treed312165ed5e471da2591cfaef786c9454ef2f855
parente785d848b3d963595ab8b4f549b6e9f3919287f4 (diff)
configure: Add TODO, add MariaDB to a message.
-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
LDFLAGS=$SAVE_LDFLAGS
CPPFLAGS=$SAVE_CPPFLAGS
+# TODO: should this test for "or" not "and"?
+# TODO: Add postgres?
AS_IF([test "$sqlite" = 0 -a "$mysql" = 0],
[
- AC_MSG_ERROR([GNUnet requires SQLite or MySQL])
+ AC_MSG_ERROR([GNUnet requires SQLite or MySQL / MariaDB.])
])
# libmicrohttpd
@@ -2013,7 +2015,9 @@ AS_IF([test x$gnutls != xtrue],
gnutls_msg="yes (without DANE support)"],
[gnutls_msg="yes (with DANE support)"])])
# -- databases
-AS_IF([test $mysqlfail = true]
+# TODO: this always returns true, the check might
+# TODO: not be working as intended (for msqlfail).
+AS_IF([test x$mysqlfail = "true"]
[AC_MSG_NOTICE([WARNING: optional MySQL not found (or too old)])])
AS_IF([test "$mysql" = true],
[features_msg="$features_msg mysql"