diff -ruN TiMidity++-2.5.1/ChangeLog TiMidity++-2.6.0-beta1/ChangeLog
--- TiMidity++-2.5.1/ChangeLog	Sat Aug 28 00:26:52 1999
+++ TiMidity++-2.6.0-beta1/ChangeLog	Mon Aug 30 19:04:02 1999
@@ -1,3 +1,59 @@
+1999-08-30  Masanao Izumo <mo@goice.co.jp>
+
+    * Version 2.6.0-beta1 released for test version.
+
+1999-08-30  Masanao Izumo <mo@goice.co.jp>
+
+    * timidity/playmidi.c (midi_program_change): Bug fixed.
+    * configure.in: enable_audio_opt -> have_audio_opt
+    * timidity/hpux_a.c: Use 'A' for HPUX network audio (Alib) instead of 'n'.
+    * configure.in,timidity/{linux_a.c,oss_a.c,output.c}:
+      Rename linux_a.c to oss_a.c
+    * configure.in,timidity/output.c:
+      Rename AU_LINUX to AU_OSS.
+      Split AU_HPUX into AU_HPUX_AUDIO and AU_HPUX_ALIB.
+    * configure.in: (Audio options): --enable-audio[=mode_list]
+      `mode_list' is 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)
+		alsa: ALSA pcm device
+		alib: HPUX network audio (Alib)
+		nas:  NAS - Network Audio System
+		esd:  EsounD
+      Example:
+		--enable-audio=alsa,nas,esd
+		compiles and links ALSA, NAS, and EsounD audio output.
+      By default, --enable-audio=dev.
+    * timidity.c(TIMIDITY_OUTPUT_ID): Environment shell variable to
+      specify output mode id.
+    * configure.in(--with-default-output=<mode>): Support more output modes.
+
+1999-08-28  Katsuhiro Ueno <katsu@blue.sky.or.jp>
+
+    * configure.in:
+      enable-dynamic -> dynamic
+      If the compiler is gcc, use it for SHLD instead of ld.
+    * configure.in, timidity/output.c (--with-default-output=<mode>):
+      New configure option to specify default output mode.
+    * interface/bitmaps/Makefile.am:
+      $(TIMID_DIR)/bitmaps -> $(TCL_DIR)/bitmaps
+    * common.makefile.in (TIMID_DIR):
+      Set $(pkgdatadir) instead of $(pkglibdir).
+      *** CAUTION ***: The default configuration file is replaced to
+      /usr/local/share/timidity/timidity.cfg
+    * configure.in, common.makefile.in, interface/Makefile.am (SHLIB_DIR):
+      New makefile macro.  SHLIB_DIR is used to specify the directory
+      which contains dynamic TiMidity interfaces.
+    * configure.in, timidity/Makefile.am:
+      Add -rdynamic option for gcc if --enable-dynamic.
+    * interface/dynamic_c.c, timidity/timidity.c:
+      Pass dynamic_control_mode.flags to dynamic interface.
+
 1999-08-27  Masanao Izumo <mo@goice.co.jp>
 
     * Version 2.5.1 released.
diff -ruN TiMidity++-2.5.1/Makefile.in TiMidity++-2.6.0-beta1/Makefile.in
--- TiMidity++-2.5.1/Makefile.in	Sat Aug 28 00:29:50 1999
+++ TiMidity++-2.6.0-beta1/Makefile.in	Mon Aug 30 19:04:58 1999
@@ -111,6 +111,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 
 SUBDIRS =  	utils 	libarc 	interface 	timidity 	doc
 
diff -ruN TiMidity++-2.5.1/acinclude.m4 TiMidity++-2.6.0-beta1/acinclude.m4
--- TiMidity++-2.5.1/acinclude.m4	Fri Apr  9 20:28:52 1999
+++ TiMidity++-2.6.0-beta1/acinclude.m4	Mon Aug 30 16:26:26 1999
@@ -74,23 +74,23 @@
 AC_MSG_RESULT($ALSA_LIBS)
 
 dnl Check for the presence of the library
-dnl if test $enable_alsatest = yes; then
-dnl   AC_MSG_CHECKING(for working libasound)
-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 fi
+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 Check for a working version of libasound that is of the right version.
 min_alsa_version=ifelse([$1], ,0.1.1,$1)
@@ -382,8 +382,8 @@
 EOM
 : Call the object file tmp-dyna.o in case dlext=o.
 if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 &&
-	mv dyna.o tmp-dyna.o > /dev/null 2>&1 && 
-	$SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 && 
+	mv dyna.o tmp-dyna.o > /dev/null 2>&1 &&
+	$SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 &&
 	${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.c $LIBS $lib_dl_opt > /dev/null 2>&1; then
 	xxx=`./fred`
 	case $xxx in
@@ -520,3 +520,23 @@
     esac
 done
 ])
+
+
+dnl CHECK_COMPILER_OPTION(OPTIONS)
+AC_DEFUN(CHECK_COMPILER_OPTION,
+[AC_MSG_CHECKING([whether -$1 option is recognized])
+ac_ccoption=`echo $1 | sed 'y%./+-%__p_%'`
+AC_CACHE_VAL(timidity_cv_ccoption_$ac_ccoption,
+[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 test -s conftest.out; then
+	eval "timidity_cv_ccoption_$ac_ccoption=no"
+    else
+	eval "timidity_cv_ccoption_$ac_ccoption=yes"
+    fi
+else
+    eval "timidity_cv_ccoption_$ac_ccoption=no"
+fi
+])])
diff -ruN TiMidity++-2.5.1/aclocal.m4 TiMidity++-2.6.0-beta1/aclocal.m4
--- TiMidity++-2.5.1/aclocal.m4	Sat Aug 28 00:28:51 1999
+++ TiMidity++-2.6.0-beta1/aclocal.m4	Mon Aug 30 18:56:12 1999
@@ -86,23 +86,23 @@
 AC_MSG_RESULT($ALSA_LIBS)
 
 dnl Check for the presence of the library
-dnl if test $enable_alsatest = yes; then
-dnl   AC_MSG_CHECKING(for working libasound)
-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 fi
+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 Check for a working version of libasound that is of the right version.
 min_alsa_version=ifelse([$1], ,0.1.1,$1)
@@ -394,8 +394,8 @@
 EOM
 : Call the object file tmp-dyna.o in case dlext=o.
 if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 &&
-	mv dyna.o tmp-dyna.o > /dev/null 2>&1 && 
-	$SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 && 
+	mv dyna.o tmp-dyna.o > /dev/null 2>&1 &&
+	$SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 &&
 	${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.c $LIBS $lib_dl_opt > /dev/null 2>&1; then
 	xxx=`./fred`
 	case $xxx in
@@ -532,6 +532,26 @@
     esac
 done
 ])
+
+
+dnl CHECK_COMPILER_OPTION(OPTIONS)
+AC_DEFUN(CHECK_COMPILER_OPTION,
+[AC_MSG_CHECKING([whether -$1 option is recognized])
+ac_ccoption=`echo $1 | sed 'y%./+-%__p_%'`
+AC_CACHE_VAL(timidity_cv_ccoption_$ac_ccoption,
+[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 test -s conftest.out; then
+	eval "timidity_cv_ccoption_$ac_ccoption=no"
+    else
+	eval "timidity_cv_ccoption_$ac_ccoption=yes"
+    fi
+else
+    eval "timidity_cv_ccoption_$ac_ccoption=no"
+fi
+])])
 
 # Define a conditional.
 
diff -ruN TiMidity++-2.5.1/common.makefile.in TiMidity++-2.6.0-beta1/common.makefile.in
--- TiMidity++-2.5.1/common.makefile.in	Wed Aug 11 17:49:20 1999
+++ TiMidity++-2.6.0-beta1/common.makefile.in	Sat Aug 28 22:17:05 1999
@@ -43,14 +43,17 @@
 #exec_prefix = @exec_prefix@
 #bindir = @bindir@
 #libdir = @libdir@
+#datadir = @datadir@
 #mandir = @mandir@
 pkglibdir = $(libdir)/timidity
+pkgdatadir = $(datadir)/timidity
 #INSTALL = @INSTALL@
 
 # Where to install the patches, config files, and MIDI files.
 # If you change this, it's a good idea to recompile the binary,
 # or you'll need to invoke timidity with the -L option.
-TIMID_DIR = $(pkglibdir)
+TIMID_DIR = $(pkgdatadir)
+SHLIB_DIR = $(pkglibdir)
 
 # Where to install the Tcl code, if you use the Tcl code that is.
 TCL_DIR = $(pkglibdir)
diff -ruN TiMidity++-2.5.1/configs/msc-config.h TiMidity++-2.6.0-beta1/configs/msc-config.h
--- TiMidity++-2.5.1/configs/msc-config.h	Sat Aug 28 00:30:47 1999
+++ TiMidity++-2.6.0-beta1/configs/msc-config.h	Mon Aug 30 19:05:28 1999
@@ -217,7 +217,7 @@
 #define HAVE_MMSYSTEM_H
 
 /* In VDS Macro AAA=BBB is not available. */
-#define TIMID_VERSION	"2.5.1"
+#define TIMID_VERSION	"2.6.0-beta1"
 #define DEFAULT_PATH	".\\"
 #define AU_W32
 #define WINSOCK
diff -ruN TiMidity++-2.5.1/configure TiMidity++-2.6.0-beta1/configure
--- TiMidity++-2.5.1/configure	Sat Aug 28 00:28:53 1999
+++ TiMidity++-2.6.0-beta1/configure	Mon Aug 30 18:56:14 1999
@@ -30,17 +30,27 @@
 ac_help="$ac_help
   --with-offix-libs=dir      Offix include file path "
 ac_help="$ac_help
-  --enable-esd		  Enable EsounD output		(default is no)"
+  --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)
+                              alsa: ALSA pcm device
+                              alib: HPUX network audio (Alib)
+                              nas:  NAS - Network Audio System
+                              esd:  EsounD"
 ac_help="$ac_help
-  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)"
-ac_help="$ac_help
-  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)"
+  --with-default-output=<mode>  Specify default output mode (optional):
+                              dev|oss|alsa|alib|nas|esd|wav|au|aiff|list"
 ac_help="$ac_help
-  --disable-esdtest       Do not try to compile and run a test ESD program"
+  --enable-esd            EsounD (Obsoleted.  Use --enable-audio=esd)"
 ac_help="$ac_help
-  --enable-audio          Enable audio (default if you use supported platform)  "
+  --enable-nas            NAS    (Obsoleted.  Use --enable-audio=nas)"
 ac_help="$ac_help
-  --enable-nas            NAS (Network Audio Sound) support "
+  --enable-alsa           ALSA   (Obsoleted.  Use --enable-audio=alsa)"
 ac_help="$ac_help
   --with-alsa-prefix=PFX  Prefix where Alsa library is installed(optional)"
 ac_help="$ac_help
@@ -48,6 +58,12 @@
 ac_help="$ac_help
   --disable-alsatest      Do not try to compile and run a test Alsa program"
 ac_help="$ac_help
+  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)"
+ac_help="$ac_help
+  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)"
+ac_help="$ac_help
+  --disable-esdtest       Do not try to compile and run a test ESD program"
+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)"
@@ -644,7 +660,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:648: checking host system type" >&5
+echo "configure:664: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -665,7 +681,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:669: checking target system type" >&5
+echo "configure:685: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -683,7 +699,7 @@
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:687: checking build system type" >&5
+echo "configure:703: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -717,7 +733,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:721: checking for a BSD compatible install" >&5
+echo "configure:737: 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
@@ -770,7 +786,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:774: checking whether build environment is sane" >&5
+echo "configure:790: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -827,7 +843,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:831: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:847: 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
@@ -856,7 +872,7 @@
 
 PACKAGE=TiMidity++
 
-VERSION=2.5.1
+VERSION=2.6.0-beta1
 
 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; }
@@ -866,7 +882,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:870: checking for working aclocal" >&5
+echo "configure:886: 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.
@@ -879,7 +895,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:883: checking for working autoconf" >&5
+echo "configure:899: 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.
@@ -892,7 +908,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:896: checking for working automake" >&5
+echo "configure:912: 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.
@@ -905,7 +921,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:909: checking for working autoheader" >&5
+echo "configure:925: 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.
@@ -918,7 +934,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:922: checking for working makeinfo" >&5
+echo "configure:938: 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.
@@ -933,7 +949,7 @@
 
 
 echo $ac_n "checking whether grep returns status""... $ac_c" 1>&6
-echo "configure:937: checking whether grep returns status" >&5
+echo "configure:953: checking whether grep returns status" >&5
 echo "grimblepritz" >grimble
 if grep blurfldyick grimble >/dev/null 2>&1 ; then
 	contains="./contains"
@@ -968,7 +984,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:972: checking for $ac_word" >&5
+echo "configure:988: 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
@@ -1006,7 +1022,7 @@
 
   if test $EMACS != "no"; then
     echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:1010: checking where .elc files should go" >&5
+echo "configure:1026: 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
@@ -1045,6 +1061,7 @@
 EXTRADEFS=
 EXTRALIBS=
 SYSEXTRAS=
+timidity_LDFLAGS=
 
 lib_xm_opt=
 lib_xaw_opt=
@@ -1091,7 +1108,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:1095: checking for $ac_word" >&5
+echo "configure:1112: 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
@@ -1121,7 +1138,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:1125: checking for $ac_word" >&5
+echo "configure:1142: 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
@@ -1172,7 +1189,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:1176: checking for $ac_word" >&5
+echo "configure:1193: 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
@@ -1204,7 +1221,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1208: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1225: 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.
@@ -1215,12 +1232,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1219 "configure"
+#line 1236 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1241: \"$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
@@ -1246,12 +1263,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:1250: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1267: 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:1255: checking whether we are using GNU C" >&5
+echo "configure:1272: 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
@@ -1260,7 +1277,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1264: \"$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:1281: \"$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
@@ -1279,7 +1296,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1283: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1300: 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
@@ -1322,7 +1339,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:1326: checking for a BSD compatible install" >&5
+echo "configure:1343: 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
@@ -1377,7 +1394,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:1381: checking for $ac_word" >&5
+echo "configure:1398: 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
@@ -1405,7 +1422,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1409: checking whether ln -s works" >&5
+echo "configure:1426: 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
@@ -1425,6 +1442,26 @@
   echo "$ac_t""no" 1>&6
 fi
 
+echo $ac_n "checking whether -rdynamic option is recognized""... $ac_c" 1>&6
+echo "configure:1447: 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
+else
+  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 test -s conftest.out; then
+	eval "timidity_cv_ccoption_$ac_ccoption=no"
+    else
+	eval "timidity_cv_ccoption_$ac_ccoption=yes"
+    fi
+else
+    eval "timidity_cv_ccoption_$ac_ccoption=no"
+fi
+
+fi
 
 
 # Check whether --with-elf or --without-elf was given.
@@ -1503,14 +1540,19 @@
     so="so"
     ;;
   *)
-    test -n "$SHLD" || SHLD="ld -Bdynamic -G"
+    test -n "$SHLD" || \
+      if test "x$GCC" = xyes; then
+        SHLD="$CC -shared"
+      else
+        SHLD="ld -Bdynamic -G"
+      fi
     so="so"
     ;;
 esac
 
 
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:1514: checking for sqrt in -lm" >&5
+echo "configure:1556: 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
@@ -1518,7 +1560,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1522 "configure"
+#line 1564 "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
@@ -1529,7 +1571,7 @@
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:1533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1575: \"$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
@@ -1557,7 +1599,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:1561: checking for socket in -lsocket" >&5
+echo "configure:1603: 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
@@ -1565,7 +1607,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1569 "configure"
+#line 1611 "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
@@ -1576,7 +1618,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:1580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1622: \"$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
@@ -1604,7 +1646,7 @@
 fi
 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1608: checking for dlopen in -ldl" >&5
+echo "configure:1650: 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
@@ -1612,7 +1654,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1616 "configure"
+#line 1658 "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
@@ -1623,7 +1665,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1669: \"$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,12 +1688,12 @@
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1650: checking for $ac_func" >&5
+echo "configure:1692: 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 1655 "configure"
+#line 1697 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1674,7 +1716,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1720: \"$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
@@ -1696,7 +1738,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1700: checking for gethostbyname in -lnsl" >&5
+echo "configure:1742: 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
@@ -1704,7 +1746,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1708 "configure"
+#line 1750 "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
@@ -1715,7 +1757,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1761: \"$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
@@ -1746,7 +1788,7 @@
 done
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1750: checking how to run the C preprocessor" >&5
+echo "configure:1792: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1761,13 +1803,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1765 "configure"
+#line 1807 "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:1771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1813: \"$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
   :
@@ -1778,13 +1820,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1782 "configure"
+#line 1824 "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:1788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1830: \"$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
   :
@@ -1795,13 +1837,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1799 "configure"
+#line 1841 "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:1805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1847: \"$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
   :
@@ -1830,7 +1872,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:1834: checking for X" >&5
+echo "configure:1876: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1892,12 +1934,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1896 "configure"
+#line 1938 "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:1901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1943: \"$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*
@@ -1966,14 +2008,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1970 "configure"
+#line 2012 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2019: \"$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.
@@ -2079,17 +2121,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:2083: checking whether -R must be followed by a space" >&5
+echo "configure:2125: 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 2086 "configure"
+#line 2128 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -2105,14 +2147,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 2109 "configure"
+#line 2151 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -2144,7 +2186,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:2148: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2190: 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
@@ -2152,7 +2194,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2156 "configure"
+#line 2198 "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
@@ -2163,7 +2205,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2209: \"$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
@@ -2185,7 +2227,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:2189: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2231: 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
@@ -2193,7 +2235,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2197 "configure"
+#line 2239 "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
@@ -2204,7 +2246,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2250: \"$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
@@ -2233,12 +2275,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:2237: checking for gethostbyname" >&5
+echo "configure:2279: 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 2242 "configure"
+#line 2284 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -2261,7 +2303,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2307: \"$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
@@ -2282,7 +2324,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2286: checking for gethostbyname in -lnsl" >&5
+echo "configure:2328: 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
@@ -2290,7 +2332,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2294 "configure"
+#line 2336 "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
@@ -2301,7 +2343,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:2305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2347: \"$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
@@ -2331,12 +2373,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:2335: checking for connect" >&5
+echo "configure:2377: 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 2340 "configure"
+#line 2382 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -2359,7 +2401,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2405: \"$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
@@ -2380,7 +2422,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2384: checking for connect in -lsocket" >&5
+echo "configure:2426: 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
@@ -2388,7 +2430,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2392 "configure"
+#line 2434 "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
@@ -2399,7 +2441,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:2403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2445: \"$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
@@ -2423,12 +2465,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:2427: checking for remove" >&5
+echo "configure:2469: 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 2432 "configure"
+#line 2474 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -2451,7 +2493,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2497: \"$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
@@ -2472,7 +2514,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2476: checking for remove in -lposix" >&5
+echo "configure:2518: 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
@@ -2480,7 +2522,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2484 "configure"
+#line 2526 "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
@@ -2491,7 +2533,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2537: \"$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
@@ -2515,12 +2557,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2519: checking for shmat" >&5
+echo "configure:2561: 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 2524 "configure"
+#line 2566 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -2543,7 +2585,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2589: \"$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
@@ -2564,7 +2606,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2568: checking for shmat in -lipc" >&5
+echo "configure:2610: 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
@@ -2572,7 +2614,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2576 "configure"
+#line 2618 "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
@@ -2583,7 +2625,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2629: \"$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
@@ -2616,7 +2658,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:2620: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2662: 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
@@ -2624,7 +2666,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2628 "configure"
+#line 2670 "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
@@ -2635,7 +2677,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2681: \"$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
@@ -2683,7 +2725,7 @@
   fi
 
   echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:2687: checking for XOpenDisplay in -lX11" >&5
+echo "configure:2729: 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
@@ -2691,7 +2733,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lX11  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2695 "configure"
+#line 2737 "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
@@ -2702,7 +2744,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:2706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2748: \"$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
@@ -2730,12 +2772,12 @@
 fi
 
   echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
-echo "configure:2734: checking X11 version 6" >&5
+echo "configure:2776: 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 2739 "configure"
+#line 2781 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int main() {
@@ -2745,7 +2787,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2791: \"$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
@@ -2765,7 +2807,7 @@
 
     KEEPLIBS=$LIBS
   echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
-echo "configure:2769: checking for XShapeCombineMask in -lXext" >&5
+echo "configure:2811: 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
@@ -2773,7 +2815,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXext  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2777 "configure"
+#line 2819 "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
@@ -2784,7 +2826,7 @@
 XShapeCombineMask()
 ; return 0; }
 EOF
-if { (eval echo configure:2788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2830: \"$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
@@ -2806,7 +2848,7 @@
 fi
 
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2810: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2852: 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
@@ -2814,7 +2856,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2818 "configure"
+#line 2860 "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
@@ -2825,7 +2867,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2871: \"$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
@@ -2853,7 +2895,7 @@
 fi
 
   echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6
-echo "configure:2857: checking for SmcOpenConnection in -lSM" >&5
+echo "configure:2899: 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
@@ -2861,7 +2903,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lSM  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2865 "configure"
+#line 2907 "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
@@ -2872,7 +2914,7 @@
 SmcOpenConnection()
 ; return 0; }
 EOF
-if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2918: \"$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
@@ -2894,7 +2936,7 @@
 fi
 
   echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:2898: checking for XtVaAppInitialize in -lXt" >&5
+echo "configure:2940: 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
@@ -2902,7 +2944,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2906 "configure"
+#line 2948 "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
@@ -2913,7 +2955,7 @@
 XtVaAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:2917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2959: \"$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
@@ -2935,7 +2977,7 @@
 fi
 
   echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6
-echo "configure:2939: checking for XmuInternAtom in -lXmu" >&5
+echo "configure:2981: 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
@@ -2943,7 +2985,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXmu  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2947 "configure"
+#line 2989 "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
@@ -2954,7 +2996,7 @@
 XmuInternAtom()
 ; return 0; }
 EOF
-if { (eval echo configure:2958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3000: \"$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,12 +3019,12 @@
   for ac_func in XmuRegisterExternalAgent
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2981: checking for $ac_func" >&5
+echo "configure:3023: 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 2986 "configure"
+#line 3028 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3005,7 +3047,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3051: \"$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
@@ -3030,7 +3072,7 @@
 done
 
   echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6
-echo "configure:3034: checking for XawInitializeWidgetSet in -lXaw3d" >&5
+echo "configure:3076: 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
@@ -3038,7 +3080,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw3d  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3042 "configure"
+#line 3084 "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
@@ -3049,7 +3091,7 @@
 XawInitializeWidgetSet()
 ; return 0; }
 EOF
-if { (eval echo configure:3053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3095: \"$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
@@ -3068,7 +3110,7 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6
-echo "configure:3072: checking for XawInitializeWidgetSet in -lXaw" >&5
+echo "configure:3114: 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
@@ -3076,7 +3118,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3080 "configure"
+#line 3122 "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
@@ -3087,7 +3129,7 @@
 XawInitializeWidgetSet()
 ; return 0; }
 EOF
-if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3133: \"$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
@@ -3111,7 +3153,7 @@
 fi
 
   echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6
-echo "configure:3115: checking for XmCreateForm in -lXm" >&5
+echo "configure:3157: 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
@@ -3119,7 +3161,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3123 "configure"
+#line 3165 "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
@@ -3130,7 +3172,7 @@
 XmCreateForm()
 ; return 0; }
 EOF
-if { (eval echo configure:3134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3176: \"$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
@@ -3154,12 +3196,12 @@
   for ac_func in XShmCreatePixmap
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3158: checking for $ac_func" >&5
+echo "configure:3200: 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 3163 "configure"
+#line 3205 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3182,7 +3224,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3228: \"$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
@@ -3215,12 +3257,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:3219: checking for $ac_hdr that defines DIR" >&5
+echo "configure:3261: 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 3224 "configure"
+#line 3266 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3228,7 +3270,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -3253,7 +3295,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:3257: checking for opendir in -ldir" >&5
+echo "configure:3299: 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
@@ -3261,7 +3303,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3265 "configure"
+#line 3307 "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
@@ -3272,7 +3314,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3318: \"$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
@@ -3294,7 +3336,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:3298: checking for opendir in -lx" >&5
+echo "configure:3340: 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
@@ -3302,7 +3344,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3306 "configure"
+#line 3348 "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
@@ -3313,7 +3355,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3359: \"$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,12 +3378,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3340: checking for ANSI C header files" >&5
+echo "configure:3382: 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 3345 "configure"
+#line 3387 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3349,7 +3391,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3395: \"$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*
@@ -3366,7 +3408,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 3370 "configure"
+#line 3412 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3384,7 +3426,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 3388 "configure"
+#line 3430 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3405,7 +3447,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3409 "configure"
+#line 3451 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3416,7 +3458,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3440,12 +3482,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3444: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3486: 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 3449 "configure"
+#line 3491 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3461,7 +3503,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3485,21 +3527,21 @@
 	unistd.h dlfcn.h glob.h getopt.h errno.h machine/endian.h \
 	stropts.h sys/audioio.h sun/audioio.h sys/types.h \
 	sys/ipc.h sys/shm.h sys/param.h X11/extensions/XShm.h \
-	X11/Xmu/ExtAgent.h
+	X11/Xmu/ExtAgent.h sys/soundcard.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3493: checking for $ac_hdr" >&5
+echo "configure:3535: 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 3498 "configure"
+#line 3540 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3545: \"$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*
@@ -3527,17 +3569,17 @@
 
 ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for string.h""... $ac_c" 1>&6
-echo "configure:3531: checking for string.h" >&5
+echo "configure:3573: 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 3536 "configure"
+#line 3578 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3583: \"$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*
@@ -3561,12 +3603,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3565: checking for working const" >&5
+echo "configure:3607: 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 3570 "configure"
+#line 3612 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3615,7 +3657,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3636,14 +3678,14 @@
 fi
 
 echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:3640: checking whether char is unsigned" >&5
+echo "configure:3682: 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 3647 "configure"
+#line 3689 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -3665,7 +3707,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3669 "configure"
+#line 3711 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -3675,7 +3717,7 @@
   volatile char c = 255; exit(c < 0);
 }
 EOF
-if { (eval echo configure:3679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3721: \"$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
@@ -3699,14 +3741,14 @@
 fi
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3703: checking whether byte ordering is bigendian" >&5
+echo "configure:3745: 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 3710 "configure"
+#line 3752 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3717,11 +3759,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3763: \"$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 3725 "configure"
+#line 3767 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3732,7 +3774,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -3752,7 +3794,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3756 "configure"
+#line 3798 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3765,7 +3807,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3811: \"$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
@@ -3789,21 +3831,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3793: checking for inline" >&5
+echo "configure:3835: 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 3800 "configure"
+#line 3842 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3829,12 +3871,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3833: checking for off_t" >&5
+echo "configure:3875: 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 3838 "configure"
+#line 3880 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3862,12 +3904,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3866: checking for pid_t" >&5
+echo "configure:3908: 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 3871 "configure"
+#line 3913 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3895,12 +3937,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3899: checking for size_t" >&5
+echo "configure:3941: 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 3904 "configure"
+#line 3946 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3928,12 +3970,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3932: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3974: 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 3937 "configure"
+#line 3979 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3942,7 +3984,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3964,19 +4006,19 @@
 
 
 echo $ac_n "checking volatile declaration""... $ac_c" 1>&6
-echo "configure:3968: checking volatile declaration" >&5
+echo "configure:4010: 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 3973 "configure"
+#line 4015 "configure"
 #include "confdefs.h"
 
 int main() {
 volatile int x
 ; return 0; }
 EOF
-if { (eval echo configure:3980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   timidity_cv_type_volatile=yes
 else
@@ -3994,12 +4036,12 @@
 fi
 
 echo $ac_n "checking union semun declaration""... $ac_c" 1>&6
-echo "configure:3998: checking union semun declaration" >&5
+echo "configure:4040: 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 4003 "configure"
+#line 4045 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -4008,7 +4050,7 @@
 union semun x
 ; return 0; }
 EOF
-if { (eval echo configure:4012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   timidity_cv_type_union_semun=yes
 else
@@ -4027,13 +4069,13 @@
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:4031: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:4073: 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 4037 "configure"
+#line 4079 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -4051,7 +4093,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 4055 "configure"
+#line 4097 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -4073,7 +4115,7 @@
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:4077: checking for 8-bit clean memcmp" >&5
+echo "configure:4119: 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
@@ -4081,7 +4123,7 @@
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4085 "configure"
+#line 4127 "configure"
 #include "confdefs.h"
 
 main()
@@ -4091,7 +4133,7 @@
 }
 
 EOF
-if { (eval echo configure:4095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4137: \"$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
@@ -4112,17 +4154,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4116: checking for $ac_hdr" >&5
+echo "configure:4158: 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 4121 "configure"
+#line 4163 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4168: \"$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*
@@ -4151,12 +4193,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4155: checking for $ac_func" >&5
+echo "configure:4197: 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 4160 "configure"
+#line 4202 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4179,7 +4221,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4225: \"$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
@@ -4204,7 +4246,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:4208: checking for working mmap" >&5
+echo "configure:4250: 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
@@ -4212,7 +4254,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4216 "configure"
+#line 4258 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4352,7 +4394,7 @@
 }
 
 EOF
-if { (eval echo configure:4356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4398: \"$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
@@ -4375,7 +4417,7 @@
 fi
 
 echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
-echo "configure:4379: checking whether setvbuf arguments are reversed" >&5
+echo "configure:4421: 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
@@ -4383,7 +4425,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4387 "configure"
+#line 4429 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -4397,7 +4439,7 @@
   exit(0);			/* Non-reversed systems segv here.  */
 }
 EOF
-if { (eval echo configure:4401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4443: \"$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
@@ -4421,12 +4463,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4425: checking return type of signal handlers" >&5
+echo "configure:4467: 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 4430 "configure"
+#line 4472 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4443,7 +4485,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4462,12 +4504,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:4466: checking for vprintf" >&5
+echo "configure:4508: 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 4471 "configure"
+#line 4513 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -4490,7 +4532,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4536: \"$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
@@ -4514,12 +4556,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:4518: checking for _doprnt" >&5
+echo "configure:4560: 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 4523 "configure"
+#line 4565 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -4542,7 +4584,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4588: \"$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
@@ -4570,12 +4612,12 @@
 	sleep usleep strncasecmp strerror getopt getcwd popen signal isatty
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4574: checking for $ac_func" >&5
+echo "configure:4616: 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 4579 "configure"
+#line 4621 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4598,7 +4640,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4644: \"$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
@@ -4627,12 +4669,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:4631: checking for opendir" >&5
+echo "configure:4673: 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 4636 "configure"
+#line 4678 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char opendir(); below.  */
@@ -4655,7 +4697,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4701: \"$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
@@ -4683,12 +4725,12 @@
   esac
   if test "x$enable_network" = "xyes"; then
     echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:4687: checking for socket" >&5
+echo "configure:4729: 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 4692 "configure"
+#line 4734 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -4711,7 +4753,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4757: \"$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
@@ -4729,7 +4771,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6
-echo "configure:4733: checking for WSAStartup in -lwsock32" >&5
+echo "configure:4775: 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
@@ -4737,7 +4779,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lwsock32  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4741 "configure"
+#line 4783 "configure"
 #include "confdefs.h"
 #include <windows.h>
 #include <winsock.h>
@@ -4746,7 +4788,7 @@
 WSAStartup(0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:4750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4792: \"$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
@@ -4831,585 +4873,740 @@
 
 
 
+
+audio_targets='dev oss alsa alib nas esd'
+# Check whether --enable-audio or --disable-audio was given.
+if test "${enable_audio+set}" = set; then
+  enableval="$enable_audio"
+   enable_audio=$enableval
+    have_audio_opt=yes 
+else
+   enable_audio=yes
+    have_audio_opt=no 
+fi
+
+
+if test "x$enable_audio" = xyes; then
+  enable_audio=dev
+fi
+
+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
+  for i in `echo $enable_audio | sed 's/,/ /g'`; do
+    eval "au_enable_$i=yes"
+  done
+fi
+
+DEFAULT_PLAYMODE=
+# Check whether --with-default-output or --without-default-output was given.
+if test "${with_default_output+set}" = set; then
+  withval="$with_default_output"
+   if test "$enable_audio" != no; then
+      DEFAULT_PLAYMODE=$withval
+      eval "au_enable_$DEFAULT_PLAYMODE=yes"
+    else
+      echo "configure: warning: --with-default-output=$withval: audio is not enabled" 1>&2
+    fi
+fi
+
+
 # Check whether --enable-esd or --disable-esd was given.
 if test "${enable_esd+set}" = set; then
   enableval="$enable_esd"
-   if test "$enableval" = "yes"; then
-	KEEPCFLAGS=$CFLAGS
-	KEEPLIBS=$LIBS
-	KEEPLDFLAGS=$LDFLAGS
-	# Check whether --with-esd-prefix or --without-esd-prefix was given.
-if test "${with_esd_prefix+set}" = set; then
-  withval="$with_esd_prefix"
-  esd_prefix="$withval"
-else
-  esd_prefix=""
+   au_enable_esd=$enableval 
 fi
 
-# Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given.
-if test "${with_esd_exec_prefix+set}" = set; then
-  withval="$with_esd_exec_prefix"
-  esd_exec_prefix="$withval"
-else
-  esd_exec_prefix=""
+# Check whether --enable-nas or --disable-nas was given.
+if test "${enable_nas+set}" = set; then
+  enableval="$enable_nas"
+   au_enable_nas=$enableval 
 fi
 
-# Check whether --enable-esdtest or --disable-esdtest was given.
-if test "${enable_esdtest+set}" = set; then
-  enableval="$enable_esdtest"
-  :
-else
-  enable_esdtest=yes
+# Check whether --enable-alsa or --disable-alsa was given.
+if test "${enable_alsa+set}" = set; then
+  enableval="$enable_alsa"
+   au_enable_nas=$enableval 
 fi
 
 
-  if test x$esd_exec_prefix != x ; then
-     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-     if test x${ESD_CONFIG+set} != xset ; then
-        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
-     fi
-  fi
-  if test x$esd_prefix != x ; then
-     esd_args="$esd_args --prefix=$esd_prefix"
-     if test x${ESD_CONFIG+set} != xset ; then
-        ESD_CONFIG=$esd_prefix/bin/esd-config
-     fi
-  fi
-
-  # 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:4883: 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
+if test "x$au_enable_oss" = xyes; then
+  enable_audio_dev=no
 else
-  case "$ESD_CONFIG" in
-  /*)
-  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no"
-  ;;
-esac
+  echo $ac_n "checking enable_audio=dev""... $ac_c" 1>&6
+echo "configure:4940: checking enable_audio=dev" >&5
 fi
-ESD_CONFIG="$ac_cv_path_ESD_CONFIG"
-if test -n "$ESD_CONFIG"; then
-  echo "$ac_t""$ESD_CONFIG" 1>&6
+if test "x$au_enable_dev" = xyes; then
+  case "$target" in
+    *-*-linux*|*-*-freebsd*)
+      EXTRADEFS="$EXTRADEFS -DAU_OSS"
+      SYSEXTRAS="$SYSEXTRAS oss_a.c"
+      echo "$ac_t""OSS /dev/dsp" 1>&6
+      ;;
+    *-*-bsdi2.0)
+      EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500"
+      SYSEXTRAS="$SYSEXTRAS bsd20_a.c"
+      echo "$ac_t""/dev/sb_dsp" 1>&6
+      ;;
+    *-*-bsdi2.1|*-*-bsdi3.?|*-*-bsdi4.?)
+      EXTRADEFS="$EXTRADEFS -DAU_OSS"
+      SYSEXTRAS="$SYSEXTRAS oss_a.c"
+      echo "$ac_t""OSS /dev/dsp" 1>&6
+      ;;
+    *-*-hpux*)
+      EXTRADEFS="$EXTRADEFS -DAU_HPUX_AUDIO"
+      SYSEXTRAS="$SYSEXTRAS hpux_d_a.c"
+      echo "$ac_t""hpux /dev/audio" 1>&6
+      ;;
+    *-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
+      ;;
+    *-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
+      ;;
+    *-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*)
+      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"
+      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"
+      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
+      ;;
+    *-*-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
+      ;;
+    *)
+      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
+      ;;
+  esac
 else
   echo "$ac_t""no" 1>&6
 fi
 
-  min_esd_version=0.2.7
-  echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
-echo "configure:4918: checking for ESD - version >= $min_esd_version" >&5
-  no_esd=""
-  if test "$ESD_CONFIG" = "no" ; then
-    no_esd=yes
+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
-    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
-    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-
-    esd_major_version=`$ESD_CONFIG $esd_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x$enable_esdtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $ESD_CFLAGS"
-      LIBS="$LIBS $ESD_LIBS"
-      rm -f conf.esdtest
-      if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
+    echo "configure: warning: <sys/soundcard.h> is not found" 1>&2
+  fi
 else
-  cat > conftest.$ac_ext <<EOF
-#line 4942 "configure"
-#include "confdefs.h"
+  echo "$ac_t""no" 1>&6
+fi
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <esd.h>
+echo $ac_n "checking enable_audio=alsa""... $ac_c" 1>&6
+echo "configure:5045: checking enable_audio=alsa" >&5
+if test "x$au_enable_alsa" = xyes; then
+  echo "$ac_t""" 1>&6
+  KEEPCFLAGS=$CFLAGS
+  KEEPLIBS=$LIBS
+  KEEPLDFLAGS=$LDFLAGS
+  have_alsa=no
+# Check whether --with-alsa-prefix or --without-alsa-prefix was given.
+if test "${with_alsa_prefix+set}" = set; then
+  withval="$with_alsa_prefix"
+  alsa_prefix="$withval"
+else
+  alsa_prefix=""
+fi
 
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
+# Check whether --with-alsa-inc-prefix or --without-alsa-inc-prefix was given.
+if test "${with_alsa_inc_prefix+set}" = set; then
+  withval="$with_alsa_inc_prefix"
+  alsa_inc_prefix="$withval"
+else
+  alsa_inc_prefix=""
+fi
 
-int main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
+# Check whether --enable-alsatest or --disable-alsatest was given.
+if test "${enable_alsatest+set}" = set; then
+  enableval="$enable_alsatest"
+  enable_alsatest=no
+else
+  enable_alsatest=yes
+fi
 
-  system ("touch conf.esdtest");
 
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_esd_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_esd_version");
-     exit(1);
-   }
+echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6
+echo "configure:5078: 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"
+fi
+echo "$ac_t""$ALSA_CFLAGS" 1>&6
 
-   if (($esd_major_version > major) ||
-      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
-      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
-      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
-      printf("*** to point to the correct copy of esd-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
+echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6
+echo "configure:5086: checking for ALSA LDFLAGS" >&5
+if test "$alsa_prefix" != "" ; then
+	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
+	LIBS="-L$alsa_prefix"
+fi
 
+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:5000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+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*
-  no_esd=yes
+  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
 
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_esd" = x ; then
-     echo "$ac_t""yes" 1>&6
-     :     
-  else
-     echo "$ac_t""no" 1>&6
-     if test "$ESD_CONFIG" = "no" ; then
-       echo "*** The esd-config script installed by ESD could not be found"
-       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the ESD_CONFIG environment variable to the"
-       echo "*** full path to esd-config."
-     else
-       if test -f conf.esdtest ; then
-        :
-       else
-          echo "*** Could not run ESD test program, checking why..."
-          CFLAGS="$CFLAGS $ESD_CFLAGS"
-          LIBS="$LIBS $ESD_LIBS"
-          cat > conftest.$ac_ext <<EOF
-#line 5034 "configure"
+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
+no_alsa=""
+    alsa_min_major_version=`echo $min_alsa_version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    alsa_min_minor_version=`echo $min_alsa_version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    alsa_min_micro_version=`echo $min_alsa_version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+
+cat > conftest.$ac_ext <<EOF
+#line 5142 "configure"
 #include "confdefs.h"
 
-#include <stdio.h>
-#include <esd.h>
+#include <sys/asoundlib.h>
 
 int main() {
- return 0; 
+
+/* ensure backward compatibility */
+#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
+#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
+#endif
+#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
+#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
+#endif
+#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
+#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
+#endif
+
+#  if(SND_LIB_MAJOR > $alsa_min_major_version)
+  exit(0);
+#  else
+#    if(SND_LIB_MAJOR < $alsa_min_major_version)
+#       error not present
+#    endif
+
+#   if(SND_LIB_MINOR > $alsa_min_minor_version)
+  exit(0);
+#   else
+#     if(SND_LIB_MINOR < $alsa_min_minor_version)
+#          error not present
+#      endif
+
+#      if(SND_LIB_SUBMINOR < $alsa_min_micro_version)
+#        error not present
+#      endif
+#    endif
+#  endif
+exit(0);
+
 ; return 0; }
 EOF
-if { (eval echo configure:5044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; 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"
-          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+  echo "$ac_t""found." 1>&6
+   have_alsa=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-   echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
-          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
-          echo "*** may want to edit the esd-config script: $ESD_CONFIG" 
+  echo "$ac_t""not present." 1>&6
+
 fi
 rm -f conftest*
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     ESD_CFLAGS=""
-     ESD_LIBS=""
-     :
-  fi
-  
-  
-  rm -f conf.esdtest
 
-	CFLAGS=$KEEPCFLAGS
-	LIBS=$KEEPLIBS
-	LDFLAGS=$KEEPLDFLAGS
-	if test "x$no_esd" = x; then
-	  EXTRADEFS="$EXTRADEFS -DAU_ESD"
-	  SYSEXTRAS="$SYSEXTRAS esd_a.c"
-	  for f in $ESD_CFLAGS; do
-    case ".$f" in
-	.-I?*|.-D?*)	CPPFLAGS="$CPPFLAGS $f" ;;
-	*)		CFLAGS="$CPPFLAGS $f" ;;
-    esac
-done
+echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6
+echo "configure:5197: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lasound  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5205 "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
+    builtin and then its argument prototype would still apply.  */
+char snd_cards();
 
-	  LIBS="$LIBS $ESD_LIBS"
-	else
-	  echo "configure: warning: EsounD: Couldn't configure" 1>&2
-	fi
-    fi 
+int main() {
+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
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo asound | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
 
+  LIBS="-lasound $LIBS"
 
-echo $ac_n "checking whether to enable audio""... $ac_c" 1>&6
-echo "configure:5100: checking whether to enable audio" >&5
-# Check whether --enable-audio or --disable-audio was given.
-if test "${enable_audio+set}" = set; then
-  enableval="$enable_audio"
-   enable_audio=$enableval 
 else
-   enable_audio=yes
-    enable_audio_opt=no 
+  echo "$ac_t""no" 1>&6
+echo "$ac_t""No linkable libasound was found." 1>&6
+
 fi
 
 
-# Check whether --enable-nas or --disable-nas was given.
-if test "${enable_nas+set}" = set; then
-  enableval="$enable_nas"
-   if test "x$with_x" != xyes; then
-        { echo "configure: error: nas: --with-x option must be specified" 1>&2; exit 1; }
-    fi
-    EXTRADEFS="$EXTRADEFS -DAU_NAS"
-    SYSEXTRAS="$SYSEXTRAS nas_a.c"
 
-            EXTRALIBS="$EXTRALIBS $x_libraries/libaudio.a"
-    lib_xt_opt=-lXt
-    if test "x$have_xext" = xyes; then
-      lib_xext_opt=-lXext
-    fi
-    if test "x$have_xprelibs" = xyes; then
-	lib_xprelibs_opt='-lSM -lICE'
-    fi
-    
-fi
 
 
-if test "$enable_audio" = "yes"; then
-  case "$target" in 
-    *-*-linux*|*-*-freebsd*)
-      EXTRADEFS="$EXTRADEFS -DAU_LINUX"
-      SYSEXTRAS="$SYSEXTRAS linux_a.c"
-      echo "$ac_t""yes linux" 1>&6
-      KEEPCFLAGS=$CFLAGS
-      KEEPLIBS=$LIBS
-      KEEPLDFLAGS=$LDFLAGS
-      have_alsa=no
-# Check whether --with-alsa-prefix or --without-alsa-prefix was given.
-if test "${with_alsa_prefix+set}" = set; then
-  withval="$with_alsa_prefix"
-  alsa_prefix="$withval"
+  if test have_alsa = no; then
+    echo "configure: warning: ALSA: Couldn't configure" 1>&2
+    CFLAGS=$KEEPCFLAGS
+    LIBS=$KEEPLIBS
+    LDFLAGS=$KEEPLDFLAGS
+  else
+    echo "$ac_t""ALSA: Enabled" 1>&6
+    EXTRADEFS="$EXTRADEFS -DAU_ALSA"
+    SYSEXTRAS="$SYSEXTRAS alsa_a.c"
+    for f in $ALSA_CFLAGS; do
+    case ".$f" in
+	.-I?*|.-D?*)	CPPFLAGS="$CPPFLAGS $f" ;;
+	*)		CFLAGS="$CPPFLAGS $f" ;;
+    esac
+done
+
+    LIBS="$LIBS $ALSA_LIBS"
+  fi
 else
-  alsa_prefix=""
+  echo "$ac_t""no" 1>&6
 fi
 
-# Check whether --with-alsa-inc-prefix or --without-alsa-inc-prefix was given.
-if test "${with_alsa_inc_prefix+set}" = set; then
-  withval="$with_alsa_inc_prefix"
-  alsa_inc_prefix="$withval"
+echo $ac_n "checking enable_audio=alib""... $ac_c" 1>&6
+echo "configure:5272: 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 ;;
+  esac
+  SYSEXTRAS="$SYSEXTRAS hpux_a.c"
+  EXTRADEFS="$EXTRADEFS -DAU_HPUX_ALIB"
+  if test -d /opt/audio/include; then
+    CPPFLAGS="$CPPFLAGS -I/opt/audio/include"
+  fi
+  if test -d /opt/audio/lib; then
+    EXTRALIBS="$EXTRALIBS -L/opt/audio/lib"
+  fi
+  EXTRALIBS="$EXTRALIBS -lAlib"
 else
-  alsa_inc_prefix=""
+  echo "$ac_t""no" 1>&6
 fi
 
-# Check whether --enable-alsatest or --disable-alsatest was given.
-if test "${enable_alsatest+set}" = set; then
-  enableval="$enable_alsatest"
-  enable_alsatest=no
+echo $ac_n "checking enable_audio=nas""... $ac_c" 1>&6
+echo "configure:5292: 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; }
+  fi
+  EXTRADEFS="$EXTRADEFS -DAU_NAS"
+  SYSEXTRAS="$SYSEXTRAS nas_a.c"
+      EXTRALIBS="$EXTRALIBS $x_libraries/libaudio.a"
+  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
+  fi
+  lib_xt_opt=-lXt
+  if test "x$have_xext" = xyes; then
+    lib_xext_opt=-lXext
+  fi
+  if test "x$have_xprelibs" = xyes; then
+    lib_xprelibs_opt='-lSM -lICE'
+  fi
 else
-  enable_alsatest=yes
+  echo "$ac_t""no" 1>&6
 fi
 
+echo $ac_n "checking enable_audio=esd""... $ac_c" 1>&6
+echo "configure:5317: checking enable_audio=esd" >&5
+if test "x$au_enable_esd" = xyes; then
+  echo "$ac_t""" 1>&6
+  KEEPCFLAGS=$CFLAGS
+  KEEPLIBS=$LIBS
+  KEEPLDFLAGS=$LDFLAGS
+  # Check whether --with-esd-prefix or --without-esd-prefix was given.
+if test "${with_esd_prefix+set}" = set; then
+  withval="$with_esd_prefix"
+  esd_prefix="$withval"
+else
+  esd_prefix=""
+fi
 
-echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6
-echo "configure:5168: 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"
+# Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given.
+if test "${with_esd_exec_prefix+set}" = set; then
+  withval="$with_esd_exec_prefix"
+  esd_exec_prefix="$withval"
+else
+  esd_exec_prefix=""
 fi
-echo "$ac_t""$ALSA_CFLAGS" 1>&6
 
-echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6
-echo "configure:5176: checking for ALSA LDFLAGS" >&5
-if test "$alsa_prefix" != "" ; then
-	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
-	LIBS="-L$alsa_prefix"
+# Check whether --enable-esdtest or --disable-esdtest was given.
+if test "${enable_esdtest+set}" = set; then
+  enableval="$enable_esdtest"
+  :
+else
+  enable_esdtest=yes
 fi
 
-ALSA_LIBS="$ALSA_LIBS -lasound"
-echo "$ac_t""$ALSA_LIBS" 1>&6
 
+  if test x$esd_exec_prefix != x ; then
+     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
+     if test x${ESD_CONFIG+set} != xset ; then
+        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
+     fi
+  fi
+  if test x$esd_prefix != x ; then
+     esd_args="$esd_args --prefix=$esd_prefix"
+     if test x${ESD_CONFIG+set} != xset ; then
+        ESD_CONFIG=$esd_prefix/bin/esd-config
+     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:5188: checking for libasound headers version >= $min_alsa_version" >&5
-no_alsa=""
-    alsa_min_major_version=`echo $min_alsa_version | \
+  # 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
+if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$ESD_CONFIG" in
+  /*)
+  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no"
+  ;;
+esac
+fi
+ESD_CONFIG="$ac_cv_path_ESD_CONFIG"
+if test -n "$ESD_CONFIG"; then
+  echo "$ac_t""$ESD_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  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
+  no_esd=""
+  if test "$ESD_CONFIG" = "no" ; then
+    no_esd=yes
+  else
+    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
+    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
+
+    esd_major_version=`$ESD_CONFIG $esd_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    alsa_min_minor_version=`echo $min_alsa_version | \
+    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    alsa_min_micro_version=`echo $min_alsa_version | \
+    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-
-cat > conftest.$ac_ext <<EOF
-#line 5198 "configure"
+    if test "x$enable_esdtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $ESD_CFLAGS"
+      LIBS="$LIBS $ESD_LIBS"
+      rm -f conf.esdtest
+      if test "$cross_compiling" = yes; then
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5423 "configure"
 #include "confdefs.h"
 
-#include <sys/asoundlib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <esd.h>
+
+char*
+my_strdup (char *str)
+{
+  char *new_str;
+  
+  if (str)
+    {
+      new_str = malloc ((strlen (str) + 1) * sizeof(char));
+      strcpy (new_str, str);
+    }
+  else
+    new_str = NULL;
+  
+  return new_str;
+}
 
-int main() {
+int main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
 
-/* ensure backward compatibility */
-#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
-#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
-#endif
-#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
-#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
-#endif
-#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
-#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
-#endif
+  system ("touch conf.esdtest");
 
-#  if(SND_LIB_MAJOR > $alsa_min_major_version)
-  exit(0);
-#  else
-#    if(SND_LIB_MAJOR < $alsa_min_major_version)
-#       error not present
-#    endif
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = my_strdup("$min_esd_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_esd_version");
+     exit(1);
+   }
 
-#   if(SND_LIB_MINOR > $alsa_min_minor_version)
-  exit(0);
-#   else
-#     if(SND_LIB_MINOR < $alsa_min_minor_version)
-#          error not present
-#      endif
+   if (($esd_major_version > major) ||
+      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
+      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
+    {
+      return 0;
+    }
+  else
+    {
+      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
+      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
+      printf("*** best to upgrade to the required version.\n");
+      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
+      printf("*** to point to the correct copy of esd-config, and remove the file\n");
+      printf("*** config.cache before re-running configure\n");
+      return 1;
+    }
+}
 
-#      if(SND_LIB_SUBMINOR < $alsa_min_micro_version)
-#        error not present
-#      endif
-#    endif
-#  endif
-exit(0);
 
-; return 0; }
 EOF
-if { (eval echo configure:5239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""found." 1>&6
-   have_alsa=yes
+if { (eval echo configure:5481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""not present." 1>&6
-
+  rm -fr conftest*
+  no_esd=yes
+fi
+rm -fr conftest*
 fi
-rm -f conftest*
 
-echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6
-echo "configure:5253: 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
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lasound  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5261 "configure"
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_esd" = x ; then
+     echo "$ac_t""yes" 1>&6
+     :     
+  else
+     echo "$ac_t""no" 1>&6
+     if test "$ESD_CONFIG" = "no" ; then
+       echo "*** The esd-config script installed by ESD could not be found"
+       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the ESD_CONFIG environment variable to the"
+       echo "*** full path to esd-config."
+     else
+       if test -f conf.esdtest ; then
+        :
+       else
+          echo "*** Could not run ESD test program, checking why..."
+          CFLAGS="$CFLAGS $ESD_CFLAGS"
+          LIBS="$LIBS $ESD_LIBS"
+          cat > conftest.$ac_ext <<EOF
+#line 5515 "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
-    builtin and then its argument prototype would still apply.  */
-char snd_cards();
+
+#include <stdio.h>
+#include <esd.h>
 
 int main() {
-snd_cards()
+ return 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:5272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5525: \"$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"
+   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"
+          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
+          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
+          echo "*** may want to edit the esd-config script: $ESD_CONFIG" 
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo asound | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lasound $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-echo "$ac_t""No linkable libasound was found." 1>&6
-
-fi
-
-
-
-
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     ESD_CFLAGS=""
+     ESD_LIBS=""
+     :
+  fi
+  
+  
+  rm -f conf.esdtest
 
-      CFLAGS=$KEEPCFLAGS
-      LIBS=$KEEPLIBS
-      LDFLAGS=$KEEPLDFLAGS
-      if test "x$have_alsa" = "xyes"; then
-          EXTRADEFS="$EXTRADEFS -DAU_ALSA"
-          SYSEXTRAS="$SYSEXTRAS alsa_a.c"
-          for f in $ALSA_CFLAGS; do
+  CFLAGS=$KEEPCFLAGS
+  LIBS=$KEEPLIBS
+  LDFLAGS=$KEEPLDFLAGS
+  if test "x$no_esd" = x; then
+    echo "$ac_t""EsounD: Enabled" 1>&6
+    EXTRADEFS="$EXTRADEFS -DAU_ESD"
+    SYSEXTRAS="$SYSEXTRAS esd_a.c"
+    for f in $ESD_CFLAGS; do
     case ".$f" in
 	.-I?*|.-D?*)	CPPFLAGS="$CPPFLAGS $f" ;;
 	*)		CFLAGS="$CPPFLAGS $f" ;;
     esac
 done
 
-          LIBS="$LIBS $ALSA_LIBS"
-      fi
-      ;;
-    *-*-bsdi2.0)
-      EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500"
-      SYSEXTRAS="$SYSEXTRAS bsd20_a.c"
-      echo "$ac_t""yes bsdi" 1>&6
-      ;;
-    *-*-bsdi2.1|*-*-bsdi3.?|*-*-bsdi4.?)
-      EXTRADEFS="$EXTRADEFS -DAU_LINUX"
-      SYSEXTRAS="$SYSEXTRAS linux_a.c"
-      echo "$ac_t""yes bsdi" 1>&6
-      ;;
-    *-*-hpux*)
-      EXTRADEFS="$EXTRADEFS -DAU_HPUX"
-      SYSEXTRAS="$SYSEXTRAS hpux_d_a.c hpux_a.c"
-      if test -d /opt/audio/include; then
-        CPPFLAGS="$CPPFLAGS -I/opt/audio/include"
-      fi
-      if test -d /opt/audio/lib; then
-        EXTRALIBS="$EXTRALIBS -L/opt/audio/lib"
-      fi
-      EXTRALIBS="$EXTRALIBS -lAlib"
-      echo "$ac_t""yes hpux" 1>&6
-      ;;
-    *-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""yes dec" 1>&6
-      ;;
-    *-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""yes irix5.x or irix6.2" 1>&6
-      ;;
-    *-sgi-irix6*)
-      EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL"
-      SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c"
-      EXTRALIBS="$EXTRASLIBS -laudio"
-      echo "$ac_t""yes irix6" 1>&6
-      ;;
-    *-*-sunos4*)
-      EXTRADEFS="$EXTRADEFS -DAU_SUN"
-      SYSEXTRAS="$SYSEXTRAS sun_a.c"
-      echo "$ac_t""yes sunos4" 1>&6
-      if test -f /usr/demo/SOUND/libaudio.a; then
-	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/libaudio.a"
-      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""yes solaris" 1>&6
-      if test -f /usr/demo/SOUND/lib/libaudio.a; then
-	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/lib/libaudio.a"
-      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""yes netbsd" 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""yes cygnus" 1>&6
-      ;;
-    *)
-      echo "configure: warning: no method to play" 1>&2
-      if test "x$enable_audio_opt" != xno; then
-	EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV"
-	SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c"
-      fi
-      ;;
-  esac
+    LIBS="$LIBS $ESD_LIBS"
+  else
+    echo "configure: warning: EsounD: Couldn't configure" 1>&2
+  fi
 else
   echo "$ac_t""no" 1>&6
 fi
 
+echo $ac_n "checking default output mode""... $ac_c" 1>&6
+echo "configure:5581: 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
+fi
+case ".$DEFAULT_PLAYMODE" in
+  .dev)  TIMIDITY_OUTPUT_ID=d ;;
+  .oss)  TIMIDITY_OUTPUT_ID=d ;;
+  .alsa) TIMIDITY_OUTPUT_ID=s ;;
+  .alib) TIMIDITY_OUTPUT_ID=A ;;
+  .nas)  TIMIDITY_OUTPUT_ID=n ;;
+  .esd)  TIMIDITY_OUTPUT_ID=e ;;
+  .wav)  TIMIDITY_OUTPUT_ID=w ;;
+  .au)   TIMIDITY_OUTPUT_ID=u ;;
+  .aiff) TIMIDITY_OUTPUT_ID=a ;;
+  .list) TIMIDITY_OUTPUT_ID=l ;;
+  *)     TIMIDITY_OUTPUT_ID= ;;
+esac
+echo "$ac_t""$DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID" 1>&6
 
 
-# Check whether --enable-enable-dynamic or --disable-enable-dynamic was given.
-if test "${enable_enable_dynamic+set}" = set; then
-  enableval="$enable_enable_dynamic"
+
+
+
+# Check whether --enable-dynamic or --disable-dynamic was given.
+if test "${enable_dynamic+set}" = set; then
+  enableval="$enable_dynamic"
        test "x$enable_dynamic" = xyes && enable_dynamic=dynamic
   
 fi
@@ -5420,19 +5617,19 @@
 *)         NEEDDLOPEN=no;;
 esac
 
-if test "$GCC" = yes; then SHCFLAGS="$SHCFLAGS -fPIC"; fi
+if test "x$GCC" = xyes; then SHCFLAGS="$SHCFLAGS -fPIC"; fi
 case "x$enable_ump" in xyes|xdynamic) EXTRACFLAGS="$EXTRACFLAGS -DXP_UNIX $SHCFLAGS";; esac
 
 if test "$NEEDDLOPEN" = "yes"; then
   have_dl=no
 
   echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6
-echo "configure:5431: checking for LoadLibraryExA" >&5
+echo "configure:5628: 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 5436 "configure"
+#line 5633 "configure"
 #include "confdefs.h"
 #include <windows.h>
 
@@ -5441,7 +5638,7 @@
 LoadLibraryExA(0,0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:5445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   wapi_cv_func_LoadLibraryExA=yes
 else
@@ -5464,12 +5661,12 @@
 
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:5468: checking for shl_load" >&5
+echo "configure:5665: 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 5473 "configure"
+#line 5670 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load(); below.  */
@@ -5492,7 +5689,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5693: \"$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
@@ -5517,12 +5714,12 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:5521: checking for dlopen" >&5
+echo "configure:5718: 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 5526 "configure"
+#line 5723 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
@@ -5545,7 +5742,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5746: \"$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
@@ -5567,12 +5764,12 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dld_init""... $ac_c" 1>&6
-echo "configure:5571: checking for dld_init" >&5
+echo "configure:5768: 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 5576 "configure"
+#line 5773 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dld_init(); below.  */
@@ -5595,7 +5792,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5796: \"$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
@@ -5617,7 +5814,7 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:5621: checking for dld_init in -ldld" >&5
+echo "configure:5818: 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
@@ -5625,7 +5822,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5629 "configure"
+#line 5826 "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
@@ -5636,7 +5833,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5837: \"$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
@@ -5659,13 +5856,13 @@
   fi
 
   echo $ac_n "checking dynamic link method""... $ac_c" 1>&6
-echo "configure:5663: checking dynamic link method" >&5
+echo "configure:5860: 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:5669: checking whether your dlsym() needs a leading underscore" >&5
+echo "configure:5866: 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
@@ -5724,8 +5921,8 @@
 EOM
 : Call the object file tmp-dyna.o in case dlext=o.
 if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 &&
-	mv dyna.o tmp-dyna.o > /dev/null 2>&1 && 
-	$SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 && 
+	mv dyna.o tmp-dyna.o > /dev/null 2>&1 &&
+	$SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 &&
 	${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.c $LIBS $lib_dl_opt > /dev/null 2>&1; then
 	xxx=`./fred`
 	case $xxx in
@@ -5776,16 +5973,18 @@
 fi
 
 if test "$NEEDDLOPEN" = "yes"; then
-  SHARED_LIB_PATH="\$(TIMID_DIR)"
+  SHARED_LIB_PATH="\$(SHLIB_DIR)"
   cat >> confdefs.h <<EOF
 #define IA_DYNAMIC 1
 EOF
 
   EXTRADEFS="$EXTRADEFS -DSHARED_LIB_EXT=\\\".$so\\\""
   EXTRADEFS="$EXTRADEFS -DSHARED_LIB_PATH=\\\"$SHARED_LIB_PATH\\\""
+  test "x$GCC" = xyes -a "x$timidity_cv_ccoption_rdynamic" = xyes  && timidity_LDFLAGS="-rdynamic"
 fi
 
 
+
 if test "$NEEDDLOPEN" = "yes"; then
   NEEDDLOPEN_TRUE=
   NEEDDLOPEN_FALSE='#'
@@ -5798,7 +5997,6 @@
 
 
 
-
 if false; then
   ENABLE_NCURSES_TRUE=
   ENABLE_NCURSES_FALSE='#'
@@ -5813,17 +6011,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5817: checking for $ac_hdr" >&5
+echo "configure:6015: 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 5822 "configure"
+#line 6020 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6025: \"$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*
@@ -5864,7 +6062,7 @@
     esac
 
     echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:5868: checking for initscr in -lncurses" >&5
+echo "configure:6066: 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
@@ -5872,7 +6070,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5876 "configure"
+#line 6074 "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
@@ -5883,7 +6081,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:5887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6085: \"$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
@@ -5902,7 +6100,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:5906: checking for PDC_set_ctrl_break in -lcurses" >&5
+echo "configure:6104: 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
@@ -5910,7 +6108,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses $lib_user32_test $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5914 "configure"
+#line 6112 "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
@@ -5921,7 +6119,7 @@
 PDC_set_ctrl_break()
 ; return 0; }
 EOF
-if { (eval echo configure:5925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6123: \"$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
@@ -6008,7 +6206,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:6012: checking for SLang_init_tty in -lslang" >&5
+echo "configure:6210: 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
@@ -6016,7 +6214,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lslang  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6020 "configure"
+#line 6218 "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
@@ -6027,7 +6225,7 @@
 SLang_init_tty()
 ; return 0; }
 EOF
-if { (eval echo configure:6031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6229: \"$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
@@ -6053,17 +6251,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6057: checking for $ac_hdr" >&5
+echo "configure:6255: 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 6062 "configure"
+#line 6260 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6265: \"$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*
@@ -6115,7 +6313,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:6119: checking for initscr in -ltermcap" >&5
+echo "configure:6317: 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
@@ -6123,7 +6321,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6127 "configure"
+#line 6325 "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
@@ -6134,7 +6332,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6336: \"$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
@@ -6254,7 +6452,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:6258: checking for Tcl_Init in -l$l" >&5
+echo "configure:6456: 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
@@ -6262,7 +6460,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$l  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6266 "configure"
+#line 6464 "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
@@ -6273,7 +6471,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:6277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6475: \"$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
@@ -6297,7 +6495,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:6301: checking for Tk_Init in -l$l" >&5
+echo "configure:6499: 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
@@ -6305,7 +6503,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$l  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6309 "configure"
+#line 6507 "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
@@ -6316,7 +6514,7 @@
 Tk_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:6320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6518: \"$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
@@ -6682,7 +6880,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:6686: checking for $ac_word" >&5
+echo "configure:6884: 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
@@ -6717,7 +6915,7 @@
 
   min_gtk_version=1.1.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:6721: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:6919: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -6740,7 +6938,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 6744 "configure"
+#line 6942 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -6806,7 +7004,7 @@
 }
 
 EOF
-if { (eval echo configure:6810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -6840,7 +7038,7 @@
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 6844 "configure"
+#line 7042 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -6850,7 +7048,7 @@
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:6854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7052: \"$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"
@@ -6918,7 +7116,7 @@
   ;;
 xdynamic)
   dynamic_targets="$dynamic_targets interface_g.\$(so)"
-   if test "$GCC" = yes; then
+   if test "x$GCC" = xyes; then
 		for i in $GTK_LIBS; do
 	    case "x$i" in
 		x-rdynamic) ;;
@@ -7000,17 +7198,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:7004: checking for X11/xpm.h" >&5
+echo "configure:7202: 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 7009 "configure"
+#line 7207 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7212: \"$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*
@@ -7033,7 +7231,7 @@
 fi
 
     echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
-echo "configure:7037: checking for XpmCreatePixmapFromData in -lXpm" >&5
+echo "configure:7235: 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
@@ -7041,7 +7239,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7045 "configure"
+#line 7243 "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
@@ -7052,7 +7250,7 @@
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:7056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7254: \"$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
@@ -7148,17 +7346,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7152: checking for $ac_hdr" >&5
+echo "configure:7350: 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 7157 "configure"
+#line 7355 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7360: \"$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*
@@ -7209,7 +7407,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:7213: checking for DndInitialize in -lDnd" >&5
+echo "configure:7411: 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
@@ -7217,7 +7415,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lDnd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7221 "configure"
+#line 7419 "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
@@ -7228,7 +7426,7 @@
 DndInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:7232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7430: \"$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
@@ -7311,7 +7509,7 @@
       EXTRADEFS="$EXTRADEFS -DWRDT_X"
       enable_sherry_wrd=yes
       echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6
-echo "configure:7315: checking for zlibVersion in -lz" >&5
+echo "configure:7513: 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
@@ -7319,7 +7517,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7323 "configure"
+#line 7521 "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
@@ -7330,7 +7528,7 @@
 zlibVersion()
 ; return 0; }
 EOF
-if { (eval echo configure:7334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7532: \"$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
@@ -7353,17 +7551,17 @@
 
       ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:7357: checking for png.h" >&5
+echo "configure:7555: 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 7362 "configure"
+#line 7560 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7565: \"$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*
@@ -7386,7 +7584,7 @@
 fi
 
       echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6
-echo "configure:7390: checking for png_init_io in -lpng" >&5
+echo "configure:7588: 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
@@ -7394,7 +7592,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7398 "configure"
+#line 7596 "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
@@ -7405,7 +7603,7 @@
 png_init_io()
 ; return 0; }
 EOF
-if { (eval echo configure:7409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7607: \"$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
@@ -7520,7 +7718,7 @@
 CPPFLAGS="$val"
 rm -f wordtmp >/dev/null 2>&1
 
-CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\""
+CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\" -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\""
 
 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/"`
@@ -7542,6 +7740,7 @@
 
 
 
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -7724,11 +7923,11 @@
 s%@X_LIBS@%$X_LIBS%g
 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
 s%@LIBOBJS@%$LIBOBJS%g
+s%@ALSA_CFLAGS@%$ALSA_CFLAGS%g
+s%@ALSA_LIBS@%$ALSA_LIBS%g
 s%@ESD_CONFIG@%$ESD_CONFIG%g
 s%@ESD_CFLAGS@%$ESD_CFLAGS%g
 s%@ESD_LIBS@%$ESD_LIBS%g
-s%@ALSA_CFLAGS@%$ALSA_CFLAGS%g
-s%@ALSA_LIBS@%$ALSA_LIBS%g
 s%@NEEDDLOPEN_TRUE@%$NEEDDLOPEN_TRUE%g
 s%@NEEDDLOPEN_FALSE@%$NEEDDLOPEN_FALSE%g
 s%@ENABLE_NCURSES_TRUE@%$ENABLE_NCURSES_TRUE%g
@@ -7784,6 +7983,7 @@
 s%@CYGNUS_FALSE@%$CYGNUS_FALSE%g
 s%@W32READDIR_TRUE@%$W32READDIR_TRUE%g
 s%@W32READDIR_FALSE@%$W32READDIR_FALSE%g
+s%@timidity_LDFLAGS@%$timidity_LDFLAGS%g
 s%@SYSEXTRAS@%$SYSEXTRAS%g
 s%@EXTRALIBS@%$EXTRALIBS%g
 s%@NETSRCS@%$NETSRCS%g
diff -ruN TiMidity++-2.5.1/configure.in TiMidity++-2.6.0-beta1/configure.in
--- TiMidity++-2.5.1/configure.in	Sat Aug 28 00:25:51 1999
+++ TiMidity++-2.6.0-beta1/configure.in	Mon Aug 30 18:55:59 1999
@@ -53,7 +53,7 @@
 
 AC_INIT(timidity/timidity.c)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(TiMidity++, 2.5.1, no-define)
+AM_INIT_AUTOMAKE(TiMidity++, 2.6.0-beta1, no-define)
 
 dnl To use CONTAINS() macro (See acinclude.m4)
 CONTAINS_INIT
@@ -75,6 +75,7 @@
 EXTRADEFS=
 EXTRALIBS=
 SYSEXTRAS=
+timidity_LDFLAGS=
 
 dnl Optional library dependent
 lib_xm_opt=
@@ -127,7 +128,7 @@
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_LN_S
-
+CHECK_COMPILER_OPTION(rdynamic)
 
 dnl Target dependent
 AC_ARG_WITH(elf,
@@ -202,7 +203,12 @@
     so="so"
     ;;
   *)
-    test -n "$SHLD" || SHLD="ld -Bdynamic -G"
+    test -n "$SHLD" || \
+      if test "x$GCC" = xyes; then
+        SHLD="$CC -shared"
+      else
+        SHLD="ld -Bdynamic -G"
+      fi
     so="so"
     ;;
 esac
@@ -280,7 +286,7 @@
 	unistd.h dlfcn.h glob.h getopt.h errno.h machine/endian.h \
 	stropts.h sys/audioio.h sun/audioio.h sys/types.h \
 	sys/ipc.h sys/shm.h sys/param.h X11/extensions/XShm.h \
-	X11/Xmu/ExtAgent.h)
+	X11/Xmu/ExtAgent.h sys/soundcard.h)
 AC_CHECK_HEADER(string.h,, [ EXTRADEFS="$EXTRADEFS -DNO_STRING_H " ])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -386,119 +392,127 @@
     offix_lib_dir="-L$withval" ])
 
 
-AC_ARG_ENABLE(esd,
-  [  --enable-esd		  Enable EsounD output		(default is no)],
-  [ if test "$enableval" = "yes"; then
-	KEEPCFLAGS=$CFLAGS
-	KEEPLIBS=$LIBS
-	KEEPLDFLAGS=$LDFLAGS
-	AM_PATH_ESD()
-	CFLAGS=$KEEPCFLAGS
-	LIBS=$KEEPLIBS
-	LDFLAGS=$KEEPLDFLAGS
-	if test "x$no_esd" = x; then
-	  EXTRADEFS="$EXTRADEFS -DAU_ESD"
-	  SYSEXTRAS="$SYSEXTRAS esd_a.c"
-	  EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$ESD_CFLAGS)
-	  LIBS="$LIBS $ESD_LIBS"
-	else
-	  AC_MSG_WARN(EsounD: Couldn't configure)
-	fi
-    fi ])
+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 alsa(s):	ALSA pcm device
+dnl alib(A):	HPUX network audio (Alib)
+dnl nas(n):	Network Audio System
+dnl esd(e):	EsounD
 
-
-AC_MSG_CHECKING(whether to enable audio)
+audio_targets='dev oss alsa alib nas esd'
 AC_ARG_ENABLE(audio,
-  [  --enable-audio          Enable audio (default if you use supported platform)  ],
-  [ enable_audio=$enableval ],
+  [  --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)
+                              alsa: ALSA pcm device
+                              alib: HPUX network audio (Alib)
+                              nas:  NAS - Network Audio System
+                              esd:  EsounD],
+  [ enable_audio=$enableval
+    have_audio_opt=yes ],
   [ enable_audio=yes
-    enable_audio_opt=no ])
+    have_audio_opt=no ])
 
-AC_ARG_ENABLE(nas,
-  [  --enable-nas            NAS (Network Audio Sound) support ],
-  [ if test "x$with_x" != xyes; then
-        AC_MSG_ERROR(nas: --with-x option must be specified)
-    fi
-    EXTRADEFS="$EXTRADEFS -DAU_NAS"
-    SYSEXTRAS="$SYSEXTRAS nas_a.c"
+if test "x$enable_audio" = xyes; then
+  enable_audio=dev
+fi
 
-    dnl -laudio conflicts another audio library,
-    dnl so I specify NAS library directly
-    EXTRALIBS="$EXTRALIBS $x_libraries/libaudio.a"
-    lib_xt_opt=-lXt
-    if test "x$have_xext" = xyes; then
-      lib_xext_opt=-lXext
-    fi
-    if test "x$have_xprelibs" = xyes; then
-	lib_xprelibs_opt='-lSM -lICE'
-    fi
-    ])
+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
+  for i in `echo $enable_audio | sed 's/,/ /g'`; do
+    eval "au_enable_$i=yes"
+  done
+fi
+
+dnl Turn on default output mode
+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],
+  [ if test "$enable_audio" != no; then
+      DEFAULT_PLAYMODE=$withval
+      eval "au_enable_$DEFAULT_PLAYMODE=yes"
+    else
+      AC_MSG_WARN(--with-default-output=$withval: audio is not enabled)
+    fi])
 
-if test "$enable_audio" = "yes"; then
-  case "$target" in 
+dnl
+dnl for upper compatibility.
+dnl
+AC_ARG_ENABLE(esd,
+  [  --enable-esd            EsounD (Obsoleted.  Use --enable-audio=esd)],
+  [ au_enable_esd=$enableval ])
+AC_ARG_ENABLE(nas,
+  [  --enable-nas            NAS    (Obsoleted.  Use --enable-audio=nas)],
+  [ au_enable_nas=$enableval ])
+AC_ARG_ENABLE(alsa,
+  [  --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
+  case "$target" in
     *-*-linux*|*-*-freebsd*)
-      EXTRADEFS="$EXTRADEFS -DAU_LINUX"
-      SYSEXTRAS="$SYSEXTRAS linux_a.c"
-      AC_MSG_RESULT(yes linux)
-      KEEPCFLAGS=$CFLAGS
-      KEEPLIBS=$LIBS
-      KEEPLDFLAGS=$LDFLAGS
-      AM_PATH_ALSA_LOCAL()
-      CFLAGS=$KEEPCFLAGS
-      LIBS=$KEEPLIBS
-      LDFLAGS=$KEEPLDFLAGS
-      if test "x$have_alsa" = "xyes"; then
-          EXTRADEFS="$EXTRADEFS -DAU_ALSA"
-          SYSEXTRAS="$SYSEXTRAS alsa_a.c"
-          EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$ALSA_CFLAGS)
-          LIBS="$LIBS $ALSA_LIBS"
-      fi
+      EXTRADEFS="$EXTRADEFS -DAU_OSS"
+      SYSEXTRAS="$SYSEXTRAS oss_a.c"
+      AC_MSG_RESULT(OSS /dev/dsp)
       ;;
     *-*-bsdi2.0)
       EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500"
       SYSEXTRAS="$SYSEXTRAS bsd20_a.c"
-      AC_MSG_RESULT(yes bsdi)
+      AC_MSG_RESULT(/dev/sb_dsp)
       ;;
     *-*-bsdi2.1|*-*-bsdi3.?|*-*-bsdi4.?)
-      EXTRADEFS="$EXTRADEFS -DAU_LINUX"
-      SYSEXTRAS="$SYSEXTRAS linux_a.c"
-      AC_MSG_RESULT(yes bsdi)
+      EXTRADEFS="$EXTRADEFS -DAU_OSS"
+      SYSEXTRAS="$SYSEXTRAS oss_a.c"
+      AC_MSG_RESULT(OSS /dev/dsp)
       ;;
     *-*-hpux*)
-      EXTRADEFS="$EXTRADEFS -DAU_HPUX"
-      SYSEXTRAS="$SYSEXTRAS hpux_d_a.c hpux_a.c"
-      if test -d /opt/audio/include; then
-        CPPFLAGS="$CPPFLAGS -I/opt/audio/include"
-      fi
-      if test -d /opt/audio/lib; then
-        EXTRALIBS="$EXTRALIBS -L/opt/audio/lib"
-      fi
-      EXTRALIBS="$EXTRALIBS -lAlib"
-      AC_MSG_RESULT(yes hpux)
+      EXTRADEFS="$EXTRADEFS -DAU_HPUX_AUDIO"
+      SYSEXTRAS="$SYSEXTRAS hpux_d_a.c"
+      AC_MSG_RESULT(hpux /dev/audio)
       ;;
     *-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(yes dec)
+      AC_MSG_RESULT(MME)
       ;;
     *-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(yes irix5.x or irix6.2)
+      AC_MSG_RESULT(irix5.x or irix6.2 audio)
       ;;
     *-sgi-irix6*)
       EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL"
       SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c"
       EXTRALIBS="$EXTRASLIBS -laudio"
-      AC_MSG_RESULT(yes irix6)
+      AC_MSG_RESULT(irix6 audio)
       ;;
     *-*-sunos4*)
       EXTRADEFS="$EXTRADEFS -DAU_SUN"
       SYSEXTRAS="$SYSEXTRAS sun_a.c"
-      AC_MSG_RESULT(yes sunos4)
+      AC_MSG_RESULT(SunOS 4 /dev/audio)
       if test -f /usr/demo/SOUND/libaudio.a; then
 	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/libaudio.a"
       else
@@ -508,7 +522,7 @@
     *-*-solaris*)
       EXTRADEFS="$EXTRADEFS -DAU_SUN"
       SYSEXTRAS="$SYSEXTRAS sun_a.c"
-      AC_MSG_RESULT(yes solaris)
+      AC_MSG_RESULT(Solaris /dev/audio)
       if test -f /usr/demo/SOUND/lib/libaudio.a; then
 	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/lib/libaudio.a"
       else
@@ -518,7 +532,7 @@
     *-*-netbsd*)
       EXTRADEFS="$EXTRADEFS -DAU_SUN"
       SYSEXTRAS="$SYSEXTRAS sun_a.c"
-      AC_MSG_RESULT(yes netbsd)
+      AC_MSG_RESULT(NetBSD /dev/audio)
       ;;
     *-*-cygwin32*)
       EXTRADEFS="$EXTRADEFS -DAU_W32"
@@ -528,11 +542,11 @@
 	SYSEXTRAS="$SYSEXTRAS w32_a.c"
       fi
       EXTRALIBS="$EXTRALIBS -lwinmm"
-      AC_MSG_RESULT(yes cygnus)
+      AC_MSG_RESULT(Windows audio)
       ;;
     *)
       AC_MSG_WARN(no method to play)
-      if test "x$enable_audio_opt" != xno; then
+      if test "x$have_audio_opt" != xno; then
 	EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV"
 	SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c"
       fi
@@ -542,10 +556,145 @@
   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
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(enable_audio=alsa)
+if test "x$au_enable_alsa" = xyes; then
+  AC_MSG_RESULT()
+  KEEPCFLAGS=$CFLAGS
+  KEEPLIBS=$LIBS
+  KEEPLDFLAGS=$LDFLAGS
+  AM_PATH_ALSA_LOCAL()
+  if test have_alsa = no; then
+    AC_MSG_WARN(ALSA: Couldn't configure)
+    CFLAGS=$KEEPCFLAGS
+    LIBS=$KEEPLIBS
+    LDFLAGS=$KEEPLDFLAGS
+  else
+    AC_MSG_RESULT(ALSA: Enabled)
+    EXTRADEFS="$EXTRADEFS -DAU_ALSA"
+    SYSEXTRAS="$SYSEXTRAS alsa_a.c"
+    EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$ALSA_CFLAGS)
+    LIBS="$LIBS $ALSA_LIBS"
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(enable_audio=alib)
+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) ;;
+  esac
+  SYSEXTRAS="$SYSEXTRAS hpux_a.c"
+  EXTRADEFS="$EXTRADEFS -DAU_HPUX_ALIB"
+  if test -d /opt/audio/include; then
+    CPPFLAGS="$CPPFLAGS -I/opt/audio/include"
+  fi
+  if test -d /opt/audio/lib; then
+    EXTRALIBS="$EXTRALIBS -L/opt/audio/lib"
+  fi
+  EXTRALIBS="$EXTRALIBS -lAlib"
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(enable_audio=nas)
+if test "x$au_enable_nas" = xyes; then
+  if test "x$with_x" != xyes; then
+    AC_MSG_ERROR(nas: --with-x option must be specified)
+  fi
+  EXTRADEFS="$EXTRADEFS -DAU_NAS"
+  SYSEXTRAS="$SYSEXTRAS nas_a.c"
+  dnl -laudio conflicts another audio library,
+  dnl so I specify NAS library directly
+  EXTRALIBS="$EXTRALIBS $x_libraries/libaudio.a"
+  if test -f "$x_libraries/libaudio.a"; then
+    AC_MSG_RESULT(yes - $x_libraries/libaudio.a)
+  else
+    AC_MSG_WARN($x_libraries/libaudio.a: Not found)
+  fi
+  lib_xt_opt=-lXt
+  if test "x$have_xext" = xyes; then
+    lib_xext_opt=-lXext
+  fi
+  if test "x$have_xprelibs" = xyes; then
+    lib_xprelibs_opt='-lSM -lICE'
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_MSG_CHECKING(enable_audio=esd)
+if test "x$au_enable_esd" = xyes; then
+  AC_MSG_RESULT()
+  KEEPCFLAGS=$CFLAGS
+  KEEPLIBS=$LIBS
+  KEEPLDFLAGS=$LDFLAGS
+  AM_PATH_ESD()
+  CFLAGS=$KEEPCFLAGS
+  LIBS=$KEEPLIBS
+  LDFLAGS=$KEEPLDFLAGS
+  if test "x$no_esd" = x; then
+    AC_MSG_RESULT(EsounD: Enabled)
+    EXTRADEFS="$EXTRADEFS -DAU_ESD"
+    SYSEXTRAS="$SYSEXTRAS esd_a.c"
+    EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$ESD_CFLAGS)
+    LIBS="$LIBS $ESD_LIBS"
+  else
+    AC_MSG_WARN(EsounD: Couldn't configure)
+  fi
+else
+  AC_MSG_RESULT(no)
+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
+fi
+case ".$DEFAULT_PLAYMODE" in
+  .dev)  TIMIDITY_OUTPUT_ID=d ;;
+  .oss)  TIMIDITY_OUTPUT_ID=d ;;
+  .alsa) TIMIDITY_OUTPUT_ID=s ;;
+  .alib) TIMIDITY_OUTPUT_ID=A ;;
+  .nas)  TIMIDITY_OUTPUT_ID=n ;;
+  .esd)  TIMIDITY_OUTPUT_ID=e ;;
+  .wav)  TIMIDITY_OUTPUT_ID=w ;;
+  .au)   TIMIDITY_OUTPUT_ID=u ;;
+  .aiff) TIMIDITY_OUTPUT_ID=a ;;
+  .list) TIMIDITY_OUTPUT_ID=l ;;
+  *)     TIMIDITY_OUTPUT_ID= ;;
+esac
+AC_MSG_RESULT($DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID)
+
+
+
+dnl
+dnl Interface section
+dnl
 
 dnl Dynamic link configuration
 
-AC_ARG_ENABLE(enable-dynamic,
+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
@@ -557,7 +706,7 @@
 esac
 
 dnl check -fpic option for gcc
-if test "$GCC" = yes; then SHCFLAGS="$SHCFLAGS -fPIC"; fi
+if test "x$GCC" = xyes; then SHCFLAGS="$SHCFLAGS -fPIC"; fi
 case "x$enable_ump" in xyes|xdynamic) EXTRACFLAGS="$EXTRACFLAGS -DXP_UNIX $SHCFLAGS";; esac
 
 if test "$NEEDDLOPEN" = "yes"; then
@@ -610,13 +759,14 @@
 fi
 
 if test "$NEEDDLOPEN" = "yes"; then
-  SHARED_LIB_PATH="\$(TIMID_DIR)"
+  SHARED_LIB_PATH="\$(SHLIB_DIR)"
   MY_DEFINE(IA_DYNAMIC)
   EXTRADEFS="$EXTRADEFS -DSHARED_LIB_EXT=\\\".$so\\\""
   EXTRADEFS="$EXTRADEFS -DSHARED_LIB_PATH=\\\"$SHARED_LIB_PATH\\\""
+  test "x$GCC" = xyes -a "x$timidity_cv_ccoption_rdynamic" = xyes  && timidity_LDFLAGS="-rdynamic"
 fi
-AM_CONDITIONAL(NEEDDLOPEN, test "$NEEDDLOPEN" = "yes")
 
+AM_CONDITIONAL(NEEDDLOPEN, test "$NEEDDLOPEN" = "yes")
 
 
 dnl Select interfaces
@@ -863,7 +1013,7 @@
     EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$GTK_CFLAGS)
     INTERFACE_SRCS="$INTERFACE_SRCS gtk_c.c gtk_i.c gtk_p.c"
   ],
-  [ if test "$GCC" = yes; then
+  [ if test "x$GCC" = xyes; then
 	dnl Do not include -rdynamic option in $g_so_libs.
 	for i in $GTK_LIBS; do
 	    case "x$i" in
@@ -993,7 +1143,7 @@
 SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
 SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
 SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
-CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\""
+CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\" -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\""
 
 if test "x$with_x" = xyes; then
   dnl Order of X-library is: -lXm -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11
@@ -1002,6 +1152,7 @@
 LIBS="$LIBS $lib_dl_opt $lib_png_opt $lib_zip_opt $lib_user32_opt $lib_w32gui_opt $EXTRALIBS"
 SHLD="$SHLD $SHLDFLAGS"
 
+AC_SUBST(timidity_LDFLAGS)
 AC_SUBST(SYSEXTRAS)
 AC_SUBST(EXTRALIBS)
 AC_SUBST(NETSRCS)
diff -ruN TiMidity++-2.5.1/doc/C/Makefile.in TiMidity++-2.6.0-beta1/doc/C/Makefile.in
--- TiMidity++-2.5.1/doc/C/Makefile.in	Sat Aug 28 00:30:42 1999
+++ TiMidity++-2.6.0-beta1/doc/C/Makefile.in	Mon Aug 30 19:05:25 1999
@@ -109,6 +109,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 
 EXTRA_DIST =  	timidity.1 	timidity.cfg.5 	CHANGES.02i 	FAQ 	README.dl 	README.sf 	README.tk 	README.xskin 	README.xaw
 
diff -ruN TiMidity++-2.5.1/doc/Makefile.in TiMidity++-2.6.0-beta1/doc/Makefile.in
--- TiMidity++-2.5.1/doc/Makefile.in	Sat Aug 28 00:30:38 1999
+++ TiMidity++-2.6.0-beta1/doc/Makefile.in	Mon Aug 30 19:05:24 1999
@@ -109,6 +109,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 SUFFIXES = .1 .5 .txt .ps
 
 SUBDIRS = C ja_JP.ujis
diff -ruN TiMidity++-2.5.1/doc/ja_JP.ujis/Makefile.in TiMidity++-2.6.0-beta1/doc/ja_JP.ujis/Makefile.in
--- TiMidity++-2.5.1/doc/ja_JP.ujis/Makefile.in	Sat Aug 28 00:30:46 1999
+++ TiMidity++-2.6.0-beta1/doc/ja_JP.ujis/Makefile.in	Mon Aug 30 19:05:27 1999
@@ -109,6 +109,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 
 EXTRA_DIST =  	timidity.1 	timidity.cfg.5 	README.dl 	README.sf 	README.tk 	README.xskin 	README.xaw
 
diff -ruN TiMidity++-2.5.1/interface/Makefile.am TiMidity++-2.6.0-beta1/interface/Makefile.am
--- TiMidity++-2.5.1/interface/Makefile.am	Thu Aug 26 12:58:07 1999
+++ TiMidity++-2.6.0-beta1/interface/Makefile.am	Sat Aug 28 22:17:05 1999
@@ -233,7 +233,8 @@
 all-am: $(dynamic_targets)
 
 install.dynamics: $(dynamic_targets)
-	for f in $(dynamic_targets) ''; do case ".$$f" in .);; *) $(INSTALL_PROGRAM) $$f $(DESTDIR)$(TIMID_DIR);; esac; done
+	test -d $(DESTDIR)$(SHLIB_DIR) || mkdir -p $(DESTDIR)$(SHLIB_DIR)
+	for f in $(dynamic_targets) ''; do case ".$$f" in .);; *) $(INSTALL_PROGRAM) $$f $(DESTDIR)$(SHLIB_DIR);; esac; done
 
 .c.$(so):
 	$(COMPILE) $(SHCFLAGS) -c $< -o $@
diff -ruN TiMidity++-2.5.1/interface/Makefile.in TiMidity++-2.6.0-beta1/interface/Makefile.in
--- TiMidity++-2.5.1/interface/Makefile.in	Sat Aug 28 00:30:08 1999
+++ TiMidity++-2.6.0-beta1/interface/Makefile.in	Mon Aug 30 19:05:07 1999
@@ -107,6 +107,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 
 SUFFIXES = .ptcl .tcl .@so@
 
@@ -364,6 +365,10 @@
 	../timidity/output.h ../timidity/controls.h \
 	../timidity/instrum.h ../timidity/playmidi.h \
 	../timidity/readmidi.h
+dynamic_c.o: dynamic_c.c ../config.h ../timidity/timidity.h \
+	../utils/support.h ../timidity/common.h ../libarc/url.h \
+	../utils/mblock.h ../timidity/output.h ../timidity/controls.h \
+	../timidity/dlutils.h
 emacs_c.o: emacs_c.c ../config.h ../timidity/timidity.h \
 	../utils/support.h ../timidity/common.h ../libarc/url.h \
 	../utils/mblock.h ../timidity/output.h ../timidity/controls.h \
@@ -598,7 +603,8 @@
 @NEEDDLOPEN_TRUE@all-am: $(dynamic_targets)
 
 @NEEDDLOPEN_TRUE@install.dynamics: $(dynamic_targets)
-@NEEDDLOPEN_TRUE@	for f in $(dynamic_targets) ''; do case ".$$f" in .);; *) $(INSTALL_PROGRAM) $$f $(DESTDIR)$(TIMID_DIR);; esac; done
+@NEEDDLOPEN_TRUE@	test -d $(DESTDIR)$(SHLIB_DIR) || mkdir -p $(DESTDIR)$(SHLIB_DIR)
+@NEEDDLOPEN_TRUE@	for f in $(dynamic_targets) ''; do case ".$$f" in .);; *) $(INSTALL_PROGRAM) $$f $(DESTDIR)$(SHLIB_DIR);; esac; done
 
 @NEEDDLOPEN_TRUE@.c.$(so):
 @NEEDDLOPEN_TRUE@	$(COMPILE) $(SHCFLAGS) -c $< -o $@
diff -ruN TiMidity++-2.5.1/interface/bitmaps/Makefile.am TiMidity++-2.6.0-beta1/interface/bitmaps/Makefile.am
--- TiMidity++-2.5.1/interface/bitmaps/Makefile.am	Thu Jan 21 03:50:06 1999
+++ TiMidity++-2.6.0-beta1/interface/bitmaps/Makefile.am	Sat Aug 28 22:17:05 1999
@@ -35,4 +35,4 @@
 
 install.bitmaps: $(BITMAPS)
 	test -d $(DESTDIR)$(TCL_DIR)/bitmaps || mkdir -p $(DESTDIR)$(TCL_DIR)/bitmaps
-	for f in $(BITMAPS) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(TIMID_DIR)/bitmaps;; esac; done
+	for f in $(BITMAPS) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(TCL_DIR)/bitmaps;; esac; done
diff -ruN TiMidity++-2.5.1/interface/bitmaps/Makefile.in TiMidity++-2.6.0-beta1/interface/bitmaps/Makefile.in
--- TiMidity++-2.5.1/interface/bitmaps/Makefile.in	Sat Aug 28 00:30:19 1999
+++ TiMidity++-2.6.0-beta1/interface/bitmaps/Makefile.in	Mon Aug 30 19:05:12 1999
@@ -109,6 +109,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 
 BITMAPS =  	back.xbm 	fwrd.xbm 	next.xbm 	pause.xbm 	play.xbm 	prev.xbm 	quit.xbm 	stop.xbm 	random.xbm 	repeat.xbm 	timidity.xbm
 
@@ -217,7 +218,7 @@
 
 install.bitmaps: $(BITMAPS)
 	test -d $(DESTDIR)$(TCL_DIR)/bitmaps || mkdir -p $(DESTDIR)$(TCL_DIR)/bitmaps
-	for f in $(BITMAPS) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(TIMID_DIR)/bitmaps;; esac; done
+	for f in $(BITMAPS) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(TCL_DIR)/bitmaps;; esac; done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -ruN TiMidity++-2.5.1/interface/dynamic_c.c TiMidity++-2.6.0-beta1/interface/dynamic_c.c
--- TiMidity++-2.5.1/interface/dynamic_c.c	Fri Mar 12 18:56:56 1999
+++ TiMidity++-2.6.0-beta1/interface/dynamic_c.c	Sat Aug 28 22:17:05 1999
@@ -110,6 +110,7 @@
 
     ctl->verbosity = dynamic_control_mode.verbosity;
     ctl->trace_playing = dynamic_control_mode.trace_playing;
+    ctl->flags = dynamic_control_mode.flags;
 
     return ctl->open(using_stdin, using_stdout);
 }
diff -ruN TiMidity++-2.5.1/interface/motif_bitmaps/Makefile.in TiMidity++-2.6.0-beta1/interface/motif_bitmaps/Makefile.in
--- TiMidity++-2.5.1/interface/motif_bitmaps/Makefile.in	Sat Aug 28 00:30:15 1999
+++ TiMidity++-2.6.0-beta1/interface/motif_bitmaps/Makefile.in	Mon Aug 30 19:05:11 1999
@@ -109,6 +109,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 
 BITMAPS =  	back.xbm 	fwd.xbm 	next.xbm 	pause.xbm 	prev.xbm 	quit.xbm 	restart.xbm 	timidity.xbm
 
diff -ruN TiMidity++-2.5.1/interface/pixmaps/Makefile.in TiMidity++-2.6.0-beta1/interface/pixmaps/Makefile.in
--- TiMidity++-2.5.1/interface/pixmaps/Makefile.in	Sat Aug 28 00:30:24 1999
+++ TiMidity++-2.6.0-beta1/interface/pixmaps/Makefile.in	Mon Aug 30 19:05:16 1999
@@ -109,6 +109,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 
 PIXMAPS =  	ff.xpm 	loud.xpm 	nextdisc.xpm 	nexttrk.xpm 	playpaus.xpm 	prevdisc.xpm 	prevtrk.xpm 	quiet.xpm 	quit.xpm 	rew.xpm 	stop.xpm 	open.xpm 	fast.xpm 	slow.xpm 	restart.xpm 	keyup.xpm 	keydown.xpm 	timidity.xpm
 
diff -ruN TiMidity++-2.5.1/libarc/Makefile.in TiMidity++-2.6.0-beta1/libarc/Makefile.in
--- TiMidity++-2.5.1/libarc/Makefile.in	Sat Aug 28 00:30:01 1999
+++ TiMidity++-2.6.0-beta1/libarc/Makefile.in	Mon Aug 30 19:05:03 1999
@@ -109,6 +109,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 
 INCLUDES =  	-I$(top_srcdir) 	-I$(top_srcdir)/timidity 	-I$(top_srcdir)/utils 	$(EXTRAINCS)
 
diff -ruN TiMidity++-2.5.1/timidity/Makefile.am TiMidity++-2.6.0-beta1/timidity/Makefile.am
--- TiMidity++-2.5.1/timidity/Makefile.am	Sat Aug 21 02:21:35 1999
+++ TiMidity++-2.6.0-beta1/timidity/Makefile.am	Mon Aug 30 17:11:04 1999
@@ -104,7 +104,7 @@
 	esd_a.c \
 	hpux_a.c \
 	hpux_d_a.c \
-	linux_a.c \
+	oss_a.c \
 	mac_a.c \
 	mac_qt_a.c \
 	mac_com.h \
@@ -130,7 +130,6 @@
 	$(top_builddir)/libarc/libarc.a \
 	$(top_builddir)/utils/libutils.a \
 	$(W32GUI_RES)
-
 
 timidity_DEPENDENCIES = $(SYSEXTRAS:.c=.o) \
 	$(top_builddir)/interface/libinterface.a \
diff -ruN TiMidity++-2.5.1/timidity/Makefile.in TiMidity++-2.6.0-beta1/timidity/Makefile.in
--- TiMidity++-2.5.1/timidity/Makefile.in	Sat Aug 28 00:30:31 1999
+++ TiMidity++-2.6.0-beta1/timidity/Makefile.in	Mon Aug 30 19:05:18 1999
@@ -109,6 +109,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 
 INCLUDES =  	-I$(top_srcdir) 	-I$(top_srcdir)/libarc 	-I$(top_srcdir)/interface 	-I$(top_srcdir)/utils 	$(EXTRAINCS)
 
@@ -118,7 +119,7 @@
 timidity_SOURCES =  	aenc.h 	aiff_a.c 	aq.c 	aq.h 	au_a.c 	audio_cnv.c 	audio_cnv.h 	common.c 	common.h 	controls.c 	controls.h 	dlutils.h 	effect.c 	filter.c 	filter.h 	instrum.c 	instrum.h 	list_a.c 	load_mod.c 	loadtab.c 	mid-j.defs 	mid.defs 	miditrace.c 	miditrace.h 	mix.c 	mix.h 	mod.c 	mod.h 	output.c 	output.h 	playmidi.c 	playmidi.h 	raw_a.c 	rcp.c 	readmidi.c 	readmidi.h 	recache.c 	recache.h 	resample.c 	resample.h 	reverb.c 	reverb.h 	sbkconv.c 	sffile.c 	sffile.h 	sfitem.c 	sfitem.h 	sflayer.h 	smfconv.c 	smfconv.h 	sndfont.c 	tables.c 	tables.h 	timidity.c 	timidity.h 	version.c 	wave_a.c 	wrd.h 	wrd_read.c 	wrdt.c
 
 
-EXTRA_timidity_SOURCES =  	alsa_a.c 	audriv.h 	audriv_a.c 	audriv_al.c 	audriv_mme.c 	audriv_none.c 	dl_cygwin32.c 	dl_dld.c 	dl_dlopen.c 	dl_hpux.c 	bsd20_a.c 	esd_a.c 	hpux_a.c 	hpux_d_a.c 	linux_a.c 	mac_a.c 	mac_qt_a.c 	mac_com.h 	mac_dlog.c 	mac_main.c 	mac_main.h 	mac_soundspec.c 	mfnode.c 	mfnode.h 	nas_a.c 	sun_a.c 	w32_a.c 	w32g_a.c 	timpp32g.ini
+EXTRA_timidity_SOURCES =  	alsa_a.c 	audriv.h 	audriv_a.c 	audriv_al.c 	audriv_mme.c 	audriv_none.c 	dl_cygwin32.c 	dl_dld.c 	dl_dlopen.c 	dl_hpux.c 	bsd20_a.c 	esd_a.c 	hpux_a.c 	hpux_d_a.c 	oss_a.c 	mac_a.c 	mac_qt_a.c 	mac_com.h 	mac_dlog.c 	mac_main.c 	mac_main.h 	mac_soundspec.c 	mfnode.c 	mfnode.h 	nas_a.c 	sun_a.c 	w32_a.c 	w32g_a.c 	timpp32g.ini
 
 
 @ENABLE_W32GUI_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res
@@ -147,7 +148,6 @@
 mix.o mod.o output.o playmidi.o raw_a.o rcp.o readmidi.o recache.o \
 resample.o reverb.o sbkconv.o sffile.o sfitem.o smfconv.o sndfont.o \
 tables.o timidity.o version.o wave_a.o wrd_read.o wrdt.o
-timidity_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -279,6 +279,8 @@
 	../libarc/arc.h ../utils/nkflib.h wrd.h ../utils/strtab.h
 controls.o: controls.c ../config.h ../interface.h timidity.h \
 	../utils/support.h controls.h
+dl_dlopen.o: dl_dlopen.c ../config.h timidity.h ../utils/support.h \
+	dlutils.h
 effect.o: effect.c ../config.h timidity.h ../utils/support.h instrum.h \
 	playmidi.h output.h reverb.h
 filter.o: filter.c ../config.h timidity.h ../utils/support.h common.h \
diff -ruN TiMidity++-2.5.1/timidity/hpux_a.c TiMidity++-2.6.0-beta1/timidity/hpux_a.c
--- TiMidity++-2.5.1/timidity/hpux_a.c	Fri Feb 26 12:49:34 1999
+++ TiMidity++-2.6.0-beta1/timidity/hpux_a.c	Mon Aug 30 15:07:18 1999
@@ -85,7 +85,7 @@
     DEFAULT_RATE, DEFAULT_HP_ENCODING, PF_PCM_STREAM|PF_CAN_TRACE,
     -1,
     {0}, /* default: get all the buffer fragments you can */
-    "HPUX network audio", 'n',
+    "HPUX network audio (Alib)", 'A',
     "", /* THIS STRING IS THE NAME OF THE AUDIO SERVER (default =none)*/
 
     open_output,
diff -ruN TiMidity++-2.5.1/timidity/linux_a.c TiMidity++-2.6.0-beta1/timidity/linux_a.c
--- TiMidity++-2.5.1/timidity/linux_a.c	Fri Aug 27 21:35:30 1999
+++ TiMidity++-2.6.0-beta1/timidity/linux_a.c	Thu Jan  1 09:00:00 1970
@@ -1,342 +0,0 @@
-/*
-
-    TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999 Masanao Izumo <mo@goice.co.jp>
-    Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    linux_audio.c
-
-    Functions to play sound on the VoxWare audio driver (Linux or FreeBSD)
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#ifndef NO_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#ifdef linux
-#include <sys/ioctl.h> /* new with 1.2.0? Didn't need this under 1.1.64 */
-#include <linux/soundcard.h>
-#endif
-
-#ifdef __FreeBSD__
-#include <machine/soundcard.h>
-#include <sys/filio.h>
-#endif
-
-#ifdef __bsdi__
-#include <sys/soundcard.h>
-#endif
-
-#include "timidity.h"
-#include "common.h"
-#include "output.h"
-#include "controls.h"
-#include "timer.h"
-#include "instrum.h"
-#include "playmidi.h"
-#include "miditrace.h"
-
-#ifndef AFMT_S16_NE
-#ifdef LITTLE_ENDIAN
-#define AFMT_S16_NE AFMT_S16_LE
-#else
-#define AFMT_S16_NE AFMT_S16_BE
-#endif
-#endif /* AFMT_S16_NE */
-
-static int open_output(void); /* 0=success, 1=warning, -1=fatal error */
-static void close_output(void);
-static int output_data(char *buf, int32 nbytes);
-static int acntl(int request, void *arg);
-static int output_counter, counter_offset;
-static int total_bytes; /* Maximum buffer size in bytes */
-
-/* export the playback mode */
-
-#define dpm linux_play_mode
-
-PlayMode dpm = {
-    DEFAULT_RATE,
-    PE_16BIT|PE_SIGNED,
-    PF_PCM_STREAM|PF_CAN_TRACE|PF_BUFF_FRAGM_OPT,
-    -1,
-    {0}, /* default: get all the buffer fragments you can */
-    "Linux dsp device", 'd',
-    "/dev/dsp",
-    open_output,
-    close_output,
-    output_data,
-    acntl
-};
-
-/*************************************************************************/
-/* We currently only honor the PE_MONO bit, the sample rate, and the
-   number of buffer fragments. We try 16-bit signed data first, and
-   then 8-bit unsigned if it fails. If you have a sound device that
-   can't handle either, let me know. */
-
-static int open_output(void)
-{
-    int fd, tmp, i, warnings = 0;
-    int include_enc, exclude_enc;
-#ifdef SNDCTL_DSP_GETOSPACE
-    audio_buf_info info;
-#endif /* SNDCTL_DSP_GETOSPACE */
-
-    /* Open the audio device */
-    fd = open(dpm.name, O_WRONLY);
-    if(fd < 0)
-    {
-	ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
-		  dpm.name, strerror(errno));
-	return -1;
-    }
-
-    /*
-     * Modified: Fri Nov 20 1998
-     *
-     * Reported from http://www.ife.ee.ethz.ch/~sailer/linux/pciaudio.html
-     *   by Thomas Sailer <sailer@ife.ee.ethz.ch>
-     * OSS/Free sets nonblocking mode with an ioctl, unlike the rest of the
-     * kernel, which uses the O_NONBLOCK flag. I want to regularize that API,
-     * and this trips on Timidity.
-     */
-    fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) & ~O_NDELAY);
-
-    include_enc = 0;
-    exclude_enc = PE_ULAW|PE_ALAW|PE_BYTESWAP; /* They can't mean these */
-    if(dpm.encoding & PE_16BIT)
-	include_enc |= PE_SIGNED;
-    else
-	exclude_enc |= PE_SIGNED;
-    dpm.encoding = validate_encoding(dpm.encoding, include_enc, exclude_enc);
-
-    /* Set sample width to whichever the user wants. If it fails, try
-       the other one. */
-
-    i = tmp = (dpm.encoding & PE_16BIT) ? AFMT_S16_NE : AFMT_U8;
-    if(ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp) < 0 || tmp != i)
-    {
-	/* Try the other one */
-	i = tmp = (dpm.encoding & PE_16BIT) ? AFMT_U8 : AFMT_S16_NE;
-	if(ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp) < 0 || tmp != i)
-	{
-	    ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
-		      "%s doesn't support 16- or 8-bit sample width",
-		      dpm.name);
-	    close(fd);
-	    return -1;
-	}
-	ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
-		  "Sample width adjusted to %d bits", tmp);
-	dpm.encoding ^= PE_16BIT;
-	warnings = 1;
-    }
-
-    /* Try stereo or mono, whichever the user wants. If it fails, try
-       the other. */
-
-    i = tmp = (dpm.encoding & PE_MONO) ? 0 : 1;
-    if((ioctl(fd, SNDCTL_DSP_STEREO, &tmp) < 0) || tmp != i)
-    {
-	i = tmp = (dpm.encoding & PE_MONO) ? 1 : 0;
-
-	if((ioctl(fd, SNDCTL_DSP_STEREO, &tmp) < 0) || tmp != i)
-	{
-	    ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
-		      "%s doesn't support mono or stereo samples",
-		      dpm.name);
-	    close(fd);
-	    return -1;
-	}
-	if(tmp == 0) dpm.encoding |= PE_MONO;
-	else dpm.encoding &= ~PE_MONO;
-	ctl->cmsg(CMSG_WARNING, VERB_VERBOSE, "Sound adjusted to %sphonic",
-		  (tmp==0) ? "mono" : "stereo");
-	warnings = 1;
-    }
-
-
-    /* Set the sample rate */
-
-    tmp = dpm.rate;
-    if(ioctl(fd, SNDCTL_DSP_SPEED, &tmp) < 0)
-    {
-	ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
-		  "%s doesn't support a %d Hz sample rate",
-		  dpm.name, dpm.rate);
-	close(fd);
-	return -1;
-    }
-    if(tmp != dpm.rate)
-    {
-	ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
-		  "Output rate adjusted to %d Hz (requested %d Hz)",
-		  tmp, dpm.rate);
-	dpm.rate = tmp;
-	warnings = 1;
-    }
-
-    /* Older VoxWare drivers don't have buffer fragment capabilities */
-#ifdef SNDCTL_DSP_SETFRAGMENT
-    /* Set buffer fragments (in extra_param[0]) */
-
-    tmp = AUDIO_BUFFER_BITS;
-    if(!(dpm.encoding & PE_MONO)) tmp++;
-    if(dpm.encoding & PE_16BIT) tmp++;
-    i = tmp;
-    tmp |= (dpm.extra_param[0] << 16);
-    if(ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &tmp) < 0)
-    {
-	ctl->cmsg(CMSG_WARNING, VERB_NORMAL,
-		  "%s doesn't support %d-byte buffer fragments (%d)",
-		  dpm.name, 1<<i, i);
-	/* It should still work in some fashion. We should use a
-	   secondary buffer anyway -- 64k isn't enough. */
-	warnings = 1;
-    }
-#else
-    if(dpm.extra_param[0])
-    {
-	ctl->cmsg(CMSG_WARNING, VERB_NORMAL,
-		  "%s doesn't support buffer fragments", dpm.name);
-	warnings = 1;
-    }
-#endif
-
-#ifdef SNDCTL_DSP_GETOSPACE
-    if(ioctl(fd, SNDCTL_DSP_GETOSPACE, &info) != -1)
-	total_bytes = info.fragstotal * info.fragsize;
-    else
-#endif /* SNDCTL_DSP_GETOSPACE */
-	total_bytes = -1; /* Unknown */
-
-    dpm.fd = fd;
-    output_counter = counter_offset = 0;
-
-    return warnings;
-}
-
-static int output_data(char *buf, int32 nbytes)
-{
-    int n;
-
-    while(nbytes > 0)
-    {
-	if((n = write(dpm.fd, buf, nbytes)) == -1)
-	{
-#if 0
-	    if(errno != ???) /* I don't know what error should be ignored.
-			      * ??? := EWOULDBLOCK??
-			      */
-	    {
-		usleep(100000);
-		continue;
-	    }
-	    ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
-		      "%s: %s", dpm.name, strerror(errno));
-	    return -1;
-#endif
-
-	    /* Now, Ignore error */
-	    usleep(100000);
-	    continue;
-	}
-	buf += n;
-	nbytes -= n;
-	output_counter += n;
-    }
-
-    return 0;
-}
-
-static void close_output(void)
-{
-    if(dpm.fd == -1)
-	return;
-    close(dpm.fd);
-    dpm.fd = -1;
-}
-
-static int acntl(int request, void *arg)
-{
-    int i;
-
-    switch(request)
-    {
-      case PM_REQ_DISCARD:
-	counter_offset = output_counter = 0;
-	return ioctl(dpm.fd, SNDCTL_DSP_RESET);
-
-      case PM_REQ_FLUSH:
-	counter_offset = output_counter = 0;
-	return ioctl(dpm.fd, SNDCTL_DSP_SYNC);
-
-      case PM_REQ_RATE:
-	i = *(int *)arg; /* sample rate in and out */
-	if(ioctl(dpm.fd, SNDCTL_DSP_SPEED, &i) < 0)
-	    return -1;
-	play_mode->rate = i;
-	return 0;
-
-      case PM_REQ_GETQSIZ:
-	if(total_bytes <= 0)
-	    return -1;
-	*((int *)arg) = total_bytes;
-	return 0;
-
-#ifdef SNDCTL_DSP_GETODELAY
-      case PM_REQ_GETFILLED:
-	if(total_bytes <= 0 || ioctl(dpm.fd, SNDCTL_DSP_GETODELAY, &i) == -1)
-	    return -1;
-	if(!(dpm.encoding & PE_MONO)) i >>= 1;
-	if(dpm.encoding & PE_16BIT) i >>= 1;
-	*((int *)arg) = i;
-	return 0;
-
-      case PM_REQ_GETFILLABLE:
-	if(total_bytes <= 0 || ioctl(dpm.fd, SNDCTL_DSP_GETODELAY, &i) == -1)
-	    return -1;
-        i = total_bytes - i;
-	if(!(dpm.encoding & PE_MONO)) i >>= 1;
-	if(dpm.encoding & PE_16BIT) i >>= 1;
-	*((int *)arg) = i;
-	return 0;
-
-      case PM_REQ_GETSAMPLES:
-	if(total_bytes <= 0 || ioctl(dpm.fd, SNDCTL_DSP_GETODELAY, &i) == -1)
-	    return -1;
-	i = output_counter - i;
-	if(!(dpm.encoding & PE_MONO)) i >>= 1;
-	if(dpm.encoding & PE_16BIT) i >>= 1;
-	*((int *)arg) = i;
-	return 0;
-#endif /* SNDCTL_DSP_GETODELAY */
-    }
-    return -1;
-}
diff -ruN TiMidity++-2.5.1/timidity/oss_a.c TiMidity++-2.6.0-beta1/timidity/oss_a.c
--- TiMidity++-2.5.1/timidity/oss_a.c	Thu Jan  1 09:00:00 1970
+++ TiMidity++-2.6.0-beta1/timidity/oss_a.c	Mon Aug 30 17:15:35 1999
@@ -0,0 +1,340 @@
+/*
+
+    TiMidity++ -- MIDI to WAVE converter and player
+    Copyright (C) 1999 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    oss_a.c  (linux_a.c)
+
+    Functions to play sound on the OSS audio driver (Linux or FreeBSD)
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#ifndef NO_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
+#if defined(HAVE_SYS_SOUNDCARD_H)
+#include <sys/soundcard.h>
+#elif defined(linux)
+#include <sys/ioctl.h> /* new with 1.2.0? Didn't need this under 1.1.64 */
+#include <linux/soundcard.h>
+#elif defined(__FreeBSD__)
+#include <machine/soundcard.h>
+#include <sys/filio.h>
+#else
+#include <sys/soundcard.h>
+#endif /* HAVE_SYS_SOUNDCARD_H */
+
+#include "timidity.h"
+#include "common.h"
+#include "output.h"
+#include "controls.h"
+#include "timer.h"
+#include "instrum.h"
+#include "playmidi.h"
+#include "miditrace.h"
+
+#ifndef AFMT_S16_NE
+#ifdef LITTLE_ENDIAN
+#define AFMT_S16_NE AFMT_S16_LE
+#else
+#define AFMT_S16_NE AFMT_S16_BE
+#endif
+#endif /* AFMT_S16_NE */
+
+static int open_output(void); /* 0=success, 1=warning, -1=fatal error */
+static void close_output(void);
+static int output_data(char *buf, int32 nbytes);
+static int acntl(int request, void *arg);
+static int output_counter, counter_offset;
+static int total_bytes; /* Maximum buffer size in bytes */
+
+/* export the playback mode */
+
+#define dpm dsp_play_mode
+
+PlayMode dpm = {
+    DEFAULT_RATE,
+    PE_16BIT|PE_SIGNED,
+    PF_PCM_STREAM|PF_CAN_TRACE|PF_BUFF_FRAGM_OPT,
+    -1,
+    {0}, /* default: get all the buffer fragments you can */
+    "dsp device", 'd',
+    "/dev/dsp",
+    open_output,
+    close_output,
+    output_data,
+    acntl
+};
+
+/*************************************************************************/
+/* We currently only honor the PE_MONO bit, the sample rate, and the
+   number of buffer fragments. We try 16-bit signed data first, and
+   then 8-bit unsigned if it fails. If you have a sound device that
+   can't handle either, let me know. */
+
+static int open_output(void)
+{
+    int fd, tmp, i, warnings = 0;
+    int include_enc, exclude_enc;
+#ifdef SNDCTL_DSP_GETOSPACE
+    audio_buf_info info;
+#endif /* SNDCTL_DSP_GETOSPACE */
+
+    /* Open the audio device */
+    fd = open(dpm.name, O_WRONLY);
+    if(fd < 0)
+    {
+	ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
+		  dpm.name, strerror(errno));
+	return -1;
+    }
+
+    /*
+     * Modified: Fri Nov 20 1998
+     *
+     * Reported from http://www.ife.ee.ethz.ch/~sailer/linux/pciaudio.html
+     *   by Thomas Sailer <sailer@ife.ee.ethz.ch>
+     * OSS/Free sets nonblocking mode with an ioctl, unlike the rest of the
+     * kernel, which uses the O_NONBLOCK flag. I want to regularize that API,
+     * and this trips on Timidity.
+     */
+    fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) & ~O_NDELAY);
+
+    include_enc = 0;
+    exclude_enc = PE_ULAW|PE_ALAW|PE_BYTESWAP; /* They can't mean these */
+    if(dpm.encoding & PE_16BIT)
+	include_enc |= PE_SIGNED;
+    else
+	exclude_enc |= PE_SIGNED;
+    dpm.encoding = validate_encoding(dpm.encoding, include_enc, exclude_enc);
+
+    /* Set sample width to whichever the user wants. If it fails, try
+       the other one. */
+
+    i = tmp = (dpm.encoding & PE_16BIT) ? AFMT_S16_NE : AFMT_U8;
+    if(ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp) < 0 || tmp != i)
+    {
+	/* Try the other one */
+	i = tmp = (dpm.encoding & PE_16BIT) ? AFMT_U8 : AFMT_S16_NE;
+	if(ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp) < 0 || tmp != i)
+	{
+	    ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
+		      "%s doesn't support 16- or 8-bit sample width",
+		      dpm.name);
+	    close(fd);
+	    return -1;
+	}
+	ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
+		  "Sample width adjusted to %d bits", tmp);
+	dpm.encoding ^= PE_16BIT;
+	warnings = 1;
+    }
+
+    /* Try stereo or mono, whichever the user wants. If it fails, try
+       the other. */
+
+    i = tmp = (dpm.encoding & PE_MONO) ? 0 : 1;
+    if((ioctl(fd, SNDCTL_DSP_STEREO, &tmp) < 0) || tmp != i)
+    {
+	i = tmp = (dpm.encoding & PE_MONO) ? 1 : 0;
+
+	if((ioctl(fd, SNDCTL_DSP_STEREO, &tmp) < 0) || tmp != i)
+	{
+	    ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
+		      "%s doesn't support mono or stereo samples",
+		      dpm.name);
+	    close(fd);
+	    return -1;
+	}
+	if(tmp == 0) dpm.encoding |= PE_MONO;
+	else dpm.encoding &= ~PE_MONO;
+	ctl->cmsg(CMSG_WARNING, VERB_VERBOSE, "Sound adjusted to %sphonic",
+		  (tmp==0) ? "mono" : "stereo");
+	warnings = 1;
+    }
+
+
+    /* Set the sample rate */
+
+    tmp = dpm.rate;
+    if(ioctl(fd, SNDCTL_DSP_SPEED, &tmp) < 0)
+    {
+	ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
+		  "%s doesn't support a %d Hz sample rate",
+		  dpm.name, dpm.rate);
+	close(fd);
+	return -1;
+    }
+    if(tmp != dpm.rate)
+    {
+	ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
+		  "Output rate adjusted to %d Hz (requested %d Hz)",
+		  tmp, dpm.rate);
+	dpm.rate = tmp;
+	warnings = 1;
+    }
+
+    /* Older VoxWare drivers don't have buffer fragment capabilities */
+#ifdef SNDCTL_DSP_SETFRAGMENT
+    /* Set buffer fragments (in extra_param[0]) */
+
+    tmp = AUDIO_BUFFER_BITS;
+    if(!(dpm.encoding & PE_MONO)) tmp++;
+    if(dpm.encoding & PE_16BIT) tmp++;
+    i = tmp;
+    tmp |= (dpm.extra_param[0] << 16);
+    if(ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &tmp) < 0)
+    {
+	ctl->cmsg(CMSG_WARNING, VERB_NORMAL,
+		  "%s doesn't support %d-byte buffer fragments (%d)",
+		  dpm.name, 1<<i, i);
+	/* It should still work in some fashion. We should use a
+	   secondary buffer anyway -- 64k isn't enough. */
+	warnings = 1;
+    }
+#else
+    if(dpm.extra_param[0])
+    {
+	ctl->cmsg(CMSG_WARNING, VERB_NORMAL,
+		  "%s doesn't support buffer fragments", dpm.name);
+	warnings = 1;
+    }
+#endif
+
+#ifdef SNDCTL_DSP_GETOSPACE
+    if(ioctl(fd, SNDCTL_DSP_GETOSPACE, &info) != -1)
+	total_bytes = info.fragstotal * info.fragsize;
+    else
+#endif /* SNDCTL_DSP_GETOSPACE */
+	total_bytes = -1; /* Unknown */
+
+    dpm.fd = fd;
+    output_counter = counter_offset = 0;
+
+    return warnings;
+}
+
+static int output_data(char *buf, int32 nbytes)
+{
+    int n;
+
+    while(nbytes > 0)
+    {
+	if((n = write(dpm.fd, buf, nbytes)) == -1)
+	{
+#if 0
+	    if(errno != ???) /* I don't know what error should be ignored.
+			      * ??? := EWOULDBLOCK??
+			      */
+	    {
+		usleep(100000);
+		continue;
+	    }
+	    ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
+		      "%s: %s", dpm.name, strerror(errno));
+	    return -1;
+#endif
+
+	    /* Now, Ignore error */
+	    usleep(100000);
+	    continue;
+	}
+	buf += n;
+	nbytes -= n;
+	output_counter += n;
+    }
+
+    return 0;
+}
+
+static void close_output(void)
+{
+    if(dpm.fd == -1)
+	return;
+    close(dpm.fd);
+    dpm.fd = -1;
+}
+
+static int acntl(int request, void *arg)
+{
+    int i;
+
+    switch(request)
+    {
+      case PM_REQ_DISCARD:
+	counter_offset = output_counter = 0;
+	return ioctl(dpm.fd, SNDCTL_DSP_RESET);
+
+      case PM_REQ_FLUSH:
+	counter_offset = output_counter = 0;
+	return ioctl(dpm.fd, SNDCTL_DSP_SYNC);
+
+      case PM_REQ_RATE:
+	i = *(int *)arg; /* sample rate in and out */
+	if(ioctl(dpm.fd, SNDCTL_DSP_SPEED, &i) < 0)
+	    return -1;
+	play_mode->rate = i;
+	return 0;
+
+      case PM_REQ_GETQSIZ:
+	if(total_bytes <= 0)
+	    return -1;
+	*((int *)arg) = total_bytes;
+	return 0;
+
+#ifdef SNDCTL_DSP_GETODELAY
+      case PM_REQ_GETFILLED:
+	if(total_bytes <= 0 || ioctl(dpm.fd, SNDCTL_DSP_GETODELAY, &i) == -1)
+	    return -1;
+	if(!(dpm.encoding & PE_MONO)) i >>= 1;
+	if(dpm.encoding & PE_16BIT) i >>= 1;
+	*((int *)arg) = i;
+	return 0;
+
+      case PM_REQ_GETFILLABLE:
+	if(total_bytes <= 0 || ioctl(dpm.fd, SNDCTL_DSP_GETODELAY, &i) == -1)
+	    return -1;
+        i = total_bytes - i;
+	if(!(dpm.encoding & PE_MONO)) i >>= 1;
+	if(dpm.encoding & PE_16BIT) i >>= 1;
+	*((int *)arg) = i;
+	return 0;
+
+      case PM_REQ_GETSAMPLES:
+	if(total_bytes <= 0 || ioctl(dpm.fd, SNDCTL_DSP_GETODELAY, &i) == -1)
+	    return -1;
+	i = output_counter - i;
+	if(!(dpm.encoding & PE_MONO)) i >>= 1;
+	if(dpm.encoding & PE_16BIT) i >>= 1;
+	*((int *)arg) = i;
+	return 0;
+#endif /* SNDCTL_DSP_GETODELAY */
+    }
+    return -1;
+}
diff -ruN TiMidity++-2.5.1/timidity/output.c TiMidity++-2.6.0-beta1/timidity/output.c
--- TiMidity++-2.5.1/timidity/output.c	Sat Jul 17 18:34:14 1999
+++ TiMidity++-2.6.0-beta1/timidity/output.c	Mon Aug 30 18:13:10 1999
@@ -38,79 +38,88 @@
 #include "audio_cnv.h"
 
 
+
+extern PlayMode alsa_play_mode;
+
+
+extern PlayMode hpux_nplay_mode;
+
+
+
 /* These are very likely mutually exclusive.. */
-#ifdef AU_AUDRIV
+#if defined(AU_AUDRIV)
 extern PlayMode audriv_play_mode;
-#define DEFAULT_PLAY_MODE &audriv_play_mode
-#endif
+#define DEV_PLAY_MODE &audriv_play_mode
 
-#ifdef AU_SUN
+#elif defined(AU_SUN)
 extern PlayMode sun_play_mode;
-#define DEFAULT_PLAY_MODE &sun_play_mode
-#endif
+#define DEV_PLAY_MODE &sun_play_mode
 
-#ifdef AU_LINUX
-extern PlayMode linux_play_mode;
-#define DEFAULT_PLAY_MODE &linux_play_mode
-#endif
+#elif defined(AU_OSS)
+extern PlayMode oss_play_mode;
+#define DEV_PLAY_MODE &oss_play_mode
 
-#ifdef AU_ALSA
-extern PlayMode alsa_play_mode;
-#endif
-
-#ifdef AU_ESD
-extern PlayMode esd_play_mode;
-#endif
-
-#ifdef AU_HPUX
+#elif defined(AU_HPUX_AUDIO)
 extern PlayMode hpux_play_mode;
-extern PlayMode hpux_nplay_mode;
-#define DEFAULT_PLAY_MODE &hpux_play_mode
-#define NETWORK_PLAY_MODE &hpux_nplay_mode
-#endif
+#define DEV_PLAY_MODE &hpux_play_mode
 
-#ifdef AU_W32
+#elif defined(AU_W32)
 extern PlayMode w32_play_mode;
-#define DEFAULT_PLAY_MODE &w32_play_mode
-#endif
+#define DEV_PLAY_MODE &w32_play_mode
 
-#ifdef AU_BSDI
+#elif defined(AU_BSDI)
 extern PlayMode bsdi_play_mode;
-#define DEFAULT_PLAY_MODE &bsdi_play_mode
+#define DEV_PLAY_MODE &bsdi_play_mode
+
+#elif defined(__MACOS__)
+extern PlayMode mac_play_mode;
+#define DEV_PLAY_MODE &mac_play_mode
 #endif
 
+#ifdef AU_ALSA
+extern PlayMode alsa_play_mode;
+#endif /* AU_ALSA */
+
+#ifdef AU_HPUX_ALIB
+extern PlayMode hpux_nplay_mode
+#endif /* AU_HPUX_ALIB */
+
+#ifdef AU_ESD
+extern PlayMode esd_play_mode;
+#endif /* AU_ESD */
+
 #ifdef AU_NAS
 extern PlayMode nas_play_mode;
-#ifndef DEFAULT_PLAY_MODE
-#define DEFAULT_PLAY_MODE &nas_play_mode
-#endif /* DEFAULT_PLAY_MODE */
 #endif /* AU_NAS */
 
 #ifndef __MACOS__
 /* These are always compiled in. */
 extern PlayMode raw_play_mode, wave_play_mode, au_play_mode, aiff_play_mode;
 extern PlayMode list_play_mode;
-#else /* __MACOS__ */
-extern PlayMode mac_play_mode;
-#define DEFAULT_PLAY_MODE &mac_play_mode
-#endif /* __MACOS__ */
+#endif /* !__MACOS__ */
+
 
 PlayMode *play_mode_list[] = {
-#ifdef DEFAULT_PLAY_MODE
-  DEFAULT_PLAY_MODE,
+#ifdef DEV_PLAY_MODE
+  DEV_PLAY_MODE,
 #endif
+
 #ifdef AU_ALSA
   &alsa_play_mode,
-#endif
-#ifdef AU_ESD
+#endif /* AU_ALSA */
+
+#ifdef AU_HPUX_ALIB
+  &hpux_nplay_mode,
+#endif /* AU_HPUX_ALIB */
+
+#if defined(AU_ESD)
   &esd_play_mode,
-#endif
-#ifdef AU_NAS
+#endif /* AU_ESD */
+
+#if defined(AU_NAS)
   &nas_play_mode,
 #endif /* AU_NAS */
-#ifdef NETWORK_PLAY_MODE
-  NETWORK_PLAY_MODE,
-#endif
+
 #ifndef __MACOS__
   &wave_play_mode,
   &raw_play_mode,
@@ -121,11 +130,7 @@
   0
 };
 
-#ifdef DEFAULT_PLAY_MODE
-  PlayMode *play_mode=DEFAULT_PLAY_MODE;
-#else
-  PlayMode *play_mode=&wave_play_mode;
-#endif
+PlayMode *play_mode = NULL;
 PlayMode *target_play_mode = NULL;
 
 /*****************************************************************/
diff -ruN TiMidity++-2.5.1/timidity/playmidi.c TiMidity++-2.6.0-beta1/timidity/playmidi.c
--- TiMidity++-2.5.1/timidity/playmidi.c	Thu Aug 26 10:45:53 1999
+++ TiMidity++-2.6.0-beta1/timidity/playmidi.c	Mon Aug 30 10:24:28 1999
@@ -1924,18 +1924,22 @@
 	  case 0: /* Normal */
 	    midi_drumpart_change(ch, 0);
 	    channel[ch].mapID = XG_NORMAL_MAP;
+	    dr = 0;
 	    break;
 	  case 64: /* SFX voice */
 	    midi_drumpart_change(ch, 0);
 	    channel[ch].mapID = XG_SFX64_MAP;
+	    dr = 0;
 	    break;
 	  case 126: /* SFX kit */
 	    midi_drumpart_change(ch, 1);
 	    channel[ch].mapID = XG_SFX126_MAP;
+	    dr = 1;
 	    break;
 	  case 127: /* Drumset */
 	    midi_drumpart_change(ch, 1);
 	    channel[ch].mapID = XG_DRUM_MAP;
+	    dr = 1;
 	    break;
 	  default:
 	    break;
diff -ruN TiMidity++-2.5.1/timidity/timidity.c TiMidity++-2.6.0-beta1/timidity/timidity.c
--- TiMidity++-2.5.1/timidity/timidity.c	Tue Aug 24 20:52:17 1999
+++ TiMidity++-2.6.0-beta1/timidity/timidity.c	Mon Aug 30 18:00:55 1999
@@ -408,13 +408,7 @@
 "  -k msec Specify audio queue time limit to reduce voice",
 "  -L dir  Append dir to search path",
 "  -O mode Select output mode and format (see below for list)",
-#if defined(AU_HPUX)
-"  -o file Output to another file (or audio server) (Use \"-\" for stdout)",
-#elif defined (AU_LINUX)
-"  -o file Output to another file (or device) (Use \"-\" for stdout)",
-#else
-"  -o file Output to another file (Use \"-\" for stdout)",
-#endif
+"  -o file Output to another file (or device/server)  (Use \"-\" for stdout)",
 "  -P file Use patch file for all programs",
 "  -p n(a) Allow n-voice polyphony.  Optional auto polyphony reduction toggle."
 ,
@@ -797,6 +791,21 @@
 		      case 't': /* toggle */
 			cmp->trace_playing = !cmp->trace_playing;
 			break;
+		      case 'l':
+			cmp->flags ^= CTLF_LIST_LOOP;
+			break;
+		      case 'r':
+			cmp->flags ^= CTLF_LIST_RANDOM;
+			break;
+		      case 's':
+			cmp->flags ^= CTLF_LIST_SORT;
+			break;
+		      case 'a':
+			cmp->flags ^= CTLF_AUTOSTART;
+			break;
+		      case 'x':
+			cmp->flags ^= CTLF_AUTOEXIT;
+			break;
 
 		      default:
 			ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
@@ -2768,6 +2777,22 @@
 	memset(channel[i].drums, 0, sizeof(channel[i].drums));
     }
     arc_error_handler = timidity_arc_error_handler;
+
+    if(play_mode == NULL)
+    {
+	char *output_id;
+	int i;
+
+	play_mode = play_mode_list[0];
+	if((output_id = getenv("TIMIDITY_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;
+	    }
+    }
 
     if(is_first) /* initialize once time */
     {
diff -ruN TiMidity++-2.5.1/utils/Makefile.in TiMidity++-2.6.0-beta1/utils/Makefile.in
--- TiMidity++-2.5.1/utils/Makefile.in	Sat Aug 28 00:29:56 1999
+++ TiMidity++-2.6.0-beta1/utils/Makefile.in	Mon Aug 30 19:05:01 1999
@@ -109,6 +109,7 @@
 program_transform_name = @program_transform_name@
 so = @so@
 tcltk_dep = @tcltk_dep@
+timidity_LDFLAGS = @timidity_LDFLAGS@
 
 INCLUDES =  	-I$(top_srcdir)/libarc 	-I$(top_srcdir)/timidity 	$(EXTRAINCS)