3 files changed, 22 insertions, 13 deletions

diff --git a/configure.ac b/configure.ac
index 79cfa2ec2..af0e9306d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -826,11 +826,19 @@ SAVE_CPPFLAGS=$CPPFLAGS
 AC_MSG_CHECKING(for mysql)
 AC_ARG_WITH(mysql,
   [  --with-mysql=PFX        base of MySQL installation],
-  [AC_MSG_RESULT("$with_mysql")
-   if test "$with_mysql" != "no"
-   then
-    if test "$with_mysql" != "yes"
-    then
+  [AC_MSG_RESULT([$with_mysql])
+   case $with_mysql in
+   no)
+      ;;
+   yes|"")
+      AC_CHECK_HEADERS(mysql/mysql.h,
+       AC_CHECK_LIB(mysqlclient, mysql_init,
+        MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql"
+        MYSQL_CPPFLAGS="-I$with_mysql/include"
+
+        mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+      ;;
+   *)
       LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
       CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
       AC_CHECK_HEADERS(mysql/mysql.h,
@@ -839,8 +847,8 @@ AC_ARG_WITH(mysql,
         MYSQL_CPPFLAGS="-I$with_mysql/include"
 
         mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
-    fi
-   fi
+      ;;
+   esac
   ],
   [AC_MSG_RESULT([--with-mysql not specified])
    if test -d "/usr/lib64/mysql"; then
@@ -906,7 +914,7 @@ AC_ARG_WITH(microhttpd,
     case $with_microhttpd in
       no)
         ;;
-      yes)
+      yes|"")
         AC_CHECK_HEADERS([microhttpd.h],
           AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
             AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7e267160f..c6d3571e7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -461,6 +461,7 @@ src/util/gnunet-uri.c
 src/util/helper.c
 src/util/load.c
 src/util/mq.c
+src/util/mst.c
 src/util/network.c
 src/util/op.c
 src/util/os_installation.c
@@ -476,6 +477,7 @@ src/util/server_mst.c
 src/util/server_nc.c
 src/util/server_tc.c
 src/util/service.c
+src/util/service_new.c
 src/util/signal.c
 src/util/socks.c
 src/util/speedup.c
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 50b33a18a..23ce477dd 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -195,7 +195,7 @@ libgnunet_plugin_rest_namestore_la_LIBADD = \
   $(top_builddir)/src/rest/libgnunetrest.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
         $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \
-  $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \  
+  $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson -lmicrohttpd
 libgnunet_plugin_rest_namestore_la_LDFLAGS = \
@@ -355,9 +355,9 @@ test_plugin_namestore_postgres_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la
 
 check_SCRIPTS = \
-        test_namestore_put.sh \
-        test_namestore_lookup.sh \
-        test_namestore_delete.sh
+  test_namestore_put.sh \
+  test_namestore_lookup.sh \
+  test_namestore_delete.sh
 
 EXTRA_DIST = \
   test_namestore_api.conf \
@@ -370,4 +370,3 @@ EXTRA_DIST = \
   zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \
   zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey \
   $(check_SCRIPTS)
-