diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-12-11 21:00:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-12-11 21:00:32 +0000 |
commit | 13f63dab5a87cb8b95b8d77f11925a7c7429038b (patch) | |
tree | a2328cb638be9926b6ca06d1b108f1fbac6b6dc6 | |
parent | 267f7c5a9a354b8959607c7bc031906c02b61be4 (diff) | |
download | gnunet-13f63dab5a87cb8b95b8d77f11925a7c7429038b.tar.gz gnunet-13f63dab5a87cb8b95b8d77f11925a7c7429038b.zip |
-remove useless/broken configure options, and gnunet_directories.h
-rw-r--r-- | configure.ac | 23 | ||||
-rw-r--r-- | po/POTFILES.in | 8 | ||||
-rw-r--r-- | src/include/Makefile.am | 3 | ||||
-rw-r--r-- | src/include/gnunet_constants.h | 5 | ||||
-rw-r--r-- | src/include/gnunet_directories.h.in | 33 | ||||
-rw-r--r-- | src/transport/plugin_transport_smtp.c | 2 | ||||
-rw-r--r-- | src/util/disk.c | 1 | ||||
-rw-r--r-- | src/util/program.c | 2 | ||||
-rw-r--r-- | src/util/service.c | 2 |
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 | |||
877 | # restore LIBS | 877 | # restore LIBS |
878 | LIBS=$SAVE_LIBS | 878 | LIBS=$SAVE_LIBS |
879 | 879 | ||
880 | gn_user_home_dir="~/.gnunet" | ||
881 | AC_ARG_WITH(user-home-dir, | ||
882 | AC_HELP_STRING( | ||
883 | [--with-user-home-dir=DIR], | ||
884 | [default user home directory (~/.gnunet)]), | ||
885 | [gn_user_home_dir=$withval]) | ||
886 | AC_SUBST(GN_USER_HOME_DIR, $gn_user_home_dir) | ||
887 | gn_daemon_home_dir="/var/lib/gnunet" | ||
888 | AC_ARG_WITH(daemon-home-dir, | ||
889 | AC_HELP_STRING( | ||
890 | [--with-daemon-home-dir=DIR], | ||
891 | [default daemon home directory (/var/lib/gnunet)]), | ||
892 | [gn_daemon_home_dir=$withval]) | ||
893 | AC_SUBST(GN_DAEMON_HOME_DIR, $gn_daemon_home_dir) | ||
894 | gn_daemon_config_dir="/etc" | ||
895 | AC_ARG_WITH(daemon-config-dir, | ||
896 | AC_HELP_STRING( | ||
897 | [--with-daemon-config-dir=DIR], | ||
898 | [default daemon config directory (/etc)]), | ||
899 | [gn_daemon_config_dir=$withval]) | ||
900 | AC_SUBST(GN_DAEMON_CONFIG_DIR, $gn_daemon_config_dir) | ||
901 | |||
902 | GN_INTLINCL="" | 880 | GN_INTLINCL="" |
903 | GN_LIBINTL="$LTLIBINTL" | 881 | GN_LIBINTL="$LTLIBINTL" |
904 | AC_ARG_ENABLE(framework, [ --enable-framework enable Mac OS X framework build helpers],enable_framework_build=$enableval) | 882 | AC_ARG_ENABLE(framework, [ --enable-framework enable Mac OS X framework build helpers],enable_framework_build=$enableval) |
@@ -1397,7 +1375,6 @@ src/hello/Makefile | |||
1397 | src/identity/Makefile | 1375 | src/identity/Makefile |
1398 | src/identity/identity.conf | 1376 | src/identity/identity.conf |
1399 | src/include/Makefile | 1377 | src/include/Makefile |
1400 | src/include/gnunet_directories.h | ||
1401 | src/integration-tests/Makefile | 1378 | src/integration-tests/Makefile |
1402 | src/hostlist/Makefile | 1379 | src/hostlist/Makefile |
1403 | src/mesh/Makefile | 1380 | 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 | |||
11 | src/ats/gnunet-service-ats_performance.c | 11 | src/ats/gnunet-service-ats_performance.c |
12 | src/ats/gnunet-service-ats_reservations.c | 12 | src/ats/gnunet-service-ats_reservations.c |
13 | src/ats/gnunet-service-ats_scheduling.c | 13 | src/ats/gnunet-service-ats_scheduling.c |
14 | src/ats/libgnunet_plugin_ats_mlp.c | 14 | src/ats/plugin_ats_mlp.c |
15 | src/ats/libgnunet_plugin_ats_proportional.c | 15 | src/ats/plugin_ats_proportional.c |
16 | src/ats/libgnunet_plugin_ats_ril.c | 16 | src/ats/plugin_ats_ril.c |
17 | src/ats-tool/gnunet-ats.c | 17 | src/ats-tool/gnunet-ats.c |
18 | src/block/block.c | 18 | src/block/block.c |
19 | src/block/plugin_block_template.c | 19 | src/block/plugin_block_template.c |
@@ -243,6 +243,7 @@ src/revocation/revocation_api.c | |||
243 | src/scalarproduct/gnunet-scalarproduct.c | 243 | src/scalarproduct/gnunet-scalarproduct.c |
244 | src/scalarproduct/gnunet-service-scalarproduct.c | 244 | src/scalarproduct/gnunet-service-scalarproduct.c |
245 | src/scalarproduct/scalarproduct_api.c | 245 | src/scalarproduct/scalarproduct_api.c |
246 | src/secretsharing/gnunet-secretsharing-profiler.c | ||
246 | src/secretsharing/gnunet-service-secretsharing.c | 247 | src/secretsharing/gnunet-service-secretsharing.c |
247 | src/secretsharing/secretsharing_api.c | 248 | src/secretsharing/secretsharing_api.c |
248 | src/set/gnunet-service-set.c | 249 | src/set/gnunet-service-set.c |
@@ -285,6 +286,7 @@ src/testbed/testbed_api_statistics.c | |||
285 | src/testbed/testbed_api_testbed.c | 286 | src/testbed/testbed_api_testbed.c |
286 | src/testbed/testbed_api_test.c | 287 | src/testbed/testbed_api_test.c |
287 | src/testbed/testbed_api_topology.c | 288 | src/testbed/testbed_api_topology.c |
289 | src/testbed/testbed_api_underlay.c | ||
288 | src/testbed/testbed_logger_api.c | 290 | src/testbed/testbed_logger_api.c |
289 | src/testing/gnunet-testing.c | 291 | src/testing/gnunet-testing.c |
290 | src/testing/testing.c | 292 | 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 = . | |||
2 | 2 | ||
3 | gnunetincludedir = $(includedir)/gnunet | 3 | gnunetincludedir = $(includedir)/gnunet |
4 | 4 | ||
5 | nodist_gnunetinclude_HEADERS = \ | ||
6 | gnunet_directories.h | ||
7 | |||
8 | if MINGW | 5 | if MINGW |
9 | WINPROC = winproc.h | 6 | WINPROC = winproc.h |
10 | endif | 7 | 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" | |||
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | /** | 38 | /** |
39 | * Last resort choice for configuration file name. | ||
40 | */ | ||
41 | #define GNUNET_DEFAULT_USER_CONFIG_FILE "~/.config/gnunet.conf" | ||
42 | |||
43 | /** | ||
39 | * Bandwidth (in/out) to assume initially (before either peer has | 44 | * Bandwidth (in/out) to assume initially (before either peer has |
40 | * communicated any particular preference). Should be rather low; set | 45 | * communicated any particular preference). Should be rather low; set |
41 | * so that at least one maximum-size message can be send roughly once | 46 | * 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 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other contributing authors) | ||
4 | |||
5 | GNUnet is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published | ||
7 | by the Free Software Foundation; either version 2, or (at your | ||
8 | option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with GNUnet; see the file COPYING. If not, write to the | ||
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18 | Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | |||
21 | /** | ||
22 | * @file include/gnunet_directories.h | ||
23 | * @brief directories and files in GNUnet (default locations) | ||
24 | * | ||
25 | * @author Christian Grothoff | ||
26 | */ | ||
27 | |||
28 | #ifndef GNUNET_DIRECTORIES | ||
29 | #define GNUNET_DIRECTORIES | ||
30 | |||
31 | #define GNUNET_DEFAULT_USER_CONFIG_FILE "@GN_USER_HOME_DIR@/gnunet.conf" | ||
32 | |||
33 | #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 @@ | |||
27 | 27 | ||
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include "gnunet_util.h" | 29 | #include "gnunet_util.h" |
30 | #include "gnunet_directories.h" | 30 | #include "gnunet_constants.h" |
31 | #include "gnunet_protocols.h" | 31 | #include "gnunet_protocols.h" |
32 | #include "gnunet_transport.h" | 32 | #include "gnunet_transport.h" |
33 | #include "gnunet_stats_service.h" | 33 | #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 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include "gnunet_directories.h" | ||
30 | #include "gnunet_util_lib.h" | 29 | #include "gnunet_util_lib.h" |
31 | #include "disk.h" | 30 | #include "disk.h" |
32 | 31 | ||
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 @@ | |||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
29 | #include "gnunet_resolver_service.h" | 29 | #include "gnunet_resolver_service.h" |
30 | #include "gnunet_directories.h" | 30 | #include "gnunet_constants.h" |
31 | #include <gcrypt.h> | 31 | #include <gcrypt.h> |
32 | 32 | ||
33 | #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) | 33 | #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 @@ | |||
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | #include "gnunet_protocols.h" | 28 | #include "gnunet_protocols.h" |
29 | #include "gnunet_directories.h" | 29 | #include "gnunet_constants.h" |
30 | #include "gnunet_resolver_service.h" | 30 | #include "gnunet_resolver_service.h" |
31 | 31 | ||
32 | #if HAVE_MALLINFO | 32 | #if HAVE_MALLINFO |