diff -ruN TiMidity++-2.7.0/ChangeLog TiMidity++-2.8.0/ChangeLog
--- TiMidity++-2.7.0/ChangeLog	Tue Oct 12 19:17:59 1999
+++ TiMidity++-2.8.0/ChangeLog	Wed Nov 24 10:56:16 1999
@@ -1,3 +1,110 @@
+1999-11-24  Masanao Izumo <mo@goice.co.jp>
+
+    * Version 2.8.0 released.
+
+1999-11-24  Masanao Izumo <mo@goice.co.jp>
+
+    * timidity/playmidi.c (start_note): Reset porta_control_counter.
+
+1999-11-19  Masanao Izumo <mo@goice.co.jp>
+            Takaya Nogami <t-nogami@happy.email.ne.jp>
+    * Imported Macinotsh sources from the 1999.10.31 of T.Nogami released.
+
+1999-11-19  Masanao Izumo <mo@goice.co.jp>
+    * timidity/resample.c (rs_plain): Bug fixed about PRECALC_LOOPS counter.
+      This bug from the original of TiMidity.
+	Original form: i = (le - ofs) / incr + 1;		(Original)
+	Fixed form:    i = (le - ofs + incr - 1) / incr;	(Correct)
+    * timidity/wrd_read.c: Check 0x20 command in the header block.
+
+1999-11-18  Masanao Izumo <mo@goice.co.jp>
+
+    * timidity/timidity.c (-M name): New command line switch.
+	-M auto: Use *.mid.wav or *.mid.aiff instread of MIDI to WAVE
+		 convertion.  The PCM file format must be 16bit sample and
+		 the sampling rate equals as timidity's rate.
+        -M none: Disable this feature (default)
+        -M <filename>: Use the specified file.
+
+1999-11-17  Eric A. Welsh <ewelsh@gpc.wustl.edu>
+
+    * timidity/playmidi.c (reduce_voice(), reduce_voice_CPU()):
+      Improved chorus reduction.
+    * timidity/timidity.c: Changed the -h information displayed for -EFchorus=2
+
+1999-11-16  Masanao Izumo <mo@goice.co.jp>
+
+    * timidity/playmidi.c: New variable `char *pcm_alternate_file'.
+      NULL or "none":  Don't use any pre-converted pcm files.
+      "auto": Automatically select *.mid.wav or *.mid.aiff
+      filename: Use the specified file.
+
+1999-11-16  Masanao Izumo <mo@goice.co.jp>
+
+    * configure.in,timidity/timidity.h: New configure option to choose
+      wave interpolation in resampling.
+	--enable-spline=linear		Linear interpolation (default)
+	--enable-spline=cubic		Cubic interpolation
+	--enable-spline=lanrange	Langrange interpolation
+	--enable-spline=no		No interplation
+
+1999-11-12  Masanao Izumo <mo@goice.co.jp>
+
+    * timidity/{playmidi.h,playmidi.c}: Modified chorus implementations
+    * interface/{Makefile.am,Makefile.in}: Added tclIndex in the package.
+      If *.tcl are updated, tclIndex is automatically update with make.
+
+1999-11-07  Takaya Nogami <t-nogami@happy.email.ne.jp>
+
+    * timidity/{playmidi.c,readmidi.h}: 
+      Use pre-converted file *.mid.wav or *.mid.aiff file to play *.mid
+      if it is exists.
+
+1999-11-06  Glenn Trigg <ggt@netspace.net.au>
+
+    * interface/{gtk_c.c,gtk_h.h,gtk_i.c}:
+      Added support for printing the lyrics from .kar files
+      and also make the text area clear between files.
+
+1999-10-26  Eric A. Welsh <ewelsh@gpc.wustl.edu>
+
+    * timidity/instrum.c: Bug fixes.
+      It is possible that (OFS>>FRACTION_BITS)+1 will yield a value which is 1
+      beyond the length of the sample.  This happens when OFS < data_length,
+      but (OFS>>FRACTION_BITS) == (data_length>>FRACTION_BITS).
+
+1999-10-25  Eric A. Welsh <ewelsh@gpc.wustl.edu>
+
+    * timidity/playmidi.c: Support adjust panning for chorus'd notes.
+      This fix would remove "popping" noises.
+
+1999-10-24  Michael Vanier <mvanier@bbb.caltech.edu>
+
+    * README: Proofread.
+
+1999-10-17  Eric A. Welsh <ewelsh@gpc.wustl.edu>
+
+    * timidity/{mix.h,mix.c,timidity.c} (-m N): New command line switch, and
+      implemented envelope_volume decay.
+      N is the minimum number of msec to sustain a sustained note.
+
+	-m 1	Effectively behaves as if all sustains are ignored,
+		volume ramping is the same as normal stage 3.
+	-m 0	Disable sustain ramping, causes constant volume sustains.
+		(default)
+	-m 3000	A note at full volume will decay for 3 seconds once it begins
+		to be sustained (assuming the regular stage 3 rate would not
+		cause it to decay even longer). Softer notes will of course
+		die sooner.
+
+1999-10-15  Eric A. Welsh <ewelsh@gpc.wustl.edu>
+
+    * timidity/playmidi.c: Improvement to -EFchorus=2
+
+1999-10-15  Tomoki Aono <a9601m@almn.is.osaka-kyoiku.ac.jp>
+
+    * interface/{Makefile.am,Makefile.in}: Fixed a mistake of Makefile
+
 1999-10-12  Masanao Izumo <mo@goice.co.jp>
 
     * Version 2.7.0 released.
diff -ruN TiMidity++-2.7.0/NEWS TiMidity++-2.8.0/NEWS
--- TiMidity++-2.7.0/NEWS	Tue Oct 12 19:18:13 1999
+++ TiMidity++-2.8.0/NEWS	Wed Nov 24 12:04:28 1999
@@ -1,3 +1,30 @@
+11/24, 1999
+    * Version 2.8.0 released.
+    * In GTK, added support for printing the lyrics from .kar files
+      and also make the text area clear between files.
+    * New command line option: -M <name>
+	-M auto: Use *.mid.wav or *.mid.aiff instread of MIDI to WAVE
+		 convertion.  The PCM file format must be 16bit sample and
+		 the sampling rate equals as timidity's rate.
+        -M none: Disable this feature (default)
+        -M <filename>: Use the specified file.
+    * In GTK interface, added support for printing the lyrics from .kar files
+      and also make the text area clear between files.
+    * New configure option to choose wave interpolation in resampling.
+	--with-spline=linear	Linear interpolation (default)
+	--with-spline=cubic	Cubic interpolation
+	--with-spline=lanrange	Langrange interpolation
+	--with-spline=no	No interplation
+    * New command line option `-m N' to specify sustain time (msec).
+	-m 1	Effectively behaves as if all sustains are ignored,
+		volume ramping is the same as normal stage 3.
+	-m 0	Disable sustain ramping, causes constant volume sustains.
+		(default)
+	-m 3000	A note at full volume will decay for 3 seconds once it begins
+		to be sustained (assuming the regular stage 3 rate would not
+		cause it to decay even longer). Softer notes will of course
+		die sooner.
+
 10/12, 1999
     * Version 2.7.0 released.
     * adjust_panning_immediately (-F) is true by default.
diff -ruN TiMidity++-2.7.0/README TiMidity++-2.8.0/README
--- TiMidity++-2.7.0/README	Tue Apr 27 23:23:54 1999
+++ TiMidity++-2.8.0/README	Thu Nov  4 11:11:18 1999
@@ -13,53 +13,52 @@
   either version 2 of the License, or (at your  option)  any
   later version.
 
-  Original version of this program is written by Tuuka Tiovonen <tt@cgs.fi>
-  until TiMidity 0.2i. (he discontinued to develop it because of his busy
-  work)  And Masanao Izumo <mo@goice.co.jp> and other people has begun to
-  hack it, then we decided TiMidity++ officially release.
+  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.
+
+  The original version of this program was written by Tuuka Tiovonen
+  <tt@cgs.fi> until TiMidity 0.2i (he discontinued development
+  because he was too busy with work). Masanao Izumo <mo@goice.co.jp> and
+  other people began to hack it, then we officially released the new
+  version, which is called TiMidity++.
 
-  TiMidity has originally been a converter that converts MIDI files to WAV
-  audio file. But now TiMidity++ is not only a converter but also the
+  TiMidity was originally a converter that converted MIDI files to WAV
+  audio files. But now TiMidity++ is not only a converter but also a
   real-time player that can play a MIDI file in real time. TiMidity does
-  not requires external MIDI instrument module to play MIDI file, performs
-  with software power.
+  not requires an external MIDI instrument module to play MIDI file; it can
+  perform with software power only.
 
   TiMidity++ uses GUS/patch (Glavis Ultrasound) as the voice data to play.
-  And it can also handle SoundFont data for voice data.
+  It can also handle SoundFont data for voice data.
 
 *Features of TiMidity++:
-
   - Plays MIDI files without external MIDI instruments
-  - Converts MIDI file to various formatted audio file (ex. wav, au, etc..)
+  - Converts MIDI files to various audio file formats
+    (ex. wav, au, etc.)
   - Uses GUS/patch and SoundFont for voice data
-  - Displays some of information of Music data during the playing
-  - Various user interface are available (ncurses, motif, xaw, etc..)
-  - Can load dynamic shared user interface
-  - Plays the MIDI file via network
-  - Plays the MIDI file in archive file (zip, lzh, tar, tgz)
-  - Plays not only SMF file but also MOD, RCP/R36/G18/G36
+  - Displays some information about the music data during playback
+  - Various user interfaces are available (ncurses, motif, xaw, etc..)
+  - Plays MIDI files over a network
+  - Plays MIDI files in archive files
+  - Plays not only SMF files but also MOD, RCP/R36/G18/G36
   - Can handle 32 channel data
-  - Can handle user interfaces as dynamic link modules
-  - Can display the sound spectrogram
-  - Automatically detects the mode of MIDI file (GM/GS/XG)
+  - Can handle user interfaces as dynamically linked modules
+  - Can display a sound spectrogram
+  - Automatically detects the mode of a MIDI file (GM/GS/XG)
   - Automatically detects drum channels (GS/XG)
   - Trace playing
   - Low load
-  - Supports durm alternate assignment.
-  - Automatically reduce voices if there is no enough CPU power to play MIDI
-    in realtime.
-  - Can play the streamed MIDI via TCP/IP
   - The following MIDI events are supported:
-	NoteOn/Off, KeyPressure, Program, ChannelPressure, Pitchwheel,
-	ToneBank, ModulationWheel, MainVolume, Panning, Expression,
-	Sustain, Portamento, DataEntry, ReverbEffect, ChorusEffect,
-	RPN+/-, NRPN, RPN, AllSoundsOff, ResetControllers, AllNotesOff,
-	Mono/Poly Part, RandomPan, KeyShift,
-	TempoChange, Lyric, InsertText, KARAOKE-Part(@KMIDI),
-	MasterVolume, MIDI-Reset, SystemExclusiveMessages
-
-(NOTE: Features that are Japanese local are not described in this file for simplify.
-       Please refer to timidity.1/timidity.cfg.1 for these features )
+    NoteOn/Off, KeyPressure, Program, ChannelPressure, Pitchwheel,
+    ToneBank, ModulationWheel, MainVolume, Panning, Expression,
+    Sustain, Portamento, DataEntry, ReverbEffect, ChorusEffect,
+    RPN+/-, NRPN, RPN, AllSoundsOff, ResetControllers, AllNotesOff,
+    Mono/Poly Part, RandomPan, KeyShift,
+    TempoChange, Lyric, InsertText, KARAOKE-Part(@KMIDI),
+    MasterVolume, MIDI-Reset, SystemExclusiveMessages
 
 *Usage:
   -format: timidity [options] midi-filenames
@@ -346,46 +345,47 @@
 
 *Play the MIDI file in archive file:
 
- TiMidity++ can play a file contained in various archive file. The
- following archive format are supported:
+ TiMidity++ can play a file contained in various kinds of archive file. The
+ following archive formats are supported:
 
   - tar           (*.tar)
-  - tar + gzip'ed (*.tar.gz, *.tgz)
+  - gzipped tar   (*.tar.gz, *.tgz)
   - zip file      (*.zip)
   - lzh file      (*.lzh)
 
- If you  want  to  specify  a  certain MIDI file in the archive, describe
- the  #<MIDI-filename>  expression following  to  the  archive  name.  The
- expressions after the # is allowed to use  regular  expressions
- (case insensitive). For example:
+ If you want to specify a certain MIDI file in the archive, describe the
+ #<MIDI-filename> expression following the archive name.  The
+ expressions after the # are allowed to use regular expressions (case
+ insensitive).  Note that the single quotes are needed to prevent the
+ shell from misinterpreting the # character.  For example:
 
-              timidity'file.zip#file.mid'
+              timidity 'file.zip#file.mid'
                      Plays file.mid in file.zip
 
-              timidity'file.lzh#*.mid'
-                     Plays  any  files  that  match  the  regular
+              timidity 'file.lzh#*.mid'
+                     Plays  any  files that  match  the  regular
                      expression '*.mid' in file.zip
 
-              timidity'file.tgz#*'
-                     This  expression   is   same   as   timidity
-                     'file.tgz'
-
-*Play the MIDI file via network
- TiMidity++ can access a file via networks. Supported network protocol is
- HTTP, FTP and NNTP(NetNews). And specify these as
- http://foo, ftp://foo, and news://foo respectively.
- An archived file also accessible via network.
-
- On NNTP access, if you specify newsgroup in the message-ID field
- TiMidity++ plays all MIDI files posted in specified newsgroup. These MIDI
- files must be encoded in uuencode or the Multipart encoded uuencode /
- base64 / hexbin.
+              timidity 'file.tgz#*'
+                     This  expression is the same as 
+                     timidity 'file.tgz'
+
+*Play the MIDI file over a network
+ TiMidity++ can access a file over a network. Supported network protocols
+ include HTTP, FTP and NNTP(NetNews); specify these as http://foo,
+ ftp://foo, and news://foo respectively.  An archived file is also
+ accessible over a network.
+
+ With NNTP, if you specify a newsgroup in the message-ID field TiMidity++
+ plays all MIDI files posted in the specified newsgroup. These MIDI files
+ must be encoded using uuencode or the Multipart encoded
+ uuencode/base64/hexbin.
 
 *Availability:
  The latest release of TiMidity++ are available in these sites:
 
      http://www.goice.co.jp/member/mo/timidity/
-        (unix version, and developer's site)
+        (Unix version; the developer's site)
 
      http://www.asahi-net.or.jp/~gb7t-ngm/timidity/
         (Macintosh version)
@@ -393,13 +393,11 @@
      http://www2.off.ne.jp/~dai/timidity/timidity-izumo.html
         (Windows version)
 
- Now, the original release of Tuukka Toivonen is discontinued.  If you
- want to get the original, please download from follow.
-     http://www.goice.co.jp/member/mo/timidity/dist/timidity-0.2i.tar.gz
-
 
 -------------------------------------------------------------------------
-This document is translated from original README.jp (written in Japanese).
+This document was translated from the original README.jp (written in Japanese).
 Translator: NAGANO Daisuke <breeze_geo@geocities.co.jp>
             (And modified by Masanao Izumo <mo@goice.co.jp>)
-If you have any comment for this translation, please tell me.
+Proofreader: Mike Vanier (mvanier@bbb.caltech.edu)
+If you have any comments on or corrections for this translation,
+please tell us.
diff -ruN TiMidity++-2.7.0/configs/msc-config.h TiMidity++-2.8.0/configs/msc-config.h
--- TiMidity++-2.7.0/configs/msc-config.h	Tue Oct 12 19:18:52 1999
+++ TiMidity++-2.8.0/configs/msc-config.h	Wed Nov 24 12:26:01 1999
@@ -217,7 +217,7 @@
 #define HAVE_MMSYSTEM_H
 
 /* In VDS Macro AAA=BBB is not available. */
-#define TIMID_VERSION	"2.7.0"
+#define TIMID_VERSION	"2.8.0"
 #define DEFAULT_PATH	".\\"
 #define AU_W32
 #define WINSOCK
diff -ruN TiMidity++-2.7.0/configure TiMidity++-2.8.0/configure
--- TiMidity++-2.7.0/configure	Tue Oct  5 15:58:44 1999
+++ TiMidity++-2.8.0/configure	Wed Nov 24 10:32:24 1999
@@ -49,7 +49,7 @@
                               esd:  EsounD"
 ac_help="$ac_help
   --with-default-output=<mode>  Specify default output mode (optional):
-                              default|alsa|alib|nas|esd|wav|au|aiff|list"
+                                default|alsa|alib|nas|esd|wav|au|aiff|list"
 ac_help="$ac_help
   --enable-esd            EsounD (Obsoleted.  Use --enable-audio=esd)"
 ac_help="$ac_help
@@ -110,6 +110,9 @@
 ac_help="$ac_help
   --enable-spectrogram    Enable Sound Spectrogram Viewer (default is no)"
 ac_help="$ac_help
+  --enable-spline=[method]  Specify spline method: no|linear|cubic|lanrange
+                                                          (default is linear)"
+ac_help="$ac_help
   --enable-wrd            Enable WRD interface for X      (default is no)"
 
 # Initialize some variables set by options.
@@ -669,7 +672,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:673: checking host system type" >&5
+echo "configure:676: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -690,7 +693,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:694: checking target system type" >&5
+echo "configure:697: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -708,7 +711,7 @@
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:712: checking build system type" >&5
+echo "configure:715: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -742,7 +745,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:746: checking for a BSD compatible install" >&5
+echo "configure:749: 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
@@ -795,7 +798,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:799: checking whether build environment is sane" >&5
+echo "configure:802: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -852,7 +855,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:856: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:859: 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
@@ -881,7 +884,7 @@
 
 PACKAGE=TiMidity++
 
-VERSION=2.7.0
+VERSION=2.8.0
 
 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; }
@@ -891,7 +894,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:895: checking for working aclocal" >&5
+echo "configure:898: 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.
@@ -904,7 +907,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:908: checking for working autoconf" >&5
+echo "configure:911: 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.
@@ -917,7 +920,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:921: checking for working automake" >&5
+echo "configure:924: 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.
@@ -930,7 +933,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:934: checking for working autoheader" >&5
+echo "configure:937: 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.
@@ -943,7 +946,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:947: checking for working makeinfo" >&5
+echo "configure:950: 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.
@@ -958,7 +961,7 @@
 
 
 echo $ac_n "checking whether grep returns status""... $ac_c" 1>&6
-echo "configure:962: checking whether grep returns status" >&5
+echo "configure:965: checking whether grep returns status" >&5
 echo "grimblepritz" >grimble
 if grep blurfldyick grimble >/dev/null 2>&1 ; then
 	contains="./contains"
@@ -993,7 +996,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:997: checking for $ac_word" >&5
+echo "configure:1000: 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
@@ -1031,7 +1034,7 @@
 
   if test $EMACS != "no"; then
     echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:1035: checking where .elc files should go" >&5
+echo "configure:1038: 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
@@ -1117,7 +1120,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:1121: checking for $ac_word" >&5
+echo "configure:1124: 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
@@ -1147,7 +1150,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:1151: checking for $ac_word" >&5
+echo "configure:1154: 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
@@ -1198,7 +1201,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:1202: checking for $ac_word" >&5
+echo "configure:1205: 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
@@ -1230,7 +1233,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1234: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1237: 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.
@@ -1241,12 +1244,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1245 "configure"
+#line 1248 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1253: \"$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
@@ -1272,12 +1275,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:1276: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1279: 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:1281: checking whether we are using GNU C" >&5
+echo "configure:1284: 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
@@ -1286,7 +1289,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1290: \"$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:1293: \"$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
@@ -1305,7 +1308,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1309: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1312: 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
@@ -1348,7 +1351,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:1352: checking for a BSD compatible install" >&5
+echo "configure:1355: 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
@@ -1403,7 +1406,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:1407: checking for $ac_word" >&5
+echo "configure:1410: 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
@@ -1431,7 +1434,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1435: checking whether ln -s works" >&5
+echo "configure:1438: 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
@@ -1452,7 +1455,7 @@
 fi
 
 echo $ac_n "checking whether -rdynamic option is recognized""... $ac_c" 1>&6
-echo "configure:1456: checking whether -rdynamic option is recognized" >&5
+echo "configure:1459: 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
@@ -1569,7 +1572,7 @@
 
 
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:1573: checking for sqrt in -lm" >&5
+echo "configure:1576: 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
@@ -1577,7 +1580,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1581 "configure"
+#line 1584 "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
@@ -1588,7 +1591,7 @@
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1595: \"$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
@@ -1616,7 +1619,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:1620: checking for socket in -lsocket" >&5
+echo "configure:1623: 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
@@ -1624,7 +1627,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1628 "configure"
+#line 1631 "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
@@ -1635,7 +1638,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1642: \"$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
@@ -1663,7 +1666,7 @@
 fi
 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1667: checking for dlopen in -ldl" >&5
+echo "configure:1670: 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
@@ -1671,7 +1674,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1675 "configure"
+#line 1678 "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
@@ -1682,7 +1685,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1689: \"$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
@@ -1705,12 +1708,12 @@
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1709: checking for $ac_func" >&5
+echo "configure:1712: 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 1714 "configure"
+#line 1717 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1733,7 +1736,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1740: \"$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
@@ -1755,7 +1758,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1759: checking for gethostbyname in -lnsl" >&5
+echo "configure:1762: 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
@@ -1763,7 +1766,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1767 "configure"
+#line 1770 "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
@@ -1774,7 +1777,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1781: \"$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
@@ -1805,7 +1808,7 @@
 done
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1809: checking how to run the C preprocessor" >&5
+echo "configure:1812: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1820,13 +1823,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1824 "configure"
+#line 1827 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1837,13 +1840,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1841 "configure"
+#line 1844 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1850: \"$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
   :
@@ -1854,13 +1857,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1858 "configure"
+#line 1861 "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:1864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1867: \"$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
   :
@@ -1889,7 +1892,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:1893: checking for X" >&5
+echo "configure:1896: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1951,12 +1954,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1955 "configure"
+#line 1958 "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:1960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1963: \"$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*
@@ -2025,14 +2028,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2029 "configure"
+#line 2032 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:2036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2039: \"$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.
@@ -2138,17 +2141,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:2142: checking whether -R must be followed by a space" >&5
+echo "configure:2145: 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 2145 "configure"
+#line 2148 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -2164,14 +2167,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 2168 "configure"
+#line 2171 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -2203,7 +2206,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:2207: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2210: 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
@@ -2211,7 +2214,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2215 "configure"
+#line 2218 "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
@@ -2222,7 +2225,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2229: \"$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
@@ -2244,7 +2247,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:2248: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2251: 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
@@ -2252,7 +2255,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2256 "configure"
+#line 2259 "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
@@ -2263,7 +2266,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2270: \"$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
@@ -2292,12 +2295,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:2296: checking for gethostbyname" >&5
+echo "configure:2299: 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 2301 "configure"
+#line 2304 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -2320,7 +2323,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2327: \"$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
@@ -2341,7 +2344,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2345: checking for gethostbyname in -lnsl" >&5
+echo "configure:2348: 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
@@ -2349,7 +2352,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2353 "configure"
+#line 2356 "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
@@ -2360,7 +2363,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:2364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2367: \"$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
@@ -2390,12 +2393,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:2394: checking for connect" >&5
+echo "configure:2397: 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 2399 "configure"
+#line 2402 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -2418,7 +2421,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2425: \"$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
@@ -2439,7 +2442,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2443: checking for connect in -lsocket" >&5
+echo "configure:2446: 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
@@ -2447,7 +2450,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2451 "configure"
+#line 2454 "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
@@ -2458,7 +2461,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:2462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2465: \"$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
@@ -2482,12 +2485,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:2486: checking for remove" >&5
+echo "configure:2489: 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 2491 "configure"
+#line 2494 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -2510,7 +2513,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2517: \"$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
@@ -2531,7 +2534,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2535: checking for remove in -lposix" >&5
+echo "configure:2538: 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
@@ -2539,7 +2542,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2543 "configure"
+#line 2546 "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
@@ -2550,7 +2553,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2557: \"$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
@@ -2574,12 +2577,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2578: checking for shmat" >&5
+echo "configure:2581: 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 2583 "configure"
+#line 2586 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -2602,7 +2605,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2609: \"$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
@@ -2623,7 +2626,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2627: checking for shmat in -lipc" >&5
+echo "configure:2630: 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
@@ -2631,7 +2634,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2635 "configure"
+#line 2638 "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
@@ -2642,7 +2645,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2649: \"$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
@@ -2675,7 +2678,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:2679: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2682: 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
@@ -2683,7 +2686,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2687 "configure"
+#line 2690 "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
@@ -2694,7 +2697,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2701: \"$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
@@ -2742,7 +2745,7 @@
   fi
 
   echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:2746: checking for XOpenDisplay in -lX11" >&5
+echo "configure:2749: 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
@@ -2750,7 +2753,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lX11  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2754 "configure"
+#line 2757 "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
@@ -2761,7 +2764,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2768: \"$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
@@ -2789,12 +2792,12 @@
 fi
 
   echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
-echo "configure:2793: checking X11 version 6" >&5
+echo "configure:2796: 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 2798 "configure"
+#line 2801 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int main() {
@@ -2804,7 +2807,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2811: \"$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
@@ -2824,7 +2827,7 @@
 
     KEEPLIBS=$LIBS
   echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
-echo "configure:2828: checking for XShapeCombineMask in -lXext" >&5
+echo "configure:2831: 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
@@ -2832,7 +2835,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXext  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2836 "configure"
+#line 2839 "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
@@ -2843,7 +2846,7 @@
 XShapeCombineMask()
 ; return 0; }
 EOF
-if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2850: \"$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
@@ -2865,7 +2868,7 @@
 fi
 
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2869: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2872: 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
@@ -2873,7 +2876,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
+#line 2880 "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
@@ -2884,7 +2887,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2891: \"$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
@@ -2912,7 +2915,7 @@
 fi
 
   echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6
-echo "configure:2916: checking for SmcOpenConnection in -lSM" >&5
+echo "configure:2919: 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
@@ -2920,7 +2923,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lSM  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2924 "configure"
+#line 2927 "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
@@ -2931,7 +2934,7 @@
 SmcOpenConnection()
 ; return 0; }
 EOF
-if { (eval echo configure:2935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2938: \"$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
@@ -2953,7 +2956,7 @@
 fi
 
   echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:2957: checking for XtVaAppInitialize in -lXt" >&5
+echo "configure:2960: 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
@@ -2961,7 +2964,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2965 "configure"
+#line 2968 "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
@@ -2972,7 +2975,7 @@
 XtVaAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2979: \"$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
@@ -2994,7 +2997,7 @@
 fi
 
   echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6
-echo "configure:2998: checking for XmuInternAtom in -lXmu" >&5
+echo "configure:3001: 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
@@ -3002,7 +3005,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXmu  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3006 "configure"
+#line 3009 "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
@@ -3013,7 +3016,7 @@
 XmuInternAtom()
 ; return 0; }
 EOF
-if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3020: \"$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
@@ -3036,12 +3039,12 @@
   for ac_func in XmuRegisterExternalAgent
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3040: checking for $ac_func" >&5
+echo "configure:3043: 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 3045 "configure"
+#line 3048 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3064,7 +3067,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3071: \"$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
@@ -3089,7 +3092,7 @@
 done
 
   echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6
-echo "configure:3093: checking for XawInitializeWidgetSet in -lXaw3d" >&5
+echo "configure:3096: 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
@@ -3097,7 +3100,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw3d  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3101 "configure"
+#line 3104 "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
@@ -3108,7 +3111,7 @@
 XawInitializeWidgetSet()
 ; return 0; }
 EOF
-if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3115: \"$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
@@ -3127,7 +3130,7 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6
-echo "configure:3131: checking for XawInitializeWidgetSet in -lXaw" >&5
+echo "configure:3134: 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
@@ -3135,7 +3138,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3139 "configure"
+#line 3142 "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
@@ -3146,7 +3149,7 @@
 XawInitializeWidgetSet()
 ; return 0; }
 EOF
-if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3153: \"$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
@@ -3170,7 +3173,7 @@
 fi
 
   echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6
-echo "configure:3174: checking for XmCreateForm in -lXm" >&5
+echo "configure:3177: 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
@@ -3178,7 +3181,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3182 "configure"
+#line 3185 "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
@@ -3189,7 +3192,7 @@
 XmCreateForm()
 ; return 0; }
 EOF
-if { (eval echo configure:3193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3196: \"$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
@@ -3213,12 +3216,12 @@
   for ac_func in XShmCreatePixmap
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3217: checking for $ac_func" >&5
+echo "configure:3220: 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 3222 "configure"
+#line 3225 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3241,7 +3244,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3248: \"$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
@@ -3274,12 +3277,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:3278: checking for $ac_hdr that defines DIR" >&5
+echo "configure:3281: 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 3283 "configure"
+#line 3286 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3287,7 +3290,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -3312,7 +3315,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:3316: checking for opendir in -ldir" >&5
+echo "configure:3319: 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
@@ -3320,7 +3323,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3324 "configure"
+#line 3327 "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
@@ -3331,7 +3334,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3338: \"$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
@@ -3353,7 +3356,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:3357: checking for opendir in -lx" >&5
+echo "configure:3360: 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
@@ -3361,7 +3364,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3365 "configure"
+#line 3368 "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
@@ -3372,7 +3375,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3379: \"$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
@@ -3395,12 +3398,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3399: checking for ANSI C header files" >&5
+echo "configure:3402: 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 3404 "configure"
+#line 3407 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3408,7 +3411,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3415: \"$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*
@@ -3425,7 +3428,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 3429 "configure"
+#line 3432 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3443,7 +3446,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 3447 "configure"
+#line 3450 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3464,7 +3467,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3468 "configure"
+#line 3471 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3475,7 +3478,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3499,12 +3502,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3503: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3506: 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 3508 "configure"
+#line 3511 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3520,7 +3523,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3548,17 +3551,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3552: checking for $ac_hdr" >&5
+echo "configure:3555: 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 3557 "configure"
+#line 3560 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3565: \"$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*
@@ -3586,17 +3589,17 @@
 
 ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for string.h""... $ac_c" 1>&6
-echo "configure:3590: checking for string.h" >&5
+echo "configure:3593: 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 3595 "configure"
+#line 3598 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3603: \"$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*
@@ -3620,12 +3623,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3624: checking for working const" >&5
+echo "configure:3627: 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 3629 "configure"
+#line 3632 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3674,7 +3677,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3695,14 +3698,14 @@
 fi
 
 echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:3699: checking whether char is unsigned" >&5
+echo "configure:3702: 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 3706 "configure"
+#line 3709 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -3724,7 +3727,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3728 "configure"
+#line 3731 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -3734,7 +3737,7 @@
   volatile char c = 255; exit(c < 0);
 }
 EOF
-if { (eval echo configure:3738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3741: \"$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
@@ -3758,14 +3761,14 @@
 fi
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3762: checking whether byte ordering is bigendian" >&5
+echo "configure:3765: 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 3769 "configure"
+#line 3772 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3776,11 +3779,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3783: \"$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 3784 "configure"
+#line 3787 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3791,7 +3794,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -3811,7 +3814,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3815 "configure"
+#line 3818 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3824,7 +3827,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3831: \"$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
@@ -3848,21 +3851,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3852: checking for inline" >&5
+echo "configure:3855: 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 3859 "configure"
+#line 3862 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3888,12 +3891,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3892: checking for off_t" >&5
+echo "configure:3895: 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 3897 "configure"
+#line 3900 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3921,12 +3924,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3925: checking for pid_t" >&5
+echo "configure:3928: 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 3930 "configure"
+#line 3933 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3954,12 +3957,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3958: checking for size_t" >&5
+echo "configure:3961: 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 3963 "configure"
+#line 3966 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3987,12 +3990,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3991: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3994: 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 3996 "configure"
+#line 3999 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4001,7 +4004,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:4005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -4023,19 +4026,19 @@
 
 
 echo $ac_n "checking volatile declaration""... $ac_c" 1>&6
-echo "configure:4027: checking volatile declaration" >&5
+echo "configure:4030: 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 4032 "configure"
+#line 4035 "configure"
 #include "confdefs.h"
 
 int main() {
 volatile int x
 ; return 0; }
 EOF
-if { (eval echo configure:4039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   timidity_cv_type_volatile=yes
 else
@@ -4053,12 +4056,12 @@
 fi
 
 echo $ac_n "checking union semun declaration""... $ac_c" 1>&6
-echo "configure:4057: checking union semun declaration" >&5
+echo "configure:4060: 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 4062 "configure"
+#line 4065 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -4067,7 +4070,7 @@
 union semun x
 ; return 0; }
 EOF
-if { (eval echo configure:4071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   timidity_cv_type_union_semun=yes
 else
@@ -4086,13 +4089,13 @@
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:4090: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:4093: 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 4096 "configure"
+#line 4099 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -4110,7 +4113,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 4114 "configure"
+#line 4117 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -4132,7 +4135,7 @@
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:4136: checking for 8-bit clean memcmp" >&5
+echo "configure:4139: 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
@@ -4140,7 +4143,7 @@
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4144 "configure"
+#line 4147 "configure"
 #include "confdefs.h"
 
 main()
@@ -4150,7 +4153,7 @@
 }
 
 EOF
-if { (eval echo configure:4154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4157: \"$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
@@ -4171,17 +4174,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4175: checking for $ac_hdr" >&5
+echo "configure:4178: 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 4180 "configure"
+#line 4183 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4188: \"$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*
@@ -4210,12 +4213,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4214: checking for $ac_func" >&5
+echo "configure:4217: 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 4219 "configure"
+#line 4222 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4238,7 +4241,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4245: \"$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
@@ -4263,7 +4266,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:4267: checking for working mmap" >&5
+echo "configure:4270: 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
@@ -4271,7 +4274,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4275 "configure"
+#line 4278 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4411,7 +4414,7 @@
 }
 
 EOF
-if { (eval echo configure:4415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4418: \"$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
@@ -4434,7 +4437,7 @@
 fi
 
 echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
-echo "configure:4438: checking whether setvbuf arguments are reversed" >&5
+echo "configure:4441: 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
@@ -4442,7 +4445,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4446 "configure"
+#line 4449 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -4456,7 +4459,7 @@
   exit(0);			/* Non-reversed systems segv here.  */
 }
 EOF
-if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4463: \"$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
@@ -4480,12 +4483,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4484: checking return type of signal handlers" >&5
+echo "configure:4487: 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 4489 "configure"
+#line 4492 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4502,7 +4505,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4521,12 +4524,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:4525: checking for vprintf" >&5
+echo "configure:4528: 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 4530 "configure"
+#line 4533 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -4549,7 +4552,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4556: \"$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
@@ -4573,12 +4576,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:4577: checking for _doprnt" >&5
+echo "configure:4580: 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 4582 "configure"
+#line 4585 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -4601,7 +4604,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4608: \"$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
@@ -4629,12 +4632,12 @@
 	sleep usleep strncasecmp strerror getopt getcwd popen signal isatty
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4633: checking for $ac_func" >&5
+echo "configure:4636: 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 4638 "configure"
+#line 4641 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4657,7 +4660,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4664: \"$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
@@ -4686,12 +4689,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:4690: checking for opendir" >&5
+echo "configure:4693: 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 4695 "configure"
+#line 4698 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char opendir(); below.  */
@@ -4714,7 +4717,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4721: \"$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
@@ -4742,12 +4745,12 @@
   esac
   if test "x$enable_network" = "xyes"; then
     echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:4746: checking for socket" >&5
+echo "configure:4749: 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 4751 "configure"
+#line 4754 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -4770,7 +4773,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4777: \"$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
@@ -4788,7 +4791,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6
-echo "configure:4792: checking for WSAStartup in -lwsock32" >&5
+echo "configure:4795: 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
@@ -4796,7 +4799,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lwsock32  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4800 "configure"
+#line 4803 "configure"
 #include "confdefs.h"
 #include <windows.h>
 #include <winsock.h>
@@ -4805,7 +4808,7 @@
 WSAStartup(0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4812: \"$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
@@ -4997,7 +5000,7 @@
 fi
 
 echo $ac_n "checking enable_audio=oss""... $ac_c" 1>&6
-echo "configure:5001: checking enable_audio=oss" >&5
+echo "configure:5004: checking enable_audio=oss" >&5
 if test "x$au_enable_oss" = xyes; then
   EXTRADEFS="$EXTRADEFS -DAU_OSS"
   SYSEXTRAS="$SYSEXTRAS oss_a.c"
@@ -5018,7 +5021,7 @@
 fi
 
 echo $ac_n "checking enable_audio=sun""... $ac_c" 1>&6
-echo "configure:5022: checking enable_audio=sun" >&5
+echo "configure:5025: checking enable_audio=sun" >&5
 if test "x$au_enable_sun" = xyes; then
   case "$target" in
     *-*-sunos4*)
@@ -5047,7 +5050,7 @@
 fi
 
 echo $ac_n "checking enable_audio=hpux""... $ac_c" 1>&6
-echo "configure:5051: checking enable_audio=hpux" >&5
+echo "configure:5054: checking enable_audio=hpux" >&5
 if test "x$au_enable_hpux" = xyes; then
   case "$target" in
     *-*-hpux*) echo "$ac_t""yes" 1>&6 ;;
@@ -5060,7 +5063,7 @@
 fi
 
 echo $ac_n "checking enable_audio=irix""... $ac_c" 1>&6
-echo "configure:5064: checking enable_audio=irix" >&5
+echo "configure:5067: checking enable_audio=irix" >&5
 if test "x$au_enable_irix" = xyes; then
   case "$target" in
     *-sgi-irix5*|*-sgi-irix6.2)
@@ -5080,7 +5083,7 @@
 fi
 
 echo $ac_n "checking enable_audio=mme""... $ac_c" 1>&6
-echo "configure:5084: checking enable_audio=mme" >&5
+echo "configure:5087: checking enable_audio=mme" >&5
 if test "x$au_enable_mme" = xyes; then
   case "$target" in
     *-dec-*) echo "$ac_t""yes" 1>&6 ;;
@@ -5095,7 +5098,7 @@
 fi
 
 echo $ac_n "checking enable_audio=sb_dsp""... $ac_c" 1>&6
-echo "configure:5099: checking enable_audio=sb_dsp" >&5
+echo "configure:5102: checking enable_audio=sb_dsp" >&5
 if test "x$au_enable_sb_dsp" = xyes; then
   case "$target" in
     *-*-bsdi2.0) echo "$ac_t""yes" 1>&6 ;;
@@ -5108,7 +5111,7 @@
 fi
 
 echo $ac_n "checking enable_audio=w32""... $ac_c" 1>&6
-echo "configure:5112: checking enable_audio=w32" >&5
+echo "configure:5115: checking enable_audio=w32" >&5
 if test "x$au_enable_w32" = xyes; then
   case "$target" in
     *-*-cygwin32*)
@@ -5131,7 +5134,7 @@
 fi
 
 echo $ac_n "checking enable_audio=alsa""... $ac_c" 1>&6
-echo "configure:5135: checking enable_audio=alsa" >&5
+echo "configure:5138: checking enable_audio=alsa" >&5
 if test "x$au_enable_alsa" = xyes; then
   echo "$ac_t""" 1>&6
   KEEPCFLAGS=$CFLAGS
@@ -5164,7 +5167,7 @@
 
 
 echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6
-echo "configure:5168: checking for ALSA CFLAGS" >&5
+echo "configure:5171: 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"
@@ -5172,7 +5175,7 @@
 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
+echo "configure:5179: checking for ALSA LDFLAGS" >&5
 if test "$alsa_prefix" != "" ; then
 	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
 	LIBS="-L$alsa_prefix"
@@ -5184,7 +5187,7 @@
 
 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
+echo "configure:5191: 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/'`
@@ -5194,7 +5197,7 @@
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
 
 cat > conftest.$ac_ext <<EOF
-#line 5198 "configure"
+#line 5201 "configure"
 #include "confdefs.h"
 
 #include <sys/asoundlib.h>
@@ -5235,7 +5238,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""found." 1>&6
    have_alsa=yes
@@ -5249,7 +5252,7 @@
 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
+echo "configure:5256: 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
@@ -5257,7 +5260,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5261 "configure"
+#line 5264 "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
@@ -5268,7 +5271,7 @@
 snd_cards()
 ; 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:5275: \"$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
@@ -5324,7 +5327,7 @@
 fi
 
 echo $ac_n "checking enable_audio=alib""... $ac_c" 1>&6
-echo "configure:5328: checking enable_audio=alib" >&5
+echo "configure:5331: checking enable_audio=alib" >&5
 if test "x$au_enable_alib" = xyes; then
   case "$target" in
     *-*-hpux*) echo "$ac_t""yes" 1>&6 ;;
@@ -5344,7 +5347,7 @@
 fi
 
 echo $ac_n "checking enable_audio=nas""... $ac_c" 1>&6
-echo "configure:5348: checking enable_audio=nas" >&5
+echo "configure:5351: 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; }
@@ -5359,7 +5362,7 @@
   else
     echo "$ac_t""" 1>&6
     echo $ac_n "checking for library containing AuOpenServer""... $ac_c" 1>&6
-echo "configure:5363: checking for library containing AuOpenServer" >&5
+echo "configure:5366: checking for library containing AuOpenServer" >&5
 if eval "test \"`echo '$''{'timidity_cv_search_AuOpenServer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5370,7 +5373,7 @@
 	/usr/lib/libaudio.a ; do
   LIBS="$i  $ac_func_search_save_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 5374 "configure"
+#line 5377 "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
@@ -5381,7 +5384,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:5385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   timidity_cv_search_AuOpenServer="$i"; break
 else
@@ -5414,7 +5417,7 @@
 fi
 
 echo $ac_n "checking enable_audio=esd""... $ac_c" 1>&6
-echo "configure:5418: checking enable_audio=esd" >&5
+echo "configure:5421: checking enable_audio=esd" >&5
 if test "x$au_enable_esd" = xyes; then
   echo "$ac_t""" 1>&6
   KEEPCFLAGS=$CFLAGS
@@ -5461,7 +5464,7 @@
   # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5465: checking for $ac_word" >&5
+echo "configure:5468: 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
@@ -5496,7 +5499,7 @@
 
   min_esd_version=0.2.7
   echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
-echo "configure:5500: checking for ESD - version >= $min_esd_version" >&5
+echo "configure:5503: checking for ESD - version >= $min_esd_version" >&5
   no_esd=""
   if test "$ESD_CONFIG" = "no" ; then
     no_esd=yes
@@ -5520,7 +5523,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 5524 "configure"
+#line 5527 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5578,7 +5581,7 @@
 
 
 EOF
-if { (eval echo configure:5582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -5612,7 +5615,7 @@
           CFLAGS="$CFLAGS $ESD_CFLAGS"
           LIBS="$LIBS $ESD_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 5616 "configure"
+#line 5619 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5622,7 +5625,7 @@
  return 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:5626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding ESD or finding the wrong"
@@ -5684,7 +5687,7 @@
 
 
 echo $ac_n "checking default output mode""... $ac_c" 1>&6
-echo "configure:5688: checking default output mode" >&5
+echo "configure:5691: checking default output mode" >&5
 if test "x$DEFAULT_PLAYMODE" = x; then
   DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'`
 fi
@@ -5753,12 +5756,12 @@
   have_dl=no
 
   echo $ac_n "checking for LoadLibrary""... $ac_c" 1>&6
-echo "configure:5757: checking for LoadLibrary" >&5
+echo "configure:5760: checking for LoadLibrary" >&5
 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibrary'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5762 "configure"
+#line 5765 "configure"
 #include "confdefs.h"
 #include <windows.h>
 
@@ -5767,7 +5770,7 @@
 LoadLibrary(0);
 ; return 0; }
 EOF
-if { (eval echo configure:5771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   wapi_cv_func_LoadLibrary=yes
 else
@@ -5790,12 +5793,12 @@
 
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:5794: checking for shl_load" >&5
+echo "configure:5797: 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 5799 "configure"
+#line 5802 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load(); below.  */
@@ -5818,7 +5821,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5825: \"$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
@@ -5843,12 +5846,12 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:5847: checking for dlopen" >&5
+echo "configure:5850: 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 5852 "configure"
+#line 5855 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
@@ -5871,7 +5874,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5878: \"$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
@@ -5893,12 +5896,12 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dld_init""... $ac_c" 1>&6
-echo "configure:5897: checking for dld_init" >&5
+echo "configure:5900: 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 5902 "configure"
+#line 5905 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dld_init(); below.  */
@@ -5921,7 +5924,7 @@
 
 ; 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:5928: \"$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
@@ -5943,7 +5946,7 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:5947: checking for dld_init in -ldld" >&5
+echo "configure:5950: 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
@@ -5951,7 +5954,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5955 "configure"
+#line 5958 "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
@@ -5962,7 +5965,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5969: \"$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
@@ -5985,13 +5988,13 @@
   fi
 
   echo $ac_n "checking dynamic link method""... $ac_c" 1>&6
-echo "configure:5989: checking dynamic link method" >&5
+echo "configure:5992: 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:5995: checking whether your dlsym() needs a leading underscore" >&5
+echo "configure:5998: 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
@@ -6139,17 +6142,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6143: checking for $ac_hdr" >&5
+echo "configure:6146: 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 6148 "configure"
+#line 6151 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6156: \"$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*
@@ -6190,7 +6193,7 @@
     esac
 
     echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:6194: checking for initscr in -lncurses" >&5
+echo "configure:6197: 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
@@ -6198,7 +6201,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6202 "configure"
+#line 6205 "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
@@ -6209,7 +6212,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6216: \"$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
@@ -6228,7 +6231,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:6232: checking for PDC_set_ctrl_break in -lcurses" >&5
+echo "configure:6235: 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
@@ -6236,7 +6239,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses $lib_user32_test $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6240 "configure"
+#line 6243 "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
@@ -6247,7 +6250,7 @@
 PDC_set_ctrl_break()
 ; return 0; }
 EOF
-if { (eval echo configure:6251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6254: \"$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
@@ -6334,7 +6337,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:6338: checking for SLang_init_tty in -lslang" >&5
+echo "configure:6341: 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
@@ -6342,7 +6345,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lslang  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6346 "configure"
+#line 6349 "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
@@ -6353,7 +6356,7 @@
 SLang_init_tty()
 ; return 0; }
 EOF
-if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6360: \"$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
@@ -6379,17 +6382,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6383: checking for $ac_hdr" >&5
+echo "configure:6386: 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 6388 "configure"
+#line 6391 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6396: \"$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*
@@ -6441,7 +6444,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:6445: checking for initscr in -ltermcap" >&5
+echo "configure:6448: 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
@@ -6449,7 +6452,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6453 "configure"
+#line 6456 "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
@@ -6460,7 +6463,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6467: \"$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
@@ -6580,7 +6583,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:6584: checking for Tcl_Init in -l$l" >&5
+echo "configure:6587: 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
@@ -6588,7 +6591,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$l  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6592 "configure"
+#line 6595 "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
@@ -6599,7 +6602,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:6603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6606: \"$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
@@ -6623,7 +6626,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:6627: checking for Tk_Init in -l$l" >&5
+echo "configure:6630: 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
@@ -6631,7 +6634,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$l  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6635 "configure"
+#line 6638 "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
@@ -6642,7 +6645,7 @@
 Tk_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:6646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6649: \"$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
@@ -7006,7 +7009,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:7010: checking for $ac_word" >&5
+echo "configure:7013: 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
@@ -7041,7 +7044,7 @@
 
   min_gtk_version=1.1.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:7045: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:7048: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -7064,7 +7067,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 7068 "configure"
+#line 7071 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -7130,7 +7133,7 @@
 }
 
 EOF
-if { (eval echo configure:7134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -7164,7 +7167,7 @@
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 7168 "configure"
+#line 7171 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -7174,7 +7177,7 @@
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:7178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7181: \"$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"
@@ -7324,17 +7327,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:7328: checking for X11/xpm.h" >&5
+echo "configure:7331: 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 7333 "configure"
+#line 7336 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7341: \"$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*
@@ -7357,7 +7360,7 @@
 fi
 
     echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
-echo "configure:7361: checking for XpmCreatePixmapFromData in -lXpm" >&5
+echo "configure:7364: 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
@@ -7365,7 +7368,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7369 "configure"
+#line 7372 "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
@@ -7376,7 +7379,7 @@
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:7380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7383: \"$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
@@ -7472,17 +7475,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7476: checking for $ac_hdr" >&5
+echo "configure:7479: 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 7481 "configure"
+#line 7484 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7489: \"$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*
@@ -7533,7 +7536,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:7537: checking for DndInitialize in -lDnd" >&5
+echo "configure:7540: 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
@@ -7541,7 +7544,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lDnd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7545 "configure"
+#line 7548 "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
@@ -7552,7 +7555,7 @@
 DndInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:7556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7559: \"$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
@@ -7625,6 +7628,30 @@
   ENABLE_SOUND_SPEC_FALSE=
 fi
 
+# Check whether --enable-spline or --disable-spline was given.
+if test "${enable_spline+set}" = set; then
+  enableval="$enable_spline"
+   case "x$enableval" in
+      xlinear)
+	EXTRADEFS="$EXTRADEFS -DLINEAR_INTERPOLATION"
+	;;
+      xcubic)
+	EXTRADEFS="$EXTRADEFS -DCSPLINE_INTERPOLATION"
+	;;
+      xlanrange)
+	EXTRADEFS="$EXTRADEFS -DLAGRANGE_INTERPOLATION"
+	;;
+      xno)
+	EXTRADEFS="$EXTRADEFS -DNO_INTERPOLATION"
+	;;
+      *)
+	{ echo "configure: error: Invalid method of --enable-spline" 1>&2; exit 1; }
+	;;
+    esac 
+fi
+
+
+
 # Check whether --enable-wrd or --disable-wrd was given.
 if test "${enable_wrd+set}" = set; then
   enableval="$enable_wrd"
@@ -7635,7 +7662,7 @@
       EXTRADEFS="$EXTRADEFS -DWRDT_X"
       enable_sherry_wrd=yes
       echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6
-echo "configure:7639: checking for zlibVersion in -lz" >&5
+echo "configure:7666: 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
@@ -7643,7 +7670,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7647 "configure"
+#line 7674 "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
@@ -7654,7 +7681,7 @@
 zlibVersion()
 ; return 0; }
 EOF
-if { (eval echo configure:7658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7685: \"$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
@@ -7677,17 +7704,17 @@
 
       ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:7681: checking for png.h" >&5
+echo "configure:7708: 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 7686 "configure"
+#line 7713 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7718: \"$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*
@@ -7710,7 +7737,7 @@
 fi
 
       echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6
-echo "configure:7714: checking for png_init_io in -lpng" >&5
+echo "configure:7741: 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
@@ -7718,7 +7745,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7722 "configure"
+#line 7749 "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
@@ -7729,7 +7756,7 @@
 png_init_io()
 ; return 0; }
 EOF
-if { (eval echo configure:7733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7760: \"$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
diff -ruN TiMidity++-2.7.0/configure.in TiMidity++-2.8.0/configure.in
--- TiMidity++-2.7.0/configure.in	Tue Oct  5 15:58:34 1999
+++ TiMidity++-2.8.0/configure.in	Wed Nov 24 10:32:06 1999
@@ -55,7 +55,7 @@
 AC_INIT(timidity/timidity.c)
 SHELL=${CONFIG_SHELL-/bin/sh}
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(TiMidity++, 2.7.0, no-define)
+AM_INIT_AUTOMAKE(TiMidity++, 2.8.0, no-define)
 
 dnl To use CONTAINS() macro (See acinclude.m4)
 CONTAINS_INIT
@@ -451,7 +451,7 @@
 DEFAULT_PLAYMODE=
 AC_ARG_WITH(default-output,
   [  --with-default-output=<mode>  Specify default output mode (optional):
-                              default|alsa|alib|nas|esd|wav|au|aiff|list],
+                                default|alsa|alib|nas|esd|wav|au|aiff|list],
   [ if test "$enable_audio" != no; then
       DEFAULT_PLAYMODE=$withval
       eval "au_enable_$DEFAULT_PLAYMODE=yes"
@@ -1220,6 +1220,29 @@
       EXTRADEFS="$EXTRADEFS -DSUPPORT_SOUNDSPEC"
     fi ])
 AM_CONDITIONAL(ENABLE_SOUND_SPEC, test "x$enable_spectrogram" = "xyes")
+
+dnl Wave Spline Interpolations
+AC_ARG_ENABLE(spline,
+  [  --enable-spline=[method]  Specify spline method: no|linear|cubic|lanrange
+                                                          (default is linear)],
+  [ case "x$enableval" in
+      xlinear)
+	EXTRADEFS="$EXTRADEFS -DLINEAR_INTERPOLATION"
+	;;
+      xcubic)
+	EXTRADEFS="$EXTRADEFS -DCSPLINE_INTERPOLATION"
+	;;
+      xlanrange)
+	EXTRADEFS="$EXTRADEFS -DLAGRANGE_INTERPOLATION"
+	;;
+      xno)
+	EXTRADEFS="$EXTRADEFS -DNO_INTERPOLATION"
+	;;
+      *)
+	AC_MSG_ERROR(Invalid method of --enable-spline)
+	;;
+    esac ])
+
 
 dnl WRD interface
 AC_ARG_ENABLE(wrd,
diff -ruN TiMidity++-2.7.0/interface/Makefile.am TiMidity++-2.8.0/interface/Makefile.am
--- TiMidity++-2.7.0/interface/Makefile.am	Sat Sep  4 07:45:54 1999
+++ TiMidity++-2.8.0/interface/Makefile.am	Fri Nov 12 16:42:29 1999
@@ -147,7 +147,7 @@
 	$(SOUND_SPEC_OBJS)
 
 libinterface_a_DEPENDENCIES = \
-	$(top_srcdir)/interface.h \
+	$(top_builddir)/interface.h \
 	$(libinterface_a_LIBADD) \
 	$(tcltk_dep) \
 	$(W32GUI_DEPS)
@@ -163,7 +163,8 @@
 	tkpanel.tcl \
 	browser.tcl \
 	misc.tcl \
-	timidity.el
+	timidity.el \
+	tclIndex
 
 .ptcl.tcl:
 	sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@
@@ -173,6 +174,7 @@
 	rm -f *.$(so)
 
 tclIndex: $(TCLF)
+	rm -f tclIndex
 	echo 'auto_mkindex . *.tcl; exit' | $(WISH)
 
 if ENABLE_TCLTK
diff -ruN TiMidity++-2.7.0/interface/Makefile.in TiMidity++-2.8.0/interface/Makefile.in
--- TiMidity++-2.7.0/interface/Makefile.in	Tue Oct 12 19:18:30 1999
+++ TiMidity++-2.8.0/interface/Makefile.in	Wed Nov 24 12:25:38 1999
@@ -140,7 +140,7 @@
 libinterface_a_LIBADD =  	$(INTERFACE_OBJS) 	$(WRD_OBJS) 	$(WRD_WINCON_OBJS) 	$(DYNAMIC_OBJS) 	$(SOUND_SPEC_OBJS)
 
 
-libinterface_a_DEPENDENCIES =  	$(top_srcdir)/interface.h 	$(libinterface_a_LIBADD) 	$(tcltk_dep) 	$(W32GUI_DEPS)
+libinterface_a_DEPENDENCIES =  	$(top_builddir)/interface.h 	$(libinterface_a_LIBADD) 	$(tcltk_dep) 	$(W32GUI_DEPS)
 
 
 # Tcl interface sources
@@ -149,7 +149,7 @@
 TCLF = tkmidity.tcl tkpanel.tcl browser.tcl misc.tcl
 ALLTCLF = $(TCLF) tclIndex
 
-EXTRA_DIST =  	tkmidity.ptcl 	tkpanel.tcl 	browser.tcl 	misc.tcl 	timidity.el
+EXTRA_DIST =  	tkmidity.ptcl 	tkpanel.tcl 	browser.tcl 	misc.tcl 	timidity.el 	tclIndex
 
 @ENABLE_TCLTK_TRUE@install_tk = install.tk
 @ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk
@@ -582,6 +582,7 @@
 	rm -f *.$(so)
 
 tclIndex: $(TCLF)
+	rm -f tclIndex
 	echo 'auto_mkindex . *.tcl; exit' | $(WISH)
 
 install.tk: $(ALLTCLF) install.bitmaps
diff -ruN TiMidity++-2.7.0/interface/gtk_c.c TiMidity++-2.8.0/interface/gtk_c.c
--- TiMidity++-2.7.0/interface/gtk_c.c	Sat Jul 17 19:46:36 1999
+++ TiMidity++-2.8.0/interface/gtk_c.c	Fri Nov 12 13:25:10 1999
@@ -71,6 +71,7 @@
 static void ctl_sustain(int channel, int val);
 static void ctl_pitch_bend(int channel, int val);
 static void ctl_reset(void);
+static void ctl_lyric(int);
 
 
 /**********************************************/
@@ -176,6 +177,7 @@
       case CTLE_REVERB_EFFECT:
 	break;
       case CTLE_LYRIC:
+	ctl_lyric((int)e->v1);
 	break;
       case CTLE_REFRESH:
 	ctl_refresh();
@@ -351,6 +353,52 @@
     }
   ctl_refresh();
   */
+}
+
+static void
+ctl_lyric(int lyricid)
+{
+    char	*lyric;
+    static char	lyric_buf[300];
+
+    lyric = event2string(lyricid);
+    if(lyric != NULL)
+    {
+	if(lyric[0] == ME_KARAOKE_LYRIC)
+	{
+	    if(!lyric[1])
+		return;
+	    if(lyric[1] == '/' || lyric[1] == '\\')
+	    {
+		snprintf(lyric_buf, sizeof(lyric_buf), "\n%s", lyric + 2);
+		gtk_pipe_int_write(LYRIC_MESSAGE);
+		gtk_pipe_string_write(lyric_buf);
+	    }
+	    else if(lyric[1] == '@')
+	    {
+		if(lyric[2] == 'L')
+		    snprintf(lyric_buf, sizeof(lyric_buf), "Language: %s\n", lyric + 3);
+		else if(lyric[2] == 'T')
+		    snprintf(lyric_buf, sizeof(lyric_buf), "Title: %s\n", lyric + 3);
+		else
+		    snprintf(lyric_buf, sizeof(lyric_buf), "%s\n", lyric + 1);
+		gtk_pipe_int_write(LYRIC_MESSAGE);
+		gtk_pipe_string_write(lyric_buf);
+	    }
+	    else
+	    {
+		strncpy(lyric_buf, lyric + 1, sizeof(lyric_buf));
+		gtk_pipe_int_write(LYRIC_MESSAGE);
+		gtk_pipe_string_write(lyric_buf);
+	    }
+	}
+	else
+	{
+	    strncpy(lyric_buf, lyric + 1, sizeof(lyric_buf));
+	    gtk_pipe_int_write(LYRIC_MESSAGE);
+	    gtk_pipe_string_write(lyric_buf);
+	}
+    }
 }
 
 /***********************************************************************/
diff -ruN TiMidity++-2.7.0/interface/gtk_h.h TiMidity++-2.8.0/interface/gtk_h.h
--- TiMidity++-2.7.0/interface/gtk_h.h	Wed Jan 20 16:09:18 1999
+++ TiMidity++-2.8.0/interface/gtk_h.h	Fri Nov 12 13:25:10 1999
@@ -45,6 +45,7 @@
 #define NEXT_FILE_MESSAGE 18
 #define PREV_FILE_MESSAGE 19
 #define TUNE_END_MESSAGE 20
+#define LYRIC_MESSAGE 21
 
 typedef enum {
     GTK_CHANGE_VOLUME = 1,
diff -ruN TiMidity++-2.7.0/interface/gtk_i.c TiMidity++-2.8.0/interface/gtk_i.c
--- TiMidity++-2.7.0/interface/gtk_i.c	Sun Sep  5 13:44:15 1999
+++ TiMidity++-2.8.0/interface/gtk_i.c	Fri Nov 12 13:25:10 1999
@@ -706,7 +706,7 @@
 
     case FILENAME_MESSAGE:
 	{
-	    char filename[255], separator[255], title[255];
+	    char filename[255], title[255];
 	    char *pc;
 	    int i;
 
@@ -722,12 +722,12 @@
 	    sprintf(title, "Timidity %s - %s", timidity_version, pc);
 	    gtk_window_set_title(GTK_WINDOW(window), title);
 
-	    for (i = 0; i < 30; i++)
-		separator[i]='*';
-	    separator[i++]='\n';
-	    separator[i]='\0';
-	    gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
-			    separator, -1);
+	    /* Clear the text area. */
+	    gtk_text_freeze(GTK_TEXT(text));
+	    gtk_text_set_point(GTK_TEXT(text), 0);
+	    gtk_text_forward_delete(GTK_TEXT(text),
+				    gtk_text_get_length(GTK_TEXT(text)));
+	    gtk_text_thaw(GTK_TEXT(text));
 	}
 	break;
 
@@ -917,6 +917,16 @@
 			    message, -1);
 	    gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
 			    "\n", 1);
+	}
+	break;
+    case LYRIC_MESSAGE:
+	{
+	    char message[1000];
+
+	    gtk_pipe_string_read(message);
+
+	    gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
+			    message, -1);
 	}
 	break;
     default:
diff -ruN TiMidity++-2.7.0/interface/mac_trace.c TiMidity++-2.8.0/interface/mac_trace.c
--- TiMidity++-2.7.0/interface/mac_trace.c	Sat Aug  7 22:42:29 1999
+++ TiMidity++-2.8.0/interface/mac_trace.c	Sat Oct 30 12:23:12 1999
@@ -38,7 +38,7 @@
 #include "miditrace.h"
 #include "bitset.h"
 #include "mfnode.h"
-#include "aq.h"
+//#include "aq.h"
 
 #include "mac_main.h"
 #include "mac_util.h"
@@ -230,7 +230,7 @@
 void mac_trc_update_time( int cur_sec, int tot_sec )
 {
 	static int	save_tot_sec=0, save_cur_sec;
-	int rate;
+	//int rate;
 	char		buf[80];
 	
 	if( cur_sec!=-1 ) save_cur_sec=tot_sec;
@@ -239,12 +239,12 @@
 	if( cur_sec > save_tot_sec ) cur_sec=save_tot_sec;
 	
 	if( !win.show ) return;
-	rate = (int)(aq_filled_ratio() * 100 + 0.5);
+	//rate = (int)(aq_filled_ratio() * 100 + 0.5);
 
 	SetPortWindowPort(win.ref);
-	snprintf(buf, 80," %3d:%02d /%3d:%02d   buffering=%3d %% " "buffer %d/256  ",
+	snprintf(buf, 80," %3d:%02d /%3d:%02d   " /*"buffering=%3d %% "*/ "buffer %d/256  ",
 		cur_sec/60, cur_sec%60, save_tot_sec/60,save_tot_sec%60,
-		rate ,mac_buf_using_num );
+		/*rate,*/ mac_buf_using_num );
 	RGBForeColor(&black);
 	MoveTo(400,12); DrawText(buf, 0, strlen(buf));
 }
diff -ruN TiMidity++-2.7.0/interface/tclIndex TiMidity++-2.8.0/interface/tclIndex
--- TiMidity++-2.7.0/interface/tclIndex	Thu Jan  1 09:00:00 1970
+++ TiMidity++-2.8.0/interface/tclIndex	Fri Nov 12 16:40:40 1999
@@ -0,0 +1,62 @@
+# Tcl autoload index file, version 2.0
+# This file is generated by the "auto_mkindex" command
+# and sourced to set up indexing information for one or
+# more commands.  Typically each line is a command that
+# sets an element in the auto_index array, where the
+# element name is the name of a command and the value is
+# a script that loads the command.
+
+set auto_index(InitGlobal) [list source [file join $dir tkpanel.tcl]]
+set auto_index(HandleInput) [list source [file join $dir tkpanel.tcl]]
+set auto_index(MakeShuffleList) [list source [file join $dir tkpanel.tcl]]
+set auto_index(AppendMsg) [list source [file join $dir tkpanel.tcl]]
+set auto_index(ClearMsg) [list source [file join $dir tkpanel.tcl]]
+set auto_index(SelectNumber) [list source [file join $dir tkpanel.tcl]]
+set auto_index(SetTime) [list source [file join $dir tkpanel.tcl]]
+set auto_index(DispButtonPlay) [list source [file join $dir tkpanel.tcl]]
+set auto_index(SetVolume) [list source [file join $dir tkpanel.tcl]]
+set auto_index(WriteMsg) [list source [file join $dir tkpanel.tcl]]
+set auto_index(JumpCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(VolumeCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(LoadCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(PlayCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(PauseCheck) [list source [file join $dir tkpanel.tcl]]
+set auto_index(PauseCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(StopCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(QuitCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(PrevCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(NextCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(ForwardCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(BackwardCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(VolUpCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(VolDownCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(DispTables) [list source [file join $dir tkpanel.tcl]]
+set auto_index(SaveConfig) [list source [file join $dir tkpanel.tcl]]
+set auto_index(LoadConfig) [list source [file join $dir tkpanel.tcl]]
+set auto_index(InitCmdLine) [list source [file join $dir tkpanel.tcl]]
+set auto_index(SelectList) [list source [file join $dir tkpanel.tcl]]
+set auto_index(OpenFiles) [list source [file join $dir tkpanel.tcl]]
+set auto_index(CloseFiles) [list source [file join $dir tkpanel.tcl]]
+set auto_index(ToggleCurFileMode) [list source [file join $dir tkpanel.tcl]]
+set auto_index(CreateWindow) [list source [file join $dir tkpanel.tcl]]
+set auto_index(filebrowser) [list source [file join $dir browser.tcl]]
+set auto_index(fs:init) [list source [file join $dir browser.tcl]]
+set auto_index(fs:init-lbox) [list source [file join $dir browser.tcl]]
+set auto_index(fs:get-cur-lbox) [list source [file join $dir browser.tcl]]
+set auto_index(fs:select) [list source [file join $dir browser.tcl]]
+set auto_index(fs:selall) [list source [file join $dir browser.tcl]]
+set auto_index(fs:updir) [list source [file join $dir browser.tcl]]
+set auto_index(fs:changedir) [list source [file join $dir browser.tcl]]
+set auto_index(fs:update) [list source [file join $dir browser.tcl]]
+set auto_index(retrieve-filename) [list source [file join $dir misc.tcl]]
+set auto_index(sec2time) [list source [file join $dir misc.tcl]]
+set auto_index(numeric-bind) [list source [file join $dir misc.tcl]]
+set auto_index(my-listbox) [list source [file join $dir misc.tcl]]
+set auto_index(my-dialog) [list source [file join $dir misc.tcl]]
+set auto_index(warning) [list source [file join $dir misc.tcl]]
+set auto_index(error) [list source [file join $dir misc.tcl]]
+set auto_index(information) [list source [file join $dir misc.tcl]]
+set auto_index(question) [list source [file join $dir misc.tcl]]
+set auto_index(rootname) [list source [file join $dir misc.tcl]]
+set auto_index(my-random) [list source [file join $dir misc.tcl]]
+set auto_index(init-random) [list source [file join $dir misc.tcl]]
diff -ruN TiMidity++-2.7.0/timidity/Makefile.in TiMidity++-2.8.0/timidity/Makefile.in
--- TiMidity++-2.7.0/timidity/Makefile.in	Tue Oct 12 19:18:42 1999
+++ TiMidity++-2.8.0/timidity/Makefile.in	Wed Nov 24 12:25:50 1999
@@ -352,7 +352,7 @@
 	../utils/support.h common.h ../libarc/url.h ../utils/mblock.h \
 	instrum.h playmidi.h readmidi.h output.h controls.h tables.h \
 	miditrace.h reverb.h ../interface/soundspec.h recache.h \
-	../libarc/arc.h ../utils/strtab.h wrd.h mid.defs aq.h
+	../libarc/arc.h ../utils/strtab.h wrd.h mid.defs aq.h mix.h
 wave_a.o: wave_a.c ../config.h timidity.h ../utils/support.h output.h \
 	controls.h
 wrd_read.o: wrd_read.c ../config.h timidity.h ../utils/support.h \
diff -ruN TiMidity++-2.7.0/timidity/instrum.c TiMidity++-2.8.0/timidity/instrum.c
--- TiMidity++-2.7.0/timidity/instrum.c	Sun Jul 25 22:12:26 1999
+++ TiMidity++-2.8.0/timidity/instrum.c	Tue Oct 26 18:49:55 1999
@@ -604,7 +604,7 @@
       }
 
       /* Then read the sample data */
-      sp->data = (sample_t *)safe_malloc(sp->data_length);
+      sp->data = (sample_t *)safe_malloc(sp->data_length+1);
       sp->data_alloced = 1;
       if ((j = tf_read(sp->data, 1, sp->data_length, tf)) != sp->data_length)
       {
@@ -617,7 +617,7 @@
 	  int32 i = sp->data_length, j;
 	  uint8 *cp = (uint8 *)sp->data;
 	  uint16 *tmp, *new;
-	  tmp = new = (uint16 *)safe_malloc(sp->data_length*2);
+	  tmp = new = (uint16 *)safe_malloc(sp->data_length*2+2);
 	  for(j = 0; j < i; j++)
 	      tmp[j] = (uint16)(cp[j]) << 8;
 	  cp=(uint8 *)(sp->data);
@@ -704,6 +704,11 @@
       sp->data_length /= 2; /* These are in bytes. Convert into samples. */
       sp->loop_start /= 2;
       sp->loop_end /= 2;
+
+      /* The sample must be padded out by 1 extra sample, so that
+         round off errors in the offsets used in interpolation will not
+         cause a "pop" by reading random data beyond data_length */
+      sp->data[sp->data_length] = sp->data[sp->data_length-1];
 
       /* Then fractional samples */
       sp->data_length <<= FRACTION_BITS;
diff -ruN TiMidity++-2.7.0/timidity/mac_a.c TiMidity++-2.8.0/timidity/mac_a.c
--- TiMidity++-2.7.0/timidity/mac_a.c	Sat Aug  7 22:42:41 1999
+++ TiMidity++-2.8.0/timidity/mac_a.c	Sat Oct 30 12:23:25 1999
@@ -132,18 +132,24 @@
 {
 	int		i;
 	SndCommand	theCmd;
-
+	int include_enc, exclude_enc;
+	
 	gSndCannel=MyCreateSndChannel(sampledSynth, 0,
 					NewSndCallBackProc(callback), MAC_SOUNDBUF_QLENGTH);
 	if( gSndCannel==0 )
 			{ StopAlertMessage("\pCan't open Sound Channel"); ExitToShell(); }
 					
-	dpm.encoding |= PE_16BIT;
-	dpm.encoding |= PE_SIGNED;
-	dpm.encoding &= ~PE_ULAW;
-	dpm.encoding &= ~PE_ALAW;
-	dpm.encoding &= ~PE_BYTESWAP;
-
+	dpm.encoding = include_enc = exclude_enc = 0;
+	
+	include_enc |= PE_16BIT;
+	include_enc |= PE_SIGNED;
+	
+	exclude_enc |= PE_ULAW;
+	exclude_enc |= PE_ALAW;
+	exclude_enc |= PE_BYTESWAP;
+	dpm.encoding = include_enc;
+	dpm.encoding = validate_encoding(dpm.encoding, include_enc, exclude_enc);
+    
 	for( i=0; i<MACBUFNUM; i++) /*making sound buffer*/
 	{
 		soundHandle[i]=NewHandle(MACBUFSIZE);
@@ -155,7 +161,11 @@
 	theCmd.param1=mac_amplitude;
 	SndDoCommand(gSndCannel, &theCmd, 0);
 	initCounter();
-	do_initial_filling=1; //experimental
+#ifdef MAC_INITIAL_FILLING
+	do_initial_filling=1;
+#else
+	do_initial_filling=0;
+#endif
 	return 0;
 }
 
@@ -185,7 +195,9 @@
 		{
 			gBusy=false;
 				//end of INITIAL FILLING
+#ifdef MAC_INITIAL_FILLING
 			filling_end();
+#endif
 			trace_loop();
 			YieldToAnyThread();
 		}
@@ -206,11 +218,12 @@
 		InitCursor();	gCursorIsWatch=false;
 	}
 
-			// start INITIAL FILLING
+#ifdef MAC_INITIAL_FILLING	// start INITIAL FILLING
 	if( play_counter==0 && filling_flag==0 && do_initial_filling){
 		filling_flag=1;
 		theCmd.cmd=pauseCmd; SndDoImmediate(gSndCannel, &theCmd);
 	}
+#endif
 	
 	samples = nbytes;
 	if (!(dpm.encoding & PE_MONO)) /* Stereo sample */
@@ -317,7 +330,7 @@
 
 static int flush_output (void)
 {
-	int			ret=RC_NONE;
+	int		ret=RC_NONE;
 	SndCommand	theCmd;
 
 	mac_flushing_flag=1;
@@ -355,11 +368,18 @@
       case PM_REQ_DISCARD:
 	purge_output();
 	return 0;
+      case PM_REQ_FLUSH:
+      case PM_REQ_OUTPUT_FINISH:
+      	flush_output();
+	return 0;
       case PM_REQ_GETQSIZ:
         *(int32*)arg= MACBUFNUM*AUDIO_BUFFER_SIZE*10;
       	return 0;
       case PM_REQ_GETSAMPLES:
       	*(int*)arg= current_samples();
+      	return 0;
+      case PM_REQ_PLAY_START:
+	initCounter();
       	return 0;
     }
     return -1;
diff -ruN TiMidity++-2.7.0/timidity/mac_dlog.c TiMidity++-2.8.0/timidity/mac_dlog.c
--- TiMidity++-2.7.0/timidity/mac_dlog.c	Sat Aug  7 22:42:41 1999
+++ TiMidity++-2.8.0/timidity/mac_dlog.c	Sat Oct 30 12:23:26 1999
@@ -76,6 +76,7 @@
 #else
 	opt_chorus_control = 0;
 #endif
+	opt_surround_chorus = 0;
 	opt_channel_pressure = 0;
 	opt_trace_text_meta_event = 0;
 	opt_overlap_voice_allow = 1;
@@ -88,7 +89,8 @@
 	
 	evil_level=EVIL_NORMAL;
 	do_initial_filling=0;
-	reduce_voice_threshold = -1;
+	reduce_voice_threshold = 0;
+	auto_reduce_polyphony = 0;
 }
 
 enum{iOK=1, iCancel=2, iDefault=3, iRate=5, iMono=6, iStereo=7,
@@ -98,13 +100,28 @@
 			iModulation_wheel = 21,
 			iPortamento = 22,
 			iNrpn_vibrato = 23,
+			
 			iReverb = 24,
+			iReverb_setlevel = 38,
+			iReverb_level = 39,
+			iReverb_level_hint = 42,
+						
 			iChorus = 25,
+			iChorus_setlevel = 40,
+			iChorus_level = 41,
+			iChorus_level_hint = 43,
+			
 			iChannel_pressure = 26,
 			iText_meta_event = 27,
 			iOverlap_voice = 28,
-			iPReverb = 29,
-			iModify_release=30,
+			/*iPReverb = 29,*/
+			
+			iModify_release=31,
+			iModify_release_ms=37,
+			iModify_release_ms_hint1=30,			
+			iModify_release_ms_hint2=44,
+			iModify_release_ms_hint3=45,
+			
 			iPresence_balance=32,
 			iManufacture=33,
 			iEvil_level=34,
@@ -112,7 +129,66 @@
 			iShuffle= 36
 			};
 
+// ******************************************
+
+static void mac_AdjustDialog( DialogRef dialog )
+{
+	//reverb
+	if( GetDialogItemValue(dialog, iReverb)==2 ){
+		SetDialogItemHilite(dialog, iReverb_setlevel, kControlNoPart);
+	}else{
+		SetDialogItemHilite(dialog, iReverb_setlevel, kControlInactivePart);
+		SetDialogItemValue(dialog, iReverb_setlevel, 0);
+	}
+
+	if( GetDialogItemValue(dialog, iReverb_setlevel) )
+	{
+		ShowDialogItem(dialog, iReverb_level);
+		ShowDialogItem(dialog, iReverb_level_hint);						
+	}else{
+		HideDialogItem(dialog, iReverb_level);
+		HideDialogItem(dialog, iReverb_level_hint);						
+	}
+	//chorus
+	if( GetDialogItemValue(dialog, iChorus)==2 ){
+		// activate
+		SetDialogItemHilite(dialog, iChorus_setlevel, kControlNoPart);
+		mySetDialogItemText(dialog, iChorus_level_hint, "\p(1..127)");
+	}else if( GetDialogItemValue(dialog, iChorus)==3 ){
+		// activate
+		SetDialogItemHilite(dialog, iChorus_setlevel, kControlNoPart);
+		mySetDialogItemText(dialog, iChorus_level_hint, "\p(1..63)");
+	}else{	// inactivate
+		SetDialogItemHilite(dialog, iChorus_setlevel, kControlInactivePart);
+		SetDialogItemValue(dialog, iChorus_setlevel, 0);
+	}
+	
+	if( GetDialogItemValue(dialog, iChorus_setlevel) )
+	{
+		ShowDialogItem(dialog, iChorus_level);
+		ShowDialogItem(dialog, iChorus_level_hint);
+	}else{
+		HideDialogItem(dialog, iChorus_level);
+		HideDialogItem(dialog, iChorus_level_hint);
+	}
+	
+	// modify release
+	if( GetDialogItemValue(dialog, iModify_release) )
+	{
+		ShowDialogItem(dialog, iModify_release_ms);
+		ShowDialogItem(dialog, iModify_release_ms_hint1);
+		ShowDialogItem(dialog, iModify_release_ms_hint2);
+		ShowDialogItem(dialog, iModify_release_ms_hint3);
+	}else{
+		HideDialogItem(dialog, iModify_release_ms);
+		HideDialogItem(dialog, iModify_release_ms_hint1);
+		HideDialogItem(dialog, iModify_release_ms_hint2);
+		HideDialogItem(dialog, iModify_release_ms_hint3);
+	}
+}
+
 // ***************************************************
+
 static void SetDialogValue(DialogRef theDialog)
 {
 #define BUFSIZE 80
@@ -141,15 +217,50 @@
 	SetDialogItemValue(theDialog, iModulation_wheel, opt_modulation_wheel);
 	SetDialogItemValue(theDialog, iPortamento, opt_portamento);
 	SetDialogItemValue(theDialog, iNrpn_vibrato, opt_nrpn_vibrato);
-	SetDialogItemValue(theDialog, iReverb, opt_reverb_control);
-	SetDialogItemValue(theDialog, iChorus, opt_chorus_control);
 	SetDialogItemValue(theDialog, iChannel_pressure, opt_channel_pressure);
 	SetDialogItemValue(theDialog, iText_meta_event, opt_trace_text_meta_event);
 	SetDialogItemValue(theDialog, iOverlap_voice, opt_overlap_voice_allow);
 	
-	SetDialogItemValue(theDialog, iPReverb, (opt_reverb_control==2));
+	/*-----reverb-----*/
+	if( opt_reverb_control<0 ){ //Enabel
+		SetDialogItemValue(theDialog, iReverb, 2);
+		SetDialogItemValue(theDialog, iReverb_setlevel, 1);
+		SetDialogItemHilite(theDialog, iReverb_setlevel, kControlNoPart);
+		SetDialogTEValue(theDialog, iReverb_level, -opt_reverb_control);
+		
+	}else if( opt_reverb_control==0 || opt_reverb_control==2 ){ //Non or global
+		SetDialogItemValue(theDialog, iReverb, opt_reverb_control+1);
+		SetDialogItemValue(theDialog, iReverb_setlevel, 1);
+		SetDialogItemHilite(theDialog, iReverb_setlevel, kControlInactivePart);
+	}else{	// opt_reverb_control==1, no level
+		SetDialogItemValue(theDialog, iReverb, 2);
+		SetDialogItemValue(theDialog, iReverb_setlevel, 0);
+		SetDialogItemHilite(theDialog, iReverb_setlevel, kControlNoPart);
+	}
+	
+	/*-----chorus-----*/
+	if( opt_surround_chorus ){
+		SetDialogItemValue(theDialog, iChorus, 3); //surround
+	}else if( opt_chorus_control<0 || opt_chorus_control==1 ){
+		SetDialogItemValue(theDialog, iChorus, 2); //Enable
+		SetDialogItemHilite(theDialog, iChorus_setlevel, kControlNoPart);
+	}else{
+		SetDialogItemValue(theDialog, iChorus, 1); //Non
+		SetDialogItemHilite(theDialog, iChorus_setlevel, kControlInactivePart);
+	}
+	
+	if( opt_chorus_control<0 ){
+		SetDialogItemHilite(theDialog, iChorus_setlevel, kControlNoPart);
+		SetDialogItemValue(theDialog, iChorus_setlevel, 1);
+		SetDialogTEValue(theDialog, iChorus_level, -opt_chorus_control);
+	}else{
+		SetDialogItemValue(theDialog, iChorus_setlevel, 0);
+	}
+	
+	/*-----modify_release-----*/
+	SetDialogItemValue(theDialog, iModify_release,  (modify_release!=0) );
+	SetDialogTEValue(theDialog, iModify_release_ms, modify_release);
 	
-	SetDialogItemValue(theDialog, iModify_release,  modify_release+1);
 	SetDialogItemValue(theDialog, iPresence_balance, effect_lr_mode+2);
 	value= (	opt_default_mid==0x41? 1:           //GS
 				opt_default_mid==0x43? 2:3	);		//XG:GM
@@ -157,11 +268,21 @@
 	SetDialogItemValue(theDialog, iEvil_level, evil_level);
 	//SetDialogItemValue(theDialog, iDo_initial_filling, do_initial_filling);
 	SetDialogItemValue(theDialog, iShuffle, gShuffle);
+	
+	mac_AdjustDialog( theDialog );
 }
 
-//*******************************************
-//					mac_SetPlayOption
-//*******************************************
+static int mac_limit_params(int var, int min_limit, int max_limit)
+{
+	if( var < min_limit ) var = min_limit;
+	if( var > max_limit ) var = max_limit;
+	return var;
+}
+
+
+// *******************************************
+//	mac_SetPlayOption
+// *******************************************
 OSErr mac_SetPlayOption()
 {
 	Boolean		more=false;
@@ -238,16 +359,65 @@
 					opt_modulation_wheel=		GetDialogItemValue(dialog, iModulation_wheel)? 1:0;
 					opt_portamento=				GetDialogItemValue(dialog, iPortamento)? 1:0;
 					opt_nrpn_vibrato=			GetDialogItemValue(dialog, iNrpn_vibrato)? 1:0;
-					opt_reverb_control=			GetDialogItemValue(dialog, iReverb)? 1:0;
-					opt_chorus_control=			GetDialogItemValue(dialog, iChorus)? 1:0;
 					opt_channel_pressure=		GetDialogItemValue(dialog, iChannel_pressure)? 1:0;
 					opt_trace_text_meta_event=	GetDialogItemValue(dialog, iText_meta_event)? 1:0;
 					opt_overlap_voice_allow=	GetDialogItemValue(dialog, iOverlap_voice)? 1:0;
 					
-					if( opt_reverb_control && GetDialogItemValue(dialog, iPReverb))
-						opt_reverb_control=2;
+					/*-----reverb-----*/
+					switch(GetDialogItemValue(dialog, iReverb))
+					{
+					  case 1:
+					    opt_reverb_control = 0;
+					    break;
+					  case 2:
+					    if(GetDialogItemValue(dialog, iReverb_setlevel))
+						opt_reverb_control =
+							- (mac_limit_params( GetDialogTEValue( dialog, iReverb_level ), 1, 127));
+					    else
+						opt_reverb_control = 1;
+					    break;
+					  case 3:
+					    opt_reverb_control = 2;
+					    break;
+					  /*default:
+					    ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
+						      "Invalid -EFreverb parameter.");*/
+					}
+					
+					/*-----chorus-----*/
+					opt_surround_chorus = 0;
+					switch(GetDialogItemValue(dialog, iChorus))
+					{
+					  case 1:
+					    opt_chorus_control = 0;
+					    break;
+
+					  case 2:
+					    if( GetDialogItemValue(dialog, iChorus_setlevel) )
+						opt_chorus_control =
+							- (mac_limit_params( GetDialogTEValue(dialog,iChorus_level), 1, 127 ) );
+					    else
+						opt_chorus_control = 1;
+					    break;
+					  case 3:
+						opt_surround_chorus = 1;
+					    	if( GetDialogItemValue(dialog, iChorus_setlevel) )
+							opt_chorus_control =
+								- (mac_limit_params( GetDialogTEValue(dialog,iChorus_level), 1,63));
+					  	else
+							opt_chorus_control = 1;
+						break;
+					  /*default:
+					    ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
+						      "Invalid -EFchorus parameter.");
+					    return 1;*/
+					}
 					
-					modify_release= 	GetDialogItemValue(dialog, iModify_release)-1;
+					modify_release=0;
+					if( GetDialogItemValue(dialog, iModify_release) ){
+						modify_release=GetDialogTEValue(dialog, iModify_release_ms);
+						modify_release = mac_limit_params(modify_release, 0, 5000);
+					}
 					effect_lr_mode=	GetDialogItemValue(dialog, iPresence_balance)-2;
 					value=GetDialogItemValue(dialog, iManufacture);
 					opt_default_mid= 	(value==1? 0x41:		//GS
@@ -298,13 +468,32 @@
 				case iModulation_wheel:	ToggleDialogItem(dialog, iModulation_wheel);	break;
 				case iPortamento:		ToggleDialogItem(dialog, iPortamento);	break;
 				case iNrpn_vibrato:		ToggleDialogItem(dialog, iNrpn_vibrato);	break;
-				case iReverb:			ToggleDialogItem(dialog, iReverb);	break;
-				case iChorus:			ToggleDialogItem(dialog, iChorus);	break;
 				case iChannel_pressure:	ToggleDialogItem(dialog, iChannel_pressure);	break;
 				case iText_meta_event:	ToggleDialogItem(dialog, iText_meta_event);	break;
 				case iOverlap_voice:	ToggleDialogItem(dialog, iOverlap_voice);	break;
-				case iPReverb:			ToggleDialogItem(dialog, iPReverb);	break;
-				//case iDo_initial_filling:	ToggleDialogItem(dialog, iDo_initial_filling);	break;
+
+				case iReverb:
+					mac_AdjustDialog(dialog);
+					break;
+				case iReverb_setlevel:
+					ToggleDialogItem(dialog, iReverb_setlevel);
+					mac_AdjustDialog(dialog);
+					break;
+				case iChorus:
+					mac_AdjustDialog(dialog);
+					break;
+
+				case iChorus_setlevel:
+					ToggleDialogItem(dialog, iChorus_setlevel);
+					mac_AdjustDialog(dialog);
+					break;
+				case iModify_release:
+					ToggleDialogItem(dialog, iModify_release);
+					if( GetDialogItemValue(dialog, iModify_release) ){ //newly checked on
+						SetDialogTEValue(theDialog, iModify_release_ms, DEFAULT_MREL);
+					}
+					mac_AdjustDialog(dialog);
+					break;
 				case iShuffle:			ToggleDialogItem(dialog, iShuffle);	break;
 				}
 			}
@@ -333,9 +522,9 @@
 	int32	modify_release;
 	int		effect_lr_mode;
 	int		opt_default_mid;
-	char	showMsg, showList, showWrd, showDoc, showSpec, showTrace, showSkin,
+	int		showMsg, showList, showWrd, showDoc, showSpec, showTrace, showSkin,
 			modulation_wheel, portamento, nrpn_vibrato, reverb_control,
-			chorus_control, channel_pressure,
+			chorus_control, surround_chorus, channel_pressure,
 			xg_bank_select_lsb, trace_text_meta_event, overlap_voice_allow,
 			do_reverb_flag;
 	int		evil_level,do_initial_filling;
@@ -346,9 +535,9 @@
 }Preference;
 
 
-#define	PREF_VER	13
+#define	PREF_VER	14
+						/* ++ 2.6.1        ->prefver=14 */
 						/* ++ 2.1.0        ->prefver=13 */
-						/* ++ beta1        ->prefver=12 */
 #define	PREF_NUM	(sizeof(Preference))	/*pref data bytes*/
 
 OSErr mac_GetPreference()
@@ -438,6 +627,7 @@
 	opt_nrpn_vibrato =			Preference.nrpn_vibrato;
 	opt_reverb_control =		Preference.reverb_control;
 	opt_chorus_control =		Preference.chorus_control;
+	opt_surround_chorus = 		Preference.surround_chorus;
 	opt_channel_pressure =		Preference.channel_pressure;
 	opt_trace_text_meta_event =	Preference.trace_text_meta_event;
 	opt_overlap_voice_allow =	Preference.overlap_voice_allow;
diff -ruN TiMidity++-2.7.0/timidity/mac_main.c TiMidity++-2.8.0/timidity/mac_main.c
--- TiMidity++-2.7.0/timidity/mac_main.c	Sat Aug  7 22:42:41 1999
+++ TiMidity++-2.8.0/timidity/mac_main.c	Sat Oct 30 12:23:26 1999
@@ -184,7 +184,7 @@
 	InitMenuBar();
 }
 
-
+extern char *opt_aq_max_buff,*opt_aq_fill_buff;
 int  main()
 {
 	int32	output_rate=DEFAULT_RATE;
@@ -196,7 +196,13 @@
 	
 	mac_DefaultOption();
 	mac_GetPreference();
-	
+
+#ifdef MAC_INITIAL_FILLING
+	if(!opt_aq_max_buff)
+		opt_aq_max_buff = safe_strdup("0.0");
+	if(!opt_aq_fill_buff)
+		opt_aq_fill_buff = safe_strdup("100%");
+#endif
 	
 	timidity_start_initialize();
 	if((err = timidity_pre_load_configuration()) != 0)
@@ -645,53 +651,6 @@
 		return 0;
 	}
 }
-
-/*int isMidiFile(const FSSpec *spec)
-{
-	int len;
-
-	//err= FSpGetFInfo(spec, &fndrInfo);
-	len=spec->name[0];	//strlen
-	if( memcmp( &spec->name[len-3], ".mid", 4)==0 ||
-		memcmp( &spec->name[len-3], ".MID", 4)==0 ||
-		memcmp( &spec->name[len-3], ".rcp", 4)==0 ||
-		memcmp( &spec->name[len-3], ".RCP", 4)==0 ||
-		memcmp( &spec->name[len-3], ".R36", 4)==0 ||
-		memcmp( &spec->name[len-3], ".r36", 4)==0 ||
-		memcmp( &spec->name[len-3], ".G18", 4)==0 ||		
-		memcmp( &spec->name[len-3], ".g18", 4)==0 ||
-		memcmp( &spec->name[len-3], ".G36", 4)==0 ||
-		memcmp( &spec->name[len-3], ".g36", 4)==0 ||
-		memcmp( &spec->name[len-2], ".gz",  3)==0 ||
-		memcmp( &spec->name[len-3], ".mod", 4)==0 ||
-		memcmp( &spec->name[len-3], ".hqx", 4)==0 ||
-		memcmp( &spec->name[len-4], ".mime", 5)==0
-		){
-		return 1;
-	}
-	else{
-		return 0;
-	}
-}*/
-
-/*int isArchiveFile(const FSSpec *spec)
-{
-	int len;
-
-	len=spec->name[0];	//strlen
-	if( memcmp( &spec->name[len-3], ".lzh", 4)==0 ||
-		memcmp( &spec->name[len-3], ".LZH", 4)==0 ||
-		memcmp( &spec->name[len-3], ".zip", 4)==0 ||
-		memcmp( &spec->name[len-3], ".ZIP", 4)==0
-		//memcmp( &spec->name[len-3], ".hqx", 4)==0 ||
-		//memcmp( &spec->name[len-4], ".mime", 5)==0		
-		){
-		return 1;
-	}
-	else{
-		return 0;
-	}
-}*/
 
 static void AddFolderFSSpec2PlayList(const FSSpec *spec)
 {
diff -ruN TiMidity++-2.7.0/timidity/mac_qt_a.c TiMidity++-2.8.0/timidity/mac_qt_a.c
--- TiMidity++-2.7.0/timidity/mac_qt_a.c	Sat Aug  7 22:42:41 1999
+++ TiMidity++-2.8.0/timidity/mac_qt_a.c	Sat Oct 30 12:23:26 1999
@@ -537,7 +537,7 @@
 		for(;; ev++){
 			ch = ev->channel;
 		if(ev->type == ME_NOTEON && note_channel[ch] == NULL){
-			MidiEvent *ev;
+			//MidiEvent *ev;
 
 			ev->channel = ch;
 			ev->a = 0;
@@ -555,7 +555,7 @@
 				drum_part[ch] = true;
 		}
 		else if(ev->type == ME_DRUMPART && !drum_part[ch]){
-			MidiEvent *ev;
+			//MidiEvent *ev;
 
 			ev->channel = ch;
 			ev->a = channel[ch].program;
@@ -829,7 +829,7 @@
 		break;
 	case ME_DRUMPART:
 		if(!drum_part[ch]){
-			MidiEvent *ev;
+			//MidiEvent *ev;
 
 			ev->channel = ch;
 			ev->a = channel[ch].program;
diff -ruN TiMidity++-2.7.0/timidity/mix.c TiMidity++-2.8.0/timidity/mix.c
--- TiMidity++-2.7.0/timidity/mix.c	Fri Jul  9 16:51:54 1999
+++ TiMidity++-2.8.0/timidity/mix.c	Tue Nov 16 15:50:29 1999
@@ -39,59 +39,123 @@
 #include "resample.h"
 #include "mix.h"
 
+int min_sustain_time = 0;
+
+static void voice_ran_out(int v)
+{
+    /* Envelope ran out. */
+    int died = (voice[v].status == VOICE_DIE); /* Already displayed as dead */
+    free_voice(v);
+    if(!died)
+	ctl_note_event(v);
+}
+
 /* Returns 1 if envelope runs out */
 int recompute_envelope(int v)
 {
-  int stage, ch;
-  int32 rate, offset;
-  Voice *vp = &voice[v];
-
-  stage = vp->envelope_stage;
-  if (stage>5)
-    {
-      /* Envelope ran out. */
-      int tmp=(vp->status == VOICE_DIE); /* Already displayed as dead */
-      vp->status = VOICE_FREE;
-      if(!tmp)
-	ctl_note_event(v);
-      return 1;
+    int stage, ch;
+    int32 rate, offset;
+    Voice *vp = &voice[v];
+
+    stage = vp->envelope_stage;
+    if(stage > 5)
+    {
+	voice_ran_out(v);
+	return 1;
     }
 
-  if(stage > 2 &&
-     (vp->sample->modes & MODES_ENVELOPE) &&
-     (vp->status & (VOICE_ON | VOICE_SUSTAINED)))
-  {
-      /* Freeze envelope until note turns off. Trumpets want this. */
-      vp->envelope_increment = 0;
-      return 0;
-  }
-  vp->envelope_stage=stage+1;
-
-  offset = vp->sample->envelope_offset[stage];
-  if(vp->envelope_volume == offset ||
-     (stage > 2 && vp->envelope_volume < offset))
-      return recompute_envelope(v);
-
-  rate = 0;
-  ch = vp->channel;
-  if(ISDRUMCHANNEL(ch))
-  {
-      int note;
-
-      note = vp->note;
-      if(channel[ch].drums[note] != NULL)
-	  rate = channel[ch].drums[note]->drum_envelope_rate[stage];
-  }
-  else
-      rate = channel[ch].envelope_rate[stage];
-  if(rate == 0)
-      rate = vp->sample->envelope_rate[stage];
-
-  vp->envelope_target    = offset;
-  vp->envelope_increment = rate;
-  if(vp->envelope_target < vp->envelope_volume)
-      vp->envelope_increment = -vp->envelope_increment;
-  return 0;
+    if(stage > 2 && vp->envelope_volume <= 0)
+    {
+	/* Remove silent voice in the release stage */
+	voice_ran_out(v);
+	return 1;
+    }
+
+    if(stage == 3 &&
+       (vp->sample->modes & MODES_ENVELOPE) &&
+       (vp->status & (VOICE_ON | VOICE_SUSTAINED)))
+    {
+	/* EAW -- Routine to decay the sustain envelope
+	 *
+	 * Disabled if !min_sustain_time or if there is no loop.
+	 * If calculated decay rate is larger than the regular
+	 *  stage 3 rate, use the stage 3 rate instead.
+	 * min_sustain_time is given in msec, and is the time
+	 *  it will take to decay a note at maximum volume.
+	 * 2000-3000 msec seem to be decent values to use.
+	 *
+	 */
+
+	if(min_sustain_time <= 0)	/* Default behavior */
+	{
+	    /* Freeze envelope until note turns off */
+	    vp->envelope_increment = 0;
+	}
+	else if((vp->status & VOICE_SUSTAINED) &&
+		(vp->sample->modes & MODES_LOOPING))
+	{
+	    if(min_sustain_time == 1)
+		goto next_stage; /* Go to next stage.
+				  * The sustain stage is ignored.
+				  */
+
+	    /* Set envelope volume target to zero.
+	     * This cause to be vp->envelope_volume <= 0, then the
+	     * voice will be removed.  The next stage never come.
+	     */
+	    vp->envelope_target = 0;
+
+	    /* Calculate the release phase speed.
+	     * (1073741823000 == (2^(15+15)-1) * 1000)
+	     */
+	    rate = (int32)(-1073741823000.0 * control_ratio /
+			   (min_sustain_time * play_mode->rate));
+	    vp->envelope_increment = -vp->sample->envelope_rate[3];
+	    /* use the slower of the two rates */
+	    if(vp->envelope_increment < rate)
+		vp->envelope_increment = rate;
+	    if(!vp->envelope_increment)
+		vp->envelope_increment = -1; /* Avoid freezing */
+	}
+	else /* it's not decaying, so freeze it */
+	{
+	    /* tiny value to make other functions happy, freeze note */
+	    vp->envelope_increment = 1;
+
+	    /* this will cause update_envelope(v) to undo the +1 inc. */
+	    vp->envelope_target = vp->envelope_volume;
+	}
+	return 0;
+    }
+
+  next_stage:
+    vp->envelope_stage = stage + 1;
+
+    offset = vp->sample->envelope_offset[stage];
+    if(vp->envelope_volume == offset ||
+       (stage > 2 && vp->envelope_volume < offset))
+	return recompute_envelope(v);
+
+    rate = 0;
+    ch = vp->channel;
+    if(ISDRUMCHANNEL(ch))
+    {
+	int note;
+
+	note = vp->note;
+	if(channel[ch].drums[note] != NULL)
+	    rate = channel[ch].drums[note]->drum_envelope_rate[stage];
+    }
+    else
+	rate = channel[ch].envelope_rate[stage];
+    if(rate == 0)
+	rate = vp->sample->envelope_rate[stage];
+
+    vp->envelope_target    = offset;
+    vp->envelope_increment = rate;
+    if(vp->envelope_target < vp->envelope_volume)
+	vp->envelope_increment = -vp->envelope_increment;
+    return 0;
 }
 
 int apply_envelope_to_amp(int v)
@@ -124,7 +188,7 @@
       if((voice[v].status & (VOICE_OFF | VOICE_SUSTAINED))
 	 && (la | ra) <= MIN_AMP_VALUE)
       {
-	  voice[v].status = VOICE_FREE;
+	  free_voice(v);
 	  ctl_note_event(v);
 	  return 1;
       }
@@ -145,7 +209,7 @@
       if((voice[v].status & (VOICE_OFF | VOICE_SUSTAINED)) &&
 	 la <= MIN_AMP_VALUE)
       {
-	  voice[v].status = VOICE_FREE;
+	  free_voice(v);
 	  ctl_note_event(v);
 	  return 1;
       }
@@ -555,7 +619,7 @@
       sp=resample_voice(v, &c);
       if(c > 0)
 	  ramp_out(sp, buf, v, c);
-      vp->status=VOICE_FREE;
+      free_voice(v);
     }
   else
     {
diff -ruN TiMidity++-2.7.0/timidity/mix.h TiMidity++-2.8.0/timidity/mix.h
--- TiMidity++-2.7.0/timidity/mix.h	Mon Nov 30 17:41:44 1998
+++ TiMidity++-2.8.0/timidity/mix.h	Tue Oct 19 22:33:51 1999
@@ -28,5 +28,6 @@
 extern void mix_voice(int32 *buf, int v, int32 c);
 extern int recompute_envelope(int v);
 extern int apply_envelope_to_amp(int v);
+extern int min_sustain_time;  /* time (ms) for full vol note to sustain */
 
 #endif /* ___MIX_H_ */
diff -ruN TiMidity++-2.7.0/timidity/playmidi.c TiMidity++-2.8.0/timidity/playmidi.c
--- TiMidity++-2.7.0/timidity/playmidi.c	Tue Oct  5 15:30:33 1999
+++ TiMidity++-2.8.0/timidity/playmidi.c	Wed Nov 24 12:25:08 1999
@@ -175,10 +175,15 @@
 int reduce_quality_flag=0;
 int no_4point_interpolation=0;
 #endif
+char* pcm_alternate_file = NULL; /* NULL or "none": Nothing (default)
+				  * "auto": Auto select
+				  * filename: Use it
+				  */
 
 static int32 lost_notes, cut_notes;
 static int32 common_buffer[AUDIO_BUFFER_SIZE*2], /* stereo samples */
              *buffer_pointer;
+static int16 wav_buffer[AUDIO_BUFFER_SIZE*2];
 static int32 buffered_count;
 static char *reverb_buffer = NULL; /* MAX_CHANNELS*AUDIO_BUFFER_SIZE*8 */
 
@@ -319,7 +324,10 @@
 {
     int i;
     for(i = 0; i < MAX_VOICES; i++)
+    {
 	voice[i].status = VOICE_FREE;
+	voice[i].chorus_link = i;
+    }
     upper_voices = 0;
     memset(vidq_head, 0, sizeof(vidq_head));
     memset(vidq_tail, 0, sizeof(vidq_tail));
@@ -827,7 +835,7 @@
     {
       if(voice[j].status & VOICE_FREE || voice[j].cache != NULL)
 	    continue;
-      if(voice[j].delay)
+      if(voice[j].chorus_link < j)
       {
 	/* score notes based on both volume AND duration */
 	/* this scoring function needs some more tweaking... */
@@ -850,23 +858,14 @@
     }
     if(lowest != -0x7FFFFFFF)
     {
-	int low_channel, low_note;
-
 	cut_notes++;
 
-	/* hack - double volume of chorus partner */
-	low_channel = voice[lowest].channel;
-	low_note = voice[lowest].note;
-	for (j = 0; j < i; j++) {
-		if (voice[j].status & VOICE_FREE) continue;
-		if (voice[j].channel == low_channel &&
-		    voice[j].note == low_note &&
-		    j != lowest) {
-		    	voice[j].left_mix <<= 1;
-		    	voice[j].right_mix <<= 1;
-		    	break;
-		}
-	}
+	/* hack - double volume of chorus partner, fix pan */
+	j = voice[lowest].chorus_link;
+	voice[j].velocity <<= 1;
+    	voice[j].panning = channel[voice[lowest].channel].panning;
+    	recompute_amp(j);
+    	apply_envelope_to_amp(j);
 
 	return lowest;
     }
@@ -969,7 +968,7 @@
 	   we could use a reserve of voices to play dying notes only. */
 
 	cut_notes++;
-	voice[lowest].status = VOICE_FREE;
+	free_voice(lowest);
 	if(!prescanning_flag)
 	    ctl_note_event(lowest);
 	return lowest;
@@ -1002,7 +1001,7 @@
     if(lowest != -1)
     {
 	cut_notes++;
-	voice[lowest].status = VOICE_FREE;
+	free_voice(lowest);
 	if(!prescanning_flag)
 	    ctl_note_event(lowest);
 	return lowest;
@@ -1031,7 +1030,7 @@
     if(lowest != -0x7FFFFFFF)
     {
 	cut_notes++;
-	voice[lowest].status = VOICE_FREE;
+	free_voice(lowest);
 	if(!prescanning_flag)
 	    ctl_note_event(lowest);
 	return lowest;
@@ -1042,9 +1041,9 @@
     lowest = -0x7FFFFFFF;
     for(j = 0; j < i; j++)
     {
-      if(voice[j].status & VOICE_FREE || voice[j].cache != NULL)
+      if(voice[j].status & VOICE_FREE)
 	    continue;
-      if(voice[j].delay)
+      if(voice[j].chorus_link < j)
       {
 	/* find lowest volume */
 	v = voice[j].left_mix;
@@ -1059,25 +1058,16 @@
     }
     if(lowest != -0x7FFFFFFF)
     {
-	int low_channel, low_note;
-
 	cut_notes++;
 
-	/* hack - double volume of chorus partner */
-	low_channel = voice[lowest].channel;
-	low_note = voice[lowest].note;
-	for (j = 0; j < i; j++) {
-		if (voice[j].status & VOICE_FREE) continue;
-		if (voice[j].channel == low_channel &&
-		    voice[j].note == low_note &&
-		    j != lowest) {
-		    	voice[j].left_mix <<= 1;
-		    	voice[j].right_mix <<= 1;
-			break;
-		}
-	}
+	/* hack - double volume of chorus partner, fix pan */
+	j = voice[lowest].chorus_link;
+	voice[j].velocity <<= 1;
+    	voice[j].panning = channel[voice[lowest].channel].panning;
+    	recompute_amp(j);
+    	apply_envelope_to_amp(j);
 
-	voice[lowest].status = VOICE_FREE;
+	free_voice(lowest);
 	if(!prescanning_flag)
 	    ctl_note_event(lowest);
 	return lowest;
@@ -1106,7 +1096,7 @@
     }
     if(lowest != -0x7FFFFFFF)
     {
-	voice[lowest].status = VOICE_FREE;
+	free_voice(lowest);
 	if(!prescanning_flag)
 	    ctl_note_event(lowest);
 	return lowest;
@@ -1129,8 +1119,8 @@
 	    lowest = j;
 	}
     }
-    
-    voice[lowest].status = VOICE_FREE;
+
+    free_voice(lowest);
     if(!prescanning_flag)
 	ctl_note_event(lowest);
     return lowest;
@@ -1187,6 +1177,20 @@
   return reduce_voice();
 }
 
+void free_voice(int v1)
+{
+    int v2;
+
+    v2 = voice[v1].chorus_link;
+    if(v1 != v2)
+    {
+	/* Unlink chorus link */
+	voice[v1].chorus_link = v1;
+	voice[v2].chorus_link = v2;
+    }
+    voice[v1].status = VOICE_FREE;
+}
+
 static int find_free_voice(void)
 {
     int i, nv = voices, lowest;
@@ -1222,7 +1226,7 @@
     }
     if(lowest != -1 && !prescanning_flag)
     {
-	voice[lowest].status = VOICE_FREE;
+	free_voice(lowest);
 	ctl_note_event(lowest);
     }
     return lowest;
@@ -1377,10 +1381,12 @@
   ch = e->channel;
 
   note = MIDI_EVENT_NOTE(e);
-  voice[i].status=VOICE_ON;
-  voice[i].channel=ch;
-  voice[i].note=note;
-  voice[i].velocity=e->b;
+  voice[i].status = VOICE_ON;
+  voice[i].channel = ch;
+  voice[i].note = note;
+  voice[i].velocity = e->b;
+  voice[i].chorus_link = i;	/* No link */
+
   j = channel[ch].special_sample;
   if(j == 0 || special_patch[j] == NULL)
       voice[i].sample_offset = 0;
@@ -1395,7 +1401,7 @@
       }
       else if(voice[i].sample_offset > voice[i].sample->data_length)
       {
-	  voice[i].status = VOICE_FREE;
+	  free_voice(i);
 	  return;
       }
   }
@@ -1441,6 +1447,7 @@
   else
       voice[i].panning = voice[i].sample->panning;
 
+  voice[i].porta_control_counter = 0;
   if(channel[ch].portamento && !channel[ch].porta_control_ratio)
       update_portamento_controls(ch);
   if(channel[ch].porta_control_ratio)
@@ -1489,131 +1496,197 @@
 
 static void finish_note(int i)
 {
-  if (voice[i].sample->modes & MODES_ENVELOPE)
+    if (voice[i].sample->modes & MODES_ENVELOPE)
     {
-      /* We need to get the envelope out of Sustain stage. */
-      /* Note that voice[i].envelope_stage < 3 */
-      voice[i].status=VOICE_OFF;
-      voice[i].envelope_stage=3;
-      recompute_envelope(i);
-      apply_envelope_to_amp(i);
-      ctl_note_event(i);
+	/* We need to get the envelope out of Sustain stage. */
+	/* Note that voice[i].envelope_stage < 3 */
+	voice[i].status=VOICE_OFF;
+	voice[i].envelope_stage=3;
+	recompute_envelope(i);
+	apply_envelope_to_amp(i);
+	ctl_note_event(i);
     }
-  else
+    else
     {
-      /* Set status to OFF so resample_voice() will let this voice out
-         of its loop, if any. In any case, this voice dies when it
-         hits the end of its data (ofs>=data_length). */
-	if(voice[i].status != VOICE_OFF)
+	if(current_file_info->pcm_mode != PCM_MODE_NON)
 	{
-	    voice[i].status=VOICE_OFF;
+	    free_voice(i);
 	    ctl_note_event(i);
 	}
+	else
+	{
+	    /* Set status to OFF so resample_voice() will let this voice out
+		of its loop, if any. In any case, this voice dies when it
+		    hits the end of its data (ofs>=data_length). */
+	    if(voice[i].status != VOICE_OFF)
+	    {
+		voice[i].status = VOICE_OFF;
+		ctl_note_event(i);
+	    }
+	}
     }
 }
 
-static void new_chorus_voice(int v, int level)
+static void new_chorus_voice(int v1, int level)
 {
-    int cv, ch;
+    int v2, ch;
     uint8 vol;
 
-    if((cv = find_free_voice()) == -1)
+    if((v2 = find_free_voice()) == -1)
 	return;
-    ch = voice[v].channel;
+    ch = voice[v1].channel;
+    vol = voice[v1].velocity;
+    voice[v2] = voice[v1];	/* copy all parameters */
+
+    /* Choose lower voice index for base voice (v1) */
+    if(v1 > v2)
+    {
+	int tmp;
+	tmp = v1;
+	v1 = v2;
+	v2 = v1;
+    }
 
-    vol = voice[v].velocity;
-    voice[cv] = voice[v];
-    voice[v].velocity  = (uint8)(vol * CHORUS_VELOCITY_TUNING1);
-    voice[cv].velocity = (uint8)(vol * CHORUS_VELOCITY_TUNING2);
-    if (level > 42) level = 42;    /* higher levels detune notes too much */
+    /* v1: Base churos voice
+     * v2: Sub chorus voice (detuned)
+     */
+
+    voice[v1].velocity = (uint8)(vol * CHORUS_VELOCITY_TUNING1);
+    voice[v2].velocity = (uint8)(vol * CHORUS_VELOCITY_TUNING2);
+
+    /* Make doubled link v1 and v2 */
+    voice[v1].chorus_link = v2;
+    voice[v2].chorus_link = v1;
+
+    level >>= 2;		     /* scale level to a "better" value */
     if(channel[ch].pitchbend + level < 0x2000)
-        voice[cv].orig_frequency *= bend_fine[level];
+        voice[v2].orig_frequency *= bend_fine[level];
     else
-	voice[cv].orig_frequency /= bend_fine[level];
-    voice[cv].cache = NULL;
+	voice[v2].orig_frequency /= bend_fine[level];
+    voice[v2].cache = NULL;
 
     /* set panning & delay */
-    if(play_mode->encoding & PE_MONO)
-	voice[cv].delay = 0;
-    else
+    if(!(play_mode->encoding & PE_MONO))
     {
 	double delay;
 
-	if(voice[cv].panned == PANNED_CENTER)
+	if(voice[v2].panned == PANNED_CENTER)
 	{
-	    static int cpan[MAX_CHANNELS];
-	    voice[cv].panning = 32 + cpan[ch];
-	    cpan[ch] = (((cpan[ch] + 1) & 63));
-	    delay = DEFAULT_CHORUS_DELAY2;
+	    voice[v2].panning = 64 + int_rand(40) - 20; /* 64 +- rand(20) */
+	    delay = 0;
 	}
 	else
 	{
-	    int panning = voice[cv].panning;
+	    int panning = voice[v2].panning;
 
 	    if(panning < CHORUS_OPPOSITE_THRESHOLD)
 	    {
-		voice[cv].panning = 127;
+		voice[v2].panning = 127;
 		delay = DEFAULT_CHORUS_DELAY1;
 	    }
 	    else if(panning > 127 - CHORUS_OPPOSITE_THRESHOLD)
 	    {
-		voice[cv].panning = 0;
+		voice[v2].panning = 0;
 		delay = DEFAULT_CHORUS_DELAY1;
 	    }
 	    else
 	    {
-		voice[cv].panning = (panning < 64 ? 0 : 127);
+		voice[v2].panning = (panning < 64 ? 0 : 127);
 		delay = DEFAULT_CHORUS_DELAY2;
 	    }
 	}
-	voice[cv].delay = (int)(play_mode->rate * delay);
+	voice[v2].delay += (int)(play_mode->rate * delay);
     }
 
-    recompute_amp(v);
-    apply_envelope_to_amp(v);
-    recompute_amp(cv);
-    apply_envelope_to_amp(cv);
-    recompute_freq(cv);
+    recompute_amp(v1);
+    apply_envelope_to_amp(v1);
+    recompute_amp(v2);
+    apply_envelope_to_amp(v2);
+
+    /* voice[v2].orig_frequency is changed.
+     * Update the depened parameters.
+     */
+    recompute_freq(v2);
 }
 
 /* Yet another chorus implementation
  *	by Eric A. Welsh <ewelsh@gpc.wustl.edu>.
  */
-static void new_chorus_voice_alternate(int v, int level)
+static void new_chorus_voice_alternate(int v1, int level)
 {
-    int cv, ch;
+    int v2, ch, panlevel;
     uint8 vol, pan;
+    double delay;
 
-    if((cv = find_free_voice()) == -1)
-      return;
-    ch = voice[v].channel;
-
-    vol = voice[v].velocity;
-    voice[cv] = voice[v];
-    voice[v].velocity  = (uint8)(vol * CHORUS_VELOCITY_TUNING1);
-    voice[cv].velocity = (uint8)(vol * CHORUS_VELOCITY_TUNING2);
+    if((v2 = find_free_voice()) == -1)
+	return;
+    ch = voice[v1].channel;
+    voice[v2] = voice[v1];
 
-    /* set panning & delay */
-    if(play_mode->encoding & PE_MONO)
-      voice[cv].delay = 0;
-    else
+    /* Choose lower voice index for base voice (v1) */
+    if(v1 > v2)
     {
-      double delay;
+	int tmp;
+	tmp = v1;
+	v1 = v2;
+	v2 = v1;
+    }
 
-      pan = voice[v].panning;
-      if (pan - level < 0) level = pan;
-      if (pan + level > 127) level = 127 - pan;
-      voice[v].panning -= level;
-      voice[cv].panning += level;
-      delay = DEFAULT_CHORUS_DELAY2;
+    /* lower the volumes so that the two notes add to roughly the orig. vol */
+    vol = voice[v1].velocity;
+    voice[v1].velocity  = (uint8)(vol * CHORUS_VELOCITY_TUNING2);
+    voice[v2].velocity  = (uint8)(vol * CHORUS_VELOCITY_TUNING2);
 
-      voice[cv].delay = (int)(play_mode->rate * delay);
+    /* Make doubled link v1 and v2 */
+    voice[v1].chorus_link = v2;
+    voice[v2].chorus_link = v1;
+
+    /* detune notes for chorus effect */
+    level >>= 2;		/* scale to a "better" value */
+    if (level)
+    {
+        if(channel[ch].pitchbend + level < 0x2000)
+            voice[v2].orig_frequency *= bend_fine[level];
+        else
+	    voice[v2].orig_frequency /= bend_fine[level];
+        voice[v2].cache = NULL;
     }
 
-    recompute_amp(v);
-    apply_envelope_to_amp(v);
-    recompute_amp(cv);
-    apply_envelope_to_amp(cv);
+    /* set panning & delay for pseudo-surround effect */
+    if(play_mode->encoding & PE_MONO)
+        voice[v2].delay += DEFAULT_CHORUS_DELAY2;   /* delay sounds good */
+    else
+    {
+        pan = voice[v1].panning;
+        panlevel = 63;
+        if (pan - panlevel < 1) panlevel = pan - 1;
+        if (pan + panlevel > 127) panlevel = 127 - pan;
+        voice[v1].panning -= panlevel;
+        voice[v2].panning += panlevel;
+
+        delay = DEFAULT_CHORUS_DELAY2;
+
+        /* choose which voice is delayed based on panning */
+        if (voice[v1].panned == PANNED_CENTER) {
+            /* randomly choose which voice is delayed */
+            if (int_rand(2))
+                voice[v1].delay += (int)(play_mode->rate * delay);
+            else
+                voice[v2].delay += (int)(play_mode->rate * delay);
+        }
+        else if (pan - 64 < 0) {
+            voice[v2].delay += (int)(play_mode->rate * delay);
+        }
+        else {
+            voice[v1].delay += (int)(play_mode->rate * delay);
+        }
+    }
+
+    recompute_amp(v1);
+    apply_envelope_to_amp(v1);
+    recompute_amp(v2);
+    apply_envelope_to_amp(v2);
+    if (level) recompute_freq(v2);
 }
 
 static void note_on(MidiEvent *e)
@@ -1640,7 +1713,8 @@
 	    ctl_mode_event(CTLE_PANNING, 1, ch, channel[ch].panning);
 	}
 	start_note(e, v, vid, nv - i - 1);
-	if(channel[ch].chorus_level && voice[v].sample->sample_rate)
+	if((channel[ch].chorus_level || opt_surround_chorus) &&
+	    voice[v].sample->sample_rate)
 	{
 	    if(opt_surround_chorus)
 		new_chorus_voice_alternate(v, channel[ch].chorus_level);
@@ -1786,15 +1860,62 @@
 
 static void adjust_panning(int c)
 {
-  int i, uv = upper_voices, pan = channel[c].panning;
-  for(i = 0; i < uv; i++)
-    if ((voice[i].channel==c) &&
-	(voice[i].status & (VOICE_ON | VOICE_SUSTAINED)))
-      {
-	voice[i].panning = pan;
-	recompute_amp(i);
-	apply_envelope_to_amp(i);
-      }
+    int i, uv = upper_voices, pan = channel[c].panning;
+    for(i = 0; i < uv; i++)
+    {
+	if ((voice[i].channel==c) &&
+	    (voice[i].status & (VOICE_ON | VOICE_SUSTAINED)))
+	{
+	    /* Hack to handle -EFchorus=2 in a "reasonable" way */
+	    if((channel[c].chorus_level || opt_surround_chorus) &&
+	       voice[i].sample->sample_rate &&
+	       voice[i].chorus_link != i)
+	    {
+		int v1, v2;
+
+		if(i >= voice[i].chorus_link)
+		    /* `i' is not base chorus voice.
+		     *  This sub voice is already updated.
+		     */
+		    continue;
+
+		v1 = i;				/* base voice */
+		v2 = voice[i].chorus_link;	/* sub voice (detuned) */
+
+		if(opt_surround_chorus) /* Surround chorus mode by Eric. */
+		{
+		    int panlevel;
+
+		    panlevel = 63;
+		    if (pan - panlevel < 1) panlevel = pan - 1;
+		    if (pan + panlevel > 127) panlevel = 127 - pan;
+		    voice[v1].panning = pan - panlevel;
+		    voice[v2].panning = pan + panlevel;
+		}
+		else
+		{
+		    voice[v1].panning = pan;
+		    if(pan > 60 && pan < 68) /* PANNED_CENTER */
+			voice[v2].panning =
+			    64 + int_rand(40) - 20; /* 64 +- rand(20) */
+		    else if(pan < CHORUS_OPPOSITE_THRESHOLD)
+			voice[v2].panning = 127;
+		    else if(pan > 127 - CHORUS_OPPOSITE_THRESHOLD)
+			voice[v2].panning = 0;
+		    else
+			voice[v2].panning = (pan < 64 ? 0 : 127);
+		}
+		recompute_amp(v2);
+		apply_envelope_to_amp(v2);
+		/* v1 == i, so v1 will be updated next */
+	    }
+	    else
+		voice[i].panning = pan;
+
+	    recompute_amp(i);
+	    apply_envelope_to_amp(i);
+	}
+    }
 }
 
 static void play_midi_setup_drums(int ch, int note)
@@ -2722,7 +2843,9 @@
     {
 	if(voices == MAX_VOICES)
 	    break;
-	voice[voices++].status = VOICE_FREE;
+	voice[voices].status = VOICE_FREE;
+	voice[voices].chorus_link = voices;
+	voices++;
     }
     if(n > 0)
 	ctl_mode_event(CTLE_MAXVOICES, 1, voices, 0);
@@ -2771,7 +2894,7 @@
 	if(lowest != -1)
 	{
 	    cut_notes++;
-	    voice[lowest].status = VOICE_FREE;
+	    free_voice(lowest);
 	    ctl_note_event(lowest);
 	    voice[lowest] = voice[voices];
 	}
@@ -2834,7 +2957,7 @@
 	{
 	    voices--;
 	    cut_notes++;
-	    voice[lowest].status = VOICE_FREE;
+	    free_voice(lowest);
 	    ctl_note_event(lowest);
 	    voice[lowest] = voice[voices];
 	}
@@ -3120,7 +3243,7 @@
     return jump_flag ? RC_JUMP : RC_NONE;
 }
 
-static void do_compute_data(int32 count)
+static void do_compute_data_midi(int32 count)
 {
     int i, uv, stereo, n;
     int32 *vpblist[MAX_CHANNELS];
@@ -3220,6 +3343,66 @@
     current_sample += count;
 }
 
+static void do_compute_data_wav(int32 count)
+{
+    int i, stereo, n, file_byte, samples;
+
+    stereo = !(play_mode->encoding & PE_MONO);
+    samples = (stereo ? (count * 2) : count );
+    n = samples*4; /* in bytes */
+    file_byte = samples*2; /*regard as 16bit*/
+
+    memset(buffer_pointer, 0, n);
+
+    tf_read(wav_buffer, 1, file_byte, current_file_info->pcm_tf);
+    for( i=0; i<samples; i++ ){
+    	buffer_pointer[i] = (LE_SHORT(wav_buffer[i])) << 16;
+    	buffer_pointer[i] /=4; /*level down*/
+    }
+
+    current_sample += count;
+}
+
+static void do_compute_data_aiff(int32 count)
+{
+    int i, stereo, n, file_byte, samples;
+
+    stereo = !(play_mode->encoding & PE_MONO);
+    samples = (stereo ? (count * 2) : count );
+    n = samples*4; /* in bytes */
+    file_byte = samples*2; /*regard as 16bit*/
+
+    memset(buffer_pointer, 0, n);
+
+    tf_read(wav_buffer, 1, file_byte, current_file_info->pcm_tf);
+    for( i=0; i<samples; i++ ){
+    	buffer_pointer[i] = (BE_SHORT(wav_buffer[i])) << 16;
+    	buffer_pointer[i] /=4; /*level down*/
+    }
+
+    current_sample += count;
+}
+
+static void do_compute_data(int32 count)
+{
+    switch(current_file_info->pcm_mode)
+    {
+      case PCM_MODE_NON:
+    	do_compute_data_midi(count);
+      	break;
+      case PCM_MODE_WAV:
+    	do_compute_data_wav(count);
+        break;
+      case PCM_MODE_AIFF:
+    	do_compute_data_aiff(count);
+        break;
+      case PCM_MODE_AU:
+        break;
+      case PCM_MODE_MP3:
+        break;
+    }    
+}
+
 static int check_midi_play_end(MidiEvent *e, int len)
 {
     int i, type;
@@ -3514,7 +3697,7 @@
 		      /* Tell VOICE_DIE to interface */
 		      voice[v].status = VOICE_DIE;
 		      ctl_note_event(v);
-		      voice[v].status = VOICE_FREE;
+		      free_voice(v);
 		  }
 
 		  /* lower max # of allowed voices to let the buffer recover */
@@ -4040,6 +4223,111 @@
     return rc;
 }
 
+static void read_header_wav(struct timidity_file* tf)
+{
+    char buff[44];
+    tf_read( buff, 1, 44, tf);
+}
+
+static int read_header_aiff(struct timidity_file* tf)
+{
+    char buff[5]="    ";
+    int i;
+    
+    for( i=0; i<100; i++ ){
+    	buff[0]=buff[1]; buff[1]=buff[2]; buff[2]=buff[3];
+    	tf_read( &buff[3], 1, 1, tf);
+    	if( strcmp(buff,"SSND")==0 ){
+            /*SSND chunk found */
+    	    tf_read( &buff[0], 1, 4, tf);
+    	    tf_read( &buff[0], 1, 4, tf);
+	    ctl->cmsg(CMSG_INFO, VERB_NOISY,
+		      "aiff header read OK.");
+	    return 0;
+    	}
+    }
+    /*SSND chunk not found */
+    return -1;
+}
+
+static int load_pcm_file_wav()
+{
+    char *filename;
+
+    if(strcmp(pcm_alternate_file, "auto") == 0)
+    {
+	filename = safe_malloc(strlen(current_file_info->filename)+5);
+	strcpy(filename, current_file_info->filename);
+	strcat(filename, ".wav");
+    }
+    else if(strlen(pcm_alternate_file) >= 5 &&
+	    strncasecmp(pcm_alternate_file + strlen(pcm_alternate_file) - 4,
+			".wav", 4) == 0)
+	filename = safe_strdup(pcm_alternate_file);
+    else
+	return -1;
+
+    ctl->cmsg(CMSG_INFO, VERB_NOISY,
+		      "wav filename: %s", filename);
+    current_file_info->pcm_tf = open_file(filename, 0, OF_SILENT);
+    if( current_file_info->pcm_tf ){
+	ctl->cmsg(CMSG_INFO, VERB_NOISY,
+		      "open successed.");
+	read_header_wav(current_file_info->pcm_tf);
+	current_file_info->pcm_filename = filename;
+	current_file_info->pcm_mode = PCM_MODE_WAV;
+	return 0;
+    }else{
+	ctl->cmsg(CMSG_INFO, VERB_NOISY,
+		      "open failed.");
+	free(filename);
+	current_file_info->pcm_filename = NULL;
+	return -1;
+    }
+}
+
+static int load_pcm_file_aiff()
+{
+    char *filename;
+
+    if(strcmp(pcm_alternate_file, "auto") == 0)
+    {
+	filename = safe_malloc(strlen(current_file_info->filename)+6);
+	strcpy(filename, current_file_info->filename);
+	strcat( filename, ".aiff");
+    }
+    else if(strlen(pcm_alternate_file) >= 6 &&
+	    strncasecmp(pcm_alternate_file + strlen(pcm_alternate_file) - 5,
+			".aiff", 5) == 0)
+	filename = safe_strdup(pcm_alternate_file);
+    else
+	return -1;
+
+    ctl->cmsg(CMSG_INFO, VERB_NOISY,
+		      "aiff filename: %s", filename);
+    current_file_info->pcm_tf = open_file(filename, 0, OF_SILENT);
+    if( current_file_info->pcm_tf ){
+	ctl->cmsg(CMSG_INFO, VERB_NOISY,
+		      "open successed.");
+	read_header_aiff(current_file_info->pcm_tf);
+	current_file_info->pcm_filename = filename;
+	current_file_info->pcm_mode = PCM_MODE_AIFF;
+	return 0;
+    }else{
+	ctl->cmsg(CMSG_INFO, VERB_NOISY,
+		      "open failed.");
+	free(filename);
+	current_file_info->pcm_filename = NULL;
+	return -1;
+    }
+}
+
+static void load_pcm_file()
+{
+    if( load_pcm_file_wav()==0 ) return; /*load OK*/
+    if( load_pcm_file_aiff()==0 ) return; /*load OK*/
+}
+
 static int play_midi_load_file(char *fn,
 			       MidiEvent **event,
 			       int32 *nsamples)
@@ -4087,19 +4375,35 @@
 	      *nsamples / play_mode->rate / 60,
 	      (*nsamples / play_mode->rate) % 60);
 
-    rc = RC_NONE;
-    if(!opt_realtime_playing && !IS_CURRENT_MOD_FILE
-       && (play_mode->flag&PF_PCM_STREAM))
+    current_file_info->pcm_mode = PCM_MODE_NON; /*initialize*/
+    if(pcm_alternate_file != NULL &&
+       strcmp(pcm_alternate_file, "none") != 0 &&
+       (play_mode->flag&PF_PCM_STREAM))
+	load_pcm_file();
+
+    if(!IS_CURRENT_MOD_FILE &&
+       (play_mode->flag&PF_PCM_STREAM))
     {
-	load_missing_instruments(&rc);
-	if(RC_IS_SKIP_FILE(rc))
+	/* FIXME: Instruments is not need for pcm_alternate_file. */
+
+	/* Load instruments
+	 * If opt_realtime_playing, the instruments will be loaded later.
+	 */
+	if(!opt_realtime_playing)
 	{
-	    /* Interupted instrument loading */
-	    ctl_mode_event(CTLE_LOADING_DONE, 0, 1, 0);
-	    clear_magic_instruments();
-	    return rc;
+	    rc = RC_NONE;
+	    load_missing_instruments(&rc);
+	    if(RC_IS_SKIP_FILE(rc))
+	    {
+		/* Instrument loading is terminated */
+		ctl_mode_event(CTLE_LOADING_DONE, 0, 1, 0);
+		clear_magic_instruments();
+		return rc;
+	    }
 	}
     }
+    else
+	clear_magic_instruments();	/* Clear load markers */
 
     ctl_mode_event(CTLE_LOADING_DONE, 0, 0, 0);
 
@@ -4159,6 +4463,13 @@
 	memset(channel[i].drums, 0, sizeof(channel[i].drums));
 
   play_end:
+    if(current_file_info->pcm_tf){
+    	close_file(current_file_info->pcm_tf);
+    	current_file_info->pcm_tf = NULL;
+    	free( current_file_info->pcm_filename );
+    	current_file_info->pcm_filename = NULL;
+    }
+    
     if(wrdt->opened)
 	wrdt->end();
 
diff -ruN TiMidity++-2.7.0/timidity/playmidi.h TiMidity++-2.8.0/timidity/playmidi.h
--- TiMidity++-2.7.0/timidity/playmidi.h	Mon Oct  4 12:22:56 1999
+++ TiMidity++-2.8.0/timidity/playmidi.h	Fri Nov 19 10:51:05 1999
@@ -271,6 +271,8 @@
   int delay; /* Note ON delay samples */
   int32 timeout;
   struct cache_hash *cache;
+
+  uint8 chorus_link;	/* Chorus link */
 } Voice;
 
 /* Voice status options: */
@@ -342,6 +344,7 @@
 extern void playmidi_output_changed(int play_state);
 extern Instrument *play_midi_load_instrument(int dr, int bk, int prog);
 extern void midi_program_change(int ch, int prog);
+extern void free_voice(int v);
 
 /* For stream player */
 extern void playmidi_stream_init(void);
diff -ruN TiMidity++-2.7.0/timidity/readmidi.h TiMidity++-2.8.0/timidity/readmidi.h
--- TiMidity++-2.7.0/timidity/readmidi.h	Tue Oct 12 14:58:13 1999
+++ TiMidity++-2.8.0/timidity/readmidi.h	Fri Nov 12 16:37:50 1999
@@ -61,6 +61,14 @@
     XG_SYSTEM_MODE
 };
 
+enum {
+    PCM_MODE_NON = 0,
+    PCM_MODE_WAV,
+    PCM_MODE_AIFF,
+    PCM_MODE_AU,
+    PCM_MODE_MP3
+};
+
 #define IS_CURRENT_MOD_FILE \
 	(current_file_info && \
 	current_file_info->file_type >= 700 && \
@@ -94,6 +102,10 @@
     char *midi_data;
     int32 midi_data_size;
     int file_type;
+    
+    int pcm_mode;
+    char *pcm_filename;
+    struct timidity_file *pcm_tf;
 };
 
 extern int32 readmidi_set_track(int trackno, int rewindp);
diff -ruN TiMidity++-2.7.0/timidity/resample.c TiMidity++-2.8.0/timidity/resample.c
--- TiMidity++-2.7.0/timidity/resample.c	Wed Aug 25 17:11:45 1999
+++ TiMidity++-2.8.0/timidity/resample.c	Mon Nov 22 11:49:23 1999
@@ -126,6 +126,9 @@
 static sample_t *vib_resample_voice(int, int32 *, int);
 static sample_t *normal_resample_voice(int, int32 *, int);
 
+#ifdef PRECALC_LOOPS
+#define PRECALC_LOOP_COUNT(start, end, incr) (((end) - (start) + (incr) - 1) / (incr))
+#endif /* PRECALC_LOOPS */
 
 /*************** resampling with fixed increment *****************/
 
@@ -149,7 +152,7 @@
     ofs += count;
     if(ofs == le)
     {
-	vp->status=VOICE_FREE;
+	free_voice(v);
 	ctl_note_event(v);
 	*countptr = count;
     }
@@ -186,7 +189,7 @@
 
   /* Precalc how many times we should go through the loop.
      NOTE: Assumes that incr > 0 and that ofs <= le */
-  i = (le - ofs) / incr + 1;
+  i = PRECALC_LOOP_COUNT(ofs, le, incr);
 
   if (i > count)
     {
@@ -204,7 +207,7 @@
   if (ofs >= le)
     {
       FINALINTERP;
-      vp->status=VOICE_FREE;
+      free_voice(v);
       ctl_note_event(v);
       *countptr-=count+1;
     }
@@ -216,7 +219,7 @@
       if (ofs >= le)
 	{
 	  FINALINTERP;
-	  vp->status=VOICE_FREE;
+	  free_voice(v);
  	  ctl_note_event(v);
 	  *countptr-=count+1;
 	  break;
@@ -287,7 +290,7 @@
       while (ofs >= le)
 	ofs -= ll;
       /* Precalc how many times we should go through the loop */
-      i = (le - ofs) / incr + 1;
+      i = PRECALC_LOOP_COUNT(ofs, le, incr);
       if (i > count)
 	{
 	  i = count;
@@ -333,12 +336,12 @@
     i, j;
   /* Play normally until inside the loop region */
 
-  if (ofs <= ls)
+  if (incr > 0 && ofs < ls)
     {
       /* NOTE: Assumes that incr > 0, which is NOT always the case
 	 when doing bidirectional looping.  I have yet to see a case
 	 where both ofs <= ls AND incr < 0, however. */
-      i = (ls - ofs) / incr + 1;
+      i = PRECALC_LOOP_COUNT(ofs, ls, incr);
       if (i > count)
 	{
 	  i = count;
@@ -357,7 +360,7 @@
   while(count)
     {
       /* Precalc how many times we should go through the loop */
-      i = ((incr > 0 ? le : ls) - ofs) / incr + 1;
+      i = PRECALC_LOOP_COUNT(ofs, incr > 0 ? le : ls, incr);
       if (i > count)
 	{
 	  i = count;
@@ -545,7 +548,7 @@
       if (ofs >= le)
 	{
 	  FINALINTERP;
-	  vp->status=VOICE_FREE;
+	  free_voice(v);
  	  ctl_note_event(v);
 	  *countptr-=count+1;
 	  break;
@@ -588,7 +591,7 @@
 	ofs -= ll;
       /* Precalc how many times to go through the loop, taking
 	 the vibrato control ratio into account this time. */
-      i = (le - ofs) / incr + 1;
+      i = PRECALC_LOOP_COUNT(ofs, le, incr);
       if(i > count) i = count;
       if(i > cc)
 	{
@@ -654,9 +657,9 @@
     vibflag = 0;
 
   /* Play normally until inside the loop region */
-  while (count && (ofs <= ls))
+  while (count && incr > 0 && ofs < ls)
     {
-      i = (ls - ofs) / incr + 1;
+      i = PRECALC_LOOP_COUNT(ofs, ls, incr);
       if (i > count) i = count;
       if (i > cc)
 	{
@@ -683,7 +686,7 @@
   while (count)
     {
       /* Precalc how many times we should go through the loop */
-      i = ((incr > 0 ? le : ls) - ofs) / incr + 1;
+      i = PRECALC_LOOP_COUNT(ofs, incr > 0 ? le : ls, incr);
       if(i > count) i = count;
       if(i > cc)
 	{
@@ -883,7 +886,7 @@
 	if(*countptr >= (vp->sample->data_length>>FRACTION_BITS) - ofs)
 	{
 	    /* Note finished. Free the voice. */
-	    vp->status = VOICE_FREE;
+	    free_voice(v);
 	    ctl_note_event(v);
 
 	    /* Let the caller know how much data we had left */
@@ -902,13 +905,13 @@
 	if(mode & MODES_PINGPONG)
 	{
 	    vp->cache = NULL;
-	    mode = 2;
+	    mode = 2;	/* Bidir loop */
 	}
 	else
-	    mode = 0;
+	    mode = 0;	/* loop */
     }
     else
-	mode = 1;
+	mode = 1;	/* no loop */
 
     if(vp->porta_control_ratio)
 	return porta_resample_voice(v, countptr, mode);
diff -ruN TiMidity++-2.7.0/timidity/timidity.c TiMidity++-2.8.0/timidity/timidity.c
--- TiMidity++-2.7.0/timidity/timidity.c	Tue Oct 12 19:12:22 1999
+++ TiMidity++-2.8.0/timidity/timidity.c	Fri Nov 19 10:11:24 1999
@@ -77,13 +77,14 @@
 #define DEFINE_GLOBALS
 #include "mid.defs"
 #include "aq.h"
+#include "mix.h"
 
 #ifdef IA_W32GUI
 #include "w32g.h"
 #include "w32g_utl.h"
 #endif
 
-#define OPTCOMMANDS "4A:aB:b:C:c:D:d:eE:Ffg:hI:i:jk:L:n:O:o:P:p:Q:q:R:rS:s:t:UW:w:x:Z:"
+#define OPTCOMMANDS "4A:aB:b:C:c:D:d:E:eFfg:hI:i:jk:L:M:m:n:O:o:P:p:Q:q:R:rS:s:t:UW:w:x:Z:"
 #define INTERACTIVE_INTERFACE_IDS "kmqagrw"
 
 /* main interfaces (To be used another main) */
@@ -191,6 +192,12 @@
  */
 int effect_lr_delay_msec = 25;
 
+extern char* pcm_alternate_file;
+/* NULL, "none": disabled (default)
+ * "auto":       automatically selected
+ * filename:     use the one.
+ */
+
 #ifndef atof
 extern double atof(const char *);
 #endif
@@ -400,6 +407,10 @@
 "  -j      Realtime load instrument (toggle on/off)",
 "  -k msec Specify audio queue time limit to reduce voice",
 "  -L dir  Append dir to search path",
+"  -M name Specify PCM filename (*.wav or *.aiff) to be played or:",
+"          \"auto\": Play *.mid.wav or *.mid.aiff",
+"          \"none\": Disable this feature (default)",
+"  -m msec Minimum time for a full volume sustained note to decay, 0 disables",
 "  -O mode Select output mode and format (see below for list)",
 "  -o file Output to another file (or device/server)  (Use \"-\" for stdout)",
 "  -P file Use patch file for all programs",
@@ -531,8 +542,8 @@
 "  -EFchorus=0 : Disable MIDI chorus effect control" NLS
 "  -EFchorus=1[,level] : Enable MIDI chorus effect control" NLS
 "                        `level' is optional to specify chorus level [0..127]"  NLS
-"  -EFchorus=2[,level] : Use the surround sound instead of detuned chorus." NLS
-"                        `level' is optional to specify level [0..63]" NLS
+"  -EFchorus=2[,level] : Surround sound, chorus detuned to a lesser degree." NLS
+"                        `level' is optional to specify chorus level [0..127]" NLS
 "  -EFreverb=0 : Disable MIDI reverb effect control" NLS
 "  -EFreverb=1[,level] : Enable MIDI reverb effect control" NLS
 "                        `level' is optional to specify reverb level [0..127]"  NLS
@@ -2209,11 +2220,6 @@
     return 1;
 }
 
-static int str2mid(char *s)
-{
-    
-}
-
 int set_extension_modes(char *flag)
 {
     int err;
@@ -2542,6 +2548,17 @@
 	add_to_pathlist(optarg);
 	try_config_again = 1;
 	break;
+
+      case 'M':
+	if(pcm_alternate_file != NULL)
+	    free(pcm_alternate_file);
+	pcm_alternate_file = safe_strdup(optarg);
+	break;
+
+      case 'm':
+        min_sustain_time = atoi(optarg);
+        if(min_sustain_time < 0) min_sustain_time = 0;
+        break;
 
       case 'n': 
 	ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
diff -ruN TiMidity++-2.7.0/timidity/timidity.h TiMidity++-2.8.0/timidity/timidity.h
--- TiMidity++-2.7.0/timidity/timidity.h	Tue Sep  7 01:23:08 1999
+++ TiMidity++-2.8.0/timidity/timidity.h	Thu Nov  4 21:14:15 1999
@@ -143,6 +143,10 @@
 #define CONTROLS_PER_SECOND 1000
 
 
+#if !defined(LINEAR_INTERPOLATION) && \
+    !defined(CSPLINE_INTERPOLATION) && \
+    !defined(LAGRANGE_INTERPOLATION) && \
+    !defined(NO_INTERPOLATION)
 /* Strongly recommended. This option increases CPU usage by half, but
    without it sound quality is very poor. */
 #define LINEAR_INTERPOLATION
@@ -153,6 +157,7 @@
    interpolation by Lagrange method. */
 /* #define CSPLINE_INTERPOLATION */
 /* #define LAGRANGE_INTERPOLATION */
+#endif
 
 
 /* This is an experimental kludge that needs to be done right, but if
diff -ruN TiMidity++-2.7.0/timidity/wrd_read.c TiMidity++-2.8.0/timidity/wrd_read.c
--- TiMidity++-2.7.0/timidity/wrd_read.c	Thu Sep  9 00:11:20 1999
+++ TiMidity++-2.8.0/timidity/wrd_read.c	Fri Nov 19 10:41:48 1999
@@ -2003,6 +2003,11 @@
 		{
 		  case 0x00: /* end of header */
 		    return;
+		  case 0x20:
+		    if( mimpi_bug_emulation_level >= 1 ){
+		      sry_timebase21(wrdstep, SRY_GET_SHORT(packet.data+1));
+		    }
+		    break;
 		  case 0x21:
 		    sry_timebase21(wrdstep, SRY_GET_SHORT(packet.data+1));
 		    break;
diff -ruN TiMidity++-2.7.0/utils/mac_readdir.c TiMidity++-2.8.0/utils/mac_readdir.c
--- TiMidity++-2.7.0/utils/mac_readdir.c	Sat Aug  7 22:42:45 1999
+++ TiMidity++-2.8.0/utils/mac_readdir.c	Sat Oct 30 12:23:32 1999
@@ -28,3 +28,19 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 #include "mac_readdir.h"
+
+DIR *opendir(const char * /*name*/)
+{
+	return NULL; //dummy
+}
+
+int closedir(DIR * /*dir*/)
+{
+	return 0; //dummy
+}
+
+struct dirent* readdir( DIR * /*p*/)
+{
+	return NULL; //dummy
+}
+
diff -ruN TiMidity++-2.7.0/utils/mac_util.c TiMidity++-2.8.0/utils/mac_util.c
--- TiMidity++-2.7.0/utils/mac_util.c	Sat Aug  7 22:42:45 1999
+++ TiMidity++-2.8.0/utils/mac_util.c	Sat Oct 30 12:23:32 1999
@@ -123,6 +123,22 @@
 	return GetControlValue(itemHandle);
 }
 
+void SetDialogTEValue(DialogRef dialog, short item, int value)
+{
+	Str255		s;
+	
+	NumToString(value, s);
+	mySetDialogItemText(dialog, item, s);
+}
+
+int GetDialogTEValue(DialogRef dialog, short item )
+{
+	Str255		s;
+	
+	myGetDialogItemText(dialog, item, s);
+	return atof(p2cstr(s));
+}
+
 short ToggleDialogItem(DialogPtr dialog, short item )
 {
 	short			itemType, value;
@@ -164,17 +180,18 @@
 	GetDialogItem(theDialog, itemNo, &itemType, &item, &box);
 	SetControlTitle((ControlRef)item, text);
 }
-// ************************************************
-/*void	mac_TransPathSeparater(char str[])
+
+void SetDialogItemHilite(DialogRef dialog, short item, short value)
 {
-	int i;
-	for( i=0; str[i]!=0; i++ ){
-		if( str[i]=='/' ){
-			str[i]=':';
-		}
-	}
-}*/
+	short		itemType;
+	ControlRef	itemHandle;
+	Rect		itemRect;
+	
+	GetDialogItem(dialog, item, &itemType, &itemHandle, &itemRect);
+	HiliteControl(itemHandle, value);
+}
 
+// ************************************************
 void    mac_TransPathSeparater(const char str[], char out[])
 {
 	int i;
diff -ruN TiMidity++-2.7.0/utils/mac_util.h TiMidity++-2.8.0/utils/mac_util.h
--- TiMidity++-2.7.0/utils/mac_util.h	Sat Aug  7 22:42:45 1999
+++ TiMidity++-2.8.0/utils/mac_util.h	Sat Oct 30 12:23:32 1999
@@ -31,10 +31,13 @@
 
 void	SetDialogItemValue(DialogPtr dialog, short item, short value);
 short	GetDialogItemValue(DialogPtr dialog, short item );
+void	SetDialogTEValue(DialogRef dialog, short item, int value);
+int	GetDialogTEValue(DialogRef dialog, short item );
 short	ToggleDialogItem(DialogPtr dialog, short item );
 void	myGetDialogItemText(DialogPtr theDialog, short itemNo, Str255 s);
 void	mySetDialogItemText(DialogRef theDialog, short itemNo, const Str255 text);
 void	SetDialogControlTitle(DialogRef theDialog, short itemNo, const Str255 text);
+void	SetDialogItemHilite(DialogRef dialog, short item, short value);
 void	mac_TransPathSeparater(const char str[], char out[]);
 void	LDeselectAll(ListHandle);
 void	TEReadFile(char* filename, TEHandle te);