fuse_ext2-osx.patch

Index: tools/macosx/prefpane/fuse-ext2.xcodeproj/project.pbxproj
===================================================================
--- a/tools/macosx/prefpane/fuse-ext2.xcodeproj/project.pbxproj	(revision 220)
+++ b/tools/macosx/prefpane/fuse-ext2.xcodeproj/project.pbxproj	(working copy)
@@ -164,9 +164,15 @@
 /* Begin PBXProject section */
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = 1DBD214C08BA80EA00186707 /* Build configuration list for PBXProject "fuse-ext2" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 089C166AFE841209C02AAC07 /* fuse-ext2 */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -267,12 +273,12 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_VERSION = 4.0;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
-				SDKROOT = macosx10.4;
+				SDKROOT = "";
 			};
 			name = Debug;
 		};
@@ -281,11 +287,11 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_VERSION = 4.0;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = macosx10.4;
+				SDKROOT = "";
 			};
 			name = Release;
 		};
Index: fuse-ext2/Makefile.am
===================================================================
--- a/fuse-ext2/Makefile.am	(revision 220)
+++ b/fuse-ext2/Makefile.am	(working copy)
@@ -20,13 +20,14 @@
 	-Wall \
 	-DHAVE_CONFIG_H \
 	-I$(top_srcdir)/e2fsprogs-1.41.9 \
-	-I/usr/local/include
+	-I/usr/local/include \
+	-I/usr/local/include/osxfuse
 
 fuse_ext2_probe_LDADD =	\
 	../e2fsprogs-1.41.9/ext2fs/libext2fs.a \
 	../e2fsprogs-1.41.9/et/libcom_err.a \
 	-L/usr/local/lib \
-	-lfuse
+	-losxfuse
 endif
 if LINUX
 fuse_ext2_probe_CFLAGS = \
@@ -168,13 +169,14 @@
 	-D__FreeBSD__=10
 
 fuse_ext2_CFLAGS +=	\
-	-D__FreeBSD__=10
+	-D__FreeBSD__=10 \
+	-I/usr/local/include/osxfuse
 
 fuse_ext2_LDADD = \
 	../e2fsprogs-1.41.9/ext2fs/libext2fs.a	\
 	../e2fsprogs-1.41.9/et/libcom_err.a	\
 	-L/usr/local/lib \
-	-lfuse
+	-losxfuse
 endif
 
 if LINUX
Index: e2fsprogs-1.41.9/misc/Makefile.am
===================================================================
--- a/e2fsprogs-1.41.9/misc/Makefile.am	(revision 220)
+++ b/e2fsprogs-1.41.9/misc/Makefile.am	(working copy)
@@ -17,8 +17,15 @@
 	-I$(top_srcdir)/e2fsprogs-1.41.9
 
 fuse_ext2_mke2fs_LDFLAGS = \
-	../ext2fs/libext2fs.a	\
-	../et/libcom_err.a \
-	../e2p/libe2p.a \
-	../blkid/libblkid.a \
-	../uuid/libuuid.a
+									../e2p/libe2p.a \
+									../uuid/libuuid.a \
+									../et/libcom_err.a \
+									../blkid/libblkid.a \
+									../ext2fs/libext2fs.a
+
+#\
+#	../ext2fs/libext2fs.a	\
+#	../et/libcom_err.a \
+#	../e2p/libe2p.a \
+#	../blkid/libblkid.a \
+#	../uuid/libuuid.a
Index: configure.ac
===================================================================
--- a/configure.ac	(revision 220)
+++ b/configure.ac	(working copy)
@@ -5,6 +5,7 @@
 AC_CONFIG_HEADER([config.h])
 
 # Checks for programs.
+AM_PROG_AR
 AC_PROG_CXX
 AC_PROG_AWK
 AC_PROG_CC
@@ -137,7 +138,7 @@
 ])
 
 # Checks for libraries
-AC_CHECK_LIB([fuse], [fuse_main], [FUSE_LIBS="-lfuse"], [AC_MSG_ERROR([Can't find libfuse, please install it])])
+AC_CHECK_LIB([osxfuse], [fuse_main], [FUSE_LIBS="-losxfuse"], [AC_MSG_ERROR([Can't find libfuse, please install it])])
 
 AC_MSG_CHECKING([if FUSE on this system is too new for us])
 AC_EGREP_CPP([fuse_version_yes], [