From 85d56558a6462bee839656f9ecc448ef5bac5a36 Mon Sep 17 00:00:00 2001 From: jankratochvil <> Date: Mon, 15 Sep 2003 19:43:12 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create tag 'bp_captive'. Sprout from master 2003-09-15 19:43:11 UTC short 'http://linux-ntfs.sourceforge.net/snapshots/ntfsprogs-200309071734.tar.bz2' Cherrypick from master 2003-08-30 09:28:32 UTC short 'http://linux-ntfs.sourceforge.net/snapshots/ntfsprogs-200307311516.tar.bz2': configure ntfsprogs/Makefile.in --- configure | 6 +++--- ntfsprogs/Makefile.in | 24 +++++++++++------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 997ac6c..2659b20 100755 --- a/configure +++ b/configure @@ -8731,10 +8731,11 @@ fi + for ac_header in fcntl.h libintl.h limits.h locale.h mntent.h stddef.h \ stdint.h stdlib.h stdio.h stdarg.h string.h strings.h errno.h time.h \ sys/ioctl.h sys/mount.h unistd.h utime.h wchar.h getopt.h sys/stat.h \ - sys/types.h asm/byteorder.h linux/major.h linux/fd.h + sys/types.h linux/types.h asm/byteorder.h linux/major.h linux/fd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -11026,7 +11027,7 @@ done # Makefiles to be created by configure. - ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile libntfs/Makefile ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs/ntfscluster.8 ntfsprogs.spec" + ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile libntfs/Makefile ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -11609,7 +11610,6 @@ do "ntfsprogs/ntfsprogs.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsprogs.8" ;; "ntfsprogs/ntfsresize.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsresize.8" ;; "ntfsprogs/ntfsundelete.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfsundelete.8" ;; - "ntfsprogs/ntfscluster.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfscluster.8" ;; "ntfsprogs.spec" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs.spec" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; diff --git a/ntfsprogs/Makefile.in b/ntfsprogs/Makefile.in index b67879f..b9f6355 100644 --- a/ntfsprogs/Makefile.in +++ b/ntfsprogs/Makefile.in @@ -111,12 +111,12 @@ install_sh = @install_sh@ # Workaround to make REALLYSTATIC work with automake 1.5. LINK = $(STATIC_LINK) $(LIBTOOL_LINK) -bin_PROGRAMS = ntfsfix ntfsinfo ntfscluster +bin_PROGRAMS = ntfsfix ntfsinfo sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize -EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate +EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate ntfscluster man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ - ntfsundelete.8 ntfsresize.8 ntfscluster.8 ntfsprogs.8 + ntfsundelete.8 ntfsresize.8 ntfsprogs.8 EXTRA_MANS = @@ -151,12 +151,12 @@ ntfsresize_SOURCES = ntfsresize.c utils.c utils.h ntfsresize_LDADD = $(AM_LIBS) ntfsresize_LDFLAGS = $(AM_LFLAGS) + +# We don't distribute these ntfscluster_SOURCES = ntfscluster.c ntfscluster.h utils.c utils.h ntfscluster_LDADD = $(AM_LIBS) ntfscluster_LDFLAGS = $(AM_LFLAGS) - -# We don't distribute these ntfstruncate_SOURCES = attrdef.c ntfstruncate.c utils.c utils.h ntfstruncate_LDADD = $(AM_LIBS) ntfstruncate_LDFLAGS = $(AM_LFLAGS) @@ -176,10 +176,10 @@ subdir = ntfsprogs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = mkntfs.8 ntfsfix.8 ntfsinfo.8 ntfslabel.8 \ - ntfsprogs.8 ntfsresize.8 ntfsundelete.8 ntfscluster.8 + ntfsprogs.8 ntfsresize.8 ntfsundelete.8 EXTRA_PROGRAMS = ntfsdump_logfile$(EXEEXT) dumplog$(EXEEXT) \ - ntfswipe$(EXEEXT) ntfstruncate$(EXEEXT) -bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) ntfscluster$(EXEEXT) + ntfswipe$(EXEEXT) ntfstruncate$(EXEEXT) ntfscluster$(EXEEXT) +bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) sbin_PROGRAMS = mkntfs$(EXEEXT) ntfslabel$(EXEEXT) ntfsundelete$(EXEEXT) \ ntfsresize$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) @@ -281,9 +281,9 @@ DIST_SOURCES = $(dumplog_SOURCES) $(mkntfs_SOURCES) \ NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in mkntfs.8.in ntfscluster.8.in \ - ntfsfix.8.in ntfsinfo.8.in ntfslabel.8.in ntfsprogs.8.in \ - ntfsresize.8.in ntfsundelete.8.in +DIST_COMMON = Makefile.am Makefile.in mkntfs.8.in ntfsfix.8.in \ + ntfsinfo.8.in ntfslabel.8.in ntfsprogs.8.in ntfsresize.8.in \ + ntfsundelete.8.in SOURCES = $(dumplog_SOURCES) $(mkntfs_SOURCES) $(ntfscluster_SOURCES) $(ntfsdump_logfile_SOURCES) $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(ntfslabel_SOURCES) $(ntfsresize_SOURCES) $(ntfstruncate_SOURCES) $(ntfsundelete_SOURCES) $(ntfswipe_SOURCES) all: all-am @@ -309,8 +309,6 @@ ntfsresize.8: $(top_builddir)/config.status ntfsresize.8.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ntfsundelete.8: $(top_builddir)/config.status ntfsundelete.8.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -ntfscluster.8: $(top_builddir)/config.status ntfscluster.8.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -- 1.8.3.1