9 files changed, 13 insertions, 66 deletions

diff --git a/configure.ac b/configure.ac
index d901efc4a..fcec00df0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -877,28 +877,6 @@ AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgrou
 # restore LIBS
 LIBS=$SAVE_LIBS
 
-gn_user_home_dir="~/.gnunet"
-AC_ARG_WITH(user-home-dir,
-        AC_HELP_STRING(
-                [--with-user-home-dir=DIR],
-                [default user home directory (~/.gnunet)]),
-        [gn_user_home_dir=$withval])
-AC_SUBST(GN_USER_HOME_DIR, $gn_user_home_dir)
-gn_daemon_home_dir="/var/lib/gnunet"
-AC_ARG_WITH(daemon-home-dir,
-        AC_HELP_STRING(
-                [--with-daemon-home-dir=DIR],
-                [default daemon home directory (/var/lib/gnunet)]),
-        [gn_daemon_home_dir=$withval])
-AC_SUBST(GN_DAEMON_HOME_DIR, $gn_daemon_home_dir)
-gn_daemon_config_dir="/etc"
-AC_ARG_WITH(daemon-config-dir,
-        AC_HELP_STRING(
-                [--with-daemon-config-dir=DIR],
-                [default daemon config directory (/etc)]),
-        [gn_daemon_config_dir=$withval])
-AC_SUBST(GN_DAEMON_CONFIG_DIR, $gn_daemon_config_dir)
-
 GN_INTLINCL=""
 GN_LIBINTL="$LTLIBINTL"
 AC_ARG_ENABLE(framework, [  --enable-framework      enable Mac OS X framework build helpers],enable_framework_build=$enableval)
@@ -1397,7 +1375,6 @@ src/hello/Makefile
 src/identity/Makefile
 src/identity/identity.conf
 src/include/Makefile
-src/include/gnunet_directories.h
 src/integration-tests/Makefile
 src/hostlist/Makefile
 src/mesh/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 21df6fcc0..713e4bee0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,9 +11,9 @@ src/ats/gnunet-service-ats_normalization.c
 src/ats/gnunet-service-ats_performance.c
 src/ats/gnunet-service-ats_reservations.c
 src/ats/gnunet-service-ats_scheduling.c
-src/ats/libgnunet_plugin_ats_mlp.c
-src/ats/libgnunet_plugin_ats_proportional.c
-src/ats/libgnunet_plugin_ats_ril.c
+src/ats/plugin_ats_mlp.c
+src/ats/plugin_ats_proportional.c
+src/ats/plugin_ats_ril.c
 src/ats-tool/gnunet-ats.c
 src/block/block.c
 src/block/plugin_block_template.c
@@ -243,6 +243,7 @@ src/revocation/revocation_api.c
 src/scalarproduct/gnunet-scalarproduct.c
 src/scalarproduct/gnunet-service-scalarproduct.c
 src/scalarproduct/scalarproduct_api.c
+src/secretsharing/gnunet-secretsharing-profiler.c
 src/secretsharing/gnunet-service-secretsharing.c
 src/secretsharing/secretsharing_api.c
 src/set/gnunet-service-set.c
@@ -285,6 +286,7 @@ src/testbed/testbed_api_statistics.c
 src/testbed/testbed_api_testbed.c
 src/testbed/testbed_api_test.c
 src/testbed/testbed_api_topology.c
+src/testbed/testbed_api_underlay.c
 src/testbed/testbed_logger_api.c
 src/testing/gnunet-testing.c
 src/testing/testing.c
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 0d13632e9..5b5783146 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -2,9 +2,6 @@ SUBDIRS = .
 
 gnunetincludedir = $(includedir)/gnunet
 
-nodist_gnunetinclude_HEADERS = \
-  gnunet_directories.h
-
 if MINGW
   WINPROC = winproc.h
 endif
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index 730a3d6d7..b8a049cb9 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -36,6 +36,11 @@ extern "C"
 #endif
 
 /**
+ * Last resort choice for configuration file name.
+ */
+#define GNUNET_DEFAULT_USER_CONFIG_FILE "~/.config/gnunet.conf"
+
+/**
  * Bandwidth (in/out) to assume initially (before either peer has
  * communicated any particular preference).  Should be rather low; set
  * so that at least one maximum-size message can be send roughly once
diff --git a/src/include/gnunet_directories.h.in b/src/include/gnunet_directories.h.in
deleted file mode 100644
index 3f6898a5e..000000000
--- a/src/include/gnunet_directories.h.in
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file include/gnunet_directories.h
- * @brief directories and files in GNUnet (default locations)
- *
- * @author Christian Grothoff
- */
-
-#ifndef GNUNET_DIRECTORIES
-#define GNUNET_DIRECTORIES
-
-#define GNUNET_DEFAULT_USER_CONFIG_FILE "@GN_USER_HOME_DIR@/gnunet.conf"
-
-#endif
diff --git a/src/transport/plugin_transport_smtp.c b/src/transport/plugin_transport_smtp.c
index 828a0b884..740d25d00 100644
--- a/src/transport/plugin_transport_smtp.c
+++ b/src/transport/plugin_transport_smtp.c
@@ -27,7 +27,7 @@
 
 #include "platform.h"
 #include "gnunet_util.h"
-#include "gnunet_directories.h"
+#include "gnunet_constants.h"
 #include "gnunet_protocols.h"
 #include "gnunet_transport.h"
 #include "gnunet_stats_service.h"
diff --git a/src/util/disk.c b/src/util/disk.c
index e3743430e..3027e1b30 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -26,7 +26,6 @@
  */
 
 #include "platform.h"
-#include "gnunet_directories.h"
 #include "gnunet_util_lib.h"
 #include "disk.h"
 
diff --git a/src/util/program.c b/src/util/program.c
index 8b1d7773e..fa22080c1 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -27,7 +27,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
-#include "gnunet_directories.h"
+#include "gnunet_constants.h"
 #include <gcrypt.h>
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
diff --git a/src/util/service.c b/src/util/service.c
index 8f8cca36d..752dd2a74 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -26,7 +26,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
-#include "gnunet_directories.h"
+#include "gnunet_constants.h"
 #include "gnunet_resolver_service.h"
 
 #if HAVE_MALLINFO