From: Bernd Porr <berndporr@f2s.com>
Date: Thu, 26 Apr 2012 22:24:50 +0000 (+0100)
Subject: Removed old hotplug install which is no longer used at all and
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=12155822bc82cb45c9f36506a41a136a45a7cfa6;p=comedilib.git

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 7a7fddc..428e07c 100644
--- 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 e9d8fe0..5c00d34 100644
--- 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 9f2785b..e5cfed1 100644
--- 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 8fd1f3e..b2af6d2 100644
--- 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