[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.35,1.36 Makefile.in,1.74,1.75

[Yura P. <cha...@us...>]

Changes by: cha0smaster

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8062/ntfsprogs

Modified Files:
	Makefile.am Makefile.in 
Log Message:
* Add check to auto scripts for FUSE to be >= 2.3.0.
* Move ntfsmount back to standard programs set.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- Makefile.am	9 Jul 2005 21:32:21 -0000	1.35
+++ Makefile.am	10 Jul 2005 12:38:50 -0000	1.36
@@ -28,7 +28,7 @@ CLEANFILES		= $(EXTRA_PROGRAMS)
 linux_ntfsincludedir	= -I$(top_srcdir)/include/ntfs
 
 if ENABLE_FUSE_MODULE
-EXTRA_PROGRAMS		+= ntfsmount
+bin_PROGRAMS		+= ntfsmount
 endif
 
 # Set the include path.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.in,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- Makefile.in	9 Jul 2005 21:32:21 -0000	1.74
+++ Makefile.in	10 Jul 2005 12:38:50 -0000	1.75
@@ -40,13 +40,13 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) ntfscluster$(EXEEXT) \
-	ntfsls$(EXEEXT) ntfscat$(EXEEXT)
+	ntfsls$(EXEEXT) ntfscat$(EXEEXT) $(am__EXEEXT_1)
 sbin_PROGRAMS = mkntfs$(EXEEXT) ntfslabel$(EXEEXT) \
 	ntfsundelete$(EXEEXT) ntfsresize$(EXEEXT) ntfsclone$(EXEEXT) \
 	ntfscp$(EXEEXT)
 EXTRA_PROGRAMS = ntfsdump_logfile$(EXEEXT) ntfswipe$(EXEEXT) \
 	ntfstruncate$(EXEEXT) ntfsmove$(EXEEXT) ntfsrm$(EXEEXT) \
-	ntfsmftalloc$(EXEEXT) $(am__EXEEXT_1)
+	ntfsmftalloc$(EXEEXT)
 @ENABLE_FUSE_MODULE_TRUE@am__append_1 = ntfsmount
 subdir = ntfsprogs
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -240,6 +240,7 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@