usbhid-dump: some autoconf cleanup

This removes some unused autoconf stuff (like the libtool checking) and
cleans up the need for some subdirectories for build tools.

Also unified the configure.ac file a bit to match the main usbutils
file, with the goal of eventually only having one run of autoconf
needed, hopefully soon.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4 files changed, 4 insertions, 20 deletions

diff --git a/usbhid-dump/Makefile.am b/usbhid-dump/Makefile.am
index b8ae148..21a0c0b 100644
--- a/usbhid-dump/Makefile.am
+++ b/usbhid-dump/Makefile.am
@@ -8,8 +8,6 @@ SUBDIRS = src
 
 dist_noinst_SCRIPTS = bootstrap
 
-ACLOCAL_AMFLAGS = -I m4
-
 dist-hook:
 	@set -e; \
 	if test -d "$(srcdir)/.git"; then \
diff --git a/usbhid-dump/auxdir/.gitignore b/usbhid-dump/auxdir/.gitignore
deleted file mode 100644
index d8263c6..0000000
--- a/usbhid-dump/auxdir/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/depcomp
-/missing
-/config.guess
-/ltmain.sh
-/config.sub
-/install-sh
diff --git a/usbhid-dump/configure.ac b/usbhid-dump/configure.ac
index acde3ea..153cd20 100644
--- a/usbhid-dump/configure.ac
+++ b/usbhid-dump/configure.ac
@@ -6,12 +6,13 @@
 
 AC_PREREQ(2.61)
 AC_INIT([usbhid-dump], [1.4])
-AC_CONFIG_AUX_DIR([auxdir])
 AM_INIT_AUTOMAKE([1.9 -Wall foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_MAINTAINER_MODE
-AC_CONFIG_HEADER([config.h])
-AC_CONFIG_MACRO_DIR([m4])
+
+AC_USE_SYSTEM_EXTENSIONS
+
+AC_CONFIG_HEADERS([config.h])
 
 # To have empty CFLAGS instead of undefined and '-g -O2' by default
 CFLAGS=$CFLAGS
@@ -24,10 +25,6 @@ CPPFLAGS="-I${ABS_BUILDDIR} -DNDEBUG $CPPFLAGS"
 #
 # Checks for programs.
 #
-AC_PROG_CC
-AC_PROG_INSTALL
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-AC_PROG_LIBTOOL
 
 #
 # Checks for libraries.
diff --git a/usbhid-dump/m4/.gitignore b/usbhid-dump/m4/.gitignore
deleted file mode 100644
index 15c07d6..0000000
--- a/usbhid-dump/m4/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/ltsugar.m4
-/libtool.m4
-/ltversion.m4
-/lt~obsolete.m4
-/ltoptions.m4