[GNUnet-SVN] r14896 - in gnunet: . src/fs

[gnunet]

Author: grothoff
Date: 2011-04-06 11:38:51 +0200 (Wed, 06 Apr 2011)
New Revision: 14896

Modified:
   gnunet/Makefile.am
   gnunet/configure.ac
   gnunet/src/fs/Makefile.am
Log:
fixing build issues

Modified: gnunet/Makefile.am
===================================================================
--- gnunet/Makefile.am  2011-04-06 09:12:14 UTC (rev 14895)
+++ gnunet/Makefile.am  2011-04-06 09:38:51 UTC (rev 14896)
@@ -8,5 +8,8 @@
  HACKING \
  acinclude.m4
 
+gnunetincludedir = $(includedir)/gnunet
+gnunetinclude_HEADERS = gnunet_config.h
+
 ACLOCAL_AMFLAGS = -I m4
 

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2011-04-06 09:12:14 UTC (rev 14895)
+++ gnunet/configure.ac 2011-04-06 09:38:51 UTC (rev 14896)
@@ -21,20 +21,20 @@
 #
 #
 AC_PREREQ(2.61)
+# Checks for programs.
 AC_INIT([gnunet], [0.9.0pre2],address@hidden)
+
+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_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)

Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am   2011-04-06 09:12:14 UTC (rev 14895)
+++ gnunet/src/fs/Makefile.am   2011-04-06 09:38:51 UTC (rev 14896)
@@ -123,7 +123,7 @@
  $(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 = \