X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils%2Fntfs-3g%2FMakefile;h=9bf4fb05b1f83a325e539223f9f74d6872e45cdd;hb=570d90fc30624f03c9876c15550855751bc8e6d0;hp=76fd7e9f94b827f1668868fd9d50126460fe79c4;hpb=350781cafe7fa0e7f65fc3bab7e7daf07703eaca;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/utils/ntfs-3g/Makefile b/utils/ntfs-3g/Makefile
index 76fd7e9f94..9bf4fb05b1 100644
--- a/utils/ntfs-3g/Makefile
+++ b/utils/ntfs-3g/Makefile
@@ -1,50 +1,92 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ntfs-3g
-PKG_VERSION:=1.616
-PKG_RELEASE:=2
+PKG_VERSION:=2009.4.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.ntfs-3g.org/
-PKG_MD5SUM:=fdb1c55f00263c962a52d0707a6d075e
-
-PKG_BUILD_DEPENDS:=libfuse
+PKG_MD5SUM:=e0b5c170f088a8d82968f0a6b34d31da
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/ntfs-3g
-  TITLE:=NTFS-3G
-  DEPENDS:=+libfuse +fuse-utils
+define Package/ntfs-3g/common
   SECTION:=utils
   CATEGORY:=Utilities
   URL:=http://www.ntfs-3g.org
   SUBMENU:=filesystem
+  TITLE:=Stable Read/Write NTFS Driver (build options)
 endef
 
 define Package/ntfs-3g/description
- This package contains the third generation Read/Write NTFS driver
+  ntfs-3g is an NTFS driver, which can create, remove, rename, 
+  move files, directories, hard links, and streams; it can read 
+  and write files, including streams and sparse files; it can 
+  handle special files like symbolic links, devices, and FIFOs; 
+  moreover it can also read transparently compressed files. 
+endef
+
+define Package/ntfs-3g
+  $(call Package/ntfs-3g/common)
+  DEPENDS+= +LINUX_2_4:kmod-fuse24 +libpthread +LINUX_2_6:kmod-fuse
+  MENU:=1
+endef
+
+define Package/externalFUSE
+  $(call Package/ntfs-3g/common)
+  TITLE:=use external FUSE library (package libfuse)
+  DEFAULT:=n
+  DEPENDS+=ntfs-3g +libfuse
+endef
+
+define Package/externalFUSE/description
+  Ntfs-3g by default uses a lite version of FUSE for the ease 
+  of use and some special features. If you'd rather like to use 
+  the systemwide standard FUSE library activate this option [M|*].
 endef
 
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
-	, \
-	ac_cv_path_LDCONFIG=""
+
+# insert config with external libfuse
+ifdef CONFIG_PACKAGE_externalFUSE    
+    CONFIGURE_ARGS += --with-fuse=external \
+                      CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+                      LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
+    PKG_RELEASE:=$(PKG_RELEASE)-fuseext
+else
+    CONFIGURE_ARGS += --with-fuse=internal
+    PKG_RELEASE:=$(PKG_RELEASE)-fuseint
+endif
+
+CONFIGURE_VARS+= \
+        CFLAGS="$(TARGET_CFLAGS)" \
+        $(TARGET_CONFIGURE_OPTS) CPPFLAGS='' LDFLAGS=''
+
+
+define Build/Configure
+        (cd $(PKG_BUILD_DIR) ;  \
+                $(TARGET_CONFIGURE_OPTS) \
+                CFLAGS="$(TARGET_CFLAGS)" \
+                ./configure \
+                        $(CONFIGURE_ARGS) \
+        )
+endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	all install
 endef
 
 define Build/InstallDev
@@ -54,20 +96,14 @@ define Build/InstallDev
 	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.{a,so*} $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/ntfs-3g \
-		$(STAGING_DIR)/usr/lib/libntfs-3g.{a,so*}
-endef
-
 define Package/ntfs-3g/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ntfs-3g $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ntfs-3g $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.so.* $(1)/usr/lib/
 endef
 
+# order matters!!! else a probably missing fuse lib might not be build beforehand
+$(eval $(call BuildPackage,externalFUSE))
 $(eval $(call BuildPackage,ntfs-3g))
 
-$(eval $(call RequireCommand,pkg-config, \
-	$(PKG_NAME) requires pkg-config. \
-))