Permalink
Browse files

Call it 0.72 ... regen configure/install scripts.

Stop including "usbmodules"; no more kernel 2.4 support.
  • Loading branch information...
1 parent 6fc9541 commit 32ed110c0d5afbc3f57f6f425ba57d88607a7005 David Brownell committed Mar 1, 2006
Showing with 72 additions and 91 deletions.
  1. +9 −0 ChangeLog
  2. +9 −9 Makefile.am
  3. +17 −21 Makefile.in
  4. +20 −44 configure
  5. +10 −10 configure.in
  6. +1 −1 lsusb.8
  7. +6 −6 usbutils.spec
View
@@ -1,3 +1,12 @@
+2006-02-28 David Brownell <dbrownell@users.sourceforge.net>
+ * configure.in, lsusb.8: version 0.72
+ * configure, other autoconf stuff: regenerate
+
+2006-02-18 David Brownell <dbrownell@users.sourceforge.net>
+ * usbutils.spec: minor corrections; we still don't use this though.
+ * usbmodules.c, usbmodules.8: obsolete, don't build or distribute
+ it any more. Any 2.4 based systems should use old usbutils.
+
2006-02-13 Bjorn Augustsson <august@chalmers.se>
* lsusb.c: (HID) prettyprinting of Unit and Unit Exponent Global items
View
@@ -15,16 +15,16 @@ data_DATA = usb.ids
man_MANS = lsusb.8
-# usbmodules is needed only with 2.4 based hotplugging, and is DEPRECATED
+# usbmodules is needed only with 2.4 based hotplugging, and is OBSOLETE
-EXTRA_PROGRAMS = usbmodules
+# EXTRA_PROGRAMS = usbmodules
-usbmodules_SOURCES = usbmodules.c usbmodules.h \
- usbmisc.c usbmisc.h
+#usbmodules_SOURCES = usbmodules.c usbmodules.h \
+# usbmisc.c usbmisc.h
-if USBMODULES
- sbin_PROGRAMS += usbmodules
- man_MANS += usbmodules.8
-endif
+#if USBMODULES
+# sbin_PROGRAMS += usbmodules
+# man_MANS += usbmodules.8
+#endif
-EXTRA_DIST = $(man_MANS) $(data_DATA) usbmodules.8 update-usbids.sh
+EXTRA_DIST = $(man_MANS) $(data_DATA) update-usbids.sh
View
@@ -17,7 +17,7 @@
# Process this file with 'automake' to create 'Makefile.in'
-SOURCES = $(lsusb_SOURCES) $(usbmodules_SOURCES)
+SOURCES = $(lsusb_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -39,10 +39,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-sbin_PROGRAMS = lsusb$(EXEEXT) $(am__EXEEXT_1)
-EXTRA_PROGRAMS = usbmodules$(EXEEXT)
-@USBMODULES_TRUE@am__append_1 = usbmodules
-@USBMODULES_TRUE@am__append_2 = usbmodules.8
+sbin_PROGRAMS = lsusb$(EXEEXT)
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -57,7 +54,6 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
-@USBMODULES_TRUE@am__EXEEXT_1 = usbmodules$(EXEEXT)
am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" \
"$(DESTDIR)$(datadir)"
sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -66,18 +62,15 @@ am_lsusb_OBJECTS = lsusb.$(OBJEXT) names.$(OBJEXT) devtree.$(OBJEXT) \
usbmisc.$(OBJEXT)
lsusb_OBJECTS = $(am_lsusb_OBJECTS)
lsusb_LDADD = $(LDADD)
-am_usbmodules_OBJECTS = usbmodules.$(OBJEXT) usbmisc.$(OBJEXT)
-usbmodules_OBJECTS = $(am_usbmodules_OBJECTS)
-usbmodules_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(lsusb_SOURCES) $(usbmodules_SOURCES)
-DIST_SOURCES = $(lsusb_SOURCES) $(usbmodules_SOURCES)
+SOURCES = $(lsusb_SOURCES)
+DIST_SOURCES = $(lsusb_SOURCES)
man8dir = $(mandir)/man8
NROFF = nroff
MANS = $(man_MANS)
@@ -148,8 +141,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USBMODULES_FALSE = @USBMODULES_FALSE@
-USBMODULES_TRUE = @USBMODULES_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_STRIP = @ac_ct_STRIP@
@@ -188,11 +179,20 @@ lsusb_SOURCES = lsusb.c \
usbmisc.c usbmisc.h
data_DATA = usb.ids
-man_MANS = lsusb.8 $(am__append_2)
-usbmodules_SOURCES = usbmodules.c usbmodules.h \
- usbmisc.c usbmisc.h
+man_MANS = lsusb.8
+
+# usbmodules is needed only with 2.4 based hotplugging, and is OBSOLETE
+
+# EXTRA_PROGRAMS = usbmodules
+
+#usbmodules_SOURCES = usbmodules.c usbmodules.h \
+# usbmisc.c usbmisc.h
-EXTRA_DIST = $(man_MANS) $(data_DATA) usbmodules.8 update-usbids.sh
+#if USBMODULES
+# sbin_PROGRAMS += usbmodules
+# man_MANS += usbmodules.8
+#endif
+EXTRA_DIST = $(man_MANS) $(data_DATA) update-usbids.sh
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -274,9 +274,6 @@ clean-sbinPROGRAMS:
lsusb$(EXEEXT): $(lsusb_OBJECTS) $(lsusb_DEPENDENCIES)
@rm -f lsusb$(EXEEXT)
$(LINK) $(lsusb_LDFLAGS) $(lsusb_OBJECTS) $(lsusb_LDADD) $(LIBS)
-usbmodules$(EXEEXT): $(usbmodules_OBJECTS) $(usbmodules_DEPENDENCIES)
- @rm -f usbmodules$(EXEEXT)
- $(LINK) $(usbmodules_LDFLAGS) $(usbmodules_OBJECTS) $(usbmodules_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -288,7 +285,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsusb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/names.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usbmisc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usbmodules.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
View
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for usbutils 0.71.
+# Generated by GNU Autoconf 2.59 for usbutils 0.72.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='usbutils'
PACKAGE_TARNAME='usbutils'
-PACKAGE_VERSION='0.71'
-PACKAGE_STRING='usbutils 0.71'
+PACKAGE_VERSION='0.72'
+PACKAGE_STRING='usbutils 0.72'
PACKAGE_BUGREPORT=''
ac_unique_file="lsusb.c"
@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ALLOCA CPP EGREP LIBOBJS USBMODULES_TRUE USBMODULES_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ALLOCA CPP EGREP LIBOBJS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -778,7 +778,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures usbutils 0.71 to adapt to many kinds of systems.
+\`configure' configures usbutils 0.72 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -840,7 +840,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of usbutils 0.71:";;
+ short | recursive ) echo "Configuration of usbutils 0.72:";;
esac
cat <<\_ACEOF
@@ -849,7 +849,6 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
- --enable-usbmodules build usbmodules (for Linux 2.4)
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
@@ -960,7 +959,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-usbutils configure 0.71
+usbutils configure 0.72
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -974,7 +973,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by usbutils $as_me 0.71, which was
+It was created by usbutils $as_me 0.72, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1622,7 +1621,7 @@ fi
# Define the identity of the package.
PACKAGE='usbutils'
- VERSION='0.71'
+ VERSION='0.72'
cat >>confdefs.h <<_ACEOF
@@ -5150,29 +5149,15 @@ echo "$as_me: error: get libusb 0.1.8 or newer" >&2;}
fi
-# Check whether --enable-usbmodules or --disable-usbmodules was given.
-if test "${enable_usbmodules+set}" = set; then
- enableval="$enable_usbmodules"
- case "${enableval}" in
- yes) usbmod=true ;;
- no) usbmod=false ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-usbmodules" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-usbmodules" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
-else
- usbmod=false
-fi;
-
-
-if test x$usbmod = xtrue; then
- USBMODULES_TRUE=
- USBMODULES_FALSE='#'
-else
- USBMODULES_TRUE='#'
- USBMODULES_FALSE=
-fi
-
+#AC_ARG_ENABLE(usbmodules,
+# [ --enable-usbmodules build usbmodules (for Linux 2.4)],
+# [ case "${enableval}" in
+# yes) usbmod=true ;;
+# no) usbmod=false ;;
+# *) AC_MSG_ERROR(bad value ${enableval} for --enable-usbmodules) ;;
+# esac ],
+# [usbmod=false])
+#AM_CONDITIONAL(USBMODULES, test x$usbmod = xtrue)
echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
@@ -5305,13 +5290,6 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${USBMODULES_TRUE}" && test -z "${USBMODULES_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USBMODULES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USBMODULES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -5590,7 +5568,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by usbutils $as_me 0.71, which was
+This file was extended by usbutils $as_me 0.72, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5653,7 +5631,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-usbutils config.status 0.71
+usbutils config.status 0.72
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -5894,8 +5872,6 @@ s,@ALLOCA@,$ALLOCA,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
-s,@USBMODULES_TRUE@,$USBMODULES_TRUE,;t t
-s,@USBMODULES_FALSE@,$USBMODULES_FALSE,;t t
s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
s,@MAINT@,$MAINT,;t t
View
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(usbutils, 0.71)
+AC_INIT(usbutils, 0.72)
AC_CONFIG_SRCDIR([lsusb.c])
AC_CONFIG_HEADER([config.h])
@@ -34,15 +34,15 @@ AC_CHECK_FUNCS([getcwd memset getopt_long strchr strerror strstr strtoul uname])
AC_CHECK_LIB(usb, usb_get_string_simple, ,
[AC_MSG_ERROR(get libusb 0.1.8 or newer)])
-AC_ARG_ENABLE(usbmodules,
- [ --enable-usbmodules build usbmodules (for Linux 2.4)],
- [ case "${enableval}" in
- yes) usbmod=true ;;
- no) usbmod=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-usbmodules) ;;
- esac ],
- [usbmod=false])
-AM_CONDITIONAL(USBMODULES, test x$usbmod = xtrue)
+#AC_ARG_ENABLE(usbmodules,
+# [ --enable-usbmodules build usbmodules (for Linux 2.4)],
+# [ case "${enableval}" in
+# yes) usbmod=true ;;
+# no) usbmod=false ;;
+# *) AC_MSG_ERROR(bad value ${enableval} for --enable-usbmodules) ;;
+# esac ],
+# [usbmod=false])
+#AM_CONDITIONAL(USBMODULES, test x$usbmod = xtrue)
AM_MAINTAINER_MODE
AC_CONFIG_FILES([Makefile])
View
@@ -1,4 +1,4 @@
-.TH lsusb 8 "25 January 2005" "usbutils-0.71" "Linux USB Utilities"
+.TH lsusb 8 "25 January 2005" "usbutils-0.72" "Linux USB Utilities"
.IX lsusb
.SH NAME
lsusb \- list USB devices
View
@@ -1,10 +1,10 @@
%define name usbutils
-%define version 0.12
+%define version 0.72
%define release 1
Name: %{name}
Version: %{version}
Release: %{release}
-Source: http://usb.cs.tum.edu/download/%{name}-%{version}.tar.gz
+Source: http://prdownloads.sourceforge.net/linux-usb/${name}-${version}.tar.gz
Copyright: GNU GPL
Buildroot: /tmp/%{name}-%{version}-root
ExclusiveOS: Linux
@@ -13,11 +13,11 @@ Group: Applications/System
BuildPrereq: libusb-devel
%description
-This package contains an utility for inspecting
-devices connected to an USB bus.
+This package contains "lsusb", a utility for inspecting
+devices connected to systems serving as USB hosts.
-It requires kernel version 2.3.99-pre7 or newer (supporting
-the /proc/bus/usb interface).
+It requires a Linux kernel with support for /proc/bus/usb
+interface.
%prep
%setup -q

0 comments on commit 32ed110

Please sign in to comment.