Updated usbdux firmware files. The udev hotplug mechanism

[comedilib.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cd8cb729a76f9262d20ce19833367c2a13f90ed8..900978ee5ffa28fc0e9111112e95920ec8ad27fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,9 @@ if test "$SWIG" == "no" ; then
 fi
 
 #python
-AC_ARG_ENABLE([python-binding],[  --disable-python-binding     Disable building of Python binding],
+AC_ARG_ENABLE([python-binding],
+       [AS_HELP_STRING([--disable-python-binding],
+               [Disable building of Python binding])],
        [ENABLE_PYTHON=$enableval],[ENABLE_PYTHON="yes"])
 if test "$ENABLE_PYTHON" == "yes" && test "$SWIG" != "no"; then
        AM_PATH_PYTHON
@@ -133,8 +135,10 @@ AS_COMPILER_FLAG([-Wno-unused-function],[PYTHON_QUIET="$PYTHON_QUIET -Wno-unused
 AC_SUBST(PYTHON_QUIET)
 
 # ruby
-AC_ARG_ENABLE([ruby-binding], [  --disable-ruby-binding        Disable building of Ruby binding],
-       [ENABLE_RUBY=$enableval], [ENABLE_RUBY="yes"])
+AC_ARG_ENABLE([ruby-binding],
+       [AS_HELP_STRING([--enable-ruby-binding],
+               [Enable building of Ruby binding])],
+       [ENABLE_RUBY=$enableval], [ENABLE_RUBY="no"])
 if test "$ENABLE_RUBY" == "yes" && test "$SWIG" != "no"; then
        AC_PATH_PROG(RUBY, ruby, no)
        if test "$RUBY" != "no" ; then
@@ -161,22 +165,31 @@ fi
 AC_SUBST(RUBY_CONFIG_OPTIONS)
 
 # scxi
-AC_ARG_ENABLE([scxi], [  --enable-scxi  Enable SCXI convenience library],
+AC_ARG_ENABLE([scxi],
+       [AS_HELP_STRING([--enable-scxi], [Enable SCXI convenience library])],
        [ENABLE_SCXI=$enableval], [ENABLE_SCXI="no"])
 AM_CONDITIONAL(BUILD_SCXI, [test "$ENABLE_SCXI" == "yes"])
 
 # docbook
-AC_ARG_ENABLE([docbook], [  --disable-docbook         Disable docbook],[ENABLE_DOCBOOK=$enableval],[ENABLE_DOCBOOK="yes"])
+AC_ARG_ENABLE([docbook],
+       [AS_HELP_STRING([--disable-docbook], [Disable docbook])],
+       [ENABLE_DOCBOOK=$enableval],[ENABLE_DOCBOOK="yes"])
 
 if test "$ENABLE_DOCBOOK" == "yes"; then
        AC_PATH_PROG(XMLTO, xmlto, no)
        if test "$XMLTO" = "no" ; then
                AC_MSG_WARN([xmlto not found, will not be able to rebuild documentation])
        fi
+       AC_PATH_PROG(DBLATEX, dblatex, no)
+        if test "$DBLATEX" = "no" ; then
+                AC_MSG_WARN([dblatex not found, will not be able to generate pdfs])
+        fi
 else
        XMLTO="no"
+       DBLATEX="no"
 fi
 AM_CONDITIONAL(HAVE_XMLTO, [test "$XMLTO" != "no"])
+AM_CONDITIONAL(HAVE_DBLATEX, [test "$DBLATEX" != "no"])
 
 pcmciadir="\${sysconfdir}/pcmcia"
 AC_SUBST(pcmciadir)
@@ -184,11 +197,11 @@ AC_SUBST(pcmciadir)
 
 
 # new udev hotplug
-AC_ARG_WITH([udev-hotplug], [  --with-udev-hotplug=[[/lib]]    enable udev hotplug],
+AC_ARG_WITH([udev-hotplug],
+       [AS_HELP_STRING([--with-udev-hotplug=[[/lib]]], [enable udev hotplug])],
        [ENABLE_UDEVHOTPLUG=$withval], [ENABLE_UDEVHOTPLUG="no"])
 AM_CONDITIONAL(INSTALL_UDEVHOTPLUG, [test "$ENABLE_UDEVHOTPLUG" != "no"])
 if test "$ENABLE_UDEVHOTPLUG" != "no"; then
-       udevrulesdir="\${sysconfdir}/udev/rules.d/"
        if  test "$ENABLE_UDEVHOTPLUG" == "yes"; then
                AC_MSG_ERROR([udev-hotplug needs a path as an argument (usually: --enable-udev-hotplug=/lib).])
        fi
@@ -198,6 +211,7 @@ if test "$ENABLE_UDEVHOTPLUG" != "no"; then
        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)
@@ -209,7 +223,9 @@ fi
 
 
 # old hotplug mechanism
-AC_ARG_ENABLE([etc-hotplug], [  --enable-etc-hotplug    enable old hotplug in /etc/hotplug],
+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"])
 
@@ -243,6 +259,7 @@ etc/hotplug/Makefile
 etc/hotplug/usb/Makefile
 etc/hotplug/usb/usbdux/Makefile
 etc/hotplug/usb/usbduxfast/Makefile
+etc/hotplug/usb/usbduxsigma/Makefile
 etc/udev/Makefile
 doc/Makefile
 demo/Makefile