-fixing #2405

git-svn-id: https://gnunet.org/svn/gnunet@21795 140774ce-b5e7-0310-ab8b-a85725594a96

17 files changed, 53 insertions, 28 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 2e858488b8..bf0d1c2db0 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -28,7 +28,8 @@ libgnunetats_la_SOURCES = \
   ats_api_performance.c 
 
 libgnunetats_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
 
 libgnunetats_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
diff --git a/src/block/Makefile.am b/src/block/Makefile.am
index 78680eee8d..d904084ad2 100644
--- a/src/block/Makefile.am
+++ b/src/block/Makefile.am
@@ -20,7 +20,8 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_block_template_la_SOURCES = \
   plugin_block_template.c
 libgnunet_plugin_block_template_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_block_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -28,7 +29,8 @@ libgnunet_plugin_block_test_la_SOURCES = \
   plugin_block_test.c
 libgnunet_plugin_block_test_la_LIBADD = \
   $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la  \
+  $(LTLIBINTL)
 libgnunet_plugin_block_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_test_la_DEPENDENCIES = \
@@ -38,7 +40,7 @@ libgnunet_plugin_block_test_la_DEPENDENCIES = \
 libgnunetblock_la_SOURCES = \
   block.c 
 libgnunetblock_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 libgnunetblock_la_DEPENDENCIES = \
  $(top_builddir)/src/util/libgnunetutil.la  
 libgnunetblock_la_LDFLAGS = \
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index d34e6e8c7e..e1cd8fd799 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -51,7 +51,8 @@ libgnunet_plugin_datacache_sqlite_la_SOURCES = \
   plugin_datacache_sqlite.c
 libgnunet_plugin_datacache_sqlite_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  $(LTLIBINTL)
 libgnunet_plugin_datacache_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -82,7 +83,8 @@ libgnunet_plugin_datacache_postgres_la_LDFLAGS = \
 libgnunet_plugin_datacache_template_la_SOURCES = \
   plugin_datacache_template.c
 libgnunet_plugin_datacache_template_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS)
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
 libgnunet_plugin_datacache_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index e7bccbc061..e9774edddb 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -92,7 +92,8 @@ libgnunet_plugin_datastore_sqlite_la_SOURCES = \
   plugin_datastore_sqlite.c
 libgnunet_plugin_datastore_sqlite_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  $(LTLIBINTL)
 libgnunet_plugin_datastore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -123,7 +124,8 @@ libgnunet_plugin_datastore_postgres_la_CPPFLAGS = \
 libgnunet_plugin_datastore_template_la_SOURCES = \
   plugin_datastore_template.c
 libgnunet_plugin_datastore_template_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS)
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
 libgnunet_plugin_datastore_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -233,4 +235,4 @@ EXTRA_DIST = \
  perf_plugin_datastore_data_postgres.conf \
  test_plugin_datastore_data_mysql.conf \
  test_plugin_datastore_data_postgres.conf \
- test_plugin_datastore_data_sqlite.conf
\ No newline at end of file
+ test_plugin_datastore_data_sqlite.conf
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index b2d18d24e3..0ea452db1f 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -26,7 +26,8 @@ libgnunetdht_la_SOURCES = \
   dht_api.c dht.h 
 libgnunetdht_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
+  $(XLIB) \
+  $(LTLIBINTL)
 libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 1:0:1
@@ -40,7 +41,8 @@ libgnunet_plugin_block_dht_la_SOURCES = \
 libgnunet_plugin_block_dht_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_block_dht_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_dht_la_DEPENDENCIES = \
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am
index c5027c7fdf..7eb819d294 100644
--- a/src/fragmentation/Makefile.am
+++ b/src/fragmentation/Makefile.am
@@ -15,7 +15,8 @@ libgnunetfragmentation_la_SOURCES = \
   defragmentation.c 
 libgnunetfragmentation_la_LIBADD = -lm \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
 libgnunetfragmentation_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
   -version-info 1:0:1
@@ -33,4 +34,4 @@ test_fragmentation_LDADD = \
  $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-EXTRA_DIST = test_fragmentation_data.conf
\ No newline at end of file
+EXTRA_DIST = test_fragmentation_data.conf
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index b916e4ee3f..f68cad75b7 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -177,7 +177,8 @@ libgnunet_plugin_block_fs_la_SOURCES = \
   plugin_block_fs.c
 libgnunet_plugin_block_fs_la_LIBADD = \
   $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_block_fs_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_fs_la_DEPENDENCIES = \
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am
index 26aa6c7c48..18cb6b29cc 100644
--- a/src/hello/Makefile.am
+++ b/src/hello/Makefile.am
@@ -14,7 +14,8 @@ lib_LTLIBRARIES = libgnunethello.la
 libgnunethello_la_SOURCES = \
   hello.c address.c
 libgnunethello_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
+ $(LTLIBINTL)
 libgnunethello_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 0:0:0
diff --git a/src/lockmanager/Makefile.am b/src/lockmanager/Makefile.am
index 0fbc20b0f9..056b8cc080 100644
--- a/src/lockmanager/Makefile.am
+++ b/src/lockmanager/Makefile.am
@@ -32,7 +32,8 @@ libgnunetlockmanager_la_SOURCES = \
   lockmanager_api.c lockmanager.h
 libgnunetlockmanager_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
+  $(XLIB) \
+  $(LTLIBINTL)
 libgnunetlockmanager_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
@@ -65,4 +66,4 @@ test_lockmanager_api_servercrash_SOURCES = \
   test_lockmanager_api_servercrash.c
 test_lockmanager_api_servercrash_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetlockmanager.la
\ No newline at end of file
+  libgnunetlockmanager.la
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 7161b40aa0..4c5dbb5d95 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -50,7 +50,8 @@ libgnunetmesh_la_SOURCES = \
   mesh_api.c mesh.h mesh_protocol.h
 libgnunetmesh_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
+  $(XLIB) \
+  $(LTLIBINTL)
 libgnunetmesh_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 1:0:0
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 7783506e92..2ab1942ee8 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -99,7 +99,8 @@ libgnunet_plugin_namestore_sqlite_la_SOURCES = \
 libgnunet_plugin_namestore_sqlite_la_LIBADD = \
   $(top_builddir)/src/namestore/libgnunetnamestore.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  $(LTLIBINTL)
 libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_namestore_sqlite_la_DEPENDENCIES = \
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 468fab541c..7ded60a9d9 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -22,7 +22,8 @@ libgnunetpeerinfo_la_SOURCES = \
 libgnunetpeerinfo_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
+  $(XLIB) \
+  $(LTLIBINTL)
 libgnunetpeerinfo_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index b7b936004e..a1b290e1b1 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -32,7 +32,8 @@ libgnunettestbed_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  -lm \
- $(top_builddir)/src/util/libgnunetutil.la 
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
 libgnunettestbed_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
  -version-info 0:0:0
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 572c033301..455df6989d 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -48,7 +48,8 @@ libgnunettesting_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  -lm \
- $(top_builddir)/src/util/libgnunetutil.la 
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
 libgnunettesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
  -version-info 0:1:0
@@ -57,7 +58,8 @@ libgnunettesting_la_LDFLAGS = \
 libgnunettesting_new_la_SOURCES = \
   testing_new.c  
 libgnunettesting_new_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
 libgnunettesting_new_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
  -version-info 0:1:0
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index b04087420f..8a318b961b 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -165,14 +165,16 @@ libgnunet_plugin_transport_tcp_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/nat/libgnunetnat.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_transport_tcp_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_transport_template_la_SOURCES = \
   plugin_transport_template.c
 libgnunet_plugin_transport_template_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_transport_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -196,7 +198,8 @@ libgnunet_plugin_transport_udp_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/nat/libgnunetnat.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_transport_udp_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -206,7 +209,8 @@ libgnunet_plugin_transport_unix_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_transport_unix_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am
index 390ce9e1ec..3b2b573b6a 100644
--- a/src/tun/Makefile.am
+++ b/src/tun/Makefile.am
@@ -14,7 +14,8 @@ lib_LTLIBRARIES = libgnunettun.la
 libgnunettun_la_SOURCES = \
   tun.c
 libgnunettun_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
+ $(LTLIBINTL)
 libgnunettun_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 0:0:0
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 8414ef225c..5426953fcd 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -107,6 +107,7 @@ libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
+  $(LTLIBINTL) \
   -lltdl -lz -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \