From: Neil Brown <neilb@suse.de>
Date: Fri, 16 Mar 2007 04:56:14 +0000 (+1100)
Subject: Remove tools/getiversion
X-Git-Tag: nfs-utils-1-1-0-rc1~66
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f4a94f9c70e279aa72a2d6aa6874c8406f68987c;p=nfs-utils.git
Remove tools/getiversion
We don't need it (any more).
Also add AM_PROG_CC_C_O as we seem to need it..
---
diff --git a/configure.in b/configure.in
index 1cac767..4f64523 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,6 @@ dnl
AC_INIT([linux nfs-utils],[1.0.11],[nfs@lists.sf.net],[nfs-utils])
AC_CANONICAL_BUILD([])
AC_CANONICAL_HOST([])
-AC_CONFIG_SRCDIR(tools/getiversion/getiversion.c)
AC_CONFIG_MACRO_DIR(aclocal)
AM_INIT_AUTOMAKE
AC_PREREQ(2.59)
@@ -141,6 +140,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
+AM_PROG_CC_C_O
if test "x$cross_compiling" = "xno"; then
CC_FOR_BUILD=${CC_FOR_BUILD-${CC-gcc}}
@@ -334,7 +334,6 @@ AC_CONFIG_FILES([
support/misc/Makefile
support/nfs/Makefile
tools/Makefile
- tools/getiversion/Makefile
tools/locktest/Makefile
tools/nlmtest/Makefile
tools/rpcdebug/Makefile
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 515da13..09f0c44 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = getiversion locktest rpcdebug rpcgen nlmtest
+SUBDIRS = locktest rpcdebug rpcgen nlmtest
MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/getiversion/Makefile.am b/tools/getiversion/Makefile.am
deleted file mode 100644
index 7d7172e..0000000
--- a/tools/getiversion/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-CC=$(CC_FOR_BUILD)
-LIBTOOL = @LIBTOOL@ --tag=CC
-
-noinst_PROGRAMS = getiversion
-getiversion_SOURCES = getiversion.c
-getiversion_CFLAGS=$(CFLAGS_FOR_BUILD)
-getiversion_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
-getiversion_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/getiversion/getiversion.c b/tools/getiversion/getiversion.c
deleted file mode 100644
index fdaf102..0000000
--- a/tools/getiversion/getiversion.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * getiversion
- *
- * Get version number for an inode on an ext2 file system.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#include <stdio.h>
-#include <sys/fs/ext2fs.h>
-
-int
-main(int argc, char **argv)
-{
- int i, fd;
- u_int32_t vers;
-
- if (argc <= 1) {
- fprintf(stderr, "usage: getiversion file ...\n");
- return 1;
- }
-
- for (i = 1; i < argc; i++) {
- if ((fd = open(argv[i], O_RDONLY)) < 0
- || ioctl(fd, EXT2_IOC_GETVERSION, &vers) < 0) {
- perror(argv[i]);
- continue;
- } else {
- printf("%-20s %d\n", argv[i], vers);
- }
- close(fd);
- }
- return 0;
-}