[GNUnet-SVN] r21741 - in gnunet-fuse: . src

[gnunet]

Author: grothoff
Date: 2012-06-03 17:07:49 +0200 (Sun, 03 Jun 2012)
New Revision: 21741

Added:
   gnunet-fuse/src/fuse/
Removed:
   gnunet-fuse/src/ext/
Modified:
   gnunet-fuse/configure.ac
   gnunet-fuse/src/Makefile.am
Log:
-fixing build system

Modified: gnunet-fuse/configure.ac
===================================================================
--- gnunet-fuse/configure.ac    2012-06-03 13:21:02 UTC (rev 21740)
+++ gnunet-fuse/configure.ac    2012-06-03 15:07:49 UTC (rev 21741)
@@ -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],address@hidden)
-AM_INIT_AUTOMAKE([gnunet-ext], [0.0.0])
-AM_CONFIG_HEADER(gnunet_ext_config.h)
+AC_INIT([gnunet-fuse],[0.9.3],address@hidden)
+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_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 @@
 
 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 @@
 Makefile
 src/Makefile
 src/include/Makefile
-src/ext/Makefile
+src/fuse/Makefile
 ])

Modified: gnunet-fuse/src/Makefile.am
===================================================================
--- gnunet-fuse/src/Makefile.am 2012-06-03 13:21:02 UTC (rev 21740)
+++ gnunet-fuse/src/Makefile.am 2012-06-03 15:07:49 UTC (rev 21741)
@@ -1,2 +1,2 @@
-SUBDIRS = include ext .
+SUBDIRS = include fuse .