8 files changed, 44 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index 7ba1d27a7..2bc9d0f2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -935,6 +935,22 @@ AC_ARG_WITH([mysql],
 AC_SUBST(MYSQL_LDFLAGS)
 AC_SUBST(MYSQL_CPPFLAGS)
 
+mysql_bool="bool"
+# check for my_bool
+AS_IF([test "x$mysql" = "xtrue"],
+  [AC_MSG_CHECKING([for my_bool])
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+     [[#include <mysql/mysql.h>]],
+     [[#ifndef my_bool
+#no my_bool found
+#endif]])],
+      [AC_MSG_RESULT([yes])
+       mysql_bool="my_bool"],
+      [AC_MSG_RESULT([no])
+       mysql_bool="bool"])])
+
+AC_SUBST([mysql_bool])
+
 # additional version checks for mysql
 AS_IF([test "x$mysql" = "xtrue"],
   [AC_MSG_CHECKING([for mysql version])
@@ -1329,6 +1345,7 @@ src/identity/Makefile
 src/identity/identity.conf
 src/include/Makefile
 src/include/gnunet_config.h
+src/include/gnunet_mysql_compat.h
 src/integration-tests/Makefile
 src/json/Makefile
 src/hostlist/Makefile
@@ -1410,6 +1427,7 @@ pkgconfig/gnunetfs.pc
 pkgconfig/gnunetgns.pc
 pkgconfig/gnunethello.pc
 pkgconfig/gnunetidentity.pc
+pkgconfig/gnunetmessenger.pc
 pkgconfig/gnunetmicrophone.pc
 pkgconfig/gnunetmysql.pc
 pkgconfig/gnunetnamestore.pc
diff --git a/contrib/conf/prepare-commit-msg b/contrib/conf/prepare-commit-msg
index 8acca9e38..a95f29430 100755
--- a/contrib/conf/prepare-commit-msg
+++ b/contrib/conf/prepare-commit-msg
@@ -27,7 +27,7 @@ done
 if [ -z "$COMMIT_SOURCE" ];
 then
   hint=$(cat "$COMMIT_MSG_FILE")
-  echo -e "# Our commit subject format policy is:\n# <subsystem>: <description>\n# Adding 'Issue #1234'/'Fixes #1234' into the description will automatically update/resolve issue #1234 in mantis." >> "$COMMIT_MSG_FILE"
+  echo -e "# Our commit subject format policy is:\n# <subsystem>: <description>\n# Adding 'Issue #1234'/'Fixes #1234' into the description will automatically update/resolve issue #1234 in mantis." > "$COMMIT_MSG_FILE"
   if [ $RET = 1 ];
   then
     echo -e "# Your commit includes staged changes that indicate an API change which requires a NEWS line." >> "$COMMIT_MSG_FILE"
diff --git a/contrib/gana b/contrib/gana
-Subproject 66228b8a4306f028d843d78fbfcca54260539ff
+Subproject 79163ab6ea6f6cfe7f4311f91fb45c747b8c33d
diff --git a/contrib/sphinx b/contrib/sphinx
-Subproject 9c5b9d9040d21542eff792e26624cf9669b127a
+Subproject 4f40b5deca02c8dc64ff6c73e6602e6abdd1bae
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 3199a04a4..b00993d0f 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -17,6 +17,7 @@ pcfiles = \
        gnunethello.pc \
        gnunetidentity.pc \
        gnunetcadet.pc \
+       gnunetmessenger.pc \
        gnunetmicrophone.pc \
        gnunetmysql.pc \
        gnunetnamestore.pc \
@@ -59,6 +60,7 @@ EXTRA_DIST = \
        gnunethello.pc.in \
        gnunetidentity.pc.in \
        gnunetcadet.pc.in \
+       gnunetmessenger.pc.in \
        gnunetmicrophone.pc.in \
        gnunetmysql.pc.in \
        gnunetnamestore.pc.in \
diff --git a/pkgconfig/gnunetmessenger.pc.in b/pkgconfig/gnunetmessenger.pc.in
index 465663d0c..126aae737 100644
--- a/pkgconfig/gnunetmessenger.pc.in
+++ b/pkgconfig/gnunetmessenger.pc.in
@@ -4,9 +4,9 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: GNUnet MESSENGER
-Description: Instant messaging based on the CADET subsystem
-URL: https://gnunet.org
+Description: Provides API to access the GNUnet Messenger subsystem
+URL: http://gnunet.org
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -lgnunetmessenger_common -lgnunetmessenger
+Libs: -L${libdir} -lgnunetmessenger
 Cflags: -I${includedir}
diff --git a/src/include/gnunet_mysql_compat.h b/src/include/gnunet_mysql_compat.h.in
index 9fb9db30f..6218386aa 100644
--- a/src/include/gnunet_mysql_compat.h
+++ b/src/include/gnunet_mysql_compat.h.in
@@ -22,6 +22,8 @@
  *
  * @file
  * MySQL/MariaDB compatibility insanity helper header
+ * Note: gnunet_mysql_compat.h is AUTOGENERATED from gnunet_mysql_compat.h.in
+ * Please do not modify or commit gnunet_mysql_compat.h
  *
  * @defgroup mysql  MySQL library
  * Helper library to access a MySQL database.
@@ -41,15 +43,7 @@ extern "C"
 #endif
 #endif
 
-#ifndef LIBMARIADB
-#if MYSQL_VERSION_ID >= 80000
-#define MYSQL_BOOL bool
-#else
-#define MYSQL_BOOL my_bool /* MySQL < 8 wants this */
-#endif
-#else
-#define MYSQL_BOOL my_bool /* MariaDB still uses my_bool */
-#endif
+#define MYSQL_BOOL @mysql_bool@
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 1a66458db..b7ca377a9 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -801,7 +801,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
       *end = '\0';
       directive = line + 1;
 
-      if (0 == strcasecmp (directive, "INLINE"))
+      if (0 == strcasecmp (directive,
+                           "INLINE"))
       {
         const char *path = end + 1;
 
@@ -816,7 +817,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
                                        source_filename,
                                        nr);
       }
-      else if (0 == strcasecmp (directive, "INLINE-MATCHING"))
+      else if (0 == strcasecmp (directive,
+                                "INLINE-MATCHING"))
       {
         const char *path = end + 1;
 
@@ -831,7 +833,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
                                        source_filename,
                                        nr);
       }
-      else if (0 == strcasecmp (directive, "INLINE-SECRET"))
+      else if (0 == strcasecmp (directive,
+                                "INLINE-SECRET"))
       {
         char *secname = end + 1;
         char *secname_end;
@@ -881,7 +884,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
       }
       continue;
     }
-    if (('[' == line[0]) && (']' == line[line_size - 1]))
+    if ( ('[' == line[0]) &&
+         (']' == line[line_size - 1]) )
     {
       /* [value] */
       line[line_size - 1] = '\0';
@@ -923,18 +927,24 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
 
       /* remove quotes */
       i = 0;
-      if (('"' == value[0]) && ('"' == value[strlen (value) - 1]))
+      if ( ('"' == value[0]) &&
+           ('"' == value[strlen (value) - 1]) )
       {
         value[strlen (value) - 1] = '\0';
         value++;
       }
-      GNUNET_CONFIGURATION_set_value_string (cfg, section, tag, &value[i]);
+      GNUNET_CONFIGURATION_set_value_string (cfg,
+                                             section,
+                                             tag,
+                                             &value[i]);
       if (cfg->diagnostics)
       {
         set_entry_hint (cfg,
                         section,
                         tag,
-                        source_filename ? source_filename : "<input>",
+                        source_filename
+                        ? source_filename
+                        : "<input>",
                         nr);
       }
       GNUNET_free (tag);