- added alsaconf script.

- fixed alsaconf script for the new module tools of 2.6 kernel.

Makefile.am

@@ -4,7 +4,7 @@ ALSAMIXER_DIR=alsamixer
 else
 ALSAMIXER_DIR=
 endif
-SUBDIRS=include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq utils
+SUBDIRS=include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq utils
 EXTRA_DIST=ChangeLog INSTALL TODO README configure cvscompile depcomp
 
 rpm: dist

README

@@ -6,6 +6,7 @@ This package contains the command line utilities for the ALSA project.
 The package can be compiled only with the installed ALSA driver and
 the ALSA C library.
 
+alsaconf	- the ALSA driver configurator script
 alsactl		- an utility for soundcard settings management
 aplay/arecord	- an utility for the playback / capture of .wav,.voc,.au files
 amixer		- a command line mixer

alsaconf/Makefile.am

@@ -0,0 +1,3 @@
+bin_SCRIPTS = alsaconf
+man_MANS = alsaconf.8
+EXTRA_DIST = alsaconf.8

alsaconf/alsaconf.8

@@ -0,0 +1,88 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" alsaconf.8 is copyright 2003 by Jordi Mallach <jordi@debian.org>
+.\" 
+.\" This is free documentation, see the latest version of the GNU
+.\" General Public License for copying conditions. There is NO warranty.
+.TH ALSACONF 8 "February 23, 2003"
+
+.SH NAME
+alsaconf \- configuration tool for the Advanced Linux Sound Architecture
+
+.SH SYNOPSIS
+.B alsaconf
+.RI [ options ]
+
+.SH DESCRIPTION
+This manual page documents briefly the
+.B alsaconf
+command.
+This manual page was written for the Debian distribution because the
+original program does not have a manual page.
+.PP
+\fBAlsaconf\fP is a simple shell script which tries to detect the sound cards
+on your system and writes a suitable configuration file for ALSA. It will try
+to guess what GNU/Linux distribution you're running, and will act accordingly
+to the standards of that distribution, if specific support is available.
+.PP
+Alsaconf will write a modutils snippet which can be then used by modutils
+to load the correct parameters for your sound card.
+
+.SH OPTIONS
+Alsaconf accepts the following options:
+.TP
+.B \-l, \-\-legacy
+Check only for legacy non-isapnp cards
+.TP
+.B \-m, \-\-modinfo
+Read module descriptions instead of reading a card database.
+.TP
+.B \-s, \-\-sound\-wav\-file
+Use the specified wav file as a test sound
+.TP
+.B \-u, \-\-uid uid
+Set the uid for the ALSA devices (default = 0)
+.TP
+.B \-g, \-\-gid gid
+Set the gid for the ALSA devices (default = 0)
+.TP
+.B \-d, \-\-devmode mode
+Set the device mode for the ALSA devices (default = 0666)
+.TP
+.B \-r, \-\-strict
+Set strict device mode (equiv. with -g 17 -d 0660)
+.TP
+.B \-L, \-\-log
+Logging on /tmp/alsaconf.log
+.TP
+.B \-p, \-\-probe card-name
+Probe a legacy non-isapnp card and print module options
+.TP
+.B \-h, \-\-help
+Displays this help text
+
+.SH DEBIAN SPECIFIC
+In Debian, the default gid of the device files is 29 (corresponding to the
+audio group) and the default device mode is 0660.
+
+For the ALSA base package, see also
+.I /usr/share/doc/alsa-base/
+
+.SH SEE ALSO
+\fB
+alsamixer(1),
+amixer(1),
+aplay(1),
+arecord(1)
+\fP
+
+.SH HOMEPAGE
+http://www.alsa-project.org/
+
+.SH AUTHOR
+The alsaconf script was written by
+Takashi Iwai <tiwai@suse.de>,
+Bernd Kaindl <bk@suse.de> and
+Jan Ondrej (SAL) <ondrejj@salstar.sk>
+
+This manual page was written by Jordi Mallach <jordi@debian.org>,
+for the Debian system (but may be used by others).

configure.in

@@ -48,9 +48,11 @@ fi
 AC_SUBST(CURSESINC)
 AC_SUBST(CURSESLIB)
 
-dnl Check for Gtk+
+AC_ARG_WITH(testsound,
-dnl AM_PATH_GTK(1.0.1)
+  [  --with-testsound=file        give the path of test sound file for alsaconf],
-dnl CFLAGS="$CFLAGS $GTK_CFLAGS"
+  TESTSOUND="$withval",
+  TESTSOUND="/usr/share/sounds/alsa/test.wav")
+AC_SUBST(TESTSOUND)
 
 AM_CONFIG_HEADER(include/aconfig.h)
 
@@ -65,5 +67,6 @@ AC_PROG_GCC_TRADITIONAL
 SAVE_UTIL_VERSION
 
 AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amidi/Makefile amixer/Makefile \
+	  alsaconf/alsaconf alsaconf/Makefile \
 	  aplay/Makefile include/Makefile iecset/Makefile utils/Makefile \
 	  utils/alsa-utils.spec seq/Makefile seq/aconnect/Makefile seq/aseqnet/Makefile)