diff -ruN TiMidity++-2.1.1/ChangeLog TiMidity++-2.2.0/ChangeLog
--- TiMidity++-2.1.1/ChangeLog	Fri Jul  9 18:17:34 1999
+++ TiMidity++-2.2.0/ChangeLog	Mon Jul 19 13:11:17 1999
@@ -1,4 +1,56 @@
-1999-06-09  Masanao Izumo <mo@goice.co.jp>
+1999-07-19  Masanao Izumo <mo@goice.co.jp>
+
+    * Version 2.2.0 released.
+
+1999-07-19  Masanao Izumo <mo@goice.co.jp>
+
+    * timidity/Makefile.am (EXTRA_timidity_SOURCES): Added timpp32g.ini
+    * interface/soundspec.c: Support screen depth 16, 24, and 32.
+
+1999-07-17  Masanao Izumo <mo@goice.co.jp>
+    * interface/w32g_c.c, timidity/{timidity.c,aq.c} (-q): New option.
+      `-q' specifiy size of software audio buffering.  The option format
+      is "-q m/n".
+	m:Maxmum buffer in second or percent of size of device driver buffer
+	n:Filled to start in second or percent of size of device driver buffer
+      The default is "5.0/100%".
+    * timidity/timidity.c (help): Arranged the help message of option in order.
+    * timidity/timidity.c (open_pager): In Windows console version, Enable
+      to pipe "PAGER" to display help message.  For example:
+      > set PAGER=more
+      > timidity -h
+    * configure.in (isatty): Check for `isatty' function.
+    * utils/{nkflib.c,net.c}, libarc/arc_zip.c,
+      interface/{xaw_i.c,gtk_i.c,x_wrdwindow.c,wrdt_x.c,ncurs_c.c},
+      timidity/{output.c,wrd_read.c,common.c}: Shut gcc warning up.
+    * configure.in: Fixed bug about X path option.
+    * timidity/timidity.h (NLS): Change to "\n" for cygwin.
+    * interface/gtk_c.c (trace_playing): False by default.
+    * interface/gtk_c.c (ctl_current_time): Update weather trace_playing
+      is true or false.
+    * interface/gtk_c.c (cmsg): Likewise.
+    * interface/gtk_c.c (_ctl_refresh): Obsoleted.
+
+1999-07-16  Eric A. Welsh <ewelsh@gpc.wustl.edu>
+
+    * timidity/playmidi.c (Voice reduction): Improved.
+      Powerful MIDI file less skip, and sound better!
+
+1999-07-13  Norikatsu Shigemura <nork@lb.u-tokai.ac.jp>
+
+    * timidity/nas_a.c: Fixed the probrem that occurs with
+      'timidity -On /dev/null'.
+    * configure.in: Fixed building for FreeBSD Objects.  Please specify
+      configure option '--with-elf' if you create ELF object, otherwise
+      create AOUT object.  This option is only for FreeBSD.
+
+1999-07-12  Masanao Izumo <mo@goice.co.jp>
+
+    * interface/{ncurs_c.c,vt100_c.c}: (reverb): Just remove about
+      reverb control interface.  It is not supported reverb control
+      interface in the current version yet.
+
+1999-07-09  Masanao Izumo <mo@goice.co.jp>
 
     * Version 2.1.1 released.
 
diff -ruN TiMidity++-2.1.1/config.h.in TiMidity++-2.2.0/config.h.in
--- TiMidity++-2.1.1/config.h.in	Wed Apr 21 10:50:31 1999
+++ TiMidity++-2.2.0/config.h.in	Sat Jul 17 15:39:25 1999
@@ -74,6 +74,9 @@
 /* Define if you have the gettimeofday function.  */
 #undef HAVE_GETTIMEOFDAY
 
+/* Define if you have the isatty function.  */
+#undef HAVE_ISATTY
+
 /* Define if you have the popen function.  */
 #undef HAVE_POPEN
 
diff -ruN TiMidity++-2.1.1/configure TiMidity++-2.2.0/configure
--- TiMidity++-2.1.1/configure	Fri Jul  9 16:52:57 1999
+++ TiMidity++-2.2.0/configure	Sat Jul 17 18:57:37 1999
@@ -14,6 +14,8 @@
 ac_help="$ac_help
   --enable-debug          Build a debugging version."
 ac_help="$ac_help
+  --with-elf              create ELF shared object instead of AOUT "
+ac_help="$ac_help
   --with-x                use the X Window System"
 ac_help="$ac_help
   --with-tcl-includes=dir Tcl include file path "
@@ -642,7 +644,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:646: checking host system type" >&5
+echo "configure:648: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -663,7 +665,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:667: checking target system type" >&5
+echo "configure:669: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -681,7 +683,7 @@
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:685: checking build system type" >&5
+echo "configure:687: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -715,7 +717,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:719: checking for a BSD compatible install" >&5
+echo "configure:721: 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
@@ -768,7 +770,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:772: checking whether build environment is sane" >&5
+echo "configure:774: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -825,7 +827,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:829: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:831: 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
@@ -854,7 +856,7 @@
 
 PACKAGE=TiMidity++
 
-VERSION=2.1.1
+VERSION=2.2.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; }
@@ -864,7 +866,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:868: checking for working aclocal" >&5
+echo "configure:870: 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.
@@ -877,7 +879,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:881: checking for working autoconf" >&5
+echo "configure:883: 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.
@@ -890,7 +892,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:894: checking for working automake" >&5
+echo "configure:896: 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.
@@ -903,7 +905,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:907: checking for working autoheader" >&5
+echo "configure:909: 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.
@@ -916,7 +918,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:920: checking for working makeinfo" >&5
+echo "configure:922: 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.
@@ -931,7 +933,7 @@
 
 
 echo $ac_n "checking whether grep returns status""... $ac_c" 1>&6
-echo "configure:935: checking whether grep returns status" >&5
+echo "configure:937: checking whether grep returns status" >&5
 echo "grimblepritz" >grimble
 if grep blurfldyick grimble >/dev/null 2>&1 ; then
 	contains="./contains"
@@ -966,7 +968,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:970: checking for $ac_word" >&5
+echo "configure:972: 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
@@ -1004,7 +1006,7 @@
 
   if test $EMACS != "no"; then
     echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:1008: checking where .elc files should go" >&5
+echo "configure:1010: 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
@@ -1075,8 +1077,8 @@
     CPPFLAGS="$CPPFLAGS -I${i}"
 done
 
-LDFLAGS="$LDFLAGS -L/usr/local/lib"
-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+LDFLAGS="$LDFLAGS -L${PREFIX:-/usr/local}/lib"
+CPPFLAGS="$CPPFLAGS -I${PREFIX:-/usr/local}/include"
 SHLDFLAGS=${SHLDFLAGS:-$LDFLAGS}
 
 if test "x$prefix" != xNONE -a "x$prefix" != "x$ac_default_prefix" -a "x$prefix" != "x/usr"; then
@@ -1089,7 +1091,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:1093: checking for $ac_word" >&5
+echo "configure:1095: 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
@@ -1119,7 +1121,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:1123: checking for $ac_word" >&5
+echo "configure:1125: 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
@@ -1170,7 +1172,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:1174: checking for $ac_word" >&5
+echo "configure:1176: 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
@@ -1202,7 +1204,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1206: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1208: 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.
@@ -1213,12 +1215,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1217 "configure"
+#line 1219 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1224: \"$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
@@ -1244,12 +1246,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:1248: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1250: 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:1253: checking whether we are using GNU C" >&5
+echo "configure:1255: 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
@@ -1258,7 +1260,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1262: \"$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:1264: \"$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
@@ -1277,7 +1279,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1281: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1283: 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
@@ -1320,7 +1322,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:1324: checking for a BSD compatible install" >&5
+echo "configure:1326: 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
@@ -1375,7 +1377,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:1379: checking for $ac_word" >&5
+echo "configure:1381: 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
@@ -1403,7 +1405,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1407: checking whether ln -s works" >&5
+echo "configure:1409: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1425,6 +1427,15 @@
 
 
 
+# Check whether --with-elf or --without-elf was given.
+if test "${with_elf+set}" = set; then
+  withval="$with_elf"
+   ELFFORMAT=$withval 
+else
+   ELFFORMAT="yes" 
+fi
+
+
 case "$target" in
   *-*-hpux*)
     EXTRADEFS="-DHPUX"
@@ -1441,24 +1452,29 @@
     so="so"
     ;;
 
-#  *-*-freebsd2*)
-#    EXTRALIBS="$EXTRALIBS -lxpg4"
-#    test -n "$SHLD" || SHLD="ld -Bshareable"
-#    so="so"
-#    ;;
+  *-*-freebsd2*)
+    EXTRALIBS="$EXTRALIBS -lxpg4"
+    test -n "$SHLD" || SHLD="ld -Bshareable"
+    so="so"
+    ;;
+  *-*-freebsd*)
+    if test "$ELFFORMAT" = yes; then
+        test -n "$SHLD" || SHLD="ld -Bshareable"
+    else
+        SHCFLAGS=-aout
+        SHLDFLAGS="-L/usr/X11R6/lib/aout $SHLDFLAGS"
+        test -n "$SHLD" || SHLD="env OBJFORMAT=aout ld -shared"
+    fi
+    EXTRALIBS="$EXTRALIBS -lxpg4"
+    so="so"
+    ;;
+
 #  *-*-freebsd*)
-#    SHCFLAGS=-aout
 #    EXTRALIBS="$EXTRALIBS -lxpg4"
-#    SHLDFLAGS="-L/usr/X11R6/lib/aout $SHLDFLAGS"
-#    test -n "$SHLD" || SHLD="env OBJFORMAT=aout ld -shared"
+#    test -n "$SHLD" || SHLD="ld -Bshareable"
 #    so="so"
 #    ;;
 
-  *-*-freebsd*)
-    EXTRALIBS="$EXTRALIBS -lxpg4"
-    test -n "$SHLD" || SHLD="ld -Bshareable"
-    so="so"
-    ;;
   *-*-cygwin32*)
     EXTRADEFS="-D__W32__"
     # ??
@@ -1493,12 +1509,12 @@
 esac
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1497: checking for Cygwin environment" >&5
+echo "configure:1513: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1502 "configure"
+#line 1518 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1509,7 +1525,7 @@
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:1513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -1526,19 +1542,19 @@
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1530: checking for mingw32 environment" >&5
+echo "configure:1546: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1535 "configure"
+#line 1551 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:1542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -1557,7 +1573,7 @@
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1561: checking for executable suffix" >&5
+echo "configure:1577: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1567,7 +1583,7 @@
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1589,7 +1605,7 @@
 
 
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:1593: checking for sqrt in -lm" >&5
+echo "configure:1609: 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
@@ -1597,7 +1613,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1601 "configure"
+#line 1617 "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
@@ -1608,7 +1624,7 @@
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:1612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1628: \"$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
@@ -1636,7 +1652,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:1640: checking for socket in -lsocket" >&5
+echo "configure:1656: 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
@@ -1644,7 +1660,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1648 "configure"
+#line 1664 "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
@@ -1655,7 +1671,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1675: \"$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
@@ -1683,7 +1699,7 @@
 fi
 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1687: checking for dlopen in -ldl" >&5
+echo "configure:1703: 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
@@ -1691,7 +1707,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1695 "configure"
+#line 1711 "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
@@ -1702,7 +1718,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1722: \"$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
@@ -1725,12 +1741,12 @@
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1729: checking for $ac_func" >&5
+echo "configure:1745: 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 1734 "configure"
+#line 1750 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1753,7 +1769,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1773: \"$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
@@ -1775,7 +1791,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1779: checking for gethostbyname in -lnsl" >&5
+echo "configure:1795: 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
@@ -1783,7 +1799,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1787 "configure"
+#line 1803 "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
@@ -1794,7 +1810,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1814: \"$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
@@ -1825,7 +1841,7 @@
 done
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1829: checking how to run the C preprocessor" >&5
+echo "configure:1845: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1840,13 +1856,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1844 "configure"
+#line 1860 "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:1850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1866: \"$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
   :
@@ -1857,13 +1873,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1861 "configure"
+#line 1877 "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:1867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1883: \"$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
   :
@@ -1874,13 +1890,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1878 "configure"
+#line 1894 "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:1884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1900: \"$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
   :
@@ -1909,7 +1925,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:1913: checking for X" >&5
+echo "configure:1929: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1971,12 +1987,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1975 "configure"
+#line 1991 "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:1980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1996: \"$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*
@@ -2045,14 +2061,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2049 "configure"
+#line 2065 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2072: \"$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.
@@ -2158,17 +2174,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:2162: checking whether -R must be followed by a space" >&5
+echo "configure:2178: 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 2165 "configure"
+#line 2181 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -2184,14 +2200,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 2188 "configure"
+#line 2204 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -2223,7 +2239,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:2227: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2243: 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
@@ -2231,7 +2247,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2235 "configure"
+#line 2251 "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
@@ -2242,7 +2258,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2262: \"$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
@@ -2264,7 +2280,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:2268: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2284: 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
@@ -2272,7 +2288,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2276 "configure"
+#line 2292 "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
@@ -2283,7 +2299,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2303: \"$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
@@ -2312,12 +2328,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:2316: checking for gethostbyname" >&5
+echo "configure:2332: 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 2321 "configure"
+#line 2337 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -2340,7 +2356,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2360: \"$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
@@ -2361,7 +2377,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2365: checking for gethostbyname in -lnsl" >&5
+echo "configure:2381: 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
@@ -2369,7 +2385,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2373 "configure"
+#line 2389 "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
@@ -2380,7 +2396,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2400: \"$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
@@ -2410,12 +2426,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:2414: checking for connect" >&5
+echo "configure:2430: 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 2419 "configure"
+#line 2435 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -2438,7 +2454,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2458: \"$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
@@ -2459,7 +2475,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2463: checking for connect in -lsocket" >&5
+echo "configure:2479: 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
@@ -2467,7 +2483,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2471 "configure"
+#line 2487 "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
@@ -2478,7 +2494,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2498: \"$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
@@ -2502,12 +2518,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:2506: checking for remove" >&5
+echo "configure:2522: 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 2511 "configure"
+#line 2527 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -2530,7 +2546,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2550: \"$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
@@ -2551,7 +2567,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2555: checking for remove in -lposix" >&5
+echo "configure:2571: 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
@@ -2559,7 +2575,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2563 "configure"
+#line 2579 "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
@@ -2570,7 +2586,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2590: \"$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
@@ -2594,12 +2610,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2598: checking for shmat" >&5
+echo "configure:2614: 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 2603 "configure"
+#line 2619 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -2622,7 +2638,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2642: \"$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
@@ -2643,7 +2659,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2647: checking for shmat in -lipc" >&5
+echo "configure:2663: 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
@@ -2651,7 +2667,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2655 "configure"
+#line 2671 "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
@@ -2662,7 +2678,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2682: \"$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
@@ -2695,7 +2711,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:2699: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2715: 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
@@ -2703,7 +2719,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2707 "configure"
+#line 2723 "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
@@ -2714,7 +2730,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2734: \"$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
@@ -2762,7 +2778,7 @@
   fi
 
   echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:2766: checking for XOpenDisplay in -lX11" >&5
+echo "configure:2782: 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
@@ -2770,7 +2786,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lX11  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2774 "configure"
+#line 2790 "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
@@ -2781,7 +2797,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2801: \"$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
@@ -2809,12 +2825,12 @@
 fi
 
   echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
-echo "configure:2813: checking X11 version 6" >&5
+echo "configure:2829: 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 2818 "configure"
+#line 2834 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int main() {
@@ -2824,7 +2840,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2844: \"$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
@@ -2844,7 +2860,7 @@
 
     KEEPLIBS=$LIBS
   echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
-echo "configure:2848: checking for XShapeCombineMask in -lXext" >&5
+echo "configure:2864: 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
@@ -2852,7 +2868,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXext  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2856 "configure"
+#line 2872 "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
@@ -2863,7 +2879,7 @@
 XShapeCombineMask()
 ; return 0; }
 EOF
-if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2883: \"$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
@@ -2885,7 +2901,7 @@
 fi
 
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2889: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2905: 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
@@ -2893,7 +2909,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2897 "configure"
+#line 2913 "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
@@ -2904,7 +2920,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2924: \"$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
@@ -2932,7 +2948,7 @@
 fi
 
   echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6
-echo "configure:2936: checking for SmcOpenConnection in -lSM" >&5
+echo "configure:2952: 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
@@ -2940,7 +2956,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lSM  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2944 "configure"
+#line 2960 "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
@@ -2951,7 +2967,7 @@
 SmcOpenConnection()
 ; return 0; }
 EOF
-if { (eval echo configure:2955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2971: \"$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
@@ -2973,7 +2989,7 @@
 fi
 
   echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:2977: checking for XtVaAppInitialize in -lXt" >&5
+echo "configure:2993: 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
@@ -2981,7 +2997,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2985 "configure"
+#line 3001 "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
@@ -2992,7 +3008,7 @@
 XtVaAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3012: \"$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
@@ -3014,7 +3030,7 @@
 fi
 
   echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6
-echo "configure:3018: checking for XmuInternAtom in -lXmu" >&5
+echo "configure:3034: 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
@@ -3022,7 +3038,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXmu  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3026 "configure"
+#line 3042 "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
@@ -3033,7 +3049,7 @@
 XmuInternAtom()
 ; return 0; }
 EOF
-if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3053: \"$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
@@ -3056,12 +3072,12 @@
   for ac_func in XmuRegisterExternalAgent
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3060: checking for $ac_func" >&5
+echo "configure:3076: 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 3065 "configure"
+#line 3081 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3084,7 +3100,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3104: \"$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
@@ -3109,7 +3125,7 @@
 done
 
   echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6
-echo "configure:3113: checking for XawInitializeWidgetSet in -lXaw3d" >&5
+echo "configure:3129: 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
@@ -3117,7 +3133,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw3d  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3121 "configure"
+#line 3137 "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
@@ -3128,7 +3144,7 @@
 XawInitializeWidgetSet()
 ; return 0; }
 EOF
-if { (eval echo configure:3132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3148: \"$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
@@ -3147,7 +3163,7 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6
-echo "configure:3151: checking for XawInitializeWidgetSet in -lXaw" >&5
+echo "configure:3167: 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
@@ -3155,7 +3171,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3159 "configure"
+#line 3175 "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
@@ -3166,7 +3182,7 @@
 XawInitializeWidgetSet()
 ; return 0; }
 EOF
-if { (eval echo configure:3170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3186: \"$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
@@ -3190,7 +3206,7 @@
 fi
 
   echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6
-echo "configure:3194: checking for XmCreateForm in -lXm" >&5
+echo "configure:3210: 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
@@ -3198,7 +3214,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3202 "configure"
+#line 3218 "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
@@ -3209,7 +3225,7 @@
 XmCreateForm()
 ; return 0; }
 EOF
-if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3229: \"$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
@@ -3233,12 +3249,12 @@
   for ac_func in XShmCreatePixmap
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3237: checking for $ac_func" >&5
+echo "configure:3253: 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 3242 "configure"
+#line 3258 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3261,7 +3277,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3281: \"$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
@@ -3294,12 +3310,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:3298: checking for $ac_hdr that defines DIR" >&5
+echo "configure:3314: 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 3303 "configure"
+#line 3319 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3307,7 +3323,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -3332,7 +3348,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:3336: checking for opendir in -ldir" >&5
+echo "configure:3352: 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
@@ -3340,7 +3356,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3344 "configure"
+#line 3360 "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
@@ -3351,7 +3367,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3371: \"$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
@@ -3373,7 +3389,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:3377: checking for opendir in -lx" >&5
+echo "configure:3393: 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
@@ -3381,7 +3397,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3385 "configure"
+#line 3401 "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
@@ -3392,7 +3408,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3412: \"$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
@@ -3415,12 +3431,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3419: checking for ANSI C header files" >&5
+echo "configure:3435: 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 3424 "configure"
+#line 3440 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3428,7 +3444,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3448: \"$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*
@@ -3445,7 +3461,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 3449 "configure"
+#line 3465 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3463,7 +3479,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 3467 "configure"
+#line 3483 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3484,7 +3500,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3488 "configure"
+#line 3504 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3495,7 +3511,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3519,12 +3535,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3523: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3539: 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 3528 "configure"
+#line 3544 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3540,7 +3556,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3568,17 +3584,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3572: checking for $ac_hdr" >&5
+echo "configure:3588: 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 3577 "configure"
+#line 3593 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3598: \"$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*
@@ -3606,17 +3622,17 @@
 
 ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for string.h""... $ac_c" 1>&6
-echo "configure:3610: checking for string.h" >&5
+echo "configure:3626: 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 3615 "configure"
+#line 3631 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3636: \"$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*
@@ -3640,12 +3656,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3644: checking for working const" >&5
+echo "configure:3660: 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 3649 "configure"
+#line 3665 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3694,7 +3710,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3715,14 +3731,14 @@
 fi
 
 echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:3719: checking whether char is unsigned" >&5
+echo "configure:3735: 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 3726 "configure"
+#line 3742 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -3744,7 +3760,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3748 "configure"
+#line 3764 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -3754,7 +3770,7 @@
   volatile char c = 255; exit(c < 0);
 }
 EOF
-if { (eval echo configure:3758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3774: \"$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
@@ -3778,14 +3794,14 @@
 fi
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3782: checking whether byte ordering is bigendian" >&5
+echo "configure:3798: 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 3789 "configure"
+#line 3805 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3796,11 +3812,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3816: \"$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 3804 "configure"
+#line 3820 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3811,7 +3827,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -3831,7 +3847,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3835 "configure"
+#line 3851 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3844,7 +3860,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3864: \"$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
@@ -3868,21 +3884,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3872: checking for inline" >&5
+echo "configure:3888: 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 3879 "configure"
+#line 3895 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3908,12 +3924,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3912: checking for off_t" >&5
+echo "configure:3928: 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 3917 "configure"
+#line 3933 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3941,12 +3957,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3945: checking for pid_t" >&5
+echo "configure:3961: 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 3950 "configure"
+#line 3966 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3974,12 +3990,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3978: checking for size_t" >&5
+echo "configure:3994: 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 3983 "configure"
+#line 3999 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4007,12 +4023,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4011: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4027: 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 4016 "configure"
+#line 4032 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4021,7 +4037,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:4025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -4043,19 +4059,19 @@
 
 
 echo $ac_n "checking volatile declaration""... $ac_c" 1>&6
-echo "configure:4047: checking volatile declaration" >&5
+echo "configure:4063: 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 4052 "configure"
+#line 4068 "configure"
 #include "confdefs.h"
 
 int main() {
 volatile int x
 ; return 0; }
 EOF
-if { (eval echo configure:4059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   timidity_cv_type_volatile=yes
 else
@@ -4073,12 +4089,12 @@
 fi
 
 echo $ac_n "checking union semun declaration""... $ac_c" 1>&6
-echo "configure:4077: checking union semun declaration" >&5
+echo "configure:4093: 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 4082 "configure"
+#line 4098 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -4087,7 +4103,7 @@
 union semun x
 ; return 0; }
 EOF
-if { (eval echo configure:4091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   timidity_cv_type_union_semun=yes
 else
@@ -4106,13 +4122,13 @@
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:4110: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:4126: 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 4116 "configure"
+#line 4132 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -4130,7 +4146,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 4134 "configure"
+#line 4150 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -4152,7 +4168,7 @@
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:4156: checking for 8-bit clean memcmp" >&5
+echo "configure:4172: 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
@@ -4160,7 +4176,7 @@
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4164 "configure"
+#line 4180 "configure"
 #include "confdefs.h"
 
 main()
@@ -4170,7 +4186,7 @@
 }
 
 EOF
-if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4190: \"$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
@@ -4191,17 +4207,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4195: checking for $ac_hdr" >&5
+echo "configure:4211: 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 4200 "configure"
+#line 4216 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4221: \"$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*
@@ -4230,12 +4246,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4234: checking for $ac_func" >&5
+echo "configure:4250: 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 4239 "configure"
+#line 4255 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4258,7 +4274,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4278: \"$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
@@ -4283,7 +4299,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:4287: checking for working mmap" >&5
+echo "configure:4303: 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
@@ -4291,7 +4307,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4295 "configure"
+#line 4311 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4431,7 +4447,7 @@
 }
 
 EOF
-if { (eval echo configure:4435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4451: \"$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
@@ -4454,7 +4470,7 @@
 fi
 
 echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
-echo "configure:4458: checking whether setvbuf arguments are reversed" >&5
+echo "configure:4474: 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
@@ -4462,7 +4478,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4466 "configure"
+#line 4482 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -4476,7 +4492,7 @@
   exit(0);			/* Non-reversed systems segv here.  */
 }
 EOF
-if { (eval echo configure:4480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4496: \"$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
@@ -4500,12 +4516,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4504: checking return type of signal handlers" >&5
+echo "configure:4520: 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 4509 "configure"
+#line 4525 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4522,7 +4538,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4541,12 +4557,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:4545: checking for vprintf" >&5
+echo "configure:4561: 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 4550 "configure"
+#line 4566 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -4569,7 +4585,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4589: \"$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
@@ -4593,12 +4609,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:4597: checking for _doprnt" >&5
+echo "configure:4613: 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 4602 "configure"
+#line 4618 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -4621,7 +4637,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4641: \"$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
@@ -4646,15 +4662,15 @@
 fi
 
 for ac_func in gettimeofday select socket strdup strstr vsnprintf snprintf \
-	sleep usleep strncasecmp strerror getopt getcwd popen signal
+	sleep usleep strncasecmp strerror getopt getcwd popen signal isatty
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4653: checking for $ac_func" >&5
+echo "configure:4669: 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 4658 "configure"
+#line 4674 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4677,7 +4693,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4697: \"$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
@@ -4706,12 +4722,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:4710: checking for opendir" >&5
+echo "configure:4726: 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 4715 "configure"
+#line 4731 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char opendir(); below.  */
@@ -4734,7 +4750,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4754: \"$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
@@ -4762,12 +4778,12 @@
   esac
   if test "x$enable_network" = "xyes"; then
     echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:4766: checking for socket" >&5
+echo "configure:4782: 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 4771 "configure"
+#line 4787 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -4790,7 +4806,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4810: \"$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
@@ -4808,7 +4824,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6
-echo "configure:4812: checking for WSAStartup in -lwsock32" >&5
+echo "configure:4828: 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
@@ -4816,7 +4832,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lwsock32  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4820 "configure"
+#line 4836 "configure"
 #include "confdefs.h"
 #include <windows.h>
 #include <winsock.h>
@@ -4825,7 +4841,7 @@
 WSAStartup(0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:4829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4845: \"$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
@@ -4958,7 +4974,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:4962: checking for $ac_word" >&5
+echo "configure:4978: 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
@@ -4993,7 +5009,7 @@
 
   min_esd_version=0.2.7
   echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
-echo "configure:4997: checking for ESD - version >= $min_esd_version" >&5
+echo "configure:5013: checking for ESD - version >= $min_esd_version" >&5
   no_esd=""
   if test "$ESD_CONFIG" = "no" ; then
     no_esd=yes
@@ -5017,7 +5033,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 5021 "configure"
+#line 5037 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5075,7 +5091,7 @@
 
 
 EOF
-if { (eval echo configure:5079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -5109,7 +5125,7 @@
           CFLAGS="$CFLAGS $ESD_CFLAGS"
           LIBS="$LIBS $ESD_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 5113 "configure"
+#line 5129 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5119,7 +5135,7 @@
  return 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:5123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5139: \"$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"
@@ -5175,7 +5191,7 @@
 
 
 echo $ac_n "checking whether to enable audio""... $ac_c" 1>&6
-echo "configure:5179: checking whether to enable audio" >&5
+echo "configure:5195: checking whether to enable audio" >&5
 # Check whether --enable-audio or --disable-audio was given.
 if test "${enable_audio+set}" = set; then
   enableval="$enable_audio"
@@ -5195,7 +5211,7 @@
     EXTRADEFS="$EXTRADEFS -DAU_NAS"
     SYSEXTRAS="$SYSEXTRAS nas_a.c"
 
-            EXTRALIBS="$EXTRALIBS $ac_x_libraries/libaudio.a"
+            EXTRALIBS="$EXTRALIBS $x_libraries/libaudio.a"
     lib_xt_opt=-lXt
     if test "x$have_xext" = xyes; then
       lib_xext_opt=-lXext
@@ -5243,7 +5259,7 @@
 
 
 echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6
-echo "configure:5247: checking for ALSA CFLAGS" >&5
+echo "configure:5263: 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"
@@ -5251,7 +5267,7 @@
 echo "$ac_t""$ALSA_CFLAGS" 1>&6
 
 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6
-echo "configure:5255: checking for ALSA LDFLAGS" >&5
+echo "configure:5271: checking for ALSA LDFLAGS" >&5
 if test "$alsa_prefix" != "" ; then
 	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
 	LIBS="-L$alsa_prefix"
@@ -5263,7 +5279,7 @@
 
 min_alsa_version=0.1.1
 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6
-echo "configure:5267: checking for libasound headers version >= $min_alsa_version" >&5
+echo "configure:5283: 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/'`
@@ -5273,7 +5289,7 @@
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
 
 cat > conftest.$ac_ext <<EOF
-#line 5277 "configure"
+#line 5293 "configure"
 #include "confdefs.h"
 
 #include <sys/asoundlib.h>
@@ -5314,7 +5330,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""found." 1>&6
    have_alsa=yes
@@ -5328,7 +5344,7 @@
 rm -f conftest*
 
 echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6
-echo "configure:5332: checking for snd_cards in -lasound" >&5
+echo "configure:5348: 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
@@ -5336,7 +5352,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5340 "configure"
+#line 5356 "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
@@ -5347,7 +5363,7 @@
 snd_cards()
 ; return 0; }
 EOF
-if { (eval echo configure:5351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5367: \"$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
@@ -5495,19 +5511,19 @@
 *)         NEEDDLOPEN=no;;
 esac
 
-case "$CC " in "gcc "*) SHCFLAGS="$SHCFLAGS -fPIC";; esac
+if test "$GCC" = yes; then SHCFLAGS="$SHCFLAGS -fPIC"; fi
 case "x$enable_ump" in xyes|xdynamic) EXTRACFLAGS="$EXTRACFLAGS -DXP_UNIX $SHCFLAGS";; esac
 
 if test "$NEEDDLOPEN" = "yes"; then
   have_dl=no
 
   echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6
-echo "configure:5506: checking for LoadLibraryExA" >&5
+echo "configure:5522: checking for LoadLibraryExA" >&5
 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibraryExA'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5511 "configure"
+#line 5527 "configure"
 #include "confdefs.h"
 #include <windows.h>
 
@@ -5516,7 +5532,7 @@
 LoadLibraryExA(0,0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:5520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   wapi_cv_func_LoadLibraryExA=yes
 else
@@ -5539,12 +5555,12 @@
 
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:5543: checking for shl_load" >&5
+echo "configure:5559: 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 5548 "configure"
+#line 5564 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load(); below.  */
@@ -5567,7 +5583,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5587: \"$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
@@ -5592,12 +5608,12 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:5596: checking for dlopen" >&5
+echo "configure:5612: 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 5601 "configure"
+#line 5617 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
@@ -5620,7 +5636,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5640: \"$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
@@ -5642,12 +5658,12 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dld_init""... $ac_c" 1>&6
-echo "configure:5646: checking for dld_init" >&5
+echo "configure:5662: 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 5651 "configure"
+#line 5667 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dld_init(); below.  */
@@ -5670,7 +5686,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5690: \"$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
@@ -5692,7 +5708,7 @@
   fi
   if test "$have_dl" = "no"; then
     echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:5696: checking for dld_init in -ldld" >&5
+echo "configure:5712: 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
@@ -5700,7 +5716,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5704 "configure"
+#line 5720 "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
@@ -5711,7 +5727,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5731: \"$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
@@ -5734,13 +5750,13 @@
   fi
 
   echo $ac_n "checking dynamic link method""... $ac_c" 1>&6
-echo "configure:5738: checking dynamic link method" >&5
+echo "configure:5754: 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:5744: checking whether your dlsym() needs a leading underscore" >&5
+echo "configure:5760: 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
@@ -5888,17 +5904,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5892: checking for $ac_hdr" >&5
+echo "configure:5908: 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 5897 "configure"
+#line 5913 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5918: \"$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*
@@ -5939,7 +5955,7 @@
     esac
 
     echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:5943: checking for initscr in -lncurses" >&5
+echo "configure:5959: 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
@@ -5947,7 +5963,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5951 "configure"
+#line 5967 "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
@@ -5958,7 +5974,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:5962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5978: \"$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
@@ -5977,7 +5993,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:5981: checking for PDC_set_ctrl_break in -lcurses" >&5
+echo "configure:5997: 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
@@ -5985,7 +6001,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses $lib_user32_test $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5989 "configure"
+#line 6005 "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
@@ -5996,7 +6012,7 @@
 PDC_set_ctrl_break()
 ; return 0; }
 EOF
-if { (eval echo configure:6000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6016: \"$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
@@ -6083,7 +6099,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:6087: checking for SLang_init_tty in -lslang" >&5
+echo "configure:6103: 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
@@ -6091,7 +6107,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lslang  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6095 "configure"
+#line 6111 "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
@@ -6102,7 +6118,7 @@
 SLang_init_tty()
 ; return 0; }
 EOF
-if { (eval echo configure:6106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6122: \"$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
@@ -6128,17 +6144,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6132: checking for $ac_hdr" >&5
+echo "configure:6148: 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 6137 "configure"
+#line 6153 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6158: \"$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 +6206,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:6194: checking for initscr in -ltermcap" >&5
+echo "configure:6210: 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
@@ -6198,7 +6214,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6202 "configure"
+#line 6218 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6209,7 +6225,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:6229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6329,7 +6345,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:6333: checking for Tcl_Init in -l$l" >&5
+echo "configure:6349: 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
@@ -6337,7 +6353,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$l  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6341 "configure"
+#line 6357 "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
@@ -6348,7 +6364,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:6352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6368: \"$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
@@ -6372,7 +6388,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:6376: checking for Tk_Init in -l$l" >&5
+echo "configure:6392: 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
@@ -6380,7 +6396,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$l  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6384 "configure"
+#line 6400 "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
@@ -6391,7 +6407,7 @@
 Tk_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:6395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6411: \"$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
@@ -6757,7 +6773,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:6761: checking for $ac_word" >&5
+echo "configure:6777: 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
@@ -6792,7 +6808,7 @@
 
   min_gtk_version=1.1.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:6796: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:6812: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -6815,7 +6831,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 6819 "configure"
+#line 6835 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -6881,7 +6897,7 @@
 }
 
 EOF
-if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -6915,7 +6931,7 @@
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 6919 "configure"
+#line 6935 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -6925,7 +6941,7 @@
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:6929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6945: \"$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"
@@ -7066,17 +7082,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:7070: checking for X11/xpm.h" >&5
+echo "configure:7086: 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 7075 "configure"
+#line 7091 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7096: \"$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*
@@ -7099,7 +7115,7 @@
 fi
 
     echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
-echo "configure:7103: checking for XpmCreatePixmapFromData in -lXpm" >&5
+echo "configure:7119: 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
@@ -7107,7 +7123,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7111 "configure"
+#line 7127 "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
@@ -7118,7 +7134,7 @@
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:7122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7138: \"$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
@@ -7214,17 +7230,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7218: checking for $ac_hdr" >&5
+echo "configure:7234: 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 7223 "configure"
+#line 7239 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7244: \"$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*
@@ -7275,7 +7291,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:7279: checking for DndInitialize in -lDnd" >&5
+echo "configure:7295: 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
@@ -7283,7 +7299,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lDnd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7287 "configure"
+#line 7303 "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
@@ -7294,7 +7310,7 @@
 DndInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:7298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7314: \"$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
@@ -7377,7 +7393,7 @@
       EXTRADEFS="$EXTRADEFS -DWRDT_X"
       enable_sherry_wrd=yes
       echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6
-echo "configure:7381: checking for zlibVersion in -lz" >&5
+echo "configure:7397: 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
@@ -7385,7 +7401,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7389 "configure"
+#line 7405 "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
@@ -7396,7 +7412,7 @@
 zlibVersion()
 ; return 0; }
 EOF
-if { (eval echo configure:7400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7416: \"$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
@@ -7419,17 +7435,17 @@
 
       ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:7423: checking for png.h" >&5
+echo "configure:7439: 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 7428 "configure"
+#line 7444 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7449: \"$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*
@@ -7452,7 +7468,7 @@
 fi
 
       echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6
-echo "configure:7456: checking for png_init_io in -lpng" >&5
+echo "configure:7472: 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
@@ -7460,7 +7476,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7464 "configure"
+#line 7480 "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
@@ -7471,7 +7487,7 @@
 png_init_io()
 ; return 0; }
 EOF
-if { (eval echo configure:7475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7491: \"$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.1.1/configure.in TiMidity++-2.2.0/configure.in
--- TiMidity++-2.1.1/configure.in	Fri Jul  9 16:52:33 1999
+++ TiMidity++-2.2.0/configure.in	Sat Jul 17 18:55:27 1999
@@ -53,7 +53,7 @@
 
 AC_INIT(timidity/timidity.c)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(TiMidity++, 2.1.1, no-define)
+AM_INIT_AUTOMAKE(TiMidity++, 2.2.0, no-define)
 
 dnl To use CONTAINS() macro (See acinclude.m4)
 CONTAINS_INIT
@@ -111,8 +111,8 @@
 done
 
 dnl add prefix /usr/local by default
-LDFLAGS="$LDFLAGS -L/usr/local/lib"
-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+LDFLAGS="$LDFLAGS -L${PREFIX:-/usr/local}/lib"
+CPPFLAGS="$CPPFLAGS -I${PREFIX:-/usr/local}/include"
 SHLDFLAGS=${SHLDFLAGS:-$LDFLAGS}
 
 dnl add $prefix if specified.
@@ -130,6 +130,10 @@
 
 
 dnl Target dependent
+AC_ARG_WITH(elf,
+  [  --with-elf              create ELF shared object instead of AOUT ],
+  [ ELFFORMAT=$withval ], [ ELFFORMAT="yes" ])
+
 case "$target" in
   *-*-hpux*)
     EXTRADEFS="-DHPUX"
@@ -147,24 +151,29 @@
     so="so"
     ;;
 
-#  *-*-freebsd2*)
-#    EXTRALIBS="$EXTRALIBS -lxpg4"
-#    test -n "$SHLD" || SHLD="ld -Bshareable"
-#    so="so"
-#    ;;
+  *-*-freebsd2*)
+    EXTRALIBS="$EXTRALIBS -lxpg4"
+    test -n "$SHLD" || SHLD="ld -Bshareable"
+    so="so"
+    ;;
+  *-*-freebsd*)
+    if test "$ELFFORMAT" = yes; then
+        test -n "$SHLD" || SHLD="ld -Bshareable"
+    else
+        SHCFLAGS=-aout
+        SHLDFLAGS="-L/usr/X11R6/lib/aout $SHLDFLAGS"
+        test -n "$SHLD" || SHLD="env OBJFORMAT=aout ld -shared"
+    fi
+    EXTRALIBS="$EXTRALIBS -lxpg4"
+    so="so"
+    ;;
+
 #  *-*-freebsd*)
-#    SHCFLAGS=-aout
 #    EXTRALIBS="$EXTRALIBS -lxpg4"
-#    SHLDFLAGS="-L/usr/X11R6/lib/aout $SHLDFLAGS"
-#    test -n "$SHLD" || SHLD="env OBJFORMAT=aout ld -shared"
+#    test -n "$SHLD" || SHLD="ld -Bshareable"
 #    so="so"
 #    ;;
 
-  *-*-freebsd*)
-    EXTRALIBS="$EXTRALIBS -lxpg4"
-    test -n "$SHLD" || SHLD="ld -Bshareable"
-    so="so"
-    ;;
   *-*-cygwin32*)
     EXTRADEFS="-D__W32__"
     # ??
@@ -310,7 +319,7 @@
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(gettimeofday select socket strdup strstr vsnprintf snprintf \
-	sleep usleep strncasecmp strerror getopt getcwd popen signal)
+	sleep usleep strncasecmp strerror getopt getcwd popen signal isatty)
 
 dnl checking on cygnus
 if test "x$CYGNUS" = xyes; then
@@ -415,7 +424,7 @@
 
     dnl -laudio conflicts another audio library,
     dnl so I specify NAS library directly
-    EXTRALIBS="$EXTRALIBS $ac_x_libraries/libaudio.a"
+    EXTRALIBS="$EXTRALIBS $x_libraries/libaudio.a"
     lib_xt_opt=-lXt
     if test "x$have_xext" = xyes; then
       lib_xext_opt=-lXext
@@ -544,7 +553,7 @@
 esac
 
 dnl check -fpic option for gcc
-case "$CC " in "gcc "*) SHCFLAGS="$SHCFLAGS -fPIC";; esac
+if test "$GCC" = yes; then SHCFLAGS="$SHCFLAGS -fPIC"; fi
 case "x$enable_ump" in xyes|xdynamic) EXTRACFLAGS="$EXTRACFLAGS -DXP_UNIX $SHCFLAGS";; esac
 
 if test "$NEEDDLOPEN" = "yes"; then
diff -ruN TiMidity++-2.1.1/interface/gtk_c.c TiMidity++-2.2.0/interface/gtk_c.c
--- TiMidity++-2.1.1/interface/gtk_c.c	Sun Apr  4 21:49:46 1999
+++ TiMidity++-2.2.0/interface/gtk_c.c	Sat Jul 17 19:46:35 1999
@@ -109,7 +109,7 @@
 	vfprintf(stderr, fmt, ap);
 	fprintf(stderr, "\n");
     }
-    else if (ctl.trace_playing) {
+    else {
 	vsnprintf(local, sizeof(local), fmt, ap);
 	gtk_pipe_int_write(CMSG_MESSAGE);
 	gtk_pipe_int_write(type);
@@ -189,16 +189,9 @@
 }
 
 static void
-_ctl_refresh(void)
-{
-    /* gtk_pipe_int_write(REFRESH_MESSAGE); */
-}
-
-static void
 ctl_refresh(void)
 {
-    if (ctl.trace_playing)
-	_ctl_refresh();
+    /* gtk_pipe_int_write(REFRESH_MESSAGE); */
 }
 
 static void
@@ -228,8 +221,6 @@
 static void
 ctl_current_time(int secs, int voices)
 {
-    if (!ctl.trace_playing) 
-	return;
     gtk_pipe_int_write(CURTIME_MESSAGE);
     gtk_pipe_int_write(secs);
     gtk_pipe_int_write(voices);
@@ -358,7 +349,7 @@
 	ctl_sustain(i, channel[i].sustain);
 	ctl_pitch_bend(i, channel[i].pitchbend);
     }
-  _ctl_refresh();
+  ctl_refresh();
   */
 }
 
@@ -369,7 +360,6 @@
 ctl_open(int using_stdin, int using_stdout)
 {
     ctl.opened=1;
-    ctl.trace_playing=1;	/* Default mode with Gtk+ interface */
   
     /* The child process won't come back from this call  */
     gtk_pipe_open();
diff -ruN TiMidity++-2.1.1/interface/gtk_i.c TiMidity++-2.2.0/interface/gtk_i.c
--- TiMidity++-2.1.1/interface/gtk_i.c	Sun Apr  4 21:50:00 1999
+++ TiMidity++-2.2.0/interface/gtk_i.c	Sat Jul 17 18:25:06 1999
@@ -250,7 +250,7 @@
     if(!data)
 	return;
 
-    action = (char)gtk_object_get_user_data(GTK_OBJECT(plfilesel));
+    action = (gchar)(int)gtk_object_get_user_data(GTK_OBJECT(plfilesel));
     filename[0] = gtk_file_selection_get_filename(GTK_FILE_SELECTION(plfilesel));
 
     if(action == 'l') {
@@ -590,7 +590,6 @@
 static void
 set_icon_pixmap(GtkWidget *window, gchar **bits)
 {
-    GtkWidget	*pw;
     GdkPixmap	*pixmap;
     GdkBitmap	*mask;
     GtkStyle	*style;
diff -ruN TiMidity++-2.1.1/interface/ncurs_c.c TiMidity++-2.2.0/interface/ncurs_c.c
--- TiMidity++-2.1.1/interface/ncurs_c.c	Tue Apr 27 22:37:50 1999
+++ TiMidity++-2.2.0/interface/ncurs_c.c	Sun Jul 18 01:58:27 1999
@@ -30,8 +30,14 @@
 
 #if defined(__MINGW32__) && defined(USE_PDCURSES)
 #define _NO_OLDNAMES 1	/* avoid type mismatch of beep() */
-#endif /* USE_PDCURSES */
+#ifndef sleep
+extern void sleep(unsigned long);
+#endif /* sleep */
+#include <stdlib.h>
+#undef _NO_OLDNAMES
+#else /* USE_PDCURSES */
 #include <stdlib.h>
+#endif
 
 #include <stdarg.h>
 #include <ctype.h>
@@ -71,6 +77,10 @@
 #include "arc.h"
 #include "aq.h"
 
+#ifdef USE_PDCURSES
+int PDC_set_ctrl_break(bool setting);
+#endif /* USE_PDCURSES */
+
 #define SCREEN_BUGFIX 1 /* FIX the old ncurses bug */
 
 /* Define WREFRESH_CACHED if wrefresh isn't clear the internal cache */
@@ -732,7 +742,7 @@
 	{
 "V/Up=Louder    b/Left=Skip back      n/Next=Next file      r/Home=Restart file",
 "v/Down=Softer  f/Right=Skip forward  p/Prev=Previous file  q/End=Quit program",
-"h/?=Help mode  1-6=Reverb            s=Toggle pause        E=ExtMode-Setting",
+"h/?=Help mode  s=Toggle pause        E=ExtMode-Setting",
 "+=Key up       -=Key down            >=Speed up            <=Speed down",
 "O=Voices up    o=Voices down         c/C=Move channel      d=Toggle drum prt.",
 "J=Jump         L=Load & play (TAB: File completion)        t=Toggle trace mode",
@@ -1516,7 +1526,9 @@
 	nonl();
 	nodelay(stdscr, 1);
 	scrollok(stdscr, 0);
+#ifndef USE_PDCURSES
 	idlok(stdscr, 1);
+#endif /* USE_PDCURSES */
 	keypad(stdscr, TRUE);
 	ctl.opened = 1;
     }
@@ -2116,7 +2128,7 @@
 	  }
 	  else
 	      return RC_NEXT;
-
+#if 0
 	case '1':
 	case '2':
 	case '3':
@@ -2127,6 +2139,7 @@
 	case '6':
 	  *valp = c - '5';
 	  return RC_CHANGE_REV_TIME;
+#endif
 	case 'q':
 	case 3: /* ^C */
 	case KEY_END:
@@ -2418,7 +2431,6 @@
 static void vwprintw(WINDOW *w, char *fmt, va_list ap)
 {
     char *buff;
-    int i;
     MBlockList pool;
 
     init_mblock(&pool);
diff -ruN TiMidity++-2.1.1/interface/soundspec.c TiMidity++-2.2.0/interface/soundspec.c
--- TiMidity++-2.1.1/interface/soundspec.c	Thu Feb 25 06:52:04 1999
+++ TiMidity++-2.2.0/interface/soundspec.c	Mon Jul 19 10:59:26 1999
@@ -75,6 +75,7 @@
 static Display *disp = NULL;
 static Window win;
 static GC gc;
+static int depth;
 static Pixmap offscr;
 static XImage *img;
 static Atom wm_delete_window;
@@ -161,7 +162,6 @@
 
 static long search_near_color(Display *disp, int r, int g, int b)
 {
-    int depth;
     double d, mind;
     int scr;
     static XColor *xc = NULL;
@@ -169,7 +169,6 @@
     long i, k;
 
     scr = DefaultScreen(disp);
-    depth = DefaultDepth(disp, scr);
 
     if(depth == 1)		/* black or white */
     {
@@ -217,6 +216,15 @@
     return k;
 }
 
+static int highbit(unsigned long ul)
+{
+    int i;  unsigned long hb;
+    hb = 0x80000000UL;
+    for(i = 31; ((ul & hb) == 0) && i >= 0;  i--, ul<<=1)
+	;
+    return i;
+}
+
 static unsigned long AllocRGBColor(
 	Display *disp,
 	double red,		/* [0, 1] */
@@ -267,16 +275,32 @@
     }
 }
 
-static void set_draw_pixel(double *val, unsigned char *pixels)
+static void set_draw_pixel(double *val, char *pixels)
 {
     int i;
+    unsigned v;
+
     for(i = 0; i < SCOPE_HEIGHT; i++)
     {
-	unsigned v;
-	v = (unsigned)val[SCOPE_HEIGHT - i - 1];
-	if(v >= NCOLOR)
-	    v = NCOLOR - 1;
-	pixels[i] = (unsigned char)color_ring[v];
+	v = (unsigned)val[i];
+	if(v > NCOLOR - 1)
+	    val[i] = NCOLOR - 1;
+    }
+
+    switch(depth) {
+      case 32:
+      case 24:
+	for(i = 0; i < SCOPE_HEIGHT; i++)
+	    ((uint32 *)pixels)[i] = (uint32)color_ring[(int)val[SCOPE_HEIGHT - i - 1]];
+	break;
+      case 16:
+	for(i = 0; i < SCOPE_HEIGHT; i++)
+	    ((uint16 *)pixels)[i] = (uint16)color_ring[(int)val[SCOPE_HEIGHT - i - 1]];
+	break;
+      default:
+	for(i = 0; i < SCOPE_HEIGHT; i++)
+	    ((uint8 *)pixels)[i] = (uint8)color_ring[(int)val[SCOPE_HEIGHT - i - 1]];
+	break;
     }
 }
 
@@ -347,7 +371,7 @@
     static int32 call_cnt;
     int offset, expose;
     XEvent e;
-    unsigned char pixels[SCOPE_HEIGHT];
+    char pixels[SCOPE_HEIGHT*32];
     double work[SCOPE_HEIGHT];
     int nze;
     char *mname;
@@ -584,6 +608,7 @@
 
     set_color_ring();
     scr = DefaultScreen(disp);
+    depth = DefaultDepth(disp, scr);
     win = XCreateSimpleWindow(disp, DefaultRootWindow(disp),
 			      0, 0, SCOPE_WIDTH, SCOPE_HEIGHT,
 			      0, 0, BlackPixel(disp, scr));
@@ -598,14 +623,12 @@
     gcv.graphics_exposures = False;
     gc = XCreateGC(disp, win, GCGraphicsExposures, &gcv);
 
-    offscr = XCreatePixmap(disp, win, SCOPE_WIDTH, SCOPE_HEIGHT,
-			   DefaultDepth(disp, scr));
+    offscr = XCreatePixmap(disp, win, SCOPE_WIDTH, SCOPE_HEIGHT, depth);
     XSetForeground(disp, gc, BlackPixel(disp, scr));
     XFillRectangle(disp, offscr, gc, 0, 0, SCOPE_WIDTH, SCOPE_HEIGHT);
 
     img = XCreateImage(disp, DefaultVisual(disp, scr),
-		       DefaultDepth(disp, scr),
-		       ZPixmap, 0, 0,
+		       depth, ZPixmap, 0, 0,
 		       1, SCOPE_HEIGHT, 8, 0);
     XMapWindow(disp, win);
     XSync(disp, False);
diff -ruN TiMidity++-2.1.1/interface/vt100_c.c TiMidity++-2.2.0/interface/vt100_c.c
--- TiMidity++-2.1.1/interface/vt100_c.c	Sun Mar 28 19:19:19 1999
+++ TiMidity++-2.2.0/interface/vt100_c.c	Mon Jul 19 12:35:31 1999
@@ -653,6 +653,7 @@
 	  case 'v':
 	    *valp =- 10 * char_count(cmd, cmd[0]);
 	    return RC_CHANGE_VOLUME;
+#if 0
 	  case '1':
 	  case '2':
 	  case '3':
@@ -663,6 +664,7 @@
 	  case '6':
 	    *valp = cmd[0] - '5';
 	    return RC_CHANGE_REV_TIME;
+#endif
 	  case 's':
 	    return RC_TOGGLE_PAUSE;
 	  case 'n':
diff -ruN TiMidity++-2.1.1/interface/w32g_c.c TiMidity++-2.2.0/interface/w32g_c.c
--- TiMidity++-2.1.1/interface/w32g_c.c	Tue Apr  6 02:48:55 1999
+++ TiMidity++-2.2.0/interface/w32g_c.c	Sat Jul 17 14:38:52 1999
@@ -778,8 +778,9 @@
 	      play_mode->id_name, play_mode->id_character);
     player_status = PLAYERSTATUS_STOP;
   } else {
+      extern void timidity_init_aq_buff(void);
       aq_setup();
-      aq_set_soft_queue(5.0, 1.0);
+      timidity_init_aq_buff();
 
     player_status = PLAYERSTATUS_PLAY;
     PlayerCanselPause();
diff -ruN TiMidity++-2.1.1/interface/wrdt_x.c TiMidity++-2.2.0/interface/wrdt_x.c
--- TiMidity++-2.1.1/interface/wrdt_x.c	Thu Mar 11 14:38:58 1999
+++ TiMidity++-2.2.0/interface/wrdt_x.c	Sat Jul 17 19:06:32 1999
@@ -232,7 +232,7 @@
     char *p;
     char *text;
     int i, len;
-    static txtclr_preserve=0;
+    static int txtclr_preserve=0;
 
     if(cmd == WRD_MAGPRELOAD){
 	/* Load MAG file */
diff -ruN TiMidity++-2.1.1/interface/x_wrdwindow.c TiMidity++-2.2.0/interface/x_wrdwindow.c
--- TiMidity++-2.1.1/interface/x_wrdwindow.c	Mon Apr  5 03:05:25 1999
+++ TiMidity++-2.2.0/interface/x_wrdwindow.c	Sat Jul 17 18:27:42 1999
@@ -1372,9 +1372,10 @@
     }
     if(pallet==FOREGROUND_PALLET){
       memcpy(mywin.curcoltab,mywin.gcolor[FOREGROUND_PALLET],sizeof(mywin.curcoltab));
-      if(mywin.redrawflag)
+      if(mywin.redrawflag) {
 	if(truecolor) RedrawPallet(FOREGROUND_PALLET);
 	else XStoreColors(mywin.d,mywin.cmap,mywin.curcoltab,NUMPXL);
+      }
     }
   }
 }
@@ -1394,9 +1395,10 @@
     memcpy(mywin.curcoltab,
 	   mywin.gcolor[FOREGROUND_PALLET],
 	   sizeof(mywin.curcoltab));
-    if(mywin.redrawflag)
+    if(mywin.redrawflag) {
 	if(truecolor) RedrawPallet(pallet);
 	else XStoreColors(mywin.d,mywin.cmap,mywin.curcoltab,NUMPXL);
+    }
   }
 }
 void x_Gscreen(int active,int appear)
@@ -1434,17 +1436,19 @@
 	if(truecolor) rgb2pixel(&mywin.curcoltab[i]);
       }
     }
-    if(mywin.redrawflag)
+    if(mywin.redrawflag) {
       if(truecolor) Redraw(0,0,SIZEX,SIZEY,True);
       else XStoreColors(mywin.d,mywin.cmap,mywin.curcoltab,NUMPXL);
+    }
   }
   else{
     if(params[2] == 0 && params[1] < MAXPAL) {
       memcpy(mywin.curcoltab,mywin.gcolor[params[1]],sizeof(mywin.curcoltab));
       memcpy(mywin.gcolor[0],mywin.curcoltab,sizeof(mywin.curcoltab));
-      if(mywin.redrawflag)
+      if(mywin.redrawflag) {
 	if(truecolor) RedrawPallet(params[1]);
 	else XStoreColors(mywin.d,mywin.cmap,mywin.curcoltab,NUMPXL);
+      }
     }
     else if(params[0] < MAXPAL && params[1] < MAXPAL)
     {
diff -ruN TiMidity++-2.1.1/interface/xaw_i.c TiMidity++-2.2.0/interface/xaw_i.c
--- TiMidity++-2.1.1/interface/xaw_i.c	Fri Jul  9 17:55:52 1999
+++ TiMidity++-2.2.0/interface/xaw_i.c	Sat Jul 17 18:22:43 1999
@@ -205,7 +205,7 @@
   optionsCB(),optionspopupCB(),optionscloseCB(),chorusCB(),optionsdestroyCB(),
   flistpopupCB(),flistcloseCB(),
   forwardCB(),backCB(),repeatCB(),randomCB(),menuCB(),sndspecCB(),
-  volsetCB(),volupdownCB(),tunesetCB(),tuneslideCB(),filemenuCB(),
+  volsetCB(),volupdownCB(),tuneslideCB(),filemenuCB(),
   fselectCB(),fdeleteCB(),fdelallCB(),backspaceCB(),aboutCB(),aboutcloseCB(),
 #ifndef WIDGET_IS_LABEL_WIDGET
   deleteTextCB(),
@@ -914,6 +914,7 @@
   setVolbar(i);
 }
 
+#if 0 /* Not used */
 static void tunesetCB(Widget w,XtPointer data,XtPointer call_data)
 {
   static int tmpval;
@@ -931,6 +932,7 @@
   sprintf(s, "T %d\n", tmpval);
   a_pipe_write(s);
 }
+#endif
 
 static void tunesetAction(Widget w,XEvent *e,String *v,Cardinal *n) {
   static float tmpval;
@@ -1460,7 +1462,7 @@
     current_flist = (char **)safe_malloc(sizeof(char *) * (n+1));
     if ('\0' != *dotfile) {
       FILE *fp;
-      if (savelist)
+      if (savelist) {
         if (NULL != (fp=fopen(dotfile, "a+"))) {
           for(i=0; i<n; i++) {
             a_pipe_read(local_buf,sizeof(local_buf));
@@ -1470,7 +1472,7 @@
           }
           fclose(fp);
         }
-      else
+      } else
         for(i=0; i<n; i++) a_pipe_read(local_buf,sizeof(local_buf));
     }
     current_flist[n] = NULL;
@@ -3526,12 +3528,12 @@
 
   if(Cfg.repeat) repeatCB(NULL,&Cfg.repeat,NULL);
   if(Cfg.shuffle) randomCB(NULL,&Cfg.shuffle,NULL);
-  if(Cfg.autostart)
+  if(Cfg.autostart) {
     if(max_files==0)
       prevCB(NULL,NULL,NULL);
     else
       playCB(NULL,NULL,NULL);
-  else
+  } else
     stopCB(NULL,NULL,NULL);
   if(ctl->trace_playing) initStatus();
   XtAppMainLoop(app_con);
diff -ruN TiMidity++-2.1.1/libarc/arc_zip.c TiMidity++-2.2.0/libarc/arc_zip.c
--- TiMidity++-2.1.1/libarc/arc_zip.c	Mon Nov  2 12:29:06 1998
+++ TiMidity++-2.2.0/libarc/arc_zip.c	Sat Jul 17 18:10:27 1999
@@ -105,10 +105,12 @@
 	break;
       case 6: /* The file is Imploded */
 	if(flags & 4)
+	{
 	    if(flags & 2)
 		method = ARCHIVEC_IMPLODED_LIT8;
 	    else
 		method = ARCHIVEC_IMPLODED_LIT4;
+	}
 	else if(flags & 2)
 	    method = ARCHIVEC_IMPLODED_NOLIT8;
 	else
diff -ruN TiMidity++-2.1.1/timidity/Makefile.am TiMidity++-2.2.0/timidity/Makefile.am
--- TiMidity++-2.1.1/timidity/Makefile.am	Tue May 18 19:39:08 1999
+++ TiMidity++-2.2.0/timidity/Makefile.am	Mon Jul 19 13:11:21 1999
@@ -116,7 +116,8 @@
 	mfnode.h \
 	nas_a.c \
 	sun_a.c \
-	w32_a.c
+	w32_a.c \
+	timpp32g.ini
 
 if ENABLE_W32GUI
 W32GUI_RES = $(top_builddir)/interface/w32g_res.res
diff -ruN TiMidity++-2.1.1/timidity/Makefile.in TiMidity++-2.2.0/timidity/Makefile.in
--- TiMidity++-2.1.1/timidity/Makefile.in	Fri Jul  9 18:20:34 1999
+++ TiMidity++-2.2.0/timidity/Makefile.in	Mon Jul 19 13:12:01 1999
@@ -119,7 +119,7 @@
 timidity_SOURCES =  	aenc.h 	aiff_a.c 	aq.c 	aq.h 	au_a.c 	audio_cnv.c 	audio_cnv.h 	common.c 	common.h 	controls.c 	controls.h 	dlutils.h 	effect.c 	filter.c 	filter.h 	instrum.c 	instrum.h 	list_a.c 	load_mod.c 	loadtab.c 	mid-j.defs 	mid.defs 	miditrace.c 	miditrace.h 	mix.c 	mix.h 	mod.c 	mod.h 	output.c 	output.h 	playmidi.c 	playmidi.h 	raw_a.c 	rcp.c 	readmidi.c 	readmidi.h 	recache.c 	recache.h 	resample.c 	resample.h 	reverb.c 	reverb.h 	sbkconv.c 	sffile.c 	sffile.h 	sfitem.c 	sfitem.h 	sflayer.h 	smfconv.c 	smfconv.h 	sndfont.c 	tables.c 	tables.h 	timidity.c 	timidity.h 	version.c 	wave_a.c 	wrd.h 	wrd_read.c 	wrdt.c
 
 
-EXTRA_timidity_SOURCES =  	alsa_a.c 	audriv.h 	audriv_a.c 	audriv_al.c 	audriv_mme.c 	audriv_none.c 	dl_cygwin32.c 	dl_dld.c 	dl_dlopen.c 	dl_hpux.c 	bsd20_a.c 	esd_a.c 	hpux_a.c 	hpux_d_a.c 	linux_a.c 	mac_a.c 	mac_qt_a.c 	mac_com.h 	mac_dlog.c 	mac_main.c 	mac_main.h 	mac_soundspec.c 	mfnode.c 	mfnode.h 	nas_a.c 	sun_a.c 	w32_a.c
+EXTRA_timidity_SOURCES =  	alsa_a.c 	audriv.h 	audriv_a.c 	audriv_al.c 	audriv_mme.c 	audriv_none.c 	dl_cygwin32.c 	dl_dld.c 	dl_dlopen.c 	dl_hpux.c 	bsd20_a.c 	esd_a.c 	hpux_a.c 	hpux_d_a.c 	linux_a.c 	mac_a.c 	mac_qt_a.c 	mac_com.h 	mac_dlog.c 	mac_main.c 	mac_main.h 	mac_soundspec.c 	mfnode.c 	mfnode.h 	nas_a.c 	sun_a.c 	w32_a.c 	timpp32g.ini
 
 
 @ENABLE_W32GUI_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res
diff -ruN TiMidity++-2.1.1/timidity/common.c TiMidity++-2.2.0/timidity/common.c
--- TiMidity++-2.1.1/timidity/common.c	Tue May 18 20:46:10 1999
+++ TiMidity++-2.2.0/timidity/common.c	Sun Jul 18 02:06:15 1999
@@ -37,6 +37,9 @@
 #include <ctype.h>
 #ifndef __W32__
 #include <unistd.h>
+#else
+#include <process.h>
+#include <io.h>
 #endif /* __W32__ */
 #include "timidity.h"
 #include "common.h"
diff -ruN TiMidity++-2.1.1/timidity/nas_a.c TiMidity++-2.2.0/timidity/nas_a.c
--- TiMidity++-2.1.1/timidity/nas_a.c	Thu Jun 10 21:42:00 1999
+++ TiMidity++-2.2.0/timidity/nas_a.c	Thu Jul 15 20:35:21 1999
@@ -250,6 +250,7 @@
 {
   if(dpm.fd != -1)
   {
+    AuStopFlow(fd.aud, fd.flow, NULL);
     while (!fd.finished) syncdevaudio();
     AuCloseServer(fd.aud);
     free(fd.data);
diff -ruN TiMidity++-2.1.1/timidity/output.c TiMidity++-2.2.0/timidity/output.c
--- TiMidity++-2.1.1/timidity/output.c	Fri Apr  9 20:28:53 1999
+++ TiMidity++-2.2.0/timidity/output.c	Sat Jul 17 18:34:13 1999
@@ -255,26 +255,25 @@
     {
 	bytes *= 2;
 	if(play_mode->encoding & PE_BYTESWAP)
+	{
 	    if(play_mode->encoding & PE_SIGNED)
 		s32tos16x(buf, count);
 	    else
 		s32tou16x(buf, count);
+	}
+	else if(play_mode->encoding & PE_SIGNED)
+	    s32tos16(buf, count);
 	else
-	    if(play_mode->encoding & PE_SIGNED)
-		s32tos16(buf, count);
-	    else
-		s32tou16(buf, count);
+	    s32tou16(buf, count);
     }
+    else if(play_mode->encoding & PE_ULAW)
+	s32toulaw(buf, count);
+    else if(play_mode->encoding & PE_ALAW)
+	s32toalaw(buf, count);
+    else if(play_mode->encoding & PE_SIGNED)
+	s32tos8(buf, count);
     else
-	if(play_mode->encoding & PE_ULAW)
-	    s32toulaw(buf, count);
-	else if(play_mode->encoding & PE_ALAW)
-	    s32toalaw(buf, count);
-	else
-	    if(play_mode->encoding & PE_SIGNED)
-		s32tos8(buf, count);
-	    else
-		s32tou8(buf, count);
+	s32tou8(buf, count);
     return bytes;
 }
 
@@ -302,44 +301,48 @@
 const char *output_encoding_string(int enc)
 {
     if(enc & PE_MONO)
+    {
 	if(enc & PE_16BIT)
+	{
 	    if(enc & PE_SIGNED)
 		return "16bit (mono)";
 	    else
 		return "unsigned 16bit (mono)";
+	}
 	else
+	{
 	    if(enc & PE_ULAW)
 		return "U-law (mono)";
 	    else if(enc & PE_ALAW)
 		return "A-law (mono)";
+	    else if(enc & PE_SIGNED)
+		return "8bit (mono)";
 	    else
-		if(enc & PE_SIGNED)
-		    return "8bit (mono)";
-		else
-		    return "unsigned 8bit (mono)";
-    else
-	if(enc & PE_16BIT)
+		return "unsigned 8bit (mono)";
+	}
+    }
+    else if(enc & PE_16BIT)
+    {
+	if(enc & PE_BYTESWAP)
 	{
-	    if(enc & PE_BYTESWAP)
-		if(enc & PE_SIGNED)
-		    return "16bit (swap)";
-		else
-		    return "unsigned 16bit (swap)";
+	    if(enc & PE_SIGNED)
+		return "16bit (swap)";
 	    else
-		if(enc & PE_SIGNED)
-		    return "16bit";
-		else
-		    return "unsigned 16bit";
+		return "unsigned 16bit (swap)";
 	}
+	else if(enc & PE_SIGNED)
+	    return "16bit";
 	else
-	    if(enc & PE_ULAW)
-		return "U-law";
-	    else if(enc & PE_ALAW)
-		return "A-law";
-	    else
-		if(enc & PE_SIGNED)
-		    return "8bit";
-		else
-		    return "unsigned 8bit";
+	    return "unsigned 16bit";
+    }
+    else
+	if(enc & PE_ULAW)
+	    return "U-law";
+	else if(enc & PE_ALAW)
+	    return "A-law";
+	else if(enc & PE_SIGNED)
+	    return "8bit";
+	else
+	    return "unsigned 8bit";
     /*NOTREACHED*/
 }
diff -ruN TiMidity++-2.1.1/timidity/playmidi.c TiMidity++-2.2.0/timidity/playmidi.c
--- TiMidity++-2.1.1/timidity/playmidi.c	Sun Jun 13 12:16:05 1999
+++ TiMidity++-2.2.0/timidity/playmidi.c	Sat Jul 17 14:00:00 1999
@@ -678,21 +678,27 @@
 
 static int reduce_voice(void)
 {
-    int32 lv, v;
-    int i, j, lowest=-1;
+    int32 lv, v, vr;
+    int i, j, lowest=-0x7FFFFFFF;
 
     i = upper_voices;
     lv = 0x7FFFFFFF;
-    /* Look for the decaying note with the lowest volume */
+    /* Look for the decaying note with the longest remaining decay time */
+    /* Protect drum decays.  They do not take as much CPU (?) and truncating
+       them early sounds bad, especially on snares and cymbals */
+    /* Also look for chorus notes */
     for(j = 0; j < i; j++)
     {
 	if(voice[j].status & VOICE_FREE)
 	    continue;
-	if(voice[j].status & ~(VOICE_ON | VOICE_DIE))
+	if (!voice[j].delay && ISDRUMCHANNEL(voice[j].channel))
+	    continue;
+	if(voice[j].status & ~(VOICE_ON | VOICE_DIE | VOICE_SUSTAINED) ||
+	   voice[j].delay)
 	{
-	    v = voice[j].left_mix;
-	    if(voice[j].panned == PANNED_MYSTERY && voice[j].right_mix > v)
-		v = voice[j].right_mix;
+	    /* Choose note with longest decay time remaining */
+	    /* This frees more CPU than choosing lowest volume */
+	    v = current_sample - voice[j].timeout;
 	    if(v < lv)
 	    {
 		lv = v;
@@ -700,8 +706,7 @@
 	    }
 	}
     }
-
-    if(lowest != -1)
+    if(lowest != -0x7FFFFFFF)
     {
 	/* This can still cause a click, but if we had a free voice to
 	   spare for ramping down this note, we wouldn't need to kill it
@@ -716,17 +721,19 @@
     }
 
     /* EAW -- try to remove VOICE_DIE before VOICE_ON */
-    lost_notes++;
-    lv = voice[0].left_mix;
-    if(voice[0].panned == PANNED_MYSTERY && voice[0].right_mix > lv)
-	lv = voice[0].right_mix;
+    lv = 0x7FFFFFFF;
     lowest = -1;
     for(j = 0; j < i; j++)
     {
-	if(voice[j].status & VOICE_FREE)
+      if(voice[j].status & VOICE_FREE)
 	    continue;
-      if(voice[j].status & ~(VOICE_ON))
+      if(voice[j].status & ~(VOICE_ON | VOICE_SUSTAINED))
       {
+	/* continue protecting the drum decays */
+	if (!voice[j].delay && voice[j].status & ~(VOICE_DIE) &&
+	    ISDRUMCHANNEL(voice[j].channel))
+		continue;
+
 	v = voice[j].left_mix;
 	if(voice[j].panned == PANNED_MYSTERY && voice[j].right_mix > v)
 	    v = voice[j].right_mix;
@@ -747,17 +754,48 @@
     }
 
     lost_notes++;
-    lv = voice[0].left_mix;
-    if(voice[0].panned == PANNED_MYSTERY && voice[0].right_mix > lv)
-	lv = voice[0].right_mix;
+
+    /* try to remove VOICE_SUSTAINED before VOICE_ON */
+    lv = 0x7FFFFFFF;
+    lowest = -0x7FFFFFFF;
+    for(j = 0; j < i; j++)
+    {
+      if(voice[j].status & VOICE_FREE)
+	    continue;
+      if(voice[j].status & VOICE_SUSTAINED)
+      {
+	/* Choose note with longest decay time remaining */
+	/* This frees more CPU than choosing lowest volume */
+	v = current_sample - voice[j].timeout;
+	if(v < lv)
+	{
+	    lv = v;
+	    lowest = j;
+	}
+      }
+    }
+    if(lowest != -0x7FFFFFFF)
+    {
+	cut_notes++;
+	voice[lowest].status = VOICE_FREE;
+	if(!prescanning_flag)
+	    ctl_note_event(lowest);
+	return lowest;
+    }
+
+    lv = 0x7FFFFFFF;
     lowest = 0;
     for(j = 0; j < i; j++)
     {
 	if(voice[j].status & VOICE_FREE)
 	    continue;
-	v = voice[j].left_mix;
-	if(voice[j].panned == PANNED_MYSTERY && voice[j].right_mix > v)
-	    v = voice[j].right_mix;
+
+	/* score notes based on both volume AND duration */
+	/* this scoring function needs some more tweaking... */
+	v = voice[j].left_mix * (voice[j].timeout - current_sample);
+	vr = voice[j].right_mix * (voice[j].timeout - current_sample);
+	if(voice[j].panned == PANNED_MYSTERY && vr > v)
+	    v = vr;
 	if(v < lv)
 	{
 	    lv = v;
@@ -2870,9 +2908,18 @@
 	          int v, kill_nv, temp_nv;
 
 		  /* EAW -- count number of !ON voices */
-		  for(i = kill_nv = 0; i < upper_voices; i++)
-		      if(voice[i].status & ~(VOICE_FREE|VOICE_ON))
-			  kill_nv++;
+		  /* treat chorus notes as !ON */
+		  for(i = kill_nv = 0; i < upper_voices; i++) {
+		      if(voice[i].status & VOICE_FREE)
+		      		continue;
+		      
+		      if(voice[i].delay ||
+		         (voice[i].status & ~(VOICE_ON|VOICE_SUSTAINED) &&
+			  !(voice[i].status & ~(VOICE_DIE) &&
+			    !voice[i].delay &&
+			    ISDRUMCHANNEL(voice[i].channel))))
+				kill_nv++;
+		  }
 
 		  /* EAW -- buffer is dangerously low, drasticly reduce
 		     voices to a hopefully "safe" amount */
diff -ruN TiMidity++-2.1.1/timidity/timidity.c TiMidity++-2.2.0/timidity/timidity.c
--- TiMidity++-2.1.1/timidity/timidity.c	Fri Jul  9 16:51:22 1999
+++ TiMidity++-2.2.0/timidity/timidity.c	Mon Jul 19 11:17:17 1999
@@ -76,7 +76,7 @@
 #include "mid.defs"
 #include "aq.h"
 
-#define OPTCOMMANDS "A:aB:b:C:c:D:d:eE:Ffg:hI:i:jk:L:n:O:o:P:p:Q:R:rS:s:t:UW:w:x:Z:"
+#define OPTCOMMANDS "A: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 INTERACTIVE_INTERFACE_IDS "kmqagr"
 
 /* main interfaces (To be used another main) */
@@ -96,6 +96,10 @@
 MAIN_INTERFACE int timidity_play_main(int nfiles, char **files);
 MAIN_INTERFACE int got_a_configuration;
 MAIN_INTERFACE char *wrdt_open_opts = NULL;
+MAIN_INTERFACE char *opt_aq_max_buff = "5.0",
+		    *opt_aq_fill_buff = "100%";
+MAIN_INTERFACE void timidity_init_aq_buff(void);
+
 #ifdef IA_DYNAMIC
 MAIN_INTERFACE char dynamic_interface_id;
 #endif /* IA_DYNAMIC */
@@ -284,9 +288,9 @@
 
 static FILE *open_pager(void)
 {
-#if !defined(__MACOS__) && !defined(__W32__)
+#if !defined(__MACOS__) && defined(HAVE_POPEN) && defined(HAVE_ISATTY) && !defined(IA_W32GUI)
     char *pager;
-    if(isatty(0) && (pager = getenv("PAGER")) != NULL)
+    if(isatty(1) && (pager = getenv("PAGER")) != NULL)
 	return popen(pager, "w");
 #endif
     return stdout;
@@ -294,7 +298,7 @@
 
 static void close_pager(FILE *fp)
 {
-#if !defined(__MACOS__) && !defined(__W32__)
+#if !defined(__MACOS__) && defined(HAVE_POPEN) && defined(HAVE_ISATTY) && !defined(IA_W32GUI)
     if(fp != stdout)
 	pclose(fp);
 #endif
@@ -326,66 +330,15 @@
 #endif
 "",
 "Options:",
-#if defined(AU_HPUX)
-"  -o file Output to another file (or audio server) (Use \"-\" for stdout)",
-#elif defined (AU_LINUX)
-"  -o file Output to another file (or device) (Use \"-\" for stdout)",
-#else
-"  -o file Output to another file (Use \"-\" for stdout)",
-#endif
-"  -O mode Select output mode and format (see below for list)",
-"  -s f    Set sampling frequency to f (Hz or kHz)",
-"  -a      Enable the antialiasing filter",
-"  -f      "
-#ifdef FAST_DECAY
-           "Disable"
-#else
-	   "Enable"
-#endif
-" fast decay mode",
-"  -p n    Allow n-voice polyphony",
 "  -A n    Amplify volume by n percent (may cause clipping)",
+"  -a      Enable the antialiasing filter",
+"  -B n    Set number of buffer fragments",
 "  -C n    Set ratio of sampling and control frequencies",
-"  -S n    Cache size (0 means no cache)",
-"  -L dir  Append dir to search path",
 "  -c file Read extra configuration file",
-"  -I n    Use program n as the default",
-"  -P file Use patch file for all programs",
 "  -D n    Play drums on channel n",
-"  -Q n    Ignore channel n",
-"  -F      Enable fast panning",
-"  -U      Unload instruments from memory between MIDI files",
-
-"  -R n    Pseudo Reveb (set every instrument's release to n ms",
-"            if n=0, n is set to 800(default)",
-
-#ifdef SUPPORT_SOUNDSPEC
-"  -g sec  Open Sound-Spectrogram Window.",
-#endif /* SUPPORT_SOUNDSPEC */
-
 #ifdef IA_DYNAMIC
 "  -d dir  Set dynamic interface module directory",
 #endif /* IA_DYNAMIC */
-"  -i mode Select user interface (see below for list)",
-"  -B n    Set number of buffer fragments",
-#ifdef __W32__
-"  -e      Increase thread priority (evil) - be careful!",
-#endif
-"  -h      Display this help message",
-"  -x \"configuration-string\"",
-"          Read configuration from command line argument",
-"  -j      Realtime load instrument (toggle on/off)",
-"  -k msec Specify audio queue time limit to reduce voice",
-"  -t code Output text language code:",
-"              code=auto  : Auto conversion by `LANG' environment variable",
-"                           (UNIX only)",
-"                   ascii : Convert unreadable characters to '.'(0x2e)",
-"                   nocnv : No conversion",
-#ifdef JAPANESE
-"                   euc   : EUC-japan",
-"                   jis   : JIS",
-"                   sjis  : shift JIS",
-#endif /* JAPANESE */
 "  -E mode TiMidity sequencer extensional modes:",
 "            mode = w/W : Enable/Disable Modulation wheel.",
 "                   p/P : Enable/Disable Portamento.",
@@ -435,13 +388,62 @@
 "O"
 #endif /* OVERLAP_VOICE_ALLOW */
 ,
-"            mode = w/W : Enable/Disable Modulation wheel.",
-
+#ifdef __W32__
+"  -e      Increase thread priority (evil) - be careful!",
+#endif
+"  -F      Enable fast panning",
+"  -f      "
+#ifdef FAST_DECAY
+           "Disable"
+#else
+	   "Enable"
+#endif
+" fast decay mode (toggle)",
+#ifdef SUPPORT_SOUNDSPEC
+"  -g sec  Open Sound-Spectrogram Window.",
+#endif /* SUPPORT_SOUNDSPEC */
+"  -h      Display this help message",
+"  -I n    Use program n as the default",
+"  -i mode Select user interface (see below for list)",
+"  -j      Realtime load instrument (toggle on/off)",
+"  -k msec Specify audio queue time limit to reduce voice",
+"  -L dir  Append dir to search path",
+"  -O mode Select output mode and format (see below for list)",
+#if defined(AU_HPUX)
+"  -o file Output to another file (or audio server) (Use \"-\" for stdout)",
+#elif defined (AU_LINUX)
+"  -o file Output to another file (or device) (Use \"-\" for stdout)",
+#else
+"  -o file Output to another file (Use \"-\" for stdout)",
+#endif
+"  -P file Use patch file for all programs",
+"  -p n    Allow n-voice polyphony",
+"  -Q n    Ignore channel n",
+"  -q m/n  Specify audio buffer in seconds",
+"            m:Maxmum buffer, n:Filled to start   (default is 5.0/100%%)",
+"            (size of 100%% equals device buffer size)",
+"  -R n    Pseudo Reveb (set every instrument's release to n ms",
+"            if n=0, n is set to 800(default)",
+"  -s f    Set sampling frequency to f (Hz or kHz)",
+"  -S n    Cache size (0 means no cache)",
+"  -t code Output text language code:",
+"              code=auto  : Auto conversion by `LANG' environment variable",
+"                           (UNIX only)",
+"                   ascii : Convert unreadable characters to '.'(0x2e)",
+"                   nocnv : No conversion",
+#ifdef JAPANESE
+"                   euc   : EUC-japan",
+"                   jis   : JIS",
+"                   sjis  : shift JIS",
+#endif /* JAPANESE */
+"  -U      Unload instruments from memory between MIDI files",
+"  -W mode Select WRD interface (see below for list)",
 #ifdef __W32__
 "  -w mode Windows extensional modes:",
 "              mode=r/R : Enable/Disable rcpcv dll",
 #endif /* __W32__ */
-"  -W mode Select WRD interface (see below for list)",
+"  -x \"configuration-string\"",
+"          Read configuration from command line argument",
 "  -Z file Load frequency table",
 NULL
 };
@@ -454,11 +456,16 @@
 
   for(i = 0; help_list[i]; i++)
   {
-      char *h;
+      char *h, *p;
 
       h = help_list[i];
-      if(strchr(h, '%'))
-	  fprintf(fp, h, help_args[j++]);
+      if((p = strchr(h, '%')) != NULL)
+      {
+	  if(*(p + 1) != '%')
+	      fprintf(fp, h, help_args[j++]);
+	  else
+	      fprintf(fp, h);
+      }
       else
 	  fputs(h, fp);
       fputs(NLS, fp);
@@ -541,7 +548,7 @@
 "                        `level' is optional to specify reverb level [0..127]"  NLS
 "                        This effect is only available in stereo"  NLS
 "  -EFreverb=2 : Global reverb effect" NLS
-"  -EFns=n : Enable the n th degree noiseshaping filter (n:0 to 4)" NLS
+"  -EFns=n : Enable the n th degree noiseshaping filter. n:[0..4]" NLS
 "            This effect is only available for 8-bit linear encoding" NLS
 NLS
 , fp);
@@ -2382,6 +2389,22 @@
 	    return 1;
 	break;
 
+      case 'q':
+	if(strchr(optarg, '/') == NULL)
+	    opt_aq_max_buff = strdup(optarg);
+	else
+	{
+	    if(optarg[0] == '/')
+		opt_aq_fill_buff = strdup(optarg + 1);
+	    else
+	    {
+		opt_aq_max_buff = strdup(optarg);
+		opt_aq_fill_buff = strchr(opt_aq_max_buff, '/');
+		*opt_aq_fill_buff++ = '\0';
+	    }
+	}
+	break;
+
       case 'b':
 	ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
 		  "-b option is obsoleted.  "
@@ -2744,6 +2767,29 @@
 #endif /* SOUNDSPEC */
 }
 
+MAIN_INTERFACE void timidity_init_aq_buff(void)
+{
+    double time1, /* max buffer */
+	   time2, /* init filled */
+	   base;  /* buffer of device driver */
+
+    if(!IS_STREAM_TRACE)
+	return; /* Ignore */
+
+    time1 = atof(opt_aq_max_buff);
+    time2 = atof(opt_aq_fill_buff);
+    base  = (double)aq_get_dev_queuesize() / play_mode->rate;
+    if(strchr(opt_aq_max_buff, '%'))
+    {
+	time1 = base * (time1 - 100) / 100.0;
+	if(time1 < 0)
+	    time1 = 0;
+    }
+    if(strchr(opt_aq_fill_buff, '%'))
+	time2 = base * time2 / 100.0;
+    aq_set_soft_queue(time1, time2);
+}
+
 MAIN_INTERFACE int timidity_play_main(int nfiles, char **files)
 {
     int need_stdin = 0, need_stdout = 0;
@@ -2832,7 +2878,7 @@
 
 	init_load_soundfont();
 	aq_setup();
-	aq_set_soft_queue(5.0, 1.0);
+	timidity_init_aq_buff();
 	if(allocate_cache_size > 0)
 	    resamp_cache_reset();
 
diff -ruN TiMidity++-2.1.1/timidity/timidity.h TiMidity++-2.2.0/timidity/timidity.h
--- TiMidity++-2.1.1/timidity/timidity.h	Thu Jun 10 21:15:27 1999
+++ TiMidity++-2.2.0/timidity/timidity.h	Sat Jul 17 18:57:20 1999
@@ -561,7 +561,7 @@
 /* new line code */
 #ifndef NLS
 #ifdef __W32__
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(__CYGWIN32__) || defined(__MINGW32__)
 #  define NLS "\n"
 #else
 #  define NLS "\r\n"
diff -ruN TiMidity++-2.1.1/timidity/timpp32g.ini TiMidity++-2.2.0/timidity/timpp32g.ini
--- TiMidity++-2.1.1/timidity/timpp32g.ini	Thu Jan  1 09:00:00 1970
+++ TiMidity++-2.2.0/timidity/timpp32g.ini	Sat Apr 17 21:51:09 1999
@@ -0,0 +1,218 @@
+[PLAYER]
+InitMinimizeFlag=0
+DebugWndStartFlag=1
+ConsoleWndStartFlag=0
+ListWndStartFlag=0
+TracerWndStartFlag=0
+DocWndStartFlag=0
+WrdWndStartFlag=0
+DebugWndFlag=1
+ConsoleWndFlag=1
+ListWndFlag=1
+TracerWndFlag=0
+DocWndFlag=0
+WrdWndFlag=0
+SoundSpecWndFlag=0
+SubWindowMax=2
+ConfigFile=\WINDOWS\TIMIDITY.CFG
+PlaylistFile=
+PlaylistHistoryFile=
+MidiFileOpenDir=
+ConfigFileOpenDir=
+PlaylistFileOpenDir=
+ProcessPriority=0
+PlayerThreadPriority=0
+MidiPlayerThreadPriority=0
+MainThreadPriority=0
+TracerThreadPriority=0
+WrdThreadPriority=0
+SystemFont=‚l‚r –¾’©
+PlayerFont=‚l‚r –¾’©
+WrdFont=‚l‚r –¾’©
+DocFont=‚l‚r –¾’©
+ListFont=‚l‚r –¾’©
+TracerFont=‚l‚r –¾’©
+SystemFontSize=9
+PlayerFontSize=16
+WrdFontSize=16
+DocFontSize=16
+ListFontSize=16
+TracerFontSize=16
+WrdGraphicFlag=0
+TraceGraphicFlag=0
+DocMaxSize=0
+DocFileExt=
+
+[TIMIDITY]
+free_instruments_afterwards=0
+effect_lr_mode=-1
+effect_lr_delay_msec=25
+quietchannels=0
+drumchannels=33554944
+drumchannel_mask=0
+default_drumchannels=33554944
+default_drumchannel_mask=0
+play_mode_id_character=d
+play_mode_encoding=6
+pmp_id_character=
+OutputName=
+antialiasing_allowed=0
+fast_decay=0
+adjust_panning_immediately=1
+output_rate=33075
+default_program0=0
+default_program1=0
+default_program2=0
+default_program3=0
+default_program4=0
+default_program5=0
+default_program6=0
+default_program7=0
+default_program8=0
+default_program9=0
+default_program10=0
+default_program11=0
+default_program12=0
+default_program13=0
+default_program14=0
+default_program15=0
+default_program16=0
+default_program17=0
+default_program18=0
+default_program19=0
+default_program20=0
+default_program21=0
+default_program22=0
+default_program23=0
+default_program24=0
+default_program25=0
+default_program26=0
+default_program27=0
+default_program28=0
+default_program29=0
+default_program30=0
+default_program31=0
+amplification=70
+control_ratio=32
+voices=128
+modify_release=0
+view_soundspec_flag=0
+allocate_cache_size=2097152
+allocate_chace_size_string=
+ctl_verbosity=1
+ctl_id_character=w
+ctl_trace_playing=1
+buffer_fragments=32
+output_text_code=SJIS
+opt_modulation_wheel=1
+opt_portamento=1
+opt_nrpn_vibrato=1
+opt_reverb_control=1
+opt_chorus_control=1
+opt_chorus_control20=0
+opt_chorus_control21=0
+opt_chorus_control22=0
+opt_chorus_control23=0
+opt_chorus_control24=0
+opt_chorus_control25=0
+opt_chorus_control26=0
+opt_chorus_control27=0
+opt_chorus_control28=0
+opt_chorus_control29=0
+opt_chorus_control210=0
+opt_chorus_control211=0
+opt_chorus_control212=0
+opt_chorus_control213=0
+opt_chorus_control214=0
+opt_chorus_control215=0
+opt_chorus_control216=0
+opt_chorus_control217=0
+opt_chorus_control218=0
+opt_chorus_control219=0
+opt_chorus_control220=0
+opt_chorus_control221=0
+opt_chorus_control222=0
+opt_chorus_control223=0
+opt_chorus_control224=0
+opt_chorus_control225=0
+opt_chorus_control226=0
+opt_chorus_control227=0
+opt_chorus_control228=0
+opt_chorus_control229=0
+opt_chorus_control230=0
+opt_chorus_control231=0
+opt_channel_pressure=0
+opt_trace_text_meta_event=0
+opt_overlap_voice_allow=1
+opt_default_mid=0
+opt_default_mid_str0=0
+opt_default_mid_str1=0
+opt_default_mid_str2=0
+opt_default_mid_str3=0
+opt_default_mid_str4=0
+opt_default_mid_str5=0
+opt_default_mid_str6=0
+opt_default_mid_str7=0
+opt_default_mid_str8=0
+opt_default_mid_str9=0
+opt_default_mid_str10=0
+opt_default_mid_str11=0
+opt_default_mid_str12=0
+opt_default_mid_str13=0
+opt_default_mid_str14=0
+opt_default_mid_str15=0
+opt_default_mid_str16=0
+opt_default_mid_str17=0
+opt_default_mid_str18=0
+opt_default_mid_str19=0
+opt_default_mid_str20=0
+opt_default_mid_str21=0
+opt_default_mid_str22=0
+opt_default_mid_str23=0
+opt_default_mid_str24=0
+opt_default_mid_str25=0
+opt_default_mid_str26=0
+opt_default_mid_str27=0
+opt_default_mid_str28=0
+opt_default_mid_str29=0
+opt_default_mid_str30=0
+opt_default_mid_str31=0
+opt_default_mid_str32=0
+opt_default_mid_str33=0
+opt_default_mid_str34=0
+opt_default_mid_str35=0
+opt_default_mid_str36=0
+opt_default_mid_str37=0
+opt_default_mid_str38=0
+opt_default_mid_str39=0
+opt_default_mid_str40=0
+opt_default_mid_str41=0
+opt_default_mid_str42=0
+opt_default_mid_str43=0
+opt_default_mid_str44=0
+opt_default_mid_str45=0
+opt_default_mid_str46=0
+opt_default_mid_str47=0
+opt_default_mid_str48=0
+opt_default_mid_str49=0
+opt_default_mid_str50=0
+opt_default_mid_str51=0
+opt_default_mid_str52=0
+opt_default_mid_str53=0
+opt_default_mid_str54=0
+opt_default_mid_str55=0
+opt_default_mid_str56=0
+opt_default_mid_str57=0
+opt_default_mid_str58=0
+opt_default_mid_str59=0
+opt_default_mid_str60=0
+opt_default_mid_str61=0
+opt_default_mid_str62=0
+opt_default_mid_str63=0
+default_tonebank=0
+special_tonebank=-1
+opt_realtime_playing=0
+opt_rcpcv_dll=0
+wrdt_id=-
+wrdt_open_opts=
+noise_sharp_type=0
diff -ruN TiMidity++-2.1.1/timidity/wrd_read.c TiMidity++-2.2.0/timidity/wrd_read.c
--- TiMidity++-2.1.1/timidity/wrd_read.c	Sun Apr 25 23:17:10 1999
+++ TiMidity++-2.2.0/timidity/wrd_read.c	Sun Jul 18 02:12:50 1999
@@ -116,8 +116,11 @@
 
 static MBlockList sry_pool; /* data buffer */
 sry_datapacket *datapacket = NULL;
+#ifdef ENABLE_SHERRY
 static int datapacket_len, datapacket_cnt;
 #define DEFAULT_DATAPACKET_LEN 16384
+static int import_sherrywrd_file(const char * );
+#endif /* ENABLE_SHERRY */
 
 static uint8 cmdlookup(uint8 *cmd);
 static int wrd_nexttok(struct timidity_file *tf);
@@ -137,8 +140,6 @@
 static void wrdstep_rest(struct wrd_step_tracer *wrdstep, int bar, int step);
 static struct wrd_delayed_event *wrd_delay_cmd(struct wrd_step_tracer *wrdstep,
 					int32 waittime, int cmd, int arg);
-static int import_sherrywrd_file(const char * );
-
 static uint8 wrd_tokval[MAXTOKLEN + 1]; /* Token value */
 static uint8 wrd_tok;		/* Token type */
 static int lineno;		/* linenumber */
diff -ruN TiMidity++-2.1.1/utils/net.c TiMidity++-2.2.0/utils/net.c
--- TiMidity++-2.1.1/utils/net.c	Mon Mar  1 20:55:48 1999
+++ TiMidity++-2.2.0/utils/net.c	Sat Jul 17 18:09:42 1999
@@ -59,13 +59,15 @@
 {
     SOCKET fd;
     struct sockaddr_in in;
-    static int first = 1;
 
+#if defined(WINSOCK)
+    static int first = 1;
     if(first) {
 	WSADATA dmy;
 	WSAStartup(MAKEWORD(1,1), &dmy);
 	first = 0;
     }
+#endif
 
     memset(&in, 0, sizeof(in));
     if((in.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE)
diff -ruN TiMidity++-2.1.1/utils/nkflib.c TiMidity++-2.2.0/utils/nkflib.c
--- TiMidity++-2.1.1/utils/nkflib.c	Mon Nov 30 18:19:18 1998
+++ TiMidity++-2.2.0/utils/nkflib.c	Sat Jul 17 18:08:32 1999
@@ -1654,10 +1654,12 @@
 {
     int		    i;
     if (c > '@')
+    {
 	if (c < '[')
 	    i = c - 'A';	/* A..Z 0-25 */
 	else
 	    i = c - 'G' /* - 'a' + 26 */ ;	/* a..z 26-51 */
+    }
     else if (c > '/')
 	i = c - '0' + '4' /* - '0' + 52 */ ;	/* 0..9 52-61 */
     else if (c == '+')