diff -ruN TiMidity++-2.6.0-beta1/ChangeLog TiMidity++-2.6.0-beta2/ChangeLog
--- TiMidity++-2.6.0-beta1/ChangeLog	Mon Aug 30 19:04:02 1999
+++ TiMidity++-2.6.0-beta2/ChangeLog	Wed Sep  1 02:39:30 1999
@@ -1,3 +1,26 @@
+1999-09-01  Masanao Izumo <mo@goice.co.jp>
+
+    * Version 2.6.0-beta2 released for test version.
+
+1999-09-01  Masanao Izumo <mo@goice.co.jp>
+
+    * configure.in: Modify action of --enable-audio[=mode_list].
+    * configure.in,timidity/timidity.c: Remove TIMIDITY_OUTPUT_ID macro
+      if any audio are not enabled.
+
+1999-08-31  Yasuhide Oomori <dasen@typhoon.co.jp>
+
+    * timidity/oss_a.c: dsp_play_mode -> oss_play_mode
+
+1999-08-31  Kei Hibino <hibi@utmc.or.jp>
+
+    * configure.in (SHELL): AC_SUBST() for autoconf-1.12
+    * configure.in (slang.h): Add new test.
+
+1999-08-31  Katsuhiro Ueno <katsu@blue.sky.or.jp>
+
+    * acinclude.m4: Bug fixed.
+
 1999-08-30  Masanao Izumo <mo@goice.co.jp>
 
     * Version 2.6.0-beta1 released for test version.
diff -ruN TiMidity++-2.6.0-beta1/Makefile.am TiMidity++-2.6.0-beta2/Makefile.am
--- TiMidity++-2.6.0-beta1/Makefile.am	Wed Aug 25 16:43:40 1999
+++ TiMidity++-2.6.0-beta2/Makefile.am	Wed Sep  1 02:01:11 1999
@@ -18,8 +18,6 @@
 #
 # This Makefile is known to work with GNU make.
 
-include $(top_builddir)/common.makefile
-
 SUBDIRS = \
 	utils \
 	libarc \
diff -ruN TiMidity++-2.6.0-beta1/Makefile.in TiMidity++-2.6.0-beta2/Makefile.in
--- TiMidity++-2.6.0-beta1/Makefile.in	Mon Aug 30 19:04:58 1999
+++ TiMidity++-2.6.0-beta2/Makefile.in	Wed Sep  1 02:57:48 1999
@@ -102,6 +102,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
@@ -422,8 +423,6 @@
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-include $(top_builddir)/common.makefile
 
 dynamics:
 	cd interface; $(MAKE) $@
diff -ruN TiMidity++-2.6.0-beta1/acinclude.m4 TiMidity++-2.6.0-beta2/acinclude.m4
--- TiMidity++-2.6.0-beta1/acinclude.m4	Mon Aug 30 16:26:26 1999
+++ TiMidity++-2.6.0-beta2/acinclude.m4	Wed Sep  1 01:44:14 1999
@@ -74,23 +74,26 @@
 AC_MSG_RESULT($ALSA_LIBS)
 
 dnl Check for the presence of the library
-if test $enable_alsatest = yes; then
-  AC_MSG_CHECKING(for working libasound)
-  AC_TRY_RUN([
-#include <sys/asoundlib.h>
-void main(void)
-{
-  snd_cards();
-  exit(0);
-}
-],
-   [AC_MSG_RESULT("present")],
-   [AC_MSG_RESULT("not found. ")
-   AC_MSG_ERROR(Fatal error: Install alsa-lib package or use --with-alsa-prefix option...)],
-   [AC_MSG_RESULT(unsopported)
-    AC_MSG_ERROR(Cross-compiling isn't supported...)]
- )
-fi
+dnl if test $enable_alsatest = yes; then
+dnl   AC_MSG_CHECKING(for working libasound)
+dnl   KEEP_LDFLAGS="$LDFLAGS"
+dnl   LDFLAGS="$LDFLAGS $ALSA_LIBS"
+dnl   AC_TRY_RUN([
+dnl #include <sys/asoundlib.h>
+dnl void main(void)
+dnl {
+dnl   snd_cards();
+dnl   exit(0);
+dnl }
+dnl ],
+dnl    [AC_MSG_RESULT("present")],
+dnl    [AC_MSG_RESULT("not found. ")
+dnl    AC_MSG_ERROR(Fatal error: Install alsa-lib package or use --with-alsa-prefix option...)],
+dnl    [AC_MSG_RESULT(unsopported)
+dnl     AC_MSG_ERROR(Cross-compiling isn't supported...)]
+dnl  )
+dnl   LDFLAGS="$KEEP_LDFLAGS"
+dnl fi
 
 dnl Check for a working version of libasound that is of the right version.
 min_alsa_version=ifelse([$1], ,0.1.1,$1)
@@ -522,7 +525,7 @@
 ])
 
 
-dnl CHECK_COMPILER_OPTION(OPTIONS)
+dnl CHECK_COMPILER_OPTION(OPTIONS [, ACTION-IF-SUCCESS [, ACTION-IF-FAILED]])
 AC_DEFUN(CHECK_COMPILER_OPTION,
 [AC_MSG_CHECKING([whether -$1 option is recognized])
 ac_ccoption=`echo $1 | sed 'y%./+-%__p_%'`
@@ -530,7 +533,7 @@
 [cat > conftest.$ac_ext <<EOF
 int main() {return 0;}
 EOF
-if ${CC-cc} $CFLAGS -o conftest${ac_exeext} $1 conftest.$ac_ext > conftest.out 2>&1; then
+if ${CC-cc} $LDFLAGS $CFLAGS -o conftest${ac_exeext} -$1 conftest.$ac_ext > conftest.out 2>&1; then
     if test -s conftest.out; then
 	eval "timidity_cv_ccoption_$ac_ccoption=no"
     else
@@ -539,4 +542,14 @@
 else
     eval "timidity_cv_ccoption_$ac_ccoption=no"
 fi
-])])
+])
+if eval "test \"`echo '$timidity_cv_ccoption_'$ac_ccoption`\" = yes"; then
+  AC_MSG_RESULT(yes)
+  ifelse([$2], , , [$2
+])
+else
+  AC_MSG_RESULT(no)
+ifelse([$3], , , [$3
+])
+fi
+])
diff -ruN TiMidity++-2.6.0-beta1/aclocal.m4 TiMidity++-2.6.0-beta2/aclocal.m4
--- TiMidity++-2.6.0-beta1/aclocal.m4	Mon Aug 30 18:56:12 1999
+++ TiMidity++-2.6.0-beta2/aclocal.m4	Wed Sep  1 02:50:49 1999
@@ -86,23 +86,26 @@
 AC_MSG_RESULT($ALSA_LIBS)
 
 dnl Check for the presence of the library
-if test $enable_alsatest = yes; then
-  AC_MSG_CHECKING(for working libasound)
-  AC_TRY_RUN([
-#include <sys/asoundlib.h>
-void main(void)
-{
-  snd_cards();
-  exit(0);
-}
-],
-   [AC_MSG_RESULT("present")],
-   [AC_MSG_RESULT("not found. ")
-   AC_MSG_ERROR(Fatal error: Install alsa-lib package or use --with-alsa-prefix option...)],
-   [AC_MSG_RESULT(unsopported)
-    AC_MSG_ERROR(Cross-compiling isn't supported...)]
- )
-fi
+dnl if test $enable_alsatest = yes; then
+dnl   AC_MSG_CHECKING(for working libasound)
+dnl   KEEP_LDFLAGS="$LDFLAGS"
+dnl   LDFLAGS="$LDFLAGS $ALSA_LIBS"
+dnl   AC_TRY_RUN([
+dnl #include <sys/asoundlib.h>
+dnl void main(void)
+dnl {
+dnl   snd_cards();
+dnl   exit(0);
+dnl }
+dnl ],
+dnl    [AC_MSG_RESULT("present")],
+dnl    [AC_MSG_RESULT("not found. ")
+dnl    AC_MSG_ERROR(Fatal error: Install alsa-lib package or use --with-alsa-prefix option...)],
+dnl    [AC_MSG_RESULT(unsopported)
+dnl     AC_MSG_ERROR(Cross-compiling isn't supported...)]
+dnl  )
+dnl   LDFLAGS="$KEEP_LDFLAGS"
+dnl fi
 
 dnl Check for a working version of libasound that is of the right version.
 min_alsa_version=ifelse([$1], ,0.1.1,$1)
@@ -534,7 +537,7 @@
 ])
 
 
-dnl CHECK_COMPILER_OPTION(OPTIONS)
+dnl CHECK_COMPILER_OPTION(OPTIONS [, ACTION-IF-SUCCESS [, ACTION-IF-FAILED]])
 AC_DEFUN(CHECK_COMPILER_OPTION,
 [AC_MSG_CHECKING([whether -$1 option is recognized])
 ac_ccoption=`echo $1 | sed 'y%./+-%__p_%'`
@@ -542,7 +545,7 @@
 [cat > conftest.$ac_ext <<EOF
 int main() {return 0;}
 EOF
-if ${CC-cc} $CFLAGS -o conftest${ac_exeext} $1 conftest.$ac_ext > conftest.out 2>&1; then
+if ${CC-cc} $LDFLAGS $CFLAGS -o conftest${ac_exeext} -$1 conftest.$ac_ext > conftest.out 2>&1; then
     if test -s conftest.out; then
 	eval "timidity_cv_ccoption_$ac_ccoption=no"
     else
@@ -551,7 +554,17 @@
 else
     eval "timidity_cv_ccoption_$ac_ccoption=no"
 fi
-])])
+])
+if eval "test \"`echo '$timidity_cv_ccoption_'$ac_ccoption`\" = yes"; then
+  AC_MSG_RESULT(yes)
+  ifelse([$2], , , [$2
+])
+else
+  AC_MSG_RESULT(no)
+ifelse([$3], , , [$3
+])
+fi
+])
 
 # Define a conditional.
 
diff -ruN TiMidity++-2.6.0-beta1/config.h.in TiMidity++-2.6.0-beta2/config.h.in
--- TiMidity++-2.6.0-beta1/config.h.in	Mon Aug 30 17:43:47 1999
+++ TiMidity++-2.6.0-beta2/config.h.in	Wed Sep  1 01:32:23 1999
@@ -158,6 +158,9 @@
 /* Define if you have the <ndir.h> header file.  */
 #undef HAVE_NDIR_H
 
+/* Define if you have the <slang.h> header file.  */
+#undef HAVE_SLANG_H
+
 /* Define if you have the <slang/slang.h> header file.  */
 #undef HAVE_SLANG_SLANG_H
 
diff -ruN TiMidity++-2.6.0-beta1/configs/msc-config.h TiMidity++-2.6.0-beta2/configs/msc-config.h
--- TiMidity++-2.6.0-beta1/configs/msc-config.h	Mon Aug 30 19:05:28 1999
+++ TiMidity++-2.6.0-beta2/configs/msc-config.h	Wed Sep  1 02:58:20 1999
@@ -217,7 +217,7 @@
 #define HAVE_MMSYSTEM_H
 
 /* In VDS Macro AAA=BBB is not available. */
-#define TIMID_VERSION	"2.6.0-beta1"
+#define TIMID_VERSION	"2.6.0-beta2"
 #define DEFAULT_PATH	".\\"
 #define AU_W32
 #define WINSOCK
diff -ruN TiMidity++-2.6.0-beta1/configure TiMidity++-2.6.0-beta2/configure
--- TiMidity++-2.6.0-beta1/configure	Mon Aug 30 18:56:14 1999
+++ TiMidity++-2.6.0-beta2/configure	Wed Sep  1 02:50:52 1999
@@ -31,20 +31,21 @@
   --with-offix-libs=dir      Offix include file path "
 ac_help="$ac_help
   --enable-audio[=mode_list]  Enable audio (Specify comma separated mode list):
-                              dev:  (default)
-                                    /dev/dsp    (Linux, FreeBSD, BSD/OS)
-                                    /dev/sb_dsp (BSD/OS)
-                                    /dev/audio  (Sun, NetBSD, HPUX)
-                                    IRIX audio or OSF/1 MME
-                                    Windows MMS
-                              oss:  OSS /dev/dsp (Exclusive dev mode)
+                              default:  Automatically select audio device.
+                              oss:  OSS /dev/dsp
+                              sun:  SunOS /dev/audio
+                              hpux: HPUX /dev/audio
+                              irix: IRIX audio
+                              mme:  OSF/1 MME
+                              sb_dsp: BSD/OS 2.0 /dev/sb_dsp
+                              w32:  Windows MMS
                               alsa: ALSA pcm device
                               alib: HPUX network audio (Alib)
                               nas:  NAS - Network Audio System
                               esd:  EsounD"
 ac_help="$ac_help
   --with-default-output=<mode>  Specify default output mode (optional):
-                              dev|oss|alsa|alib|nas|esd|wav|au|aiff|list"
+                              default|alsa|alib|nas|esd|wav|au|aiff|list"
 ac_help="$ac_help
   --enable-esd            EsounD (Obsoleted.  Use --enable-audio=esd)"
 ac_help="$ac_help
@@ -64,6 +65,8 @@
 ac_help="$ac_help
   --disable-esdtest       Do not try to compile and run a test ESD program"
 ac_help="$ac_help
+  --enable-interface=[interface_list]  Comma separated interface list "
+ac_help="$ac_help
   --enable-dynamic        Enable dynamic link interface   (default is no)"
 ac_help="$ac_help
   --enable-ncurses        Enable ncurses interface        (default is no)"
@@ -660,7 +663,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:664: checking host system type" >&5
+echo "configure:667: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -681,7 +684,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:685: checking target system type" >&5
+echo "configure:688: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -699,7 +702,7 @@
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:703: checking build system type" >&5
+echo "configure:706: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -733,7 +736,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:737: checking for a BSD compatible install" >&5
+echo "configure:740: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -786,7 +789,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:790: checking whether build environment is sane" >&5
+echo "configure:793: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -843,7 +846,7 @@
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:847: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:850: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -872,7 +875,7 @@
 
 PACKAGE=TiMidity++
 
-VERSION=2.6.0-beta1
+VERSION=2.6.0-beta2
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -882,7 +885,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:886: checking for working aclocal" >&5
+echo "configure:889: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -895,7 +898,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:899: checking for working autoconf" >&5
+echo "configure:902: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -908,7 +911,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:912: checking for working automake" >&5
+echo "configure:915: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -921,7 +924,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:925: checking for working autoheader" >&5
+echo "configure:928: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -934,7 +937,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:938: checking for working makeinfo" >&5
+echo "configure:941: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -949,7 +952,7 @@
 
 
 echo $ac_n "checking whether grep returns status""... $ac_c" 1>&6
-echo "configure:953: checking whether grep returns status" >&5
+echo "configure:956: checking whether grep returns status" >&5
 echo "grimblepritz" >grimble
 if grep blurfldyick grimble >/dev/null 2>&1 ; then
 	contains="./contains"
@@ -984,7 +987,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:988: checking for $ac_word" >&5
+echo "configure:991: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1022,7 +1025,7 @@
 
   if test $EMACS != "no"; then
     echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:1026: checking where .elc files should go" >&5
+echo "configure:1029: checking where .elc files should go" >&5
         lispdir="\$(datadir)/emacs/site-lisp"
     emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'`
     if test "x$prefix" = "xNONE"; then
@@ -1108,7 +1111,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1112: checking for $ac_word" >&5
+echo "configure:1115: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1138,7 +1141,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1142: checking for $ac_word" >&5
+echo "configure:1145: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1189,7 +1192,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1193: checking for $ac_word" >&5
+echo "configure:1196: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1221,7 +1224,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1225: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1228: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1232,12 +1235,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1236 "configure"
+#line 1239 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1263,12 +1266,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1267: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1270: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1272: checking whether we are using GNU C" >&5
+echo "configure:1275: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1277,7 +1280,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1296,7 +1299,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1300: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1303: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1339,7 +1342,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1343: checking for a BSD compatible install" >&5
+echo "configure:1346: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1394,7 +1397,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1398: checking for $ac_word" >&5
+echo "configure:1401: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1422,7 +1425,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1426: checking whether ln -s works" >&5
+echo "configure:1429: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1443,7 +1446,7 @@
 fi
 
 echo $ac_n "checking whether -rdynamic option is recognized""... $ac_c" 1>&6
-echo "configure:1447: checking whether -rdynamic option is recognized" >&5
+echo "configure:1450: checking whether -rdynamic option is recognized" >&5
 ac_ccoption=`echo rdynamic | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'timidity_cv_ccoption_$ac_ccoption'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1451,7 +1454,7 @@
   cat > conftest.$ac_ext <<EOF
 int main() {return 0;}
 EOF
-if ${CC-cc} $CFLAGS -o conftest${ac_exeext} rdynamic conftest.$ac_ext > conftest.out 2>&1; then
+if ${CC-cc} $LDFLAGS $CFLAGS -o conftest${ac_exeext} -rdynamic conftest.$ac_ext > conftest.out 2>&1; then
     if test -s conftest.out; then
 	eval "timidity_cv_ccoption_$ac_ccoption=no"
     else
@@ -1463,6 +1466,14 @@
 
 fi
 
+if eval "test \"`echo '$timidity_cv_ccoption_'$ac_ccoption`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+else
+  echo "$ac_t""no" 1>&6
+
+fi
+
 
 # Check whether --with-elf or --without-elf was given.
 if test "${with_elf+set}" = set; then
@@ -1552,7 +1563,7 @@
 
 
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:1556: checking for sqrt in -lm" >&5
+echo "configure:1567: checking for sqrt in -lm" >&5
 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1560,7 +1571,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1564 "configure"
+#line 1575 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1571,7 +1582,7 @@
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1599,7 +1610,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:1603: checking for socket in -lsocket" >&5
+echo "configure:1614: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1607,7 +1618,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1611 "configure"
+#line 1622 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1618,7 +1629,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1646,7 +1657,7 @@
 fi
 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1650: checking for dlopen in -ldl" >&5
+echo "configure:1661: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1654,7 +1665,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1658 "configure"
+#line 1669 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1665,7 +1676,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1688,12 +1699,12 @@
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1692: checking for $ac_func" >&5
+echo "configure:1703: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1697 "configure"
+#line 1708 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1716,7 +1727,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1738,7 +1749,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1742: checking for gethostbyname in -lnsl" >&5
+echo "configure:1753: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1746,7 +1757,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1750 "configure"
+#line 1761 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1757,7 +1768,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1788,7 +1799,7 @@
 done
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1792: checking how to run the C preprocessor" >&5
+echo "configure:1803: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1803,13 +1814,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1807 "configure"
+#line 1818 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1820,13 +1831,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1824 "configure"
+#line 1835 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1837,13 +1848,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1841 "configure"
+#line 1852 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1872,7 +1883,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:1876: checking for X" >&5
+echo "configure:1887: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1934,12 +1945,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1938 "configure"
+#line 1949 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2008,14 +2019,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2012 "configure"
+#line 2023 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:2019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -2121,17 +2132,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:2125: checking whether -R must be followed by a space" >&5
+echo "configure:2136: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 2128 "configure"
+#line 2139 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -2147,14 +2158,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 2151 "configure"
+#line 2162 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -2186,7 +2197,7 @@
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:2190: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2201: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2194,7 +2205,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2198 "configure"
+#line 2209 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2205,7 +2216,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2227,7 +2238,7 @@
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:2231: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2242: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2235,7 +2246,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2239 "configure"
+#line 2250 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2246,7 +2257,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2275,12 +2286,12 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:2279: checking for gethostbyname" >&5
+echo "configure:2290: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2284 "configure"
+#line 2295 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -2303,7 +2314,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -2324,7 +2335,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2328: checking for gethostbyname in -lnsl" >&5
+echo "configure:2339: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2332,7 +2343,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2336 "configure"
+#line 2347 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2343,7 +2354,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2373,12 +2384,12 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:2377: checking for connect" >&5
+echo "configure:2388: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2382 "configure"
+#line 2393 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -2401,7 +2412,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -2422,7 +2433,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2426: checking for connect in -lsocket" >&5
+echo "configure:2437: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2430,7 +2441,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2434 "configure"
+#line 2445 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2441,7 +2452,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2465,12 +2476,12 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:2469: checking for remove" >&5
+echo "configure:2480: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2474 "configure"
+#line 2485 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -2493,7 +2504,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -2514,7 +2525,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2518: checking for remove in -lposix" >&5
+echo "configure:2529: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2522,7 +2533,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2526 "configure"
+#line 2537 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2533,7 +2544,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2557,12 +2568,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2561: checking for shmat" >&5
+echo "configure:2572: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2566 "configure"
+#line 2577 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -2585,7 +2596,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -2606,7 +2617,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2610: checking for shmat in -lipc" >&5
+echo "configure:2621: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2614,7 +2625,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2618 "configure"
+#line 2629 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2625,7 +2636,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2658,7 +2669,7 @@
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2662: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2673: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2666,7 +2677,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2670 "configure"
+#line 2681 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2677,7 +2688,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2725,7 +2736,7 @@
   fi
 
   echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:2729: checking for XOpenDisplay in -lX11" >&5
+echo "configure:2740: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2733,7 +2744,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lX11  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2737 "configure"
+#line 2748 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2744,7 +2755,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:2748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2772,12 +2783,12 @@
 fi
 
   echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
-echo "configure:2776: checking X11 version 6" >&5
+echo "configure:2787: checking X11 version 6" >&5
   if eval "test \"`echo '$''{'timidity_cv_x11_version_6'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2781 "configure"
+#line 2792 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int main() {
@@ -2787,7 +2798,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   timidity_cv_x11_version_6=yes
 else
@@ -2807,7 +2818,7 @@
 
     KEEPLIBS=$LIBS
   echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
-echo "configure:2811: checking for XShapeCombineMask in -lXext" >&5
+echo "configure:2822: checking for XShapeCombineMask in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShapeCombineMask | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2815,7 +2826,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXext  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2819 "configure"
+#line 2830 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2826,7 +2837,7 @@
 XShapeCombineMask()
 ; return 0; }
 EOF
-if { (eval echo configure:2830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2848,7 +2859,7 @@
 fi
 
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2852: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2863: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2856,7 +2867,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2860 "configure"
+#line 2871 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2867,7 +2878,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2895,7 +2906,7 @@
 fi
 
   echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6
-echo "configure:2899: checking for SmcOpenConnection in -lSM" >&5
+echo "configure:2910: checking for SmcOpenConnection in -lSM" >&5
 ac_lib_var=`echo SM'_'SmcOpenConnection | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2903,7 +2914,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lSM  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2907 "configure"
+#line 2918 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2914,7 +2925,7 @@
 SmcOpenConnection()
 ; return 0; }
 EOF
-if { (eval echo configure:2918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2936,7 +2947,7 @@
 fi
 
   echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:2940: checking for XtVaAppInitialize in -lXt" >&5
+echo "configure:2951: checking for XtVaAppInitialize in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtVaAppInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2944,7 +2955,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2948 "configure"
+#line 2959 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2955,7 +2966,7 @@
 XtVaAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:2959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2977,7 +2988,7 @@
 fi
 
   echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6
-echo "configure:2981: checking for XmuInternAtom in -lXmu" >&5
+echo "configure:2992: checking for XmuInternAtom in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuInternAtom | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2985,7 +2996,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXmu  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2989 "configure"
+#line 3000 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2996,7 +3007,7 @@
 XmuInternAtom()
 ; return 0; }
 EOF
-if { (eval echo configure:3000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3019,12 +3030,12 @@
   for ac_func in XmuRegisterExternalAgent
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3023: checking for $ac_func" >&5
+echo "configure:3034: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3028 "configure"
+#line 3039 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3047,7 +3058,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3072,7 +3083,7 @@
 done
 
   echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6
-echo "configure:3076: checking for XawInitializeWidgetSet in -lXaw3d" >&5
+echo "configure:3087: checking for XawInitializeWidgetSet in -lXaw3d" >&5
 ac_lib_var=`echo Xaw3d'_'XawInitializeWidgetSet | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3080,7 +3091,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw3d  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3084 "configure"
+#line 3095 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3091,7 +3102,7 @@
 XawInitializeWidgetSet()
 ; return 0; }
 EOF
-if { (eval echo configure:3095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3110,7 +3121,7 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6
-echo "configure:3114: checking for XawInitializeWidgetSet in -lXaw" >&5
+echo "configure:3125: checking for XawInitializeWidgetSet in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'XawInitializeWidgetSet | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3118,7 +3129,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3122 "configure"
+#line 3133 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3129,7 +3140,7 @@
 XawInitializeWidgetSet()
 ; return 0; }
 EOF
-if { (eval echo configure:3133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3153,7 +3164,7 @@
 fi
 
   echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6
-echo "configure:3157: checking for XmCreateForm in -lXm" >&5
+echo "configure:3168: checking for XmCreateForm in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmCreateForm | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3161,7 +3172,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3165 "configure"
+#line 3176 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3172,7 +3183,7 @@
 XmCreateForm()
 ; return 0; }
 EOF
-if { (eval echo configure:3176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3196,12 +3207,12 @@
   for ac_func in XShmCreatePixmap
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3200: checking for $ac_func" >&5
+echo "configure:3211: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3205 "configure"
+#line 3216 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3224,7 +3235,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3257,12 +3268,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:3261: checking for $ac_hdr that defines DIR" >&5
+echo "configure:3272: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3266 "configure"
+#line 3277 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3270,7 +3281,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -3295,7 +3306,7 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:3299: checking for opendir in -ldir" >&5
+echo "configure:3310: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3303,7 +3314,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3307 "configure"
+#line 3318 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3314,7 +3325,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3336,7 +3347,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:3340: checking for opendir in -lx" >&5
+echo "configure:3351: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3344,7 +3355,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3348 "configure"
+#line 3359 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3355,7 +3366,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3378,12 +3389,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3382: checking for ANSI C header files" >&5
+echo "configure:3393: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3387 "configure"
+#line 3398 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3391,7 +3402,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3408,7 +3419,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3412 "configure"
+#line 3423 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3426,7 +3437,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3430 "configure"
+#line 3441 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3447,7 +3458,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3451 "configure"
+#line 3462 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3458,7 +3469,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3482,12 +3493,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3486: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3497: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3491 "configure"
+#line 3502 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3503,7 +3514,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3531,17 +3542,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3535: checking for $ac_hdr" >&5
+echo "configure:3546: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3540 "configure"
+#line 3551 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3569,17 +3580,17 @@
 
 ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for string.h""... $ac_c" 1>&6
-echo "configure:3573: checking for string.h" >&5
+echo "configure:3584: checking for string.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3578 "configure"
+#line 3589 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3603,12 +3614,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3607: checking for working const" >&5
+echo "configure:3618: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3612 "configure"
+#line 3623 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3657,7 +3668,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3678,14 +3689,14 @@
 fi
 
 echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:3682: checking whether char is unsigned" >&5
+echo "configure:3693: checking whether char is unsigned" >&5
 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$GCC" = yes; then
   # GCC predefines this symbol on systems where it applies.
 cat > conftest.$ac_ext <<EOF
-#line 3689 "configure"
+#line 3700 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -3707,7 +3718,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3711 "configure"
+#line 3722 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -3717,7 +3728,7 @@
   volatile char c = 255; exit(c < 0);
 }
 EOF
-if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_char_unsigned=yes
 else
@@ -3741,14 +3752,14 @@
 fi
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3745: checking whether byte ordering is bigendian" >&5
+echo "configure:3756: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3752 "configure"
+#line 3763 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3759,11 +3770,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3767 "configure"
+#line 3778 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3774,7 +3785,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -3794,7 +3805,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3798 "configure"
+#line 3809 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3807,7 +3818,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -3831,21 +3842,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3835: checking for inline" >&5
+echo "configure:3846: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 3842 "configure"
+#line 3853 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3871,12 +3882,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3875: checking for off_t" >&5
+echo "configure:3886: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3880 "configure"
+#line 3891 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3904,12 +3915,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3908: checking for pid_t" >&5
+echo "configure:3919: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3913 "configure"
+#line 3924 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3937,12 +3948,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3941: checking for size_t" >&5
+echo "configure:3952: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3946 "configure"
+#line 3957 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3970,12 +3981,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3974: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3985: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3979 "configure"
+#line 3990 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3984,7 +3995,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -4006,19 +4017,19 @@
 
 
 echo $ac_n "checking volatile declaration""... $ac_c" 1>&6
-echo "configure:4010: checking volatile declaration" >&5
+echo "configure:4021: checking volatile declaration" >&5
 if eval "test \"`echo '$''{'timidity_cv_type_volatile'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4015 "configure"
+#line 4026 "configure"
 #include "confdefs.h"
 
 int main() {
 volatile int x
 ; return 0; }
 EOF
-if { (eval echo configure:4022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   timidity_cv_type_volatile=yes
 else
@@ -4036,12 +4047,12 @@
 fi
 
 echo $ac_n "checking union semun declaration""... $ac_c" 1>&6
-echo "configure:4040: checking union semun declaration" >&5
+echo "configure:4051: checking union semun declaration" >&5
 if eval "test \"`echo '$''{'timidity_cv_type_union_semun'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4045 "configure"
+#line 4056 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -4050,7 +4061,7 @@
 union semun x
 ; return 0; }
 EOF
-if { (eval echo configure:4054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   timidity_cv_type_union_semun=yes
 else
@@ -4069,13 +4080,13 @@
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:4073: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:4084: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 4079 "configure"
+#line 4090 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -4093,7 +4104,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 4097 "configure"
+#line 4108 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -4115,7 +4126,7 @@
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:4119: checking for 8-bit clean memcmp" >&5
+echo "configure:4130: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4123,7 +4134,7 @@
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4127 "configure"
+#line 4138 "configure"
 #include "confdefs.h"
 
 main()
@@ -4133,7 +4144,7 @@
 }
 
 EOF
-if { (eval echo configure:4137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -4154,17 +4165,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4158: checking for $ac_hdr" >&5
+echo "configure:4169: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4163 "configure"
+#line 4174 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4193,12 +4204,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4197: checking for $ac_func" >&5
+echo "configure:4208: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4202 "configure"
+#line 4213 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4221,7 +4232,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4246,7 +4257,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:4250: checking for working mmap" >&5
+echo "configure:4261: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4254,7 +4265,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4258 "configure"
+#line 4269 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4394,7 +4405,7 @@
 }
 
 EOF
-if { (eval echo configure:4398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -4417,7 +4428,7 @@
 fi
 
 echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
-echo "configure:4421: checking whether setvbuf arguments are reversed" >&5
+echo "configure:4432: checking whether setvbuf arguments are reversed" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4425,7 +4436,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4429 "configure"
+#line 4440 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -4439,7 +4450,7 @@
   exit(0);			/* Non-reversed systems segv here.  */
 }
 EOF
-if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -4463,12 +4474,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4467: checking return type of signal handlers" >&5
+echo "configure:4478: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4472 "configure"
+#line 4483 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4485,7 +4496,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4504,12 +4515,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:4508: checking for vprintf" >&5
+echo "configure:4519: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4513 "configure"
+#line 4524 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -4532,7 +4543,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -4556,12 +4567,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:4560: checking for _doprnt" >&5
+echo "configure:4571: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4565 "configure"
+#line 4576 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -4584,7 +4595,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -4612,12 +4623,12 @@
 	sleep usleep strncasecmp strerror getopt getcwd popen signal isatty
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4616: checking for $ac_func" >&5
+echo "configure:4627: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4621 "configure"
+#line 4632 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4640,7 +4651,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4669,12 +4680,12 @@
   case "$ac_cv_header_dirent_dirent_h$ac_cv_header_dirent_sys_ndir_h$ac_cv_header_dirent_sys_dir_h$ac_cv_header_dirent_ndir_h" in
   *yes*)
     echo $ac_n "checking for opendir""... $ac_c" 1>&6
-echo "configure:4673: checking for opendir" >&5
+echo "configure:4684: checking for opendir" >&5
 if eval "test \"`echo '$''{'ac_cv_func_opendir'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4678 "configure"
+#line 4689 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char opendir(); below.  */
@@ -4697,7 +4708,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_opendir=yes"
 else
@@ -4725,12 +4736,12 @@
   esac
   if test "x$enable_network" = "xyes"; then
     echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:4729: checking for socket" >&5
+echo "configure:4740: checking for socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4734 "configure"
+#line 4745 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -4753,7 +4764,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -4771,7 +4782,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6
-echo "configure:4775: checking for WSAStartup in -lwsock32" >&5
+echo "configure:4786: checking for WSAStartup in -lwsock32" >&5
 ac_lib_var=`echo wsock32'_'WSAStartup | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'wapi_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4779,7 +4790,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lwsock32  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4783 "configure"
+#line 4794 "configure"
 #include "confdefs.h"
 #include <windows.h>
 #include <winsock.h>
@@ -4788,7 +4799,7 @@
 WSAStartup(0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:4792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "wapi_cv_lib_$ac_lib_var=yes"
 else
@@ -4874,7 +4885,8 @@
 
 
 
-audio_targets='dev oss alsa alib nas esd'
+audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd'
+
 # Check whether --enable-audio or --disable-audio was given.
 if test "${enable_audio+set}" = set; then
   enableval="$enable_audio"
@@ -4886,15 +4898,9 @@
 fi
 
 
-if test "x$enable_audio" = xyes; then
-  enable_audio=dev
-fi
+test "x$enable_audio" = xyes && enable_audio=default
 
-if test "x$enable_audio" = xall; then
-  for i in $audio_targets; do
-    eval "au_enable_$i=yes"
-  done
-elif test "x$enable_audio" != xno; then
+if test "x$enable_audio" != xno; then
   for i in `echo $enable_audio | sed 's/,/ /g'`; do
     eval "au_enable_$i=yes"
   done
@@ -4932,116 +4938,182 @@
 fi
 
 
-if test "x$au_enable_oss" = xyes; then
-  enable_audio_dev=no
-else
-  echo $ac_n "checking enable_audio=dev""... $ac_c" 1>&6
-echo "configure:4940: checking enable_audio=dev" >&5
-fi
-if test "x$au_enable_dev" = xyes; then
+if test "x$au_enable_default" = xyes; then
   case "$target" in
     *-*-linux*|*-*-freebsd*)
-      EXTRADEFS="$EXTRADEFS -DAU_OSS"
-      SYSEXTRAS="$SYSEXTRAS oss_a.c"
-      echo "$ac_t""OSS /dev/dsp" 1>&6
+      au_enable_oss=yes
       ;;
     *-*-bsdi2.0)
-      EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500"
-      SYSEXTRAS="$SYSEXTRAS bsd20_a.c"
-      echo "$ac_t""/dev/sb_dsp" 1>&6
+      au_enable_sb_dsp=yes
       ;;
     *-*-bsdi2.1|*-*-bsdi3.?|*-*-bsdi4.?)
-      EXTRADEFS="$EXTRADEFS -DAU_OSS"
-      SYSEXTRAS="$SYSEXTRAS oss_a.c"
-      echo "$ac_t""OSS /dev/dsp" 1>&6
+      au_enable_oss=yes
       ;;
     *-*-hpux*)
-      EXTRADEFS="$EXTRADEFS -DAU_HPUX_AUDIO"
-      SYSEXTRAS="$SYSEXTRAS hpux_d_a.c"
-      echo "$ac_t""hpux /dev/audio" 1>&6
+      au_enable_hpux=yes
       ;;
     *-dec-*)
-      EXTRADEFS="$EXTRADEFS -DAU_DEC -DAU_AUDRIV"
-      SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_mme.c"
-      CPPFLAGS="$CPPFLAGS -I/usr/opt/MME210/include"
-      EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a"
-      echo "$ac_t""MME" 1>&6
+      au_enable_mme=yes
       ;;
-    *-sgi-irix5*|*-sgi-irix6.2)
-      EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_OLDAL"
-      SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c"
-      EXTRALIBS="$EXTRALIBS -laudio"
-      echo "$ac_t""irix5.x or irix6.2 audio" 1>&6
+    *irix*)
+      au_enable_irix=yes
       ;;
-    *-sgi-irix6*)
-      EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL"
-      SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c"
-      EXTRALIBS="$EXTRASLIBS -laudio"
-      echo "$ac_t""irix6 audio" 1>&6
+    *-*-sunos4*)
+      au_enable_sun=yes
       ;;
+    *-*-solaris*)
+      au_enable_sun=yes
+      ;;
+    *-*-netbsd*)
+      au_enable_sun=yes
+      ;;
+    *-*-cygwin32*)
+      au_enable_w32=yes
+      ;;
+    *)
+      echo "configure: warning: No --enable-audio=default audio for $target" 1>&2
+      ;;
+  esac
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking enable_audio=oss""... $ac_c" 1>&6
+echo "configure:4983: checking enable_audio=oss" >&5
+if test "x$au_enable_oss" = xyes; then
+  EXTRADEFS="$EXTRADEFS -DAU_OSS"
+  SYSEXTRAS="$SYSEXTRAS oss_a.c"
+  if test "x$ac_cv_header_sys_soundcard_h" = xyes; then
+    echo "$ac_t""yes - <sys/soundcard.h>" 1>&6
+  else
+    case "$target" in
+      *linux*|*freebsd*)
+		echo "$ac_t""yes" 1>&6
+	;;
+      *)
+	echo "configure: warning: <sys/soundcard.h> is not found" 1>&2
+	;;
+    esac
+  fi
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking enable_audio=sun""... $ac_c" 1>&6
+echo "configure:5004: checking enable_audio=sun" >&5
+if test "x$au_enable_sun" = xyes; then
+  case "$target" in
     *-*-sunos4*)
-      EXTRADEFS="$EXTRADEFS -DAU_SUN"
-      SYSEXTRAS="$SYSEXTRAS sun_a.c"
-      echo "$ac_t""SunOS 4 /dev/audio" 1>&6
       if test -f /usr/demo/SOUND/libaudio.a; then
 	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/libaudio.a"
+	echo "$ac_t""yes" 1>&6
       else
 	echo "$ac_t""Notice: libaudio.a is not found (ignore)" 1>&6
       fi
       ;;
     *-*-solaris*)
-      EXTRADEFS="$EXTRADEFS -DAU_SUN"
-      SYSEXTRAS="$SYSEXTRAS sun_a.c"
-      echo "$ac_t""Solaris /dev/audio" 1>&6
       if test -f /usr/demo/SOUND/lib/libaudio.a; then
 	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/lib/libaudio.a"
+	echo "$ac_t""yes" 1>&6
       else
 	echo "$ac_t""Notice: libaudio.a is not found (ignore)" 1>&6
       fi
       ;;
-    *-*-netbsd*)
-      EXTRADEFS="$EXTRADEFS -DAU_SUN"
-      SYSEXTRAS="$SYSEXTRAS sun_a.c"
-      echo "$ac_t""NetBSD /dev/audio" 1>&6
+    *) 	echo "$ac_t""yes" 1>&6
       ;;
-    *-*-cygwin32*)
-      EXTRADEFS="$EXTRADEFS -DAU_W32"
-      if test "x$enable_w32gui" = xyes; then
-	SYSEXTRAS="$SYSEXTRAS w32g_a.c"
-      else
-	SYSEXTRAS="$SYSEXTRAS w32_a.c"
-      fi
-      EXTRALIBS="$EXTRALIBS -lwinmm"
-      echo "$ac_t""Windows audio" 1>&6
+  esac
+  EXTRADEFS="$EXTRADEFS -DAU_SUN"
+  SYSEXTRAS="$SYSEXTRAS sun_a.c"  
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking enable_audio=hpux""... $ac_c" 1>&6
+echo "configure:5033: checking enable_audio=hpux" >&5
+if test "x$au_enable_hpux" = xyes; then
+  case "$target" in
+    *-*-hpux*) echo "$ac_t""yes" 1>&6 ;;
+    *) echo "configure: warning: may not work on $target" 1>&2 ;;
+  esac
+  EXTRADEFS="$EXTRADEFS -DAU_HPUX_AUDIO"
+  SYSEXTRAS="$SYSEXTRAS hpux_d_a.c"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking enable_audio=irix""... $ac_c" 1>&6
+echo "configure:5046: checking enable_audio=irix" >&5
+if test "x$au_enable_irix" = xyes; then
+  case "$target" in
+    *-sgi-irix5*|*-sgi-irix6.2)
+      EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_OLDAL"
+      echo "$ac_t""yes" 1>&6
       ;;
-    *)
-      echo "configure: warning: no method to play" 1>&2
-      if test "x$have_audio_opt" != xno; then
-	EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV"
-	SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c"
-      fi
+    *-sgi-irix6*)
+      EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL"
+      echo "$ac_t""yes" 1>&6
       ;;
+    *) echo "configure: warning: may not work on $target" 1>&2 ;;
   esac
+  SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c"
+  EXTRALIBS="$EXTRASLIBS -laudio"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking enable_audio=oss""... $ac_c" 1>&6
-echo "configure:5031: checking enable_audio=oss" >&5
-if test "x$au_enable_oss" = xyes; then
-  EXTRADEFS="$EXTRADEFS -DAU_OSS"
-  SYSEXTRAS="$SYSEXTRAS oss_a.c"
-  if test "x$ac_cv_header_sys_soundcard_h" = xyes; then
-    echo "$ac_t""yes" 1>&6
-  else
-    echo "configure: warning: <sys/soundcard.h> is not found" 1>&2
-  fi
+echo $ac_n "checking enable_audio=mme""... $ac_c" 1>&6
+echo "configure:5066: checking enable_audio=mme" >&5
+if test "x$au_enable_mme" = xyes; then
+  case "$target" in
+    *-dec-*) echo "$ac_t""yes" 1>&6 ;;
+    *) echo "configure: warning: may not work on $target" 1>&2 ;;
+  esac
+  EXTRADEFS="$EXTRADEFS -DAU_DEC -DAU_AUDRIV"
+  SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_mme.c"
+  CPPFLAGS="$CPPFLAGS -I/usr/opt/MME210/include"
+  EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking enable_audio=sb_dsp""... $ac_c" 1>&6
+echo "configure:5081: checking enable_audio=sb_dsp" >&5
+if test "x$au_enable_sb_dsp" = xyes; then
+  case "$target" in
+    *-*-bsdi2.0) echo "$ac_t""yes" 1>&6 ;;
+    *) echo "configure: warning: may not work on $target" 1>&2 ;;
+  esac
+  EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500"
+  SYSEXTRAS="$SYSEXTRAS bsd20_a.c"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking enable_audio=w32""... $ac_c" 1>&6
+echo "configure:5094: checking enable_audio=w32" >&5
+if test "x$au_enable_w32" = xyes; then
+  case "$target" in
+    *-*-cygwin32*)
+     if test "x$enable_w32gui" = xyes; then
+	SYSEXTRAS="$SYSEXTRAS w32g_a.c"
+     else
+	SYSEXTRAS="$SYSEXTRAS w32_a.c"
+     fi
+     echo "$ac_t""yes" 1>&6
+     ;;
+   *)
+     echo "configure: warning: may not work on $target" 1>&2
+     SYSEXTRAS="$SYSEXTRAS w32_a.c"
+     ;;
+  esac
+  EXTRALIBS="$EXTRALIBS -lwinmm"
+  EXTRADEFS="$EXTRADEFS -DAU_W32"
 else
   echo "$ac_t""no" 1>&6
 fi
 
 echo $ac_n "checking enable_audio=alsa""... $ac_c" 1>&6
-echo "configure:5045: checking enable_audio=alsa" >&5
+echo "configure:5117: checking enable_audio=alsa" >&5
 if test "x$au_enable_alsa" = xyes; then
   echo "$ac_t""" 1>&6
   KEEPCFLAGS=$CFLAGS
@@ -5074,7 +5146,7 @@
 
 
 echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6
-echo "configure:5078: checking for ALSA CFLAGS" >&5
+echo "configure:5150: checking for ALSA CFLAGS" >&5
 if test "$alsa_inc_prefix" != "" ; then
 	ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
         CFLAGS="$CFLAGS -I$alsa_inc_prefix"
@@ -5082,7 +5154,7 @@
 echo "$ac_t""$ALSA_CFLAGS" 1>&6
 
 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6
-echo "configure:5086: checking for ALSA LDFLAGS" >&5
+echo "configure:5158: checking for ALSA LDFLAGS" >&5
 if test "$alsa_prefix" != "" ; then
 	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
 	LIBS="-L$alsa_prefix"
@@ -5091,44 +5163,10 @@
 ALSA_LIBS="$ALSA_LIBS -lasound"
 echo "$ac_t""$ALSA_LIBS" 1>&6
 
-if test $enable_alsatest = yes; then
-  echo $ac_n "checking for working libasound""... $ac_c" 1>&6
-echo "configure:5097: checking for working libasound" >&5
-  if test "$cross_compiling" = yes; then
-  echo "$ac_t""unsopported" 1>&6
-    { echo "configure: error: Cross-compiling isn't supported..." 1>&2; exit 1; }
- 
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5104 "configure"
-#include "confdefs.h"
-
-#include <sys/asoundlib.h>
-void main(void)
-{
-  snd_cards();
-  exit(0);
-}
-
-EOF
-if { (eval echo configure:5115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  echo "$ac_t"""present"" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  echo "$ac_t"""not found. "" 1>&6
-   { echo "configure: error: Fatal error: Install alsa-lib package or use --with-alsa-prefix option..." 1>&2; exit 1; }
-fi
-rm -fr conftest*
-fi
-
-fi
 
 min_alsa_version=0.1.1
 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6
-echo "configure:5132: checking for libasound headers version >= $min_alsa_version" >&5
+echo "configure:5170: checking for libasound headers version >= $min_alsa_version" >&5
 no_alsa=""
     alsa_min_major_version=`echo $min_alsa_version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
@@ -5138,7 +5176,7 @@
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
 
 cat > conftest.$ac_ext <<EOF
-#line 5142 "configure"
+#line 5180 "configure"
 #include "confdefs.h"
 
 #include <sys/asoundlib.h>
@@ -5179,7 +5217,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""found." 1>&6
    have_alsa=yes
@@ -5193,7 +5231,7 @@
 rm -f conftest*
 
 echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6
-echo "configure:5197: checking for snd_cards in -lasound" >&5
+echo "configure:5235: checking for snd_cards in -lasound" >&5
 ac_lib_var=`echo asound'_'snd_cards | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5201,7 +5239,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5205 "configure"
+#line 5243 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5212,7 +5250,7 @@
 snd_cards()
 ; return 0; }
 EOF
-if { (eval echo configure:5216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5268,11 +5306,11 @@
 fi
 
 echo $ac_n "checking enable_audio=alib""... $ac_c" 1>&6
-echo "configure:5272: checking enable_audio=alib" >&5
+echo "configure:5310: checking enable_audio=alib" >&5
 if test "x$au_enable_alib" = xyes; then
   case "$target" in
     *-*-hpux*) echo "$ac_t""yes" 1>&6 ;;
-    *) echo "configure: warning: alib: may not work on $target" 1>&2 ;;
+    *) echo "configure: warning: may not work on $target" 1>&2 ;;
   esac
   SYSEXTRAS="$SYSEXTRAS hpux_a.c"
   EXTRADEFS="$EXTRADEFS -DAU_HPUX_ALIB"
@@ -5288,7 +5326,7 @@
 fi
 
 echo $ac_n "checking enable_audio=nas""... $ac_c" 1>&6
-echo "configure:5292: checking enable_audio=nas" >&5
+echo "configure:5330: checking enable_audio=nas" >&5
 if test "x$au_enable_nas" = xyes; then
   if test "x$with_x" != xyes; then
     { echo "configure: error: nas: --with-x option must be specified" 1>&2; exit 1; }
@@ -5296,7 +5334,7 @@
   EXTRADEFS="$EXTRADEFS -DAU_NAS"
   SYSEXTRAS="$SYSEXTRAS nas_a.c"
       EXTRALIBS="$EXTRALIBS $x_libraries/libaudio.a"
-  if test -f "$x_libraries/libaudio.a"; then
+    if test -f "$x_libraries/libaudio.a"; then
     echo "$ac_t""yes - $x_libraries/libaudio.a" 1>&6
   else
     echo "configure: warning: $x_libraries/libaudio.a: Not found" 1>&2
@@ -5313,7 +5351,7 @@
 fi
 
 echo $ac_n "checking enable_audio=esd""... $ac_c" 1>&6
-echo "configure:5317: checking enable_audio=esd" >&5
+echo "configure:5355: checking enable_audio=esd" >&5
 if test "x$au_enable_esd" = xyes; then
   echo "$ac_t""" 1>&6
   KEEPCFLAGS=$CFLAGS
@@ -5360,7 +5398,7 @@
   # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5364: checking for $ac_word" >&5
+echo "configure:5402: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5395,7 +5433,7 @@
 
   min_esd_version=0.2.7
   echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
-echo "configure:5399: checking for ESD - version >= $min_esd_version" >&5
+echo "configure:5437: checking for ESD - version >= $min_esd_version" >&5
   no_esd=""
   if test "$ESD_CONFIG" = "no" ; then
     no_esd=yes
@@ -5419,7 +5457,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 5423 "configure"
+#line 5461 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5477,7 +5515,7 @@
 
 
 EOF
-if { (eval echo configure:5481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -5511,7 +5549,7 @@
           CFLAGS="$CFLAGS $ESD_CFLAGS"
           LIBS="$LIBS $ESD_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 5515 "configure"
+#line 5553 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5521,7 +5559,7 @@
  return 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding ESD or finding the wrong"
@@ -5576,19 +5614,27 @@
   echo "$ac_t""no" 1>&6
 fi
 
+if test "x$au_enable_none" = xyes; then
+    EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV"
+    SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c"
+fi
+
+
 echo $ac_n "checking default output mode""... $ac_c" 1>&6
-echo "configure:5581: checking default output mode" >&5
+echo "configure:5625: checking default output mode" >&5
 if test "x$DEFAULT_PLAYMODE" = x; then
-  for i in $audio_targets; do
-    case "/$enable_audio," in
-      /$i,*) DEFAULT_PLAYMODE=$i;;
-    esac
-  done
+  DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'`
 fi
 case ".$DEFAULT_PLAYMODE" in
-  .dev)  TIMIDITY_OUTPUT_ID=d ;;
+  .default)  TIMIDITY_OUTPUT_ID=d ;;
   .oss)  TIMIDITY_OUTPUT_ID=d ;;
   .alsa) TIMIDITY_OUTPUT_ID=s ;;
+  .sun)  TIMIDITY_OUTPUT_ID=d ;;
+  .hpux)  TIMIDITY_OUTPUT_ID=d ;;
+  .irix)  TIMIDITY_OUTPUT_ID=d ;;
+  .mme)  TIMIDITY_OUTPUT_ID=d ;;
+  .sb_dsp)  TIMIDITY_OUTPUT_ID=d ;;
+  .w32)  TIMIDITY_OUTPUT_ID=d ;;
   .alib) TIMIDITY_OUTPUT_ID=A ;;
   .nas)  TIMIDITY_OUTPUT_ID=n ;;
   .esd)  TIMIDITY_OUTPUT_ID=e ;;
@@ -5603,6 +5649,18 @@
 
 
 
+interface_targets='dynamic ncurses slang motif tcltk emacs vt100 xaw xskin gtk'
+
+echo "###--enable-interface###"
+# Check whether --enable-interface or --disable-interface was given.
+if test "${enable_interface+set}" = set; then
+  enableval="$enable_interface"
+   echo "###$enableval###"
+    for i in `echo $enableval | sed 's/,/ /g'`; do
+      eval "enable_$i=yes"
+    done 
+fi
+
 
 # Check whether --enable-dynamic or --disable-dynamic was given.
 if test "${enable_dynamic+set}" = set; then
@@ -5612,9 +5670,14 @@
 fi
 
 
-case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_xskin$enable_gtk$enable_dynamic" in
-*dynamic*) NEEDDLOPEN=yes;;
-*)         NEEDDLOPEN=no;;
+join_targets=
+for i in $interface_targets; do
+  eval "join_targets=$join_targets\$enable_$i"
+done
+
+case ".$join_targets" in
+.*dynamic*) NEEDDLOPEN=yes;;
+*)          NEEDDLOPEN=no;;
 esac
 
 if test "x$GCC" = xyes; then SHCFLAGS="$SHCFLAGS -fPIC"; fi
@@ -5624,12 +5687,12 @@
   have_dl=no
 
   echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6
-echo "configure:5628: checking for LoadLibraryExA" >&5
+echo "configure:5691: checking for LoadLibraryExA" >&5
 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibraryExA'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5633 "configure"
+#line 5696 "configure"
 #include "confdefs.h"
 #include <windows.h>
 
@@ -5638,7 +5701,7 @@
 LoadLibraryExA(0,0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:5642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   wapi_cv_func_LoadLibraryExA=yes
 else
@@ -5661,12 +5724,12 @@
 
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:5665: checking for shl_load" >&5
+echo "configure:5728: checking for shl_load" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5670 "configure"
+#line 5733 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load(); below.  */
@@ -5689,7 +5752,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shl_load=yes"
 else
@@ -5714,12 +5777,12 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:5718: checking for dlopen" >&5
+echo "configure:5781: checking for dlopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5723 "configure"
+#line 5786 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
@@ -5742,7 +5805,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dlopen=yes"
 else
@@ -5764,12 +5827,12 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dld_init""... $ac_c" 1>&6
-echo "configure:5768: checking for dld_init" >&5
+echo "configure:5831: checking for dld_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func_dld_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5773 "configure"
+#line 5836 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dld_init(); below.  */
@@ -5792,7 +5855,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dld_init=yes"
 else
@@ -5814,7 +5877,7 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:5818: checking for dld_init in -ldld" >&5
+echo "configure:5881: checking for dld_init in -ldld" >&5
 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5822,7 +5885,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5826 "configure"
+#line 5889 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5833,7 +5896,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5856,13 +5919,13 @@
   fi
 
   echo $ac_n "checking dynamic link method""... $ac_c" 1>&6
-echo "configure:5860: checking dynamic link method" >&5
+echo "configure:5923: checking dynamic link method" >&5
   case "$have_dl" in
     dlopen)
       echo "$ac_t""use dl_dlopen.c" 1>&6
       SYSEXTRAS="$SYSEXTRAS dl_dlopen.c"
       echo $ac_n "checking whether your dlsym() needs a leading underscore""... $ac_c" 1>&6
-echo "configure:5866: checking whether your dlsym() needs a leading underscore" >&5
+echo "configure:5929: checking whether your dlsym() needs a leading underscore" >&5
 if eval "test \"`echo '$''{'timidity_cv_func_dlsym_underscore'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6011,17 +6074,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6015: checking for $ac_hdr" >&5
+echo "configure:6078: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6020 "configure"
+#line 6083 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6062,7 +6125,7 @@
     esac
 
     echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:6066: checking for initscr in -lncurses" >&5
+echo "configure:6129: checking for initscr in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6070,7 +6133,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6074 "configure"
+#line 6137 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6081,7 +6144,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6100,7 +6163,7 @@
 else
   echo "$ac_t""no" 1>&6
  	  echo $ac_n "checking for PDC_set_ctrl_break in -lcurses""... $ac_c" 1>&6
-echo "configure:6104: checking for PDC_set_ctrl_break in -lcurses" >&5
+echo "configure:6167: checking for PDC_set_ctrl_break in -lcurses" >&5
 ac_lib_var=`echo curses'_'PDC_set_ctrl_break | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6108,7 +6171,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses $lib_user32_test $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6112 "configure"
+#line 6175 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6119,7 +6182,7 @@
 PDC_set_ctrl_break()
 ; return 0; }
 EOF
-if { (eval echo configure:6123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6206,7 +6269,7 @@
 if test "${enable_slang+set}" = set; then
   enableval="$enable_slang"
   case "x$enable_slang" in xyes|xdynamic)  echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6
-echo "configure:6210: checking for SLang_init_tty in -lslang" >&5
+echo "configure:6273: checking for SLang_init_tty in -lslang" >&5
 ac_lib_var=`echo slang'_'SLang_init_tty | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6214,7 +6277,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lslang  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6218 "configure"
+#line 6281 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6225,7 +6288,7 @@
 SLang_init_tty()
 ; return 0; }
 EOF
-if { (eval echo configure:6229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6247,21 +6310,21 @@
 	  echo "configure: warning: slang interface is not enabled" 1>&2 
 fi
 
-    for ac_hdr in slang/slang.h
+    for ac_hdr in slang/slang.h slang.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6255: checking for $ac_hdr" >&5
+echo "configure:6318: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6260 "configure"
+#line 6323 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6313,7 +6376,7 @@
   dynamic_targets="$dynamic_targets interface_s.\$(so)"
    s_so_libs="-lslang"
     echo $ac_n "checking for initscr in -ltermcap""... $ac_c" 1>&6
-echo "configure:6317: checking for initscr in -ltermcap" >&5
+echo "configure:6380: checking for initscr in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6321,7 +6384,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6325 "configure"
+#line 6388 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6332,7 +6395,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6452,7 +6515,7 @@
     tk_lib=
     for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do
       case "x$tcl_lib" in x) echo $ac_n "checking for Tcl_Init in -l$l""... $ac_c" 1>&6
-echo "configure:6456: checking for Tcl_Init in -l$l" >&5
+echo "configure:6519: checking for Tcl_Init in -l$l" >&5
 ac_lib_var=`echo $l'_'Tcl_Init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6460,7 +6523,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$l  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6464 "configure"
+#line 6527 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6471,7 +6534,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:6475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6495,7 +6558,7 @@
     LIBS="$LIBS $tcl_lib"
     for l in tk tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do
       case "x$tk_lib" in x) echo $ac_n "checking for Tk_Init in -l$l""... $ac_c" 1>&6
-echo "configure:6499: checking for Tk_Init in -l$l" >&5
+echo "configure:6562: checking for Tk_Init in -l$l" >&5
 ac_lib_var=`echo $l'_'Tk_Init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6503,7 +6566,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$l  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6507 "configure"
+#line 6570 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6514,7 +6577,7 @@
 Tk_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:6518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6880,7 +6943,7 @@
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6884: checking for $ac_word" >&5
+echo "configure:6947: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6915,7 +6978,7 @@
 
   min_gtk_version=1.1.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:6919: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:6982: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -6938,7 +7001,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 6942 "configure"
+#line 7005 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -7004,7 +7067,7 @@
 }
 
 EOF
-if { (eval echo configure:7008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -7038,7 +7101,7 @@
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 7042 "configure"
+#line 7105 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -7048,7 +7111,7 @@
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:7052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -7198,17 +7261,17 @@
     fi
     ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6
-echo "configure:7202: checking for X11/xpm.h" >&5
+echo "configure:7265: checking for X11/xpm.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7207 "configure"
+#line 7270 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7231,7 +7294,7 @@
 fi
 
     echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
-echo "configure:7235: checking for XpmCreatePixmapFromData in -lXpm" >&5
+echo "configure:7298: checking for XpmCreatePixmapFromData in -lXpm" >&5
 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7239,7 +7302,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7243 "configure"
+#line 7306 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7250,7 +7313,7 @@
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:7254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7346,17 +7409,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7350: checking for $ac_hdr" >&5
+echo "configure:7413: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7355 "configure"
+#line 7418 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7407,7 +7470,7 @@
       LDFLAGS="$LDFLAGS $offix_lib_dir"
       LIBS="$LIBS $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11"
       echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6
-echo "configure:7411: checking for DndInitialize in -lDnd" >&5
+echo "configure:7474: checking for DndInitialize in -lDnd" >&5
 ac_lib_var=`echo Dnd'_'DndInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7415,7 +7478,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lDnd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7419 "configure"
+#line 7482 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7426,7 +7489,7 @@
 DndInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:7430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7509,7 +7572,7 @@
       EXTRADEFS="$EXTRADEFS -DWRDT_X"
       enable_sherry_wrd=yes
       echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6
-echo "configure:7513: checking for zlibVersion in -lz" >&5
+echo "configure:7576: checking for zlibVersion in -lz" >&5
 ac_lib_var=`echo z'_'zlibVersion | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7517,7 +7580,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7521 "configure"
+#line 7584 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7528,7 +7591,7 @@
 zlibVersion()
 ; return 0; }
 EOF
-if { (eval echo configure:7532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7551,17 +7614,17 @@
 
       ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:7555: checking for png.h" >&5
+echo "configure:7618: checking for png.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7560 "configure"
+#line 7623 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7584,7 +7647,7 @@
 fi
 
       echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6
-echo "configure:7588: checking for png_init_io in -lpng" >&5
+echo "configure:7651: checking for png_init_io in -lpng" >&5
 ac_lib_var=`echo png'_'png_init_io | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7592,7 +7655,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7596 "configure"
+#line 7659 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7603,7 +7666,7 @@
 png_init_io()
 ; return 0; }
 EOF
-if { (eval echo configure:7607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7718,13 +7781,17 @@
 CPPFLAGS="$val"
 rm -f wordtmp >/dev/null 2>&1
 
-CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\" -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\""
+CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\""
+if test "x$TIMIDITY_OUTPUT_ID" != x; then
+  CPPFLAGS="$CPPFLAGS -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\""
+fi
 
 if test "x$with_x" = xyes; then
     LIBS=`echo $LIBS | sed "s/-lX11/$lib_offix_opt $lib_xm_opt $lib_xaw_opt $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11/"`
 fi
 LIBS="$LIBS $lib_dl_opt $lib_png_opt $lib_zip_opt $lib_user32_opt $lib_w32gui_opt $EXTRALIBS"
 SHLD="$SHLD $SHLDFLAGS"
+
 
 
 
diff -ruN TiMidity++-2.6.0-beta1/configure.in TiMidity++-2.6.0-beta2/configure.in
--- TiMidity++-2.6.0-beta1/configure.in	Mon Aug 30 18:55:59 1999
+++ TiMidity++-2.6.0-beta2/configure.in	Wed Sep  1 02:50:34 1999
@@ -51,9 +51,11 @@
 dnl SHCFLAGS	- Additional flags to compile shared object library.
 		  (such as -fPIC)
 
+SHELL=${CONFIG_SHELL-/bin/sh}
+
 AC_INIT(timidity/timidity.c)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(TiMidity++, 2.6.0-beta1, no-define)
+AM_INIT_AUTOMAKE(TiMidity++, 2.6.0-beta2, no-define)
 
 dnl To use CONTAINS() macro (See acinclude.m4)
 CONTAINS_INIT
@@ -395,26 +397,32 @@
 dnl
 dnl Audio section
 dnl
-dnl dev(d):	OSS /dev/dsp	(Linux, FreeBSD, BSD/OS)
-dnl		/dev/sb_dsp	(BSD/OS)
-dnl		/dev/audio	(Sun, HPUX, NetBSD)
-dnl		IRIX audio or OSF/1 MME
-dnl		Pseudo audio device
+dnl default(d):	auto selection
+dnl oss(d):	OSS /dev/dsp
+dnl alsa(d):	ALSA pcm device
+dnl sun(d):	SunOS /dev/audio
+dnl hpux(d):	HPUX /dev/audio
+dnl irix(d):	IRIX audio
+dnl mme(d):	OSF/1 MME
+dnl sb_dsp(d):	BSD/OS 2.0 /dev/sb_dsp
+dnl w32(d):	Windows MMS
 dnl alsa(s):	ALSA pcm device
 dnl alib(A):	HPUX network audio (Alib)
 dnl nas(n):	Network Audio System
 dnl esd(e):	EsounD
 
-audio_targets='dev oss alsa alib nas esd'
+audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd'
+
 AC_ARG_ENABLE(audio,
   [  --enable-audio[=mode_list]  Enable audio (Specify comma separated mode list):
-                              dev:  (default)
-                                    /dev/dsp    (Linux, FreeBSD, BSD/OS)
-                                    /dev/sb_dsp (BSD/OS)
-                                    /dev/audio  (Sun, NetBSD, HPUX)
-                                    IRIX audio or OSF/1 MME
-                                    Windows MMS
-                              oss:  OSS /dev/dsp (Exclusive dev mode)
+                              default:  Automatically select audio device.
+                              oss:  OSS /dev/dsp
+                              sun:  SunOS /dev/audio
+                              hpux: HPUX /dev/audio
+                              irix: IRIX audio
+                              mme:  OSF/1 MME
+                              sb_dsp: BSD/OS 2.0 /dev/sb_dsp
+                              w32:  Windows MMS
                               alsa: ALSA pcm device
                               alib: HPUX network audio (Alib)
                               nas:  NAS - Network Audio System
@@ -424,15 +432,10 @@
   [ enable_audio=yes
     have_audio_opt=no ])
 
-if test "x$enable_audio" = xyes; then
-  enable_audio=dev
-fi
+dnl yes -> default
+test "x$enable_audio" = xyes && enable_audio=default
 
-if test "x$enable_audio" = xall; then
-  for i in $audio_targets; do
-    eval "au_enable_$i=yes"
-  done
-elif test "x$enable_audio" != xno; then
+if test "x$enable_audio" != xno; then
   for i in `echo $enable_audio | sed 's/,/ /g'`; do
     eval "au_enable_$i=yes"
   done
@@ -442,7 +445,7 @@
 DEFAULT_PLAYMODE=
 AC_ARG_WITH(default-output,
   [  --with-default-output=<mode>  Specify default output mode (optional):
-                              dev|oss|alsa|alib|nas|esd|wav|au|aiff|list],
+                              default|alsa|alib|nas|esd|wav|au|aiff|list],
   [ if test "$enable_audio" != no; then
       DEFAULT_PLAYMODE=$withval
       eval "au_enable_$DEFAULT_PLAYMODE=yes"
@@ -463,108 +466,173 @@
   [  --enable-alsa           ALSA   (Obsoleted.  Use --enable-audio=alsa)],
   [ au_enable_nas=$enableval ])
 
-if test "x$au_enable_oss" = xyes; then
-  enable_audio_dev=no
-else
-  AC_MSG_CHECKING(enable_audio=dev)
-fi
-if test "x$au_enable_dev" = xyes; then
+if test "x$au_enable_default" = xyes; then
   case "$target" in
     *-*-linux*|*-*-freebsd*)
-      EXTRADEFS="$EXTRADEFS -DAU_OSS"
-      SYSEXTRAS="$SYSEXTRAS oss_a.c"
-      AC_MSG_RESULT(OSS /dev/dsp)
+      au_enable_oss=yes
       ;;
     *-*-bsdi2.0)
-      EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500"
-      SYSEXTRAS="$SYSEXTRAS bsd20_a.c"
-      AC_MSG_RESULT(/dev/sb_dsp)
+      au_enable_sb_dsp=yes
       ;;
     *-*-bsdi2.1|*-*-bsdi3.?|*-*-bsdi4.?)
-      EXTRADEFS="$EXTRADEFS -DAU_OSS"
-      SYSEXTRAS="$SYSEXTRAS oss_a.c"
-      AC_MSG_RESULT(OSS /dev/dsp)
+      au_enable_oss=yes
       ;;
     *-*-hpux*)
-      EXTRADEFS="$EXTRADEFS -DAU_HPUX_AUDIO"
-      SYSEXTRAS="$SYSEXTRAS hpux_d_a.c"
-      AC_MSG_RESULT(hpux /dev/audio)
+      au_enable_hpux=yes
       ;;
     *-dec-*)
-      EXTRADEFS="$EXTRADEFS -DAU_DEC -DAU_AUDRIV"
-      SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_mme.c"
-      CPPFLAGS="$CPPFLAGS -I/usr/opt/MME210/include"
-      EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a"
-      AC_MSG_RESULT(MME)
+      au_enable_mme=yes
       ;;
-    *-sgi-irix5*|*-sgi-irix6.2)
-      EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_OLDAL"
-      SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c"
-      EXTRALIBS="$EXTRALIBS -laudio"
-      AC_MSG_RESULT(irix5.x or irix6.2 audio)
+    *irix*)
+      au_enable_irix=yes
       ;;
-    *-sgi-irix6*)
-      EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL"
-      SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c"
-      EXTRALIBS="$EXTRASLIBS -laudio"
-      AC_MSG_RESULT(irix6 audio)
+    *-*-sunos4*)
+      au_enable_sun=yes
       ;;
+    *-*-solaris*)
+      au_enable_sun=yes
+      ;;
+    *-*-netbsd*)
+      au_enable_sun=yes
+      ;;
+    *-*-cygwin32*)
+      au_enable_w32=yes
+      ;;
+    *)
+      AC_MSG_WARN(No --enable-audio=default audio for $target)
+      ;;
+  esac
+else
+  AC_MSG_RESULT(no)
+fi
+
+dnl
+dnl oss
+dnl
+AC_MSG_CHECKING(enable_audio=oss)
+if test "x$au_enable_oss" = xyes; then
+  EXTRADEFS="$EXTRADEFS -DAU_OSS"
+  SYSEXTRAS="$SYSEXTRAS oss_a.c"
+  if test "x$ac_cv_header_sys_soundcard_h" = xyes; then
+    AC_MSG_RESULT(yes - <sys/soundcard.h>)
+  else
+    case "$target" in
+      *linux*|*freebsd*)
+	dnl <linux/soundcard.h> or <machine/soundcard.h>
+	AC_MSG_RESULT(yes)
+	;;
+      *)
+	AC_MSG_WARN(<sys/soundcard.h> is not found)
+	;;
+    esac
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(enable_audio=sun)
+if test "x$au_enable_sun" = xyes; then
+  case "$target" in
     *-*-sunos4*)
-      EXTRADEFS="$EXTRADEFS -DAU_SUN"
-      SYSEXTRAS="$SYSEXTRAS sun_a.c"
-      AC_MSG_RESULT(SunOS 4 /dev/audio)
       if test -f /usr/demo/SOUND/libaudio.a; then
 	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/libaudio.a"
+	AC_MSG_RESULT(yes)
       else
 	AC_MSG_RESULT(Notice: libaudio.a is not found [(ignore)])
       fi
       ;;
     *-*-solaris*)
-      EXTRADEFS="$EXTRADEFS -DAU_SUN"
-      SYSEXTRAS="$SYSEXTRAS sun_a.c"
-      AC_MSG_RESULT(Solaris /dev/audio)
       if test -f /usr/demo/SOUND/lib/libaudio.a; then
 	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/lib/libaudio.a"
+	AC_MSG_RESULT(yes)
       else
 	AC_MSG_RESULT(Notice: libaudio.a is not found [(ignore)])
       fi
       ;;
-    *-*-netbsd*)
-      EXTRADEFS="$EXTRADEFS -DAU_SUN"
-      SYSEXTRAS="$SYSEXTRAS sun_a.c"
-      AC_MSG_RESULT(NetBSD /dev/audio)
+    *) 	AC_MSG_RESULT(yes)
       ;;
-    *-*-cygwin32*)
-      EXTRADEFS="$EXTRADEFS -DAU_W32"
-      if test "x$enable_w32gui" = xyes; then
-	SYSEXTRAS="$SYSEXTRAS w32g_a.c"
-      else
-	SYSEXTRAS="$SYSEXTRAS w32_a.c"
-      fi
-      EXTRALIBS="$EXTRALIBS -lwinmm"
-      AC_MSG_RESULT(Windows audio)
+  esac
+  EXTRADEFS="$EXTRADEFS -DAU_SUN"
+  SYSEXTRAS="$SYSEXTRAS sun_a.c"  
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(enable_audio=hpux)
+if test "x$au_enable_hpux" = xyes; then
+  case "$target" in
+    *-*-hpux*) AC_MSG_RESULT(yes) ;;
+    *) AC_MSG_WARN(may not work on $target) ;;
+  esac
+  EXTRADEFS="$EXTRADEFS -DAU_HPUX_AUDIO"
+  SYSEXTRAS="$SYSEXTRAS hpux_d_a.c"
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(enable_audio=irix)
+if test "x$au_enable_irix" = xyes; then
+  case "$target" in
+    *-sgi-irix5*|*-sgi-irix6.2)
+      EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_OLDAL"
+      AC_MSG_RESULT(yes)
       ;;
-    *)
-      AC_MSG_WARN(no method to play)
-      if test "x$have_audio_opt" != xno; then
-	EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV"
-	SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c"
-      fi
+    *-sgi-irix6*)
+      EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL"
+      AC_MSG_RESULT(yes)
       ;;
+    *) AC_MSG_WARN(may not work on $target) ;;
   esac
+  SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c"
+  EXTRALIBS="$EXTRASLIBS -laudio"
 else
   AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING(enable_audio=oss)
-if test "x$au_enable_oss" = xyes; then
-  EXTRADEFS="$EXTRADEFS -DAU_OSS"
-  SYSEXTRAS="$SYSEXTRAS oss_a.c"
-  if test "x$ac_cv_header_sys_soundcard_h" = xyes; then
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_WARN(<sys/soundcard.h> is not found)
-  fi
+AC_MSG_CHECKING(enable_audio=mme)
+if test "x$au_enable_mme" = xyes; then
+  case "$target" in
+    *-dec-*) AC_MSG_RESULT(yes) ;;
+    *) AC_MSG_WARN(may not work on $target) ;;
+  esac
+  EXTRADEFS="$EXTRADEFS -DAU_DEC -DAU_AUDRIV"
+  SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_mme.c"
+  CPPFLAGS="$CPPFLAGS -I/usr/opt/MME210/include"
+  EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a"
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(enable_audio=sb_dsp)
+if test "x$au_enable_sb_dsp" = xyes; then
+  case "$target" in
+    *-*-bsdi2.0) AC_MSG_RESULT(yes) ;;
+    *) AC_MSG_WARN(may not work on $target) ;;
+  esac
+  EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500"
+  SYSEXTRAS="$SYSEXTRAS bsd20_a.c"
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(enable_audio=w32)
+if test "x$au_enable_w32" = xyes; then
+  case "$target" in
+    *-*-cygwin32*)
+     if test "x$enable_w32gui" = xyes; then
+	SYSEXTRAS="$SYSEXTRAS w32g_a.c"
+     else
+	SYSEXTRAS="$SYSEXTRAS w32_a.c"
+     fi
+     AC_MSG_RESULT(yes)
+     ;;
+   *)
+     AC_MSG_WARN(may not work on $target)
+     SYSEXTRAS="$SYSEXTRAS w32_a.c"
+     ;;
+  esac
+  EXTRALIBS="$EXTRALIBS -lwinmm"
+  EXTRADEFS="$EXTRADEFS -DAU_W32"
 else
   AC_MSG_RESULT(no)
 fi
@@ -596,7 +664,7 @@
 if test "x$au_enable_alib" = xyes; then
   case "$target" in
     *-*-hpux*) AC_MSG_RESULT(yes) ;;
-    *) AC_MSG_WARN(alib: may not work on $target) ;;
+    *) AC_MSG_WARN(may not work on $target) ;;
   esac
   SYSEXTRAS="$SYSEXTRAS hpux_a.c"
   EXTRADEFS="$EXTRADEFS -DAU_HPUX_ALIB"
@@ -621,6 +689,7 @@
   dnl -laudio conflicts another audio library,
   dnl so I specify NAS library directly
   EXTRALIBS="$EXTRALIBS $x_libraries/libaudio.a"
+  dnl FIXME: It is needed to test NAS library.
   if test -f "$x_libraries/libaudio.a"; then
     AC_MSG_RESULT(yes - $x_libraries/libaudio.a)
   else
@@ -660,21 +729,30 @@
   AC_MSG_RESULT(no)
 fi
 
+dnl Pseudo audio device (Undocumented).
+if test "x$au_enable_none" = xyes; then
+    EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV"
+    SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c"
+fi
+
+
 dnl
 dnl TIMIDITY_OUTPUT_ID
 dnl
 AC_MSG_CHECKING(default output mode)
 if test "x$DEFAULT_PLAYMODE" = x; then
-  for i in $audio_targets; do
-    case "/$enable_audio," in
-      /$i,*) DEFAULT_PLAYMODE=$i;;
-    esac
-  done
+  DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'`
 fi
 case ".$DEFAULT_PLAYMODE" in
-  .dev)  TIMIDITY_OUTPUT_ID=d ;;
+  .default)  TIMIDITY_OUTPUT_ID=d ;;
   .oss)  TIMIDITY_OUTPUT_ID=d ;;
   .alsa) TIMIDITY_OUTPUT_ID=s ;;
+  .sun)  TIMIDITY_OUTPUT_ID=d ;;
+  .hpux)  TIMIDITY_OUTPUT_ID=d ;;
+  .irix)  TIMIDITY_OUTPUT_ID=d ;;
+  .mme)  TIMIDITY_OUTPUT_ID=d ;;
+  .sb_dsp)  TIMIDITY_OUTPUT_ID=d ;;
+  .w32)  TIMIDITY_OUTPUT_ID=d ;;
   .alib) TIMIDITY_OUTPUT_ID=A ;;
   .nas)  TIMIDITY_OUTPUT_ID=n ;;
   .esd)  TIMIDITY_OUTPUT_ID=e ;;
@@ -692,17 +770,33 @@
 dnl Interface section
 dnl
 
-dnl Dynamic link configuration
+interface_targets='dynamic ncurses slang motif tcltk emacs vt100 xaw xskin gtk'
 
+echo "###--enable-interface###"
+AC_ARG_ENABLE(interface,
+  [  --enable-interface=[interface_list]  Comma separated interface list ],
+  [ echo "###$enableval###"
+    for i in `echo $enableval | sed 's/,/ /g'`; do
+      eval "enable_$i=yes"
+    done ])
+
+dnl
+dnl Dynamic link configuration
+dnl
 AC_ARG_ENABLE(dynamic,
   [  --enable-dynamic        Enable dynamic link interface   (default is no)],
   [ dnl --enable-dynamic=yes to --enable-dynamic=dynamic
     test "x$enable_dynamic" = xyes && enable_dynamic=dynamic
   ])
 
-case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_xskin$enable_gtk$enable_dynamic" in
-*dynamic*) NEEDDLOPEN=yes;;
-*)         NEEDDLOPEN=no;;
+join_targets=
+for i in $interface_targets; do
+  eval "join_targets=$join_targets\$enable_$i"
+done
+
+case ".$join_targets" in
+.*dynamic*) NEEDDLOPEN=yes;;
+*)          NEEDDLOPEN=no;;
 esac
 
 dnl check -fpic option for gcc
@@ -769,7 +863,9 @@
 AM_CONDITIONAL(NEEDDLOPEN, test "$NEEDDLOPEN" = "yes")
 
 
-dnl Select interfaces
+dnl
+dnl Each interface section
+dnl
 
 dnl ncurses
 AM_CONDITIONAL(ENABLE_NCURSES, false)
@@ -832,7 +928,7 @@
   [ AC_CHECK_LIB(slang,SLang_init_tty,:,
 	[ enable_slang=no
 	  AC_MSG_WARN(slang interface is not enabled) ])
-    AC_CHECK_HEADERS(slang/slang.h)
+    AC_CHECK_HEADERS(slang/slang.h slang.h)
   ],
   [ LIBS="$LIBS -lslang"
     INTERFACE_SRCS="$INTERFACE_SRCS slang_c.c"
@@ -1092,7 +1188,7 @@
   ]
 )
 
-dnl Network selection
+dnl Network section
 AC_ARG_ENABLE(network,
   [  --enable-network        Enable network support          (default is no)],
   [ if test "$enableval" = "yes"; then
@@ -1143,7 +1239,10 @@
 SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
 SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
 SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
-CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\" -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\""
+CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\""
+if test "x$TIMIDITY_OUTPUT_ID" != x; then
+  CPPFLAGS="$CPPFLAGS -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\""
+fi
 
 if test "x$with_x" = xyes; then
   dnl Order of X-library is: -lXm -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11
@@ -1152,6 +1251,7 @@
 LIBS="$LIBS $lib_dl_opt $lib_png_opt $lib_zip_opt $lib_user32_opt $lib_w32gui_opt $EXTRALIBS"
 SHLD="$SHLD $SHLDFLAGS"
 
+AC_SUBST(SHELL)
 AC_SUBST(timidity_LDFLAGS)
 AC_SUBST(SYSEXTRAS)
 AC_SUBST(EXTRALIBS)
diff -ruN TiMidity++-2.6.0-beta1/doc/C/Makefile.in TiMidity++-2.6.0-beta2/doc/C/Makefile.in
--- TiMidity++-2.6.0-beta1/doc/C/Makefile.in	Mon Aug 30 19:05:25 1999
+++ TiMidity++-2.6.0-beta2/doc/C/Makefile.in	Wed Sep  1 02:58:15 1999
@@ -100,6 +100,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
diff -ruN TiMidity++-2.6.0-beta1/doc/Makefile.in TiMidity++-2.6.0-beta2/doc/Makefile.in
--- TiMidity++-2.6.0-beta1/doc/Makefile.in	Mon Aug 30 19:05:24 1999
+++ TiMidity++-2.6.0-beta2/doc/Makefile.in	Wed Sep  1 02:58:14 1999
@@ -100,6 +100,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
diff -ruN TiMidity++-2.6.0-beta1/doc/ja_JP.ujis/Makefile.in TiMidity++-2.6.0-beta2/doc/ja_JP.ujis/Makefile.in
--- TiMidity++-2.6.0-beta1/doc/ja_JP.ujis/Makefile.in	Mon Aug 30 19:05:27 1999
+++ TiMidity++-2.6.0-beta2/doc/ja_JP.ujis/Makefile.in	Wed Sep  1 02:58:17 1999
@@ -100,6 +100,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
diff -ruN TiMidity++-2.6.0-beta1/interface/Makefile.in TiMidity++-2.6.0-beta2/interface/Makefile.in
--- TiMidity++-2.6.0-beta1/interface/Makefile.in	Mon Aug 30 19:05:07 1999
+++ TiMidity++-2.6.0-beta2/interface/Makefile.in	Wed Sep  1 02:57:59 1999
@@ -99,6 +99,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
diff -ruN TiMidity++-2.6.0-beta1/interface/bitmaps/Makefile.in TiMidity++-2.6.0-beta2/interface/bitmaps/Makefile.in
--- TiMidity++-2.6.0-beta1/interface/bitmaps/Makefile.in	Mon Aug 30 19:05:12 1999
+++ TiMidity++-2.6.0-beta2/interface/bitmaps/Makefile.in	Wed Sep  1 02:58:05 1999
@@ -100,6 +100,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
diff -ruN TiMidity++-2.6.0-beta1/interface/motif_bitmaps/Makefile.in TiMidity++-2.6.0-beta2/interface/motif_bitmaps/Makefile.in
--- TiMidity++-2.6.0-beta1/interface/motif_bitmaps/Makefile.in	Mon Aug 30 19:05:11 1999
+++ TiMidity++-2.6.0-beta2/interface/motif_bitmaps/Makefile.in	Wed Sep  1 02:58:03 1999
@@ -100,6 +100,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
diff -ruN TiMidity++-2.6.0-beta1/interface/pixmaps/Makefile.in TiMidity++-2.6.0-beta2/interface/pixmaps/Makefile.in
--- TiMidity++-2.6.0-beta1/interface/pixmaps/Makefile.in	Mon Aug 30 19:05:16 1999
+++ TiMidity++-2.6.0-beta2/interface/pixmaps/Makefile.in	Wed Sep  1 02:58:07 1999
@@ -100,6 +100,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
diff -ruN TiMidity++-2.6.0-beta1/libarc/Makefile.in TiMidity++-2.6.0-beta2/libarc/Makefile.in
--- TiMidity++-2.6.0-beta1/libarc/Makefile.in	Mon Aug 30 19:05:03 1999
+++ TiMidity++-2.6.0-beta2/libarc/Makefile.in	Wed Sep  1 02:57:55 1999
@@ -100,6 +100,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
diff -ruN TiMidity++-2.6.0-beta1/timidity/Makefile.in TiMidity++-2.6.0-beta2/timidity/Makefile.in
--- TiMidity++-2.6.0-beta1/timidity/Makefile.in	Mon Aug 30 19:05:18 1999
+++ TiMidity++-2.6.0-beta2/timidity/Makefile.in	Wed Sep  1 02:58:09 1999
@@ -100,6 +100,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
@@ -313,8 +314,7 @@
 playmidi.o: playmidi.c ../config.h timidity.h ../utils/support.h \
 	common.h ../libarc/url.h ../utils/mblock.h instrum.h playmidi.h \
 	readmidi.h output.h mix.h controls.h miditrace.h recache.h \
-	../libarc/arc.h reverb.h wrd.h aq.h ../interface/soundspec.h \
-	tables.h
+	../libarc/arc.h reverb.h wrd.h aq.h tables.h
 raw_a.o: raw_a.c ../config.h timidity.h ../utils/support.h output.h \
 	controls.h
 rcp.o: rcp.c ../config.h timidity.h ../utils/support.h common.h \
@@ -350,8 +350,8 @@
 timidity.o: timidity.c ../config.h ../interface.h timidity.h \
 	../utils/support.h common.h ../libarc/url.h ../utils/mblock.h \
 	instrum.h playmidi.h readmidi.h output.h controls.h tables.h \
-	miditrace.h reverb.h ../interface/soundspec.h recache.h \
-	../libarc/arc.h ../utils/strtab.h wrd.h mid.defs aq.h
+	miditrace.h reverb.h recache.h ../libarc/arc.h \
+	../utils/strtab.h wrd.h mid.defs aq.h
 wave_a.o: wave_a.c ../config.h timidity.h ../utils/support.h output.h \
 	controls.h
 wrd_read.o: wrd_read.c ../config.h timidity.h ../utils/support.h \
diff -ruN TiMidity++-2.6.0-beta1/timidity/oss_a.c TiMidity++-2.6.0-beta2/timidity/oss_a.c
--- TiMidity++-2.6.0-beta1/timidity/oss_a.c	Mon Aug 30 17:15:35 1999
+++ TiMidity++-2.6.0-beta2/timidity/oss_a.c	Tue Aug 31 23:53:23 1999
@@ -76,7 +76,7 @@
 
 /* export the playback mode */
 
-#define dpm dsp_play_mode
+#define dpm oss_play_mode
 
 PlayMode dpm = {
     DEFAULT_RATE,
diff -ruN TiMidity++-2.6.0-beta1/timidity/timidity.c TiMidity++-2.6.0-beta2/timidity/timidity.c
--- TiMidity++-2.6.0-beta1/timidity/timidity.c	Mon Aug 30 18:00:55 1999
+++ TiMidity++-2.6.0-beta2/timidity/timidity.c	Wed Sep  1 02:32:53 1999
@@ -2784,14 +2784,20 @@
 	int i;
 
 	play_mode = play_mode_list[0];
-	if((output_id = getenv("TIMIDITY_OUTPUT_ID")) == NULL)
+	output_id = getenv("TIMIDITY_OUTPUT_ID");
+#ifdef TIMIDITY_OUTPUT_ID
+	if(output_id == NULL)
 	    output_id = TIMIDITY_OUTPUT_ID;
-	for(i = 0; play_mode_list[i]; i++)
-	    if(play_mode_list[i]->id_character == *output_id)
-	    {
-		play_mode = play_mode_list[i];
-		break;
-	    }
+#endif /* TIMIDITY_OUTPUT_ID */
+	if(output_id != NULL)
+	{
+	    for(i = 0; play_mode_list[i]; i++)
+		if(play_mode_list[i]->id_character == *output_id)
+		{
+		    play_mode = play_mode_list[i];
+		    break;
+		}
+	}
     }
 
     if(is_first) /* initialize once time */
diff -ruN TiMidity++-2.6.0-beta1/utils/Makefile.in TiMidity++-2.6.0-beta2/utils/Makefile.in
--- TiMidity++-2.6.0-beta1/utils/Makefile.in	Mon Aug 30 19:05:01 1999
+++ TiMidity++-2.6.0-beta2/utils/Makefile.in	Wed Sep  1 02:57:51 1999
@@ -100,6 +100,7 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHCFLAGS = @SHCFLAGS@
+SHELL = @SHELL@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@