From 33ffbb2af7516fd3cd4825265048ab0a5110c76d Mon Sep 17 00:00:00 2001
From: yura <yura>
Date: Sun, 3 Dec 2006 14:19:29 +0000
Subject: [PATCH] rename --enable-fuse-module to more clear --enable-ntfsmount
 and cleanup autotools scripts a bit

---
 ChangeLog             |  3 +++
 configure.ac          | 16 ++++++++--------
 ntfsprogs/Makefile.am | 14 +++++++-------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9678bbaf..e9446cbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 
diff --git a/configure.ac b/configure.ac
index c2e83e4e..ddded1e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
index 680bf860..000f2501 100644
--- a/ntfsprogs/Makefile.am
+++ b/ntfsprogs/Makefile.am
@@ -29,7 +29,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 linux_ntfsincludedir	= -I$(top_srcdir)/include/ntfs
 
-if ENABLE_FUSE_MODULE
+if ENABLE_FUSE
 bin_PROGRAMS		+= ntfsmount
 endif
 
@@ -84,11 +84,11 @@ ntfscp_SOURCES		= ntfscp.c utils.c utils.h
 ntfscp_LDADD		= $(AM_LIBS)
 ntfscp_LDFLAGS		= $(AM_LFLAGS)
 
-if ENABLE_FUSE_MODULE
+if ENABLE_FUSE
 ntfsmount_SOURCES	= ntfsmount.c utils.c utils.h
-ntfsmount_LDADD		= $(AM_LIBS) $(FUSE_MODULE_LIBS)
+ntfsmount_LDADD		= $(AM_LIBS) $(FUSE_LIBS)
 ntfsmount_LDFLAGS	= $(AM_LFLAGS)
-ntfsmount_CFLAGS	= $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=26
+ntfsmount_CFLAGS	= $(FUSE_CFLAGS) -DFUSE_USE_VERSION=26
 endif
 
 ntfscmp_SOURCES		= ntfscmp.c utils.c utils.h
@@ -140,21 +140,21 @@ extras:	libs $(EXTRA_PROGRAMS)
 install-exec-hook:
 	$(INSTALL) -d $(DESTDIR)/sbin
 	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
-if ENABLE_FUSE_MODULE
+if ENABLE_FUSE
 	$(LN_S) -f $(bindir)/ntfsmount $(DESTDIR)/sbin/mount.ntfs-fuse
 endif
 
 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)$(man8dir)
 	$(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
-if ENABLE_FUSE_MODULE
+if ENABLE_FUSE
 	$(LN_S) -f ntfsmount.8 $(DESTDIR)$(man8dir)/mount.ntfs-fuse.8
 endif
 
 uninstall-local:
 	$(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
 	$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
-if ENABLE_FUSE_MODULE
+if ENABLE_FUSE
 	$(RM) -f $(DESTDIR)/sbin/mount.ntfs-fuse
 	$(RM) -f $(DESTDIR)$(man8dir)/mount.ntfs-fuse.8
 endif