3 files changed, 12 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index d0185ffe4..00746a6db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,7 @@ AS_CASE(["$host_os"],
   [*darwin* | *rhapsody* | *macosx*],[
      AC_DEFINE_UNQUOTED(DARWIN,1,[This is an Apple Darwin system])
      CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS"
-     CFLAGS="-fno-common $CFLAGS"
+     CFLAGS="-fno-common -D__APPLE_USE_RFC_3542 $CFLAGS"
      LDFLAGS="$OLD_LDFLAGS"
      AC_MSG_WARN([WARNING: The VPN application cannot be compiled on your OS])
      AC_CHECK_LIB(intl, gettext)
diff --git a/contrib/Makefile.inc b/contrib/Makefile.inc
index c737a07f8..a563ef4a1 100644
--- a/contrib/Makefile.inc
+++ b/contrib/Makefile.inc
@@ -8,7 +8,8 @@ BUILDCOMMON_SHLIB_FILES = \
     build-common/sh/lib.sh/existence_python.sh \
     build-common/sh/lib.sh/msg.sh \
     build-common/sh/lib.sh/progname.sh \
-    build-common/sh/lib.sh/version_gnunet.sh
+    build-common/sh/lib.sh/version_gnunet.sh \
+    build-common/LICENSE
 
 BUILDCOMMON_CONF_FILES = \
     build-common/conf/.dir-locals.el \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 68b2f3e1f..c2c64a09b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -394,6 +394,8 @@ src/template/gnunet-template.c
 src/testbed-logger/gnunet-service-testbed-logger.c
 src/testbed-logger/testbed_logger_api.c
 src/testbed/generate-underlay-topology.c
+src/testbed/gnunet-cmd.c
+src/testbed/gnunet-cmds-helper.c
 src/testbed/gnunet-daemon-latency-logger.c
 src/testbed/gnunet-daemon-testbed-blacklist.c
 src/testbed/gnunet-daemon-testbed-underlay.c
@@ -411,15 +413,19 @@ src/testbed/gnunet-service-testbed_peers.c
 src/testbed/gnunet-testbed-profiler.c
 src/testbed/gnunet_mpi_test.c
 src/testbed/gnunet_testbed_mpi_spawn.c
+src/testbed/plugin_testcmd.c
 src/testbed/testbed_api.c
 src/testbed/testbed_api_barriers.c
+src/testbed/testbed_api_cmd_block_until_all_peers_started.c
 src/testbed/testbed_api_cmd_controller.c
+src/testbed/testbed_api_cmd_local_test_finished.c
 src/testbed/testbed_api_cmd_netjail_start.c
 src/testbed/testbed_api_cmd_netjail_start_testbed.c
 src/testbed/testbed_api_cmd_netjail_stop.c
 src/testbed/testbed_api_cmd_netjail_stop_testbed.c
 src/testbed/testbed_api_cmd_peer.c
 src/testbed/testbed_api_cmd_peer_store.c
+src/testbed/testbed_api_cmd_send_peer_ready.c
 src/testbed/testbed_api_cmd_tng_connect.c
 src/testbed/testbed_api_cmd_tng_service.c
 src/testbed/testbed_api_hosts.c
@@ -438,6 +444,9 @@ src/testing/testing.c
 src/testing/testing_api_cmd_batch.c
 src/testing/testing_api_cmd_hello_world.c
 src/testing/testing_api_cmd_hello_world_birth.c
+src/testing/testing_api_cmd_send_peer_ready.c
+src/testing/testing_api_cmd_start_peer.c
+src/testing/testing_api_cmd_system_create.c
 src/testing/testing_api_loop.c
 src/testing/testing_api_trait_cmd.c
 src/testing/testing_api_trait_process.c