diff options
-rw-r--r-- | configure.ac | 24 | ||||
-rw-r--r-- | po/POTFILES.in | 2 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 9 |
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 | |||
826 | AC_MSG_CHECKING(for mysql) | 826 | AC_MSG_CHECKING(for mysql) |
827 | AC_ARG_WITH(mysql, | 827 | AC_ARG_WITH(mysql, |
828 | [ --with-mysql=PFX base of MySQL installation], | 828 | [ --with-mysql=PFX base of MySQL installation], |
829 | [AC_MSG_RESULT("$with_mysql") | 829 | [AC_MSG_RESULT([$with_mysql]) |
830 | if test "$with_mysql" != "no" | 830 | case $with_mysql in |
831 | then | 831 | no) |
832 | if test "$with_mysql" != "yes" | 832 | ;; |
833 | then | 833 | yes|"") |
834 | AC_CHECK_HEADERS(mysql/mysql.h, | ||
835 | AC_CHECK_LIB(mysqlclient, mysql_init, | ||
836 | MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql" | ||
837 | MYSQL_CPPFLAGS="-I$with_mysql/include" | ||
838 | |||
839 | mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) | ||
840 | ;; | ||
841 | *) | ||
834 | LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS" | 842 | LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS" |
835 | CPPFLAGS="-I$with_mysql/include $CPPFLAGS" | 843 | CPPFLAGS="-I$with_mysql/include $CPPFLAGS" |
836 | AC_CHECK_HEADERS(mysql/mysql.h, | 844 | AC_CHECK_HEADERS(mysql/mysql.h, |
@@ -839,8 +847,8 @@ AC_ARG_WITH(mysql, | |||
839 | MYSQL_CPPFLAGS="-I$with_mysql/include" | 847 | MYSQL_CPPFLAGS="-I$with_mysql/include" |
840 | 848 | ||
841 | mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) | 849 | mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) |
842 | fi | 850 | ;; |
843 | fi | 851 | esac |
844 | ], | 852 | ], |
845 | [AC_MSG_RESULT([--with-mysql not specified]) | 853 | [AC_MSG_RESULT([--with-mysql not specified]) |
846 | if test -d "/usr/lib64/mysql"; then | 854 | if test -d "/usr/lib64/mysql"; then |
@@ -906,7 +914,7 @@ AC_ARG_WITH(microhttpd, | |||
906 | case $with_microhttpd in | 914 | case $with_microhttpd in |
907 | no) | 915 | no) |
908 | ;; | 916 | ;; |
909 | yes) | 917 | yes|"") |
910 | AC_CHECK_HEADERS([microhttpd.h], | 918 | AC_CHECK_HEADERS([microhttpd.h], |
911 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | 919 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, |
912 | AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], | 920 | 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 | |||
461 | src/util/helper.c | 461 | src/util/helper.c |
462 | src/util/load.c | 462 | src/util/load.c |
463 | src/util/mq.c | 463 | src/util/mq.c |
464 | src/util/mst.c | ||
464 | src/util/network.c | 465 | src/util/network.c |
465 | src/util/op.c | 466 | src/util/op.c |
466 | src/util/os_installation.c | 467 | src/util/os_installation.c |
@@ -476,6 +477,7 @@ src/util/server_mst.c | |||
476 | src/util/server_nc.c | 477 | src/util/server_nc.c |
477 | src/util/server_tc.c | 478 | src/util/server_tc.c |
478 | src/util/service.c | 479 | src/util/service.c |
480 | src/util/service_new.c | ||
479 | src/util/signal.c | 481 | src/util/signal.c |
480 | src/util/socks.c | 482 | src/util/socks.c |
481 | src/util/speedup.c | 483 | 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 = \ | |||
195 | $(top_builddir)/src/rest/libgnunetrest.la \ | 195 | $(top_builddir)/src/rest/libgnunetrest.la \ |
196 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 196 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
197 | $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \ | 197 | $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \ |
198 | $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \ | 198 | $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \ |
199 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 199 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
200 | $(LTLIBINTL) -ljansson -lmicrohttpd | 200 | $(LTLIBINTL) -ljansson -lmicrohttpd |
201 | libgnunet_plugin_rest_namestore_la_LDFLAGS = \ | 201 | libgnunet_plugin_rest_namestore_la_LDFLAGS = \ |
@@ -355,9 +355,9 @@ test_plugin_namestore_postgres_LDADD = \ | |||
355 | $(top_builddir)/src/util/libgnunetutil.la | 355 | $(top_builddir)/src/util/libgnunetutil.la |
356 | 356 | ||
357 | check_SCRIPTS = \ | 357 | check_SCRIPTS = \ |
358 | test_namestore_put.sh \ | 358 | test_namestore_put.sh \ |
359 | test_namestore_lookup.sh \ | 359 | test_namestore_lookup.sh \ |
360 | test_namestore_delete.sh | 360 | test_namestore_delete.sh |
361 | 361 | ||
362 | EXTRA_DIST = \ | 362 | EXTRA_DIST = \ |
363 | test_namestore_api.conf \ | 363 | test_namestore_api.conf \ |
@@ -370,4 +370,3 @@ EXTRA_DIST = \ | |||
370 | zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \ | 370 | zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \ |
371 | zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey \ | 371 | zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey \ |
372 | $(check_SCRIPTS) | 372 | $(check_SCRIPTS) |
373 | |||