From 62d49cb175bf7a595a0e5f2418b17830b9b2b02b Mon Sep 17 00:00:00 2001
From: aia21 <aia21>
Date: Mon, 19 Mar 2007 14:39:44 +0000
Subject: [PATCH] Minor updates for OSX compatibility, i.e. glibtoolize not
 libtoolize, and automake 1.10 fix, etc.

---
 ChangeLog          |  2 +-
 README             |  2 +-
 autogen.sh         | 11 +++++++++++
 configure.ac       |  1 +
 ntfsprogs.spec.in  |  2 +-
 ntfsprogs/mkntfs.c | 19 ++-----------------
 6 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 036efa79..d52c0ed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-xx/01/2007 - 2.0.0 - ntfsmount sports full r/w and ntfsresize supports Vista.
+xx/03/2007 - 2.0.0 - ntfsmount sports full r/w and ntfsresize supports Vista.
 
 	- ntfsmount now creates files and directories with security descriptor
 	  that grant full access to everyone.  (Yura)
diff --git a/README b/README
index f3cdfb7d..26968cba 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ Linux-NTFS
 The Linux-NTFS project aims to bring full support for the NTFS filesystem to
 the Linux operating system.
 
-Linux-NTFS is copyright (c) 2000-2006 Anton Altaparmakov.
+Linux-NTFS is copyright (c) 2000-2007 Anton Altaparmakov.
 
 All of the contents of the Linux-NTFS project are free software, released under
 the GNU General Public License and you are welcome to redistribute them under
diff --git a/autogen.sh b/autogen.sh
index a51d759f..31c11403 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,6 +24,17 @@ fi
   exit 1
 }
 
+UNAME=`which uname`
+if [ $? -eq 0 -a -n ${UNAME} -a -x ${UNAME} ]; then
+	OS=`${UNAME} -s`
+	if [ $? -eq 0 -a -n ${OS} -a "${OS}" == "Darwin" ]; then
+		echo ""
+		echo "Running on Mac OS X / Darwin.  Setting LIBTOOLIZE=glibtoolize..."
+		echo ""
+		export LIBTOOLIZE="glibtoolize"
+	fi
+fi
+
 echo Running autoreconf --verbose --install
 autoreconf --force --verbose --install
 
diff --git a/configure.ac b/configure.ac
index 1afef49f..00818b36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,7 @@ esac
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PATH_PROG(RM, rm, rm)
 AC_PROG_LN_S
diff --git a/ntfsprogs.spec.in b/ntfsprogs.spec.in
index f5374642..a4cf18a6 100644
--- a/ntfsprogs.spec.in
+++ b/ntfsprogs.spec.in
@@ -41,7 +41,7 @@ allows GNOME VFS clients to seamlessly utilize the NTFS library (libntfs).
 Summary		: NTFS FUSE module (ntfsmount)
 Group		: System Environment/Base
 Requires	: ntfsprogs = %{ver}-%{rel}
-Requires	: fuse >= 2.3.0
+Requires	: fuse >= 2.6.1
 %description fuse
 This package contains the ntfsmount utility which is an NTFS filesystem in
 userspace (FUSE) module allowing users to mount an ntfs filesystem from
diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index a654853b..b6c4fe47 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -1,7 +1,7 @@
 /**
  * mkntfs - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2000-2006 Anton Altaparmakov
+ * Copyright (c) 2000-2007 Anton Altaparmakov
  * Copyright (c) 2001-2005 Richard Russon
  * Copyright (c) 2002-2006 Szabolcs Szakacsits
  * Copyright (c) 2005      Erik Sornes
@@ -29,21 +29,6 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/*
- * WARNING: This program might not work on architectures which do not allow
- * unaligned access. For those, the program would need to start using
- * get/put_unaligned macros (#include <asm/unaligned.h>), but not doing it yet,
- * since NTFS really mostly applies to ia32 only, which does allow unaligned
- * accesses. We might not actually have a problem though, since the structs are
- * defined as being packed so that might be enough for gcc to insert the
- * correct code.
- *
- * If anyone using a non-little endian and/or an aligned access only CPU tries
- * this program please let me know whether it works or not!
- *
- *	Anton Altaparmakov <aia21@cantab.net>
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -263,7 +248,7 @@ static void mkntfs_version(void)
 {
 	ntfs_log_info("\n%s v%s (libntfs %s)\n\n", EXEC_NAME, VERSION, ntfs_libntfs_version());
 	ntfs_log_info("Create an NTFS volume on a user specified (block) device.\n\n");
-	ntfs_log_info("Copyright (c) 2000-2006 Anton Altaparmakov\n");
+	ntfs_log_info("Copyright (c) 2000-2007 Anton Altaparmakov\n");
 	ntfs_log_info("Copyright (c) 2001-2005 Richard Russon\n");
 	ntfs_log_info("Copyright (c) 2002-2006 Szabolcs Szakacsits\n");
 	ntfs_log_info("Copyright (c) 2005      Erik Sornes\n");