[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog, 1.424, 1.425 configure.ac, 1.114, 1.115

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv15193

Modified Files:
	ChangeLog configure.ac 
Log Message:
rename --enable-fuse-module to more clear --enable-ntfsmount and cleanup autotools scripts a bit


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -p -r1.424 -r1.425
--- ChangeLog	28 Nov 2006 11:00:52 -0000	1.424
+++ ChangeLog	3 Dec 2006 14:19:29 -0000	1.425
@@ -90,6 +90,9 @@ xx/xx/2006 - x.xx.x - .
 	- Fix ntfsresize to unmount the volume when finished/exiting so it does
 	  not leave the volume in an inconsistent state.  Somewhat crude
 	  solution using atexit() but it works...  (Anton)
+	- Raise FUSE dependence to 2.6.1 (the most stable and featured ATM),
+	  rename --enable-fuse-module to more clear --enable-ntfsmount and
+	  cleanup autotools scripts a bit.
 
 21/06/2006 - 1.13.1 - Various fixes.
 

Index: configure.ac
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- configure.ac	1 Dec 2006 16:04:56 -0000	1.114
+++ configure.ac	3 Dec 2006 14:19:29 -0000	1.115
@@ -106,10 +106,10 @@ AC_ARG_ENABLE(gnome-vfs,
 	enable_gnome_vfs=auto
 )
 
-AC_ARG_ENABLE(fuse-module,
-	AS_HELP_STRING(--disable-fuse-module,omit FUSE 'libntfs' interface
+AC_ARG_ENABLE(ntfsmount,
+	AS_HELP_STRING(--disable-ntfsmount,omit userspace NTFS driver
 		       (default=detect)), ,
-	enable_fuse_module=auto
+	enable_ntfsmount=auto
 )
 
 AC_ARG_ENABLE(crypto,
@@ -194,17 +194,17 @@ fi
 AM_CONDITIONAL(ENABLE_GNOME_VFS, $compile_gnome_vfs)
 
 # Autodetect whether to build FUSE module or not.
-compile_fuse_module=false
-if test "$enable_fuse_module" != "no"; then
-	PKG_CHECK_MODULES(FUSE_MODULE, fuse >= 2.6.1, [ compile_fuse_module=true ],
-		if test "$enable_fuse_module" = "yes"; then
+compile_ntfsmount=false
+if test "$enable_ntfsmount" != "no"; then
+	PKG_CHECK_MODULES(FUSE, fuse >= 2.6.1, [ compile_ntfsmount=true ],
+		if test "$enable_ntfsmount" = "yes"; then
 			AC_MSG_ERROR([ntfsmount requires FUSE version >= 2.6.1.])
 		else
 			AC_MSG_WARN([ntfsmount requires FUSE version >= 2.6.1.])
 		fi
 	)
 fi
-AM_CONDITIONAL(ENABLE_FUSE_MODULE, $compile_fuse_module)
+AM_CONDITIONAL(ENABLE_FUSE, $compile_ntfsmount)
 
 # Autodetect whether we can build crypto stuff or not.
 compile_crypto=false