[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37936 - in gnunet: . po src/namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37936 - in gnunet: . po src/namestore |
Date: |
Fri, 16 Sep 2016 13:55:15 +0200 |
Author: grothoff
Date: 2016-09-16 13:55:15 +0200 (Fri, 16 Sep 2016)
New Revision: 37936
Modified:
gnunet/configure.ac
gnunet/po/POTFILES.in
gnunet/src/namestore/Makefile.am
Log:
fix #4653
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2016-09-16 11:47:25 UTC (rev 37935)
+++ gnunet/configure.ac 2016-09-16 11:55:15 UTC (rev 37936)
@@ -826,11 +826,19 @@
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 @@
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 @@
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],
Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in 2016-09-16 11:47:25 UTC (rev 37935)
+++ gnunet/po/POTFILES.in 2016-09-16 11:55:15 UTC (rev 37936)
@@ -461,6 +461,7 @@
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_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
Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am 2016-09-16 11:47:25 UTC (rev 37935)
+++ gnunet/src/namestore/Makefile.am 2016-09-16 11:55:15 UTC (rev 37936)
@@ -195,7 +195,7 @@
$(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 @@
$(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 @@
zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \
zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey \
$(check_SCRIPTS)
-
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37936 - in gnunet: . po src/namestore,
gnunet <=