-fixing build system

21 files changed, 8 insertions, 13 deletions

diff --git a/configure.ac b/configure.ac
index d0cf129..d5c6e41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001-2011 Christian Grothoff (and other contributing authors)
+# (C) 2001-2012 Christian Grothoff (and other contributing authors)
 #
 # GNUnet is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
@@ -20,9 +20,9 @@
 # Process this file with autoconf to produce a configure script.
 #
 AC_PREREQ(2.61)
-AC_INIT([gnunet-ext],[0.0.0],[bug-gnunet@gnu.org])
-AM_INIT_AUTOMAKE([gnunet-ext], [0.0.0])
-AM_CONFIG_HEADER(gnunet_ext_config.h)
+AC_INIT([gnunet-fuse],[0.9.3],[bug-gnunet@gnu.org])
+AM_INIT_AUTOMAKE([gnunet-fuse], [0.9.3])
+AM_CONFIG_HEADER(gnunet_fuse_config.h)
 
 AH_TOP([#define _GNU_SOURCE  1])
 
@@ -35,18 +35,13 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_LIBTOOL_WIN32_DLL
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_CANONICAL_HOST
-
-# dynamic libraries/plugins
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
+AM_PROG_CC_C_O
 
 CFLAGS="-Wall $CFLAGS"
 # use '-fno-strict-aliasing', but only if the compiler can take it
@@ -168,7 +163,7 @@ fi
 
 if test "x$gnunet" == "x0"
 then
-  AC_MSG_ERROR([gnunet-gtk requires GNUnet])
+  AC_MSG_ERROR([gnunet-fuse requires GNUnet])
 fi
 
 AC_SUBST(GNUNET_CFLAGS)
@@ -187,5 +182,5 @@ AC_OUTPUT([ po/Makefile.in
 Makefile
 src/Makefile
 src/include/Makefile
-src/ext/Makefile
+src/fuse/Makefile
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index a53c604..0306f77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = include ext .
+SUBDIRS = include fuse .
 
diff --git a/src/ext/Makefile.am b/src/fuse/Makefile.am
index c22779c..c22779c 100644
--- a/src/ext/Makefile.am
+++ b/src/fuse/Makefile.am
diff --git a/src/ext/ext_api.c b/src/fuse/ext_api.c
index 961995b..961995b 100644
--- a/src/ext/ext_api.c
+++ b/src/fuse/ext_api.c
diff --git a/src/ext/getattr.c b/src/fuse/getattr.c
index 1b4b6f2..1b4b6f2 100644
--- a/src/ext/getattr.c
+++ b/src/fuse/getattr.c
diff --git a/src/ext/gnunet-fuse.c b/src/fuse/gnunet-fuse.c
index cfcfa60..cfcfa60 100644
--- a/src/ext/gnunet-fuse.c
+++ b/src/fuse/gnunet-fuse.c
diff --git a/src/ext/gnunet-fuse.h b/src/fuse/gnunet-fuse.h
index f30420c..f30420c 100644
--- a/src/ext/gnunet-fuse.h
+++ b/src/fuse/gnunet-fuse.h
diff --git a/src/ext/gnunet-service-fuse.c b/src/fuse/gnunet-service-fuse.c
index 5b523ac..5b523ac 100644
--- a/src/ext/gnunet-service-fuse.c
+++ b/src/fuse/gnunet-service-fuse.c
diff --git a/src/ext/mkdir.c b/src/fuse/mkdir.c
index 68372cb..68372cb 100644
--- a/src/ext/mkdir.c
+++ b/src/fuse/mkdir.c
diff --git a/src/ext/mknod.c b/src/fuse/mknod.c
index f8fb1a5..f8fb1a5 100644
--- a/src/ext/mknod.c
+++ b/src/fuse/mknod.c
diff --git a/src/ext/open.c b/src/fuse/open.c
index 6a067e2..6a067e2 100644
--- a/src/ext/open.c
+++ b/src/fuse/open.c
diff --git a/src/ext/read.c b/src/fuse/read.c
index 0abe005..0abe005 100644
--- a/src/ext/read.c
+++ b/src/fuse/read.c
diff --git a/src/ext/readdir.c b/src/fuse/readdir.c
index 17145ae..17145ae 100644
--- a/src/ext/readdir.c
+++ b/src/fuse/readdir.c
diff --git a/src/ext/release.c b/src/fuse/release.c
index af458ab..af458ab 100644
--- a/src/ext/release.c
+++ b/src/fuse/release.c
diff --git a/src/ext/rename.c b/src/fuse/rename.c
index 10b0419..10b0419 100644
--- a/src/ext/rename.c
+++ b/src/fuse/rename.c
diff --git a/src/ext/rmdir.c b/src/fuse/rmdir.c
index afd9d0f..afd9d0f 100644
--- a/src/ext/rmdir.c
+++ b/src/fuse/rmdir.c
diff --git a/src/ext/test_fuse_api.c b/src/fuse/test_fuse_api.c
index 2c76988..2c76988 100644
--- a/src/ext/test_fuse_api.c
+++ b/src/fuse/test_fuse_api.c
diff --git a/src/ext/truncate.c b/src/fuse/truncate.c
index c605c6c..c605c6c 100644
--- a/src/ext/truncate.c
+++ b/src/fuse/truncate.c
diff --git a/src/ext/unlink.c b/src/fuse/unlink.c
index eff4098..eff4098 100644
--- a/src/ext/unlink.c
+++ b/src/fuse/unlink.c
diff --git a/src/ext/utimens.c b/src/fuse/utimens.c
index 16500ab..16500ab 100644
--- a/src/ext/utimens.c
+++ b/src/fuse/utimens.c
diff --git a/src/ext/write.c b/src/fuse/write.c
index 617d21f..617d21f 100644
--- a/src/ext/write.c
+++ b/src/fuse/write.c