3 files changed, 10 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index 386548505..1c92c1fb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,5 +8,8 @@ EXTRA_DIST = \
  HACKING \
  acinclude.m4
 
+gnunetincludedir = $(includedir)/gnunet
+gnunetinclude_HEADERS = gnunet_config.h
+
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/configure.ac b/configure.ac
index 16bf23b7e..563e7fec6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,20 +21,20 @@
 #
 #
 AC_PREREQ(2.61)
+# Checks for programs.
 AC_INIT([gnunet], [0.9.0pre2],[bug-gnunet@gnu.org])
+
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
+
 AM_INIT_AUTOMAKE([gnunet], [0.9.0pre2])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
-
 AH_TOP([#define _GNU_SOURCE  1])
 
-# Checks for programs.
-AC_CANONICAL_TARGET
-AC_CANONICAL_SYSTEM
 AC_PROG_AWK
 AC_PROG_CC
-gl_EARLY
-gl_INIT
 AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_OBJC
@@ -42,7 +42,6 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
-AC_CANONICAL_HOST
 LT_INIT([disable-static dlopen win32-dll])
 LTDL_INIT
 AC_SUBST(LTDLINCL)
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 3dc5d64eb..4fbeb9d71 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -123,7 +123,7 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
-gnunet_service_fs_new_DEPENDENCIES = \
+gnunet_service_fs_DEPENDENCIES = \
   libgnunetfs.la
 
 gnunet_unindex_SOURCES = \