Removed old hotplug install which is no longer used at all and

just left udev as the only hotplug mechanism. I've also added
an option to disable the installation of the firmware. This
is useful for debian or ubuntu packages where the firmware
is now provided by a package accompanying the staging kernel.
All usbdux files are included in the kernel firmware packages.
Package maintainers should use the --disable-firmware option.

diff --git a/configure.ac b/configure.ac
index 7a7fddc09107b4ac356e2ccb4ae3338f47f1d8f0..428e07c5fd45117c6c126bb08a1c45fd7237dc80 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -231,7 +231,10 @@ AM_CONDITIONAL(BUILD_PDF_USING_FOP, [test "$PDF_BACKEND" = "fop"])
 pcmciadir="\${sysconfdir}/pcmcia"
 AC_SUBST(pcmciadir)
 
-
+# firmware
+AC_ARG_ENABLE([firmware],
+       [AS_HELP_STRING([--disable-firmware], [Disable installation of firmware files])],
+       [ENABLE_FIRMWARE=$enableval],[ENABLE_FIRMWARE="yes"])
 
 # new udev hotplug
 AC_ARG_WITH([udev-hotplug],
@@ -245,43 +248,19 @@ if test "$ENABLE_UDEVHOTPLUG" != "no"; then
        if test "$ENABLE_UDEVHOTPLUG" != "/lib"; then
                AC_MSG_WARN([Installing the udev scripts in the non-standard location: $ENABLE_UDEVHOTPLUG (should be --enable-udev-hotplug=/lib)])
        fi
-       if test "$sysconfdir" != "/etc"; then
-               AC_MSG_WARN([udev hotplug works only if sysconfdir is set to /etc.])
-       fi
        udevrulesdir="$ENABLE_UDEVHOTPLUG/udev/rules.d/"
-       udevfirmwaredir="$ENABLE_UDEVHOTPLUG/firmware"
        udevscriptsdir="$ENABLE_UDEVHOTPLUG/udev"
        AC_SUBST(udevrulesdir)
-       AC_SUBST(udevfirmwaredir)
        AC_SUBST(udevscriptsdir)
+       if test "$ENABLE_FIRMWARE" == "yes"; then
+       udevfirmwaredir="$ENABLE_UDEVHOTPLUG/firmware"
+       AC_SUBST(udevfirmwaredir)
+       fi
 else
        ENABLE_UDEVHOTPLUG="no"
 fi
 
-
-# old hotplug mechanism
-AC_ARG_ENABLE([etc-hotplug],
-       [AS_HELP_STRING([--enable-etc-hotplug],
-               [enable old hotplug in /etc/hotplug])],
-       [ENABLE_ETCHOTPLUG=$enableval], [ENABLE_ETCHOTPLUG="no"])
-AM_CONDITIONAL(INSTALL_ETCHOTPLUG, [test "$ENABLE_ETCHOTPLUG" != "no"])
-
-if test "$ENABLE_ETCHOTPLUG" != "no"; then
-#see: http://linux-hotplug.sourceforge.net/
-#the hotplug expects the device dependent scripts here:
-       usbhotplugdir="\${sysconfdir}/hotplug/usb"
-       AC_SUBST(usbhotplugdir)
-
-#firmware for the hotplug script
-#see: http://linux-hotplug.sourceforge.net/
-       usbfirmwaredir="\${datadir}/usb"
-       AC_SUBST(usbfirmwaredir)
-       if test "$sysconfdir" != "/etc"; then
-               AC_MSG_WARN([hotplug works only if sysconfdir is set to /etc.])
-       fi
-fi
-
-if test "$ENABLE_ETCHOTPLUG" = "no" && test "$ENABLE_UDEVHOTPLUG" = "no" ; then
+if test "$ENABLE_UDEVHOTPLUG" = "no" ; then
                AC_MSG_WARN([No hotplug mechanism will be installed. Consult ./configure --help if you want hotplug.])
 fi
 

diff --git a/etc/hotplug/usb/usbdux/Makefile.am b/etc/hotplug/usb/usbdux/Makefile.am
index e9d8fe04b6e775a7b52b4ed448d84950e73acc05..5c00d34d6636003c17e388221109496b6528c10c 100644 (file)
--- a/etc/hotplug/usb/usbdux/Makefile.am
+++ b/etc/hotplug/usb/usbdux/Makefile.am
@@ -3,8 +3,3 @@ EXTRA_DIST = usbdux usbdux_firmware.hex usbdux_firmware.bin
 if INSTALL_UDEVHOTPLUG
 udevfirmware_DATA = usbdux_firmware.bin
 endif
-
-if INSTALL_ETCHOTPLUG
-usbfirmware_DATA =  usbdux_firmware.hex
-usbhotplug_SCRIPTS = usbdux
-endif

diff --git a/etc/hotplug/usb/usbduxfast/Makefile.am b/etc/hotplug/usb/usbduxfast/Makefile.am
index 9f2785bf6ea0658c9eeeefe649657a56a51d6e95..e5cfed19544948b263571487698c17fbf3878fea 100644 (file)
--- a/etc/hotplug/usb/usbduxfast/Makefile.am
+++ b/etc/hotplug/usb/usbduxfast/Makefile.am
@@ -3,8 +3,3 @@ EXTRA_DIST = usbduxfast usbduxfast_firmware.hex usbduxfast_firmware.bin
 if INSTALL_UDEVHOTPLUG
 udevfirmware_DATA = usbduxfast_firmware.bin
 endif
-
-if INSTALL_ETCHOTPLUG
-usbfirmware_DATA =  usbduxfast_firmware.hex
-usbhotplug_SCRIPTS = usbduxfast
-endif

diff --git a/etc/hotplug/usb/usbduxsigma/Makefile.am b/etc/hotplug/usb/usbduxsigma/Makefile.am
index 8fd1f3e616a38b31839b4069380c69113192efae..b2af6d2965d5c3ab4f93cb6f1d5e7e2b13aa715b 100644 (file)
--- a/etc/hotplug/usb/usbduxsigma/Makefile.am
+++ b/etc/hotplug/usb/usbduxsigma/Makefile.am
@@ -3,8 +3,3 @@ EXTRA_DIST = usbduxsigma usbduxsigma_firmware.hex usbduxsigma_firmware.bin
 if INSTALL_UDEVHOTPLUG
 udevfirmware_DATA = usbduxsigma_firmware.bin
 endif
-
-if INSTALL_ETCHOTPLUG
-usbfirmware_DATA =  usbduxsigma_firmware.hex
-usbhotplug_SCRIPTS = usbduxsigma
-endif