Add --disable-aload configure option

Added --disable-aload configure option to suppress probing of
/dev/aload* files for auto-loading.  These files often conflict with
udev mechanism.

Also, --with-resmgr is changed to --enable-resmgr.

diff --git a/configure.in b/configure.in
index c2bb6e5d683b23f3f2bc369d397b73ef39c09dcb..dccc40ac7f347013c8d62ae5109e757ea4033381 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -173,8 +173,8 @@ esac
 
 dnl Check for resmgr support...
 AC_MSG_CHECKING(for resmgr support)
-AC_ARG_WITH(resmgr,
-  [  --with-resmgr          support resmgr (optional)],
+AC_ARG_ENABLE(resmgr,
+  [  --enable-resmgr         support resmgr (optional)],
   resmgr="$withval", resmgr="no")
 AC_MSG_RESULT($resmgr)
 if test "$resmgr" = "yes"; then
@@ -183,6 +183,16 @@ if test "$resmgr" = "yes"; then
   AC_DEFINE(SUPPORT_RESMGR, "1", [Support resmgr with alsa-lib])
 fi
 
+dnl Check for aload* support...
+AC_MSG_CHECKING(for aload* support)
+AC_ARG_ENABLE(aload,
+  [  --disable-aload         disable reading /dev/aload*],
+  aload="$enableval", aload="yes")
+AC_MSG_RESULT($aload)
+if test "$aload" = "yes"; then
+  AC_DEFINE(SUPPORT_ALOAD, "1", [Support /dev/aload* access for auto-loading])
+fi
+
 dnl Make a symlink for inclusion of alsa/xxx.h
 if test ! -L include/alsa ; then
   echo "Making a symlink include/alsa"

diff --git a/src/control/cards.c b/src/control/cards.c
index 2f452452ec02651a9acd93013520c59fbe5a0c9b..b775a62ca6c61ee61320cb9d3561f47fb734c690 100644 (file)
--- a/src/control/cards.c
+++ b/src/control/cards.c
@@ -52,11 +52,13 @@ int snd_card_load(int card)
        sprintf(control, SND_FILE_CONTROL, card);
 
        open_dev = snd_open_device(control, O_RDONLY);
+#ifdef SUPPORT_ALOAD
        if (open_dev < 0) {
                char aload[32];
                sprintf(aload, SND_FILE_LOAD, card);
                open_dev = snd_open_device(aload, O_RDONLY);
        }
+#endif
        if (open_dev >= 0) {
                close (open_dev);
                return 0;

diff --git a/src/seq/seq_hw.c b/src/seq/seq_hw.c
index 7c2c4812d46600f7ddbe9ec88b813df4ebda268d..eadec550f9ee449262280920340f4ecf195d04a3 100644 (file)
--- a/src/seq/seq_hw.c
+++ b/src/seq/seq_hw.c
@@ -441,6 +441,7 @@ int snd_seq_hw_open(snd_seq_t **handle, const char *name, int streams, int mode)
 
        filename = SNDRV_FILE_SEQ;
        fd = snd_open_device(filename, fmode);
+#ifdef SUPPORT_ALOAD
        if (fd < 0) {
                fd = snd_open_device(SNDRV_FILE_ALOADSEQ, fmode);
                if (fd >= 0)
@@ -451,6 +452,7 @@ int snd_seq_hw_open(snd_seq_t **handle, const char *name, int streams, int mode)
                        return -errno;
                }
        }
+#endif
 #if 0
        /*
          * this is bogus, an application have to care about open filedescriptors