3 files changed, 28 insertions, 30 deletions

diff --git a/configure.ac b/configure.ac
index 92130c6e4..e2346803b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
-
+AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index e6469c00a..836a61fb4 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -2,13 +2,11 @@ SUBDIRS = .
 
 plugindir = $(libdir)/gnunet
 
-INCLUDES = \
+AM_CPPFLAGS = \
+  $(GNUNET_CPPFLAGS) \
   -I$(top_srcdir)/src/include \
   -I$(top_srcdir)
 
-AM_CPPFLAGS = \
-  $(GNUNET_CPPFLAGS)
-
 lib_LTLIBRARIES = \
  libgnunetmicrophone.la \
  libgnunetspeaker.la \
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index e080b83d2..44b2a17f6 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -10,7 +10,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 libexecdir= $(pkglibdir)/libexec/
 
 pkgcfg_DATA = \
-  dht.conf 
+  dht.conf
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -18,10 +18,10 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
- libgnunetdht.la 
+ libgnunetdht.la
 
 libgnunetdht_la_SOURCES = \
-  dht_api.c dht.h 
+  dht_api.c dht.h
 libgnunetdht_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB) \
@@ -32,7 +32,7 @@ libgnunetdht_la_LDFLAGS = \
 
 
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dht.la 
+  libgnunet_plugin_block_dht.la
 
 libgnunet_plugin_block_dht_la_SOURCES = \
   plugin_block_dht.c
@@ -44,12 +44,12 @@ libgnunet_plugin_block_dht_la_LIBADD = \
 libgnunet_plugin_block_dht_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_dht_la_DEPENDENCIES = \
-  $(top_builddir)/src/block/libgnunetblock.la 
+  $(top_builddir)/src/block/libgnunetblock.la
 
 
 
 libexec_PROGRAMS = \
- gnunet-service-dht 
+ gnunet-service-dht
 
 noinst_PROGRAMS = \
  gnunet-dht-monitor \
@@ -63,7 +63,7 @@ gnunet_service_dht_SOURCES = \
  gnunet-service-dht_hello.c gnunet-service-dht_hello.h \
  gnunet-service-dht_nse.c gnunet-service-dht_nse.h \
  gnunet-service-dht_neighbours.c gnunet-service-dht_neighbours.h \
- gnunet-service-dht_routing.c gnunet-service-dht_routing.h 
+ gnunet-service-dht_routing.c gnunet-service-dht_routing.h
 gnunet_service_dht_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/core/libgnunetcore.la \
@@ -78,31 +78,31 @@ gnunet_service_dht_LDADD = \
   -lm
 
 gnunet_dht_get_SOURCES = \
- gnunet-dht-get.c         
+ gnunet-dht-get.c
 gnunet_dht_get_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 gnunet_dht_get_DEPENDENCIES = \
-  libgnunetdht.la                             
+  libgnunetdht.la
 
 gnunet_dht_put_SOURCES = \
- gnunet-dht-put.c         
+ gnunet-dht-put.c
 gnunet_dht_put_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 gnunet_dht_put_DEPENDENCIES = \
-  libgnunetdht.la                             
+  libgnunetdht.la
 
 gnunet_dht_monitor_SOURCES = \
- gnunet-dht-monitor.c         
+ gnunet-dht-monitor.c
 gnunet_dht_monitor_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 gnunet_dht_monitor_DEPENDENCIES = \
-  libgnunetdht.la                             
+  libgnunetdht.la
 
 if HAVE_TESTING
 noinst_LIBRARIES = libgnunetdhttest.a
@@ -115,7 +115,7 @@ libgnunetdhttest_a_LIBADD = \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/dht/libgnunetdht.la
 libgnunetdhttest_a_DEPENDENCIES = \
-  libgnunetdht.la   
+  libgnunetdht.la
 
 if HAVE_TESTING
 check_PROGRAMS = \
@@ -130,7 +130,7 @@ endif
 if HAVE_EXPERIMENTAL
 # These tests still do not work as testbed does
 # not support the respective topology op
- NEW_TESTS = test_dht_2dtorus test_dht_multipeer 
+ NEW_TESTS = test_dht_2dtorus test_dht_multipeer
 endif
 
 if ENABLE_TEST_RUN
@@ -138,7 +138,7 @@ TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer \
  test_dht_line \
  test_dht_monitor \
- $(NEW_TESTS) 
+ $(NEW_TESTS)
 endif
 
 test_dht_api_SOURCES = \
@@ -149,7 +149,7 @@ test_dht_api_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_api_DEPENDENCIES = \
-  libgnunetdht.la                           
+  libgnunetdht.la
 
 test_dht_twopeer_SOURCES = \
  test_dht_topo.c
@@ -158,9 +158,9 @@ test_dht_twopeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la    
+ $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_twopeer_DEPENDENCIES = \
-  libgnunetdht.la                           
+  libgnunetdht.la
 
 test_dht_2dtorus_SOURCES = \
  test_dht_topo.c
@@ -178,7 +178,7 @@ test_dht_line_LDADD = \
  $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la 
+ $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_line_DEPENDENCIES = \
   libgnunetdht.la
 
@@ -189,9 +189,9 @@ test_dht_multipeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la  
+ $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_multipeer_DEPENDENCIES = \
-  libgnunetdht.la                           
+  libgnunetdht.la
 
 test_dht_monitor_SOURCES = \
   test_dht_monitor.c