diff -ruN TiMidity++-1.1.1/ChangeLog TiMidity++-1.2.0/ChangeLog
--- TiMidity++-1.1.1/ChangeLog	Mon Jan 18 22:23:33 1999
+++ TiMidity++-1.2.0/ChangeLog	Thu Jan 21 01:48:22 1999
@@ -1,3 +1,63 @@
+-- 1.2.0
+Thu Jan 21 JST 1999
+Summary:
+    * XAW interface:
+      - Changed button bitmap of random & repeat
+      - Modified some implementations.
+    * Gtk interface:
+      - Added buttons (& implementation) for raising & lowering the pitch.
+      - Added buttons (& implementation) for increasing/decreasing the tempo.
+    * Lookup TIMIDITY_SOUND_CARD and TIMIDITY_PCM_DEVICE environment variable
+      to select the PCM device of ALSA.
+    * Added interface.h to define IA_* macro for TiMidity interface.  This
+      file is generated automatically by configure.
+    * Fixed some bugs.
+
+Date: Thu, 21 Jan 1999 01:33:58 +0900 (JST)
+From: nork@lb.u-tokai.ac.jp (Norikatsu Shigemura)
+Files: configure.in
+    Fixed configure bug about FreeBSD dynamic interface.
+
+Date: Wed Jan 20 1999
+From: Masanao Izumo <mo@goice.co.jp>
+Files: interface/xskin_spectrum.c
+    Don't define xskin_spe_ana() and xskin_wave() if soundspec is not enable.
+Files: configure.in interface.h.in timidity/{Makefile.am,timidity.c,controls.c}
+    Fixed configuration bug that tcl needed -dl on some machines.
+    IA_* macro is into interface.h.  interface.h is generated automatically
+    by configure.
+
+Date: Tue, 19 Jan 1999 23:16:33 +0900 (JST)
+From: Yoshishige Arai <ryo2@on.rim.or.jp>
+Files: interface{bitmaps/Makefile.am,bitmaps/Makefile.in,bitmaps/random.xbm,
+	bitmaps/repeat.xbm,xaw.h,xaw_i.c}
+    Modified XAW interface:
+      - Changed Form Widget to Box Widget.
+      - Changed icon bitmaps
+      - Obsoleted MSGWINDOW macro configuration.  Message window is always
+        enable.
+
+Date: Tue, 19 Jan 1999 17:54:53 +0900
+From: Takanori Watanabe <takawata@shidahara1.planet.sci.kobe-u.ac.jp>,
+      Glenn Trigg <ggt@netspace.net.au>
+Files: interface{emacs_c.c,gtk_c.c,gtk_h.h,gtk_i.c,gtk_p.c,ncurs_c.c,
+	pixmaps/Makefile.in,vt100_c.c}
+	timidity/{controls.h,playmidi.c,timidity.c,wrd_read.c}
+    Pached from Glenn Trigg:
+    The changes are (roughly):
+      - Added buttons (& implementation) for raising & lowering the pitch.
+      - Added buttons (& implementation) for increasing/decreasing the tempo.
+      - Fixed a bug where starting with no files and then loading a file
+        and trying to play it caused a crash.
+      - Fixed a typo RC_TOGGLE_DURMCHAN => RC_TOGGLE_DRUMCHAN.
+      - Added some braces to two macros to stop some compiler warnings.
+
+Date: Tue, 19 Jan 1999 00:21:35 +0900
+From: Yamahata Isaku <yamahata@kusm.kyoto-u.ac.jp>
+Files: alsa_a.c
+    Lookup TIMIDITY_SOUND_CARD and TIMIDITY_PCM_DEVICE environment variable
+    to select the PCM device.
+
 -- 1.1.1
 Mon Jan 18 1999
 Summary:
diff -ruN TiMidity++-1.1.1/Makefile.in TiMidity++-1.2.0/Makefile.in
--- TiMidity++-1.1.1/Makefile.in	Mon Jan 18 22:55:35 1999
+++ TiMidity++-1.2.0/Makefile.in	Thu Jan 21 01:59:16 1999
@@ -102,9 +102,11 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 dynamic_targets = @dynamic_targets@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 
 SUBDIRS = \
 	utils \
@@ -126,12 +128,12 @@
 	timidity.mak
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
+CONFIG_HEADER = config.h interface.h
 CONFIG_CLEAN_FILES =  common.makefile
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
 Makefile.in NEWS acinclude.m4 aclocal.m4 common.makefile.in \
 config.guess config.h.in config.sub configure configure.in install-sh \
-missing mkinstalldirs stamp-h.in
+interface.h.in missing mkinstalldirs stamp-h1.in stamp-h2.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -156,24 +158,36 @@
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-config.h: stamp-h
+config.h: stamp-h1
 	@:
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
 	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	@echo timestamp > stamp-h1
+$(srcdir)/config.h.in: $(srcdir)/stamp-h1.in
+$(srcdir)/stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in
+	@echo timestamp > $(srcdir)/stamp-h1.in
+
+interface.h: stamp-h2
+	@:
+stamp-h2: $(srcdir)/interface.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=interface.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > stamp-h2
+$(srcdir)/interface.h.in: $(srcdir)/stamp-h2.in
+$(srcdir)/stamp-h2.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/stamp-h2.in
 
 mostlyclean-hdr:
 
 clean-hdr:
 
 distclean-hdr:
-	-rm -f config.h
+	-rm -f config.h interface.h
 
 maintainer-clean-hdr:
 common.makefile: $(top_builddir)/config.status common.makefile.in
@@ -222,7 +236,7 @@
 	here=`pwd` && cd $(srcdir) \
 	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in interface.h.in $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -232,8 +246,8 @@
 	unique=`for i in $$list; do echo $$i; done | \
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)config.h.in interface.h.in$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in interface.h.in $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
@@ -300,10 +314,10 @@
 check: all-am
 	$(MAKE) check-recursive
 installcheck: installcheck-recursive
-all-recursive-am: config.h
+all-recursive-am: config.h interface.h
 	$(MAKE) all-recursive
 
-all-am: Makefile config.h
+all-am: Makefile config.h interface.h
 
 install-exec: install-exec-recursive
 	@$(NORMAL_INSTALL)
diff -ruN TiMidity++-1.1.1/NEWS TiMidity++-1.2.0/NEWS
--- TiMidity++-1.1.1/NEWS	Mon Jan 18 19:32:52 1999
+++ TiMidity++-1.2.0/NEWS	Thu Jan 21 01:08:34 1999
@@ -1,3 +1,17 @@
+* 1/20, 1999
+    TiMidity++ v1.2.0 is released.
+    New features and major change from v1.1.x:
+    * XAW interface:
+      - Changed button bitmap of random & repeat
+      - Modified some implementations.
+    * Gtk interface:
+      - Added buttons (& implementation) for raising & lowering the pitch.
+      - Added buttons (& implementation) for increasing/decreasing the tempo.
+    * Lookup TIMIDITY_SOUND_CARD and TIMIDITY_PCM_DEVICE environment variable
+      to select the PCM device of ALSA.
+    * Added interface.h to define IA_* macro for TiMidity interface.  This
+      file is generated automatically by configure.
+
 * 1/18, 1999
     TiMidity++ v1.1.1 is released.
     v1.1.0 had configuration probrems, so v1.1.1 was released immediately.
diff -ruN TiMidity++-1.1.1/acinclude.m4 TiMidity++-1.2.0/acinclude.m4
--- TiMidity++-1.1.1/acinclude.m4	Mon Jan 18 19:23:41 1999
+++ TiMidity++-1.2.0/acinclude.m4	Wed Jan 20 18:22:59 1999
@@ -1,13 +1,23 @@
-dnl CONFIG_INTERFACE(package,macro_name,interface_id,help,action-if-given,
-dnl                  $1      $2         $3           $4   $5
-dnl                  yes,dynamic,no)
-dnl                  $6  $7      $8
+dnl MY_DEFINE(VARIABLE)
+AC_DEFUN(MY_DEFINE,
+[cat >> confdefs.h <<EOF
+[#define] $1 1
+EOF
+])
+
+dnl CONFIG_INTERFACE(package,macro_name,interface_id,help
+dnl                  $1      $2         $3           $4
+dnl                  action-if-yes-or-dynamic,
+dnl		     $5
+dnl		     action-if-yes,action-if-dynamic,action-if-no)
+dnl		     $6            $7                $8
 AC_DEFUN(CONFIG_INTERFACE,
-[AC_ARG_ENABLE($1,[$4],[$5])
+[AC_ARG_ENABLE($1,[$4],
+[case "x$enable_$1" in xyes|xdynamic) $5 ;; esac])
 case "x$enable_$1" in
 xyes)
+  MY_DEFINE(IA_$2)
   AM_CONDITIONAL(ENABLE_$2, true)
-  EXTRADEFS="$EXTRADEFS -DIA_$2"
   $6
   ;;
 xdynamic)
@@ -146,6 +156,9 @@
 
 
 dnl CHECK_DLSYM_UNDERSCORE([ACTION-IF-NEED [, ACTION IF-NOT-NEED]])
+dnl variable input:
+dnl   CC CFLAGS CPPFLAGS LDFLAGS LIBS SHCFLAGS SHLD SHLDFLAGS
+dnl   ac_cv_header_dlfcn_h lib_dl_opt so
 AC_DEFUN(CHECK_DLSYM_UNDERSCORE,
 [dnl Check if dlsym need a leading underscore
 AC_MSG_CHECKING(whether your dlsym() needs a leading underscore)
@@ -207,7 +220,7 @@
 if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 &&
 	mv dyna.o tmp-dyna.o > /dev/null 2>&1 && 
 	$SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 && 
-	${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.$ac_ext $LIBS > /dev/null 2>&1; then
+	${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.c $LIBS $lib_dl_opt > /dev/null 2>&1; then
 	xxx=`./fred`
 	case $xxx in
 	1)	AC_MSG_WARN(Test program failed using dlopen.  Perhaps you should not use dynamic loading.)
diff -ruN TiMidity++-1.1.1/aclocal.m4 TiMidity++-1.2.0/aclocal.m4
--- TiMidity++-1.1.1/aclocal.m4	Mon Jan 18 22:36:40 1999
+++ TiMidity++-1.2.0/aclocal.m4	Thu Jan 21 01:37:03 1999
@@ -10,16 +10,26 @@
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
-dnl CONFIG_INTERFACE(package,macro_name,interface_id,help,action-if-given,
-dnl                  $1      $2         $3           $4   $5
-dnl                  yes,dynamic,no)
-dnl                  $6  $7      $8
+dnl MY_DEFINE(VARIABLE)
+AC_DEFUN(MY_DEFINE,
+[cat >> confdefs.h <<EOF
+[#define] $1 1
+EOF
+])
+
+dnl CONFIG_INTERFACE(package,macro_name,interface_id,help
+dnl                  $1      $2         $3           $4
+dnl                  action-if-yes-or-dynamic,
+dnl		     $5
+dnl		     action-if-yes,action-if-dynamic,action-if-no)
+dnl		     $6            $7                $8
 AC_DEFUN(CONFIG_INTERFACE,
-[AC_ARG_ENABLE($1,[$4],[$5])
+[AC_ARG_ENABLE($1,[$4],
+[case "x$enable_$1" in xyes|xdynamic) $5 ;; esac])
 case "x$enable_$1" in
 xyes)
+  MY_DEFINE(IA_$2)
   AM_CONDITIONAL(ENABLE_$2, true)
-  EXTRADEFS="$EXTRADEFS -DIA_$2"
   $6
   ;;
 xdynamic)
@@ -158,6 +168,9 @@
 
 
 dnl CHECK_DLSYM_UNDERSCORE([ACTION-IF-NEED [, ACTION IF-NOT-NEED]])
+dnl variable input:
+dnl   CC CFLAGS CPPFLAGS LDFLAGS LIBS SHCFLAGS SHLD SHLDFLAGS
+dnl   ac_cv_header_dlfcn_h lib_dl_opt so
 AC_DEFUN(CHECK_DLSYM_UNDERSCORE,
 [dnl Check if dlsym need a leading underscore
 AC_MSG_CHECKING(whether your dlsym() needs a leading underscore)
@@ -219,7 +232,7 @@
 if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 &&
 	mv dyna.o tmp-dyna.o > /dev/null 2>&1 && 
 	$SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 && 
-	${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.$ac_ext $LIBS > /dev/null 2>&1; then
+	${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.c $LIBS $lib_dl_opt > /dev/null 2>&1; then
 	xxx=`./fred`
 	case $xxx in
 	1)	AC_MSG_WARN(Test program failed using dlopen.  Perhaps you should not use dynamic loading.)
diff -ruN TiMidity++-1.1.1/config.h.in TiMidity++-1.2.0/config.h.in
--- TiMidity++-1.1.1/config.h.in	Mon Jan 18 10:15:14 1999
+++ TiMidity++-1.2.0/config.h.in	Wed Jan 20 18:17:12 1999
@@ -155,9 +155,6 @@
 /* Define if you have the m library (-lm).  */
 #undef HAVE_LIBM
 
-/* Define if you have the ncurses library (-lncurses).  */
-#undef HAVE_LIBNCURSES
-
 /* Define if you have the slang library (-lslang).  */
 #undef HAVE_LIBSLANG
 
diff -ruN TiMidity++-1.1.1/configure TiMidity++-1.2.0/configure
--- TiMidity++-1.1.1/configure	Mon Jan 18 22:36:41 1999
+++ TiMidity++-1.2.0/configure	Thu Jan 21 01:37:07 1999
@@ -834,7 +834,7 @@
 
 PACKAGE=TiMidity++
 
-VERSION=1.1.1
+VERSION=1.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; }
@@ -1268,7 +1268,7 @@
 
 LDFLAGS=${LDFLAGS:--L/usr/local/lib}
 SHLDFLAGS=${LDFLAGS:--L/usr/local/lib}
-CFLAGS="$CFLAGS -I/usr/local/include"
+CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 
 EXTRACFLAGS=
 EXTRADEFS=
@@ -1283,48 +1283,62 @@
 lib_xprelibs_opt=
 lib_xext_opt=
 
+lib_dl_opt=
+
+WISH=${WISH:-wish}
+tcltk_dep=
+
+for i in `echo $LIBRARY_PATH|sed -e 's,:, ,g'`; do
+    LDFLAGS="$LDFLAGS -L${i}"
+    SHLDFLAGS="$SHLDFLAGS -L${i}"
+done
+for i in `echo $C_INCLUDE_PATH|sed -e 's,:, ,g'`; do
+    EXTRAINCS="$EXTRAINCS -I${i}"
+done
 
 case "$target" in
   *-*-hpux*)
-    SHLD="ld -b"
+    test -n "$SHLD" || SHLD="ld -b"
     so="sl"
     ;;
   *-sgi-irix*)
-    case ".$CC" in .cc*) EXTRACFLAGS="-signed";; esac
-    SHLD="cc -shared -all"
+        case ".$CC" in .cc*) EXTRACFLAGS="-signed";; esac
+    test -n "$SHLD" || SHLD="cc -shared -all"
     so="so"
     ;;
   *-*-netbsd*)
-    SHLD="ld -Bforcearchive -Bshareable"
+    test -n "$SHLD" || SHLD="ld -Bforcearchive -Bshareable"
     so="so"
     ;;
   *-*-freebsd*)
     EXTRALIBS="$EXTRALIB -lxpg4"
+    test -n "$SHLD" || SHLD="ld -Bshareable"
+    so="so"
     ;;
   *-*-cygwin32*)
     EXTRADEFS="-D__WIN32__"
-    SHLD="$CC"
+    test -n "$SHLD" || SHLD="$CC"
     so="dll"
     CYGWIN32=yes
     ;;
   *-dec-*)
     EXTRADEFS="-DDEC"
-    SHLD="ld -Bdynamic -G"
+    test -n "$SHLD" || SHLD="ld -Bdynamic -G"
     so="so"
     ;;
   *-*-solaris*)
     EXTRADEFS="-DSOLARIS"
-    SHLD="ld -Bdynamic -G"
+    test -n "$SHLD" || SHLD="/usr/ccs/bin/ld -G"
     so="so"
     ;;
   *)
-    SHLD="ld -Bdynamic -G"
+    test -n "$SHLD" || SHLD="ld -Bdynamic -G"
     so="so"
     ;;
 esac
 
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:1328: checking for sqrt in -lm" >&5
+echo "configure:1342: 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
@@ -1332,7 +1346,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1336 "configure"
+#line 1350 "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
@@ -1343,7 +1357,7 @@
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:1347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1371,7 +1385,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:1375: checking for socket in -lsocket" >&5
+echo "configure:1389: 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
@@ -1379,7 +1393,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1383 "configure"
+#line 1397 "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
@@ -1390,7 +1404,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1417,15 +1431,55 @@
   echo "$ac_t""no" 1>&6
 fi
 
+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:1436: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1444 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:1455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  lib_dl_opt=-ldl
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1424: checking for $ac_func" >&5
+echo "configure:1478: 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 1429 "configure"
+#line 1483 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1448,7 +1502,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1470,7 +1524,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1474: checking for gethostbyname in -lnsl" >&5
+echo "configure:1528: 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
@@ -1478,7 +1532,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1482 "configure"
+#line 1536 "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
@@ -1489,7 +1543,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1520,7 +1574,7 @@
 done
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1524: checking how to run the C preprocessor" >&5
+echo "configure:1578: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1535,13 +1589,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1539 "configure"
+#line 1593 "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:1545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1552,13 +1606,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1556 "configure"
+#line 1610 "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:1562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1585,7 +1639,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:1589: checking for X" >&5
+echo "configure:1643: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1647,12 +1701,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1651 "configure"
+#line 1705 "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:1656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1721,14 +1775,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1725 "configure"
+#line 1779 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:1732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -1834,17 +1888,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:1838: checking whether -R must be followed by a space" >&5
+echo "configure:1892: 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 1841 "configure"
+#line 1895 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -1860,14 +1914,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 1864 "configure"
+#line 1918 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -1899,7 +1953,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:1903: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:1957: 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
@@ -1907,7 +1961,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1911 "configure"
+#line 1965 "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
@@ -1918,7 +1972,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1940,7 +1994,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:1944: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:1998: 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
@@ -1948,7 +2002,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1952 "configure"
+#line 2006 "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
@@ -1959,7 +2013,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1988,12 +2042,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:1992: checking for gethostbyname" >&5
+echo "configure:2046: 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 1997 "configure"
+#line 2051 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -2016,7 +2070,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -2037,7 +2091,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2041: checking for gethostbyname in -lnsl" >&5
+echo "configure:2095: 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
@@ -2045,7 +2099,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2049 "configure"
+#line 2103 "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
@@ -2056,7 +2110,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:2060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2086,12 +2140,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:2090: checking for connect" >&5
+echo "configure:2144: 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 2095 "configure"
+#line 2149 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -2114,7 +2168,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -2135,7 +2189,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2139: checking for connect in -lsocket" >&5
+echo "configure:2193: 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
@@ -2143,7 +2197,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2147 "configure"
+#line 2201 "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
@@ -2154,7 +2208,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2178,12 +2232,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:2182: checking for remove" >&5
+echo "configure:2236: 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 2187 "configure"
+#line 2241 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -2206,7 +2260,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -2227,7 +2281,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2231: checking for remove in -lposix" >&5
+echo "configure:2285: 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
@@ -2235,7 +2289,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2239 "configure"
+#line 2293 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2246,7 +2300,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2270,12 +2324,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2274: checking for shmat" >&5
+echo "configure:2328: 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 2279 "configure"
+#line 2333 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -2298,7 +2352,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -2319,7 +2373,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2323: checking for shmat in -lipc" >&5
+echo "configure:2377: 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
@@ -2327,7 +2381,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2331 "configure"
+#line 2385 "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
@@ -2338,7 +2392,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2371,7 +2425,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:2375: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2429: 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
@@ -2379,7 +2433,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2383 "configure"
+#line 2437 "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
@@ -2390,7 +2444,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2416,19 +2470,22 @@
 
 
 if test "x$with_x" = xyes; then
+  if test "x$have_x" = xno; then
+    { echo "configure: error: Could not configure X" 1>&2; exit 1; }
+  fi
   if test "x$x_libraries" != x; then
     ldflags_x_opt="-L$x_libraries"
     LDFLAGS="$LDFLAGS $ldflags_x_opt"
+    SHLDFLAGS="$SHLDFLAGS $ldflags_x_opt"
   else
     ldflags_x_opt=
   fi
   if test "x$x_includes" != x; then
     CPPFLAGS="$CPPFLAGS -I$x_includes"
-    CFLAGS="$CFLAGS -I$x_includes"
   fi
 
   echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:2432: checking for XOpenDisplay in -lX11" >&5
+echo "configure:2489: 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
@@ -2436,7 +2493,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lX11  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2440 "configure"
+#line 2497 "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
@@ -2447,7 +2504,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:2451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2475,12 +2532,12 @@
 fi
 
   echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
-echo "configure:2479: checking X11 version 6" >&5
+echo "configure:2536: 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 2484 "configure"
+#line 2541 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int main() {
@@ -2490,7 +2547,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   timidity_cv_x11_version_6=yes
 else
@@ -2510,7 +2567,7 @@
 
     KEEPLIBS=$LIBS
   echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
-echo "configure:2514: checking for XShapeCombineMask in -lXext" >&5
+echo "configure:2571: 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
@@ -2518,7 +2575,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXext  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2522 "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
@@ -2529,7 +2586,7 @@
 XShapeCombineMask()
 ; return 0; }
 EOF
-if { (eval echo configure:2533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2551,7 +2608,7 @@
 fi
 
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2555: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2612: 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
@@ -2559,7 +2616,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2563 "configure"
+#line 2620 "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 +2627,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2598,7 +2655,7 @@
 fi
 
   echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6
-echo "configure:2602: checking for SmcOpenConnection in -lSM" >&5
+echo "configure:2659: 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
@@ -2606,7 +2663,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lSM  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2610 "configure"
+#line 2667 "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
@@ -2617,7 +2674,7 @@
 SmcOpenConnection()
 ; return 0; }
 EOF
-if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2639,7 +2696,7 @@
 fi
 
   echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:2643: checking for XtVaAppInitialize in -lXt" >&5
+echo "configure:2700: 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
@@ -2647,7 +2704,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2651 "configure"
+#line 2708 "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
@@ -2658,7 +2715,7 @@
 XtVaAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:2662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2680,7 +2737,7 @@
 fi
 
   echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6
-echo "configure:2684: checking for XmuInternAtom in -lXmu" >&5
+echo "configure:2741: 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
@@ -2688,7 +2745,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXmu  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2692 "configure"
+#line 2749 "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
@@ -2699,7 +2756,7 @@
 XmuInternAtom()
 ; return 0; }
 EOF
-if { (eval echo configure:2703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2720,7 +2777,7 @@
 fi
 
   echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6
-echo "configure:2724: checking for XawInitializeWidgetSet in -lXaw3d" >&5
+echo "configure:2781: 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
@@ -2728,7 +2785,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw3d  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2732 "configure"
+#line 2789 "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
@@ -2739,7 +2796,7 @@
 XawInitializeWidgetSet()
 ; return 0; }
 EOF
-if { (eval echo configure:2743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2758,7 +2815,7 @@
 else
   echo "$ac_t""no" 1>&6
  echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6
-echo "configure:2762: checking for XawInitializeWidgetSet in -lXaw" >&5
+echo "configure:2819: 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
@@ -2766,7 +2823,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2770 "configure"
+#line 2827 "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
@@ -2777,7 +2834,7 @@
 XawInitializeWidgetSet()
 ; return 0; }
 EOF
-if { (eval echo configure:2781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2801,7 +2858,7 @@
 fi
 
   echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6
-echo "configure:2805: checking for XmCreateForm in -lXm" >&5
+echo "configure:2862: 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
@@ -2809,7 +2866,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2813 "configure"
+#line 2870 "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
@@ -2820,7 +2877,7 @@
 XmCreateForm()
 ; return 0; }
 EOF
-if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2850,12 +2907,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:2854: checking for $ac_hdr that defines DIR" >&5
+echo "configure:2911: 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 2859 "configure"
+#line 2916 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -2863,7 +2920,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -2888,7 +2945,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:2892: checking for opendir in -ldir" >&5
+echo "configure:2949: 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
@@ -2896,7 +2953,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2900 "configure"
+#line 2957 "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
@@ -2907,7 +2964,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:2911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2929,7 +2986,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:2933: checking for opendir in -lx" >&5
+echo "configure:2990: 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
@@ -2937,7 +2994,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2941 "configure"
+#line 2998 "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
@@ -2948,7 +3005,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:2952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2971,12 +3028,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2975: checking for ANSI C header files" >&5
+echo "configure:3032: 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 2980 "configure"
+#line 3037 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2984,7 +3041,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3001,7 +3058,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 3005 "configure"
+#line 3062 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3019,7 +3076,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 3023 "configure"
+#line 3080 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3040,7 +3097,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3044 "configure"
+#line 3101 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3051,7 +3108,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3075,12 +3132,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3079: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3136: 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 3084 "configure"
+#line 3141 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3096,7 +3153,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3120,17 +3177,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3124: checking for $ac_hdr" >&5
+echo "configure:3181: 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 3129 "configure"
+#line 3186 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3158,17 +3215,17 @@
 
 ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for string.h""... $ac_c" 1>&6
-echo "configure:3162: checking for string.h" >&5
+echo "configure:3219: 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 3167 "configure"
+#line 3224 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3192,12 +3249,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3196: checking for working const" >&5
+echo "configure:3253: 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 3201 "configure"
+#line 3258 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3246,7 +3303,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3267,14 +3324,14 @@
 fi
 
 echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:3271: checking whether char is unsigned" >&5
+echo "configure:3328: 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 3278 "configure"
+#line 3335 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -3296,7 +3353,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3300 "configure"
+#line 3357 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -3306,7 +3363,7 @@
   volatile char c = 255; exit(c < 0);
 }
 EOF
-if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_char_unsigned=yes
 else
@@ -3330,14 +3387,14 @@
 fi
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3334: checking whether byte ordering is bigendian" >&5
+echo "configure:3391: 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 3341 "configure"
+#line 3398 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3348,11 +3405,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3409: \"$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 3356 "configure"
+#line 3413 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3363,7 +3420,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -3383,7 +3440,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3387 "configure"
+#line 3444 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3396,7 +3453,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -3420,21 +3477,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3424: checking for inline" >&5
+echo "configure:3481: 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 3431 "configure"
+#line 3488 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3460,12 +3517,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3464: checking for off_t" >&5
+echo "configure:3521: 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 3469 "configure"
+#line 3526 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3493,12 +3550,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3497: checking for pid_t" >&5
+echo "configure:3554: 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 3502 "configure"
+#line 3559 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3526,12 +3583,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3530: checking for size_t" >&5
+echo "configure:3587: 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 3535 "configure"
+#line 3592 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3559,12 +3616,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3563: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3620: 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 3568 "configure"
+#line 3625 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3573,7 +3630,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3595,19 +3652,19 @@
 
 
 echo $ac_n "checking volatile declaration""... $ac_c" 1>&6
-echo "configure:3599: checking volatile declaration" >&5
+echo "configure:3656: 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 3604 "configure"
+#line 3661 "configure"
 #include "confdefs.h"
 
 int main() {
 volatile int x
 ; return 0; }
 EOF
-if { (eval echo configure:3611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   timidity_cv_type_volatile=yes
 else
@@ -3625,12 +3682,12 @@
 fi
 
 echo $ac_n "checking union semun declaration""... $ac_c" 1>&6
-echo "configure:3629: checking union semun declaration" >&5
+echo "configure:3686: 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 3634 "configure"
+#line 3691 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -3639,7 +3696,7 @@
 union semun x
 ; return 0; }
 EOF
-if { (eval echo configure:3643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   timidity_cv_type_union_semun=yes
 else
@@ -3658,13 +3715,13 @@
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:3662: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:3719: 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 3668 "configure"
+#line 3725 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -3682,7 +3739,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 3686 "configure"
+#line 3743 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -3704,7 +3761,7 @@
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:3708: checking for 8-bit clean memcmp" >&5
+echo "configure:3765: 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
@@ -3712,7 +3769,7 @@
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3716 "configure"
+#line 3773 "configure"
 #include "confdefs.h"
 
 main()
@@ -3722,7 +3779,7 @@
 }
 
 EOF
-if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -3743,17 +3800,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3747: checking for $ac_hdr" >&5
+echo "configure:3804: 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 3752 "configure"
+#line 3809 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3782,12 +3839,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3786: checking for $ac_func" >&5
+echo "configure:3843: 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 3791 "configure"
+#line 3848 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3810,7 +3867,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3835,7 +3892,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3839: checking for working mmap" >&5
+echo "configure:3896: 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
@@ -3843,7 +3900,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3847 "configure"
+#line 3904 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3983,7 +4040,7 @@
 }
 
 EOF
-if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -4006,7 +4063,7 @@
 fi
 
 echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
-echo "configure:4010: checking whether setvbuf arguments are reversed" >&5
+echo "configure:4067: 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
@@ -4014,7 +4071,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4018 "configure"
+#line 4075 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -4028,7 +4085,7 @@
   exit(0);			/* Non-reversed systems segv here.  */
 }
 EOF
-if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -4052,12 +4109,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4056: checking return type of signal handlers" >&5
+echo "configure:4113: 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 4061 "configure"
+#line 4118 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4074,7 +4131,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4093,12 +4150,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:4097: checking for vprintf" >&5
+echo "configure:4154: 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 4102 "configure"
+#line 4159 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -4121,7 +4178,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -4145,12 +4202,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:4149: checking for _doprnt" >&5
+echo "configure:4206: 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 4154 "configure"
+#line 4211 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -4173,7 +4230,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -4200,12 +4257,12 @@
 for ac_func in gettimeofday select socket strdup strstr vsnprintf snprintf usleep strncasecmp strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4204: checking for $ac_func" >&5
+echo "configure:4261: 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 4209 "configure"
+#line 4266 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4228,7 +4285,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4255,12 +4312,12 @@
 
 # check getopt
 echo $ac_n "checking for getopt""... $ac_c" 1>&6
-echo "configure:4259: checking for getopt" >&5
+echo "configure:4316: checking for getopt" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getopt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4264 "configure"
+#line 4321 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getopt(); below.  */
@@ -4283,7 +4340,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_getopt=yes"
 else
@@ -4319,7 +4376,8 @@
    if test ! -d $withval; then
       { echo "configure: error: $withval not found." 1>&2; exit 1; }
     fi
-    tcl_include_dir=$withval 
+    tcl_include_dir=$withval
+  
 else
    tcl_include_dir=/usr/local/include 
 fi
@@ -4382,7 +4440,7 @@
 
 
 echo $ac_n "checking whether to enable audio""... $ac_c" 1>&6
-echo "configure:4386: checking whether to enable audio" >&5
+echo "configure:4444: 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"
@@ -4428,7 +4486,7 @@
 
 
 echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6
-echo "configure:4432: checking for ALSA CFLAGS" >&5
+echo "configure:4490: 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"
@@ -4436,7 +4494,7 @@
 echo "$ac_t""$ALSA_CFLAGS" 1>&6
 
 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6
-echo "configure:4440: checking for ALSA LDFLAGS" >&5
+echo "configure:4498: checking for ALSA LDFLAGS" >&5
 if test "$alsa_prefix" != "" ; then
 	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
 	LIBS="-L$alsa_prefix"
@@ -4448,7 +4506,7 @@
 
 min_alsa_version=0.1.1
 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6
-echo "configure:4452: checking for libasound headers version >= $min_alsa_version" >&5
+echo "configure:4510: 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/'`
@@ -4458,7 +4516,7 @@
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
 
 cat > conftest.$ac_ext <<EOF
-#line 4462 "configure"
+#line 4520 "configure"
 #include "confdefs.h"
 
 #include <sys/asoundlib.h>
@@ -4499,7 +4557,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""found." 1>&6
    have_alsa=yes
@@ -4513,7 +4571,7 @@
 rm -f conftest*
 
 echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6
-echo "configure:4517: checking for snd_cards in -lasound" >&5
+echo "configure:4575: 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
@@ -4521,7 +4579,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4525 "configure"
+#line 4583 "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
@@ -4532,7 +4590,7 @@
 snd_cards()
 ; return 0; }
 EOF
-if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4618,7 +4676,7 @@
       if test -f /usr/demo/SOUND/libaudio.a; then
 	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/libaudio.a"
       else
-	echo "$ac_t""Notice: libaudio.a not found" 1>&6
+	echo "$ac_t""Notice: libaudio.a is not found (ignore)" 1>&6
       fi
       ;;
     *-*-solaris*)
@@ -4628,7 +4686,7 @@
       if test -f /usr/demo/SOUND/lib/libaudio.a; then
 	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/lib/libaudio.a"
       else
-	echo "$ac_t""Notice: libaudio.a not found" 1>&6
+	echo "$ac_t""Notice: libaudio.a is not found (ignore)" 1>&6
       fi
       ;;
     *-*-netbsd*)
@@ -4663,187 +4721,219 @@
 esac
 
 if test "$NEEDDLOPEN" = "yes"; then
-  echo $ac_n "checking for LoadLibraryExA in -lc""... $ac_c" 1>&6
-echo "configure:4668: checking for LoadLibraryExA in -lc" >&5
-ac_lib_var=`echo c'_'LoadLibraryExA | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  have_dl=no
+  echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6
+echo "configure:4727: checking for LoadLibraryExA" >&5
+if eval "test \"`echo '$''{'ac_cv_func_LoadLibraryExA'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4676 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 4732 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char LoadLibraryExA(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char LoadLibraryExA();
 
 int main() {
-LoadLibraryExA()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_LoadLibraryExA) || defined (__stub___LoadLibraryExA)
+choke me
+#else
+LoadLibraryExA();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:4687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_LoadLibraryExA=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_LoadLibraryExA=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'LoadLibraryExA`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  have_dl=cygwin;dl_extra_lib=''
+  have_dl=cygwin
 else
   echo "$ac_t""no" 1>&6
-have_dl=no
 fi
 
   if test "$have_dl" = "no"; then
-    echo $ac_n "checking for shl_load in -lc""... $ac_c" 1>&6
-echo "configure:4710: checking for shl_load in -lc" >&5
-ac_lib_var=`echo c'_'shl_load | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
+echo "configure:4776: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4718 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 4781 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char shl_load();
 
 int main() {
-shl_load()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_shl_load) || defined (__stub___shl_load)
+choke me
+#else
+shl_load();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:4729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_shl_load=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_shl_load=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  have_dl=hpux;dl_extra_lib=''
+  have_dl=hpux
 else
   echo "$ac_t""no" 1>&6
-have_dl=no
 fi
 
   fi
+  if test "$have_dl" = "no" -a "x$ac_cv_lib_dl_dlopen" = xyes; then
+    have_dl=dlopen
+  fi
   if test "$have_dl" = "no"; then
-    echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4753: 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 "checking for dlopen""... $ac_c" 1>&6
+echo "configure:4829: checking for dlopen" >&5
+if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4761 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 4834 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char dlopen();
 
 int main() {
-dlopen()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_dlopen) || defined (__stub___dlopen)
+choke me
+#else
+dlopen();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:4772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_dlopen=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_dlopen=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  have_dl=dlopen;LIBS="$LIBS -ldl";dl_extra_lib=-ldl
+  have_dl=dlopen
 else
   echo "$ac_t""no" 1>&6
-have_dl=no
 fi
 
   fi
   if test "$have_dl" = "no"; then
-    echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:4796: checking for dlopen in -lc" >&5
-ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+    echo $ac_n "checking for dld_init""... $ac_c" 1>&6
+echo "configure:4879: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4804 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 4884 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dld_init(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char dlopen();
+char dld_init();
 
 int main() {
-dlopen()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_dld_init) || defined (__stub___dld_init)
+choke me
+#else
+dld_init();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_dld_init=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_dld_init=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'dld_init`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  have_dl=dlopen;dl_extra_lib=''
+  have_dl=dld
 else
   echo "$ac_t""no" 1>&6
-have_dl=no
 fi
 
   fi
   if test "$have_dl" = "no"; then
-    echo $ac_n "checking for dld_init in -lc""... $ac_c" 1>&6
-echo "configure:4839: checking for dld_init in -lc" >&5
-ac_lib_var=`echo c'_'dld_init | sed 'y%./+-%__p_%'`
+    echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
+echo "configure:4929: 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
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
+LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4847 "configure"
+#line 4937 "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
@@ -4854,7 +4944,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4869,19 +4959,21 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  have_dl=dld;dl_extra_lib=''
+  have_dl=dld;lib_dl_opt=-ldld
 else
   echo "$ac_t""no" 1>&6
-have_dl=no
 fi
 
   fi
 
+  echo $ac_n "checking dynamic link method""... $ac_c" 1>&6
+echo "configure:4971: 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:4885: checking whether your dlsym() needs a leading underscore" >&5
+echo "configure:4977: 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
@@ -4942,7 +5034,7 @@
 if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 &&
 	mv dyna.o tmp-dyna.o > /dev/null 2>&1 && 
 	$SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 && 
-	${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.$ac_ext $LIBS > /dev/null 2>&1; then
+	${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.c $LIBS $lib_dl_opt > /dev/null 2>&1; then
 	xxx=`./fred`
 	case $xxx in
 	1)	echo "configure: warning: Test program failed using dlopen.  Perhaps you should not use dynamic loading." 1>&2
@@ -4972,13 +5064,16 @@
 
       ;;
     dld)
+      echo "$ac_t""use dl_dld.c" 1>&6
       SYSEXTRAS="$SYSEXTRAS dl_dld.c"
       ;;
     hpux)
+      echo "$ac_t""use dl_hpux.c" 1>&6
       SYSEXTRAS="$SYSEXTRAS dl_hpux.c"
-      LDFLAGS="-Wl,-E $LDFLAGS"
+      LDFLAGS="$LDFLAGS -Wl,-E $LDFLAGS"
       ;;
     cygwin)
+      echo "$ac_t""use dl_cygwin32.c" 1>&6
       SYSEXTRAS="$SYSEXTRAS dl_cygwin32.c"
       ;;
     *)
@@ -4990,8 +5085,11 @@
 
 if test "$NEEDDLOPEN" = "yes"; then
   SHARED_LIB_PATH="\$(TIMID_DIR)"
-  EXTRALIBS="$EXTRALIBS $dl_extra_lib"
-  EXTRADEFS="$EXTRADEFS -DIA_DYNAMIC -DSHARED_LIB_EXT=\\\".$so\\\""
+  cat >> confdefs.h <<EOF
+#define IA_DYNAMIC 1
+EOF
+
+  EXTRADEFS="$EXTRADEFS -DSHARED_LIB_EXT=\\\".$so\\\""
   EXTRADEFS="$EXTRADEFS -DSHARED_LIB_PATH=\\\"$SHARED_LIB_PATH\\\""
 fi
 
@@ -5019,21 +5117,21 @@
 # Check whether --enable-ncurses or --disable-ncurses was given.
 if test "${enable_ncurses+set}" = set; then
   enableval="$enable_ncurses"
-   for ac_hdr in ncurses.h ncurses/curses.h curses.h
+  case "x$enable_ncurses" in xyes|xdynamic)  for ac_hdr in ncurses.h ncurses/curses.h curses.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5027: checking for $ac_hdr" >&5
+echo "configure:5125: 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 5032 "configure"
+#line 5130 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5059,9 +5157,8 @@
 fi
 done
 
-    KEEPLIBS=$LIBS
     echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:5065: checking for initscr in -lncurses" >&5
+echo "configure:5162: 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
@@ -5069,7 +5166,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5073 "configure"
+#line 5170 "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
@@ -5080,7 +5177,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:5084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5095,25 +5192,22 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lncurses $LIBS"
-
+  :
 else
   echo "$ac_t""no" 1>&6
-enable_ncurses=no
+ enable_ncurses=no
+          echo "configure: warning: ncurses library is not found" 1>&2 
 fi
 
-    LIBS=$KEEPLIBS
-  
+   ;; esac
 fi
 
 case "x$enable_ncurses" in
 xyes)
+  cat >> confdefs.h <<EOF
+#define IA_NCURSES 1
+EOF
+
   
 
 if true; then
@@ -5123,7 +5217,6 @@
   ENABLE_NCURSES_TRUE='#'
   ENABLE_NCURSES_FALSE=
 fi
-  EXTRADEFS="$EXTRADEFS -DIA_NCURSES"
    LIBS="$LIBS -lncurses"
     case "$target" in
       *-*-freebsd*)
@@ -5161,9 +5254,9 @@
 # Check whether --enable-slang or --disable-slang was given.
 if test "${enable_slang+set}" = set; then
   enableval="$enable_slang"
-   KEEPLIBS=$LIBS
+  case "x$enable_slang" in xyes|xdynamic)  KEEPLIBS=$LIBS
     echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6
-echo "configure:5167: checking for SLang_init_tty in -lslang" >&5
+echo "configure:5260: 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
@@ -5171,7 +5264,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lslang  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5175 "configure"
+#line 5268 "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
@@ -5182,7 +5275,7 @@
 SLang_init_tty()
 ; return 0; }
 EOF
-if { (eval echo configure:5186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5211,11 +5304,15 @@
 fi
 
     LIBS=$KEEPLIBS
-  
+   ;; esac
 fi
 
 case "x$enable_slang" in
 xyes)
+  cat >> confdefs.h <<EOF
+#define IA_SLANG 1
+EOF
+
   
 
 if true; then
@@ -5225,14 +5322,13 @@
   ENABLE_SLANG_TRUE='#'
   ENABLE_SLANG_FALSE=
 fi
-  EXTRADEFS="$EXTRADEFS -DIA_SLANG"
    LIBS="$LIBS -lslang" 
   ;;
 xdynamic)
   dynamic_targets="$dynamic_targets interface_s.\$(so)"
    s_so_libs="$SHLDFLAGS -lslang"
     echo $ac_n "checking for initscr in -ltermcap""... $ac_c" 1>&6
-echo "configure:5236: checking for initscr in -ltermcap" >&5
+echo "configure:5332: 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
@@ -5240,7 +5336,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5244 "configure"
+#line 5340 "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
@@ -5251,7 +5347,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:5255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5294,14 +5390,21 @@
 # Check whether --enable-motif or --disable-motif was given.
 if test "${enable_motif+set}" = set; then
   enableval="$enable_motif"
-   if test "$have_xm" != "yes"; then
+  case "x$enable_motif" in xyes|xdynamic)  if test "x$with_x" != xyes; then
+        { echo "configure: error: motif: --with-x option must be specified" 1>&2; exit 1; }
+    fi
+    if test "$have_xm" != "yes"; then
       echo "configure: warning: Motif library is not found." 1>&2
       enable_motif=no
-    fi 
+    fi  ;; esac
 fi
 
 case "x$enable_motif" in
 xyes)
+  cat >> confdefs.h <<EOF
+#define IA_MOTIF 1
+EOF
+
   
 
 if true; then
@@ -5311,7 +5414,6 @@
   ENABLE_MOTIF_TRUE='#'
   ENABLE_MOTIF_FALSE=
 fi
-  EXTRADEFS="$EXTRADEFS -DIA_MOTIF"
    lib_xm_opt=-lXm
     lib_xt_opt=-lXt
     if test "$have_xprelibs" = "yes"; then
@@ -5322,11 +5424,9 @@
 xdynamic)
   dynamic_targets="$dynamic_targets interface_m.\$(so)"
    if test x$have_xprelibs = xyes; then
-      m_so_libs="-lSM -lICE -lX11"
-    else
-      m_so_libs="-lX11"
+      m_so_libs="-lSM -lICE"
     fi
-    m_so_libs="$ldflags_x_opt -lXm -lXt $m_so_libs"
+    m_so_libs="$ldflags_x_opt -lXm -lXt $m_so_libs -lX11"
   
   ;;
 *)
@@ -5339,7 +5439,6 @@
 
 
 
-
 if false; then
   ENABLE_TCLTK_TRUE=
   ENABLE_TCLTK_FALSE='#'
@@ -5350,15 +5449,19 @@
 # Check whether --enable-tcltk or --disable-tcltk was given.
 if test "${enable_tcltk+set}" = set; then
   enableval="$enable_tcltk"
-   KEEPLIBS=$LIBS
+  case "x$enable_tcltk" in xyes|xdynamic)  if test "x$with_x" != xyes; then
+        { echo "configure: error: tcltk: --with-x option must be specified" 1>&2; exit 1; }
+    fi
+    KEEPLIBS=$LIBS
     KEEPCFLAGS=$CFLAGS
     LDFLAGS="$LDFLAGS -L$tcl_lib_dir -L$tk_lib_dir"
     CFLAGS="$CFLAGS -I$tcl_include_dir -I$tk_include_dir"
+    LIBS="$LIBS $lib_dl_opt"
     tcl_lib=
     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:5362: checking for Tcl_Init in -l$l" >&5
+echo "configure:5465: 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
@@ -5366,7 +5469,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$l  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5370 "configure"
+#line 5473 "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
@@ -5377,7 +5480,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:5381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5401,7 +5504,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:5405: checking for Tk_Init in -l$l" >&5
+echo "configure:5508: 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
@@ -5409,7 +5512,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$l  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5413 "configure"
+#line 5516 "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
@@ -5420,7 +5523,7 @@
 Tk_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:5424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5446,12 +5549,19 @@
     if test "x$tcl_lib" = x -o "x$tk_lib" = x; then
       CFLAGS=$KEEPCFLAGS
       enable_tcltk=no
+      echo "configure: warning: tcl/tk is not enable" 1>&2
+    else
+      tcltk_dep='tclIndex'
     fi
-  
+   ;; esac
 fi
 
 case "x$enable_tcltk" in
 xyes)
+  cat >> confdefs.h <<EOF
+#define IA_TCLTK 1
+EOF
+
   
 
 if true; then
@@ -5461,7 +5571,6 @@
   ENABLE_TCLTK_TRUE='#'
   ENABLE_TCLTK_FALSE=
 fi
-  EXTRADEFS="$EXTRADEFS -DIA_TCLTK"
    LIBS=`echo $LIBS | sed "s/-lX11/$tk_lib $tcl_lib -lX11/"`
     EXTRAINCS="$EXTRAINCS -I$tcl_include_dir -I$tk_include_dir"
     EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\""
@@ -5475,7 +5584,7 @@
   dynamic_targets="$dynamic_targets interface_k.\$(so)"
    EXTRAINCS="$EXTRAINCS -I$tcl_include_dir -I$tk_include_dir"
     EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\""
-    k_so_libs="-L$tcl_lib_dir -L$tk_lib_dir $tcl_lib $tk_lib"
+    k_so_libs="-L$tcl_lib_dir -L$tk_lib_dir $tcl_lib $tk_lib $lib_dl_opt"
     case "$target" in
       *-*-bsdi*)
         k_so_libs="$k_so_libs -lipc"
@@ -5513,11 +5622,15 @@
 # Check whether --enable-emacs or --disable-emacs was given.
 if test "${enable_emacs+set}" = set; then
   enableval="$enable_emacs"
-  :
+  case "x$enable_emacs" in xyes|xdynamic)  ;; esac
 fi
 
 case "x$enable_emacs" in
 xyes)
+  cat >> confdefs.h <<EOF
+#define IA_EMACS 1
+EOF
+
   
 
 if true; then
@@ -5527,7 +5640,6 @@
   ENABLE_EMACS_TRUE='#'
   ENABLE_EMACS_FALSE=
 fi
-  EXTRADEFS="$EXTRADEFS -DIA_EMACS"
    ELFILES="$ELFILES timidity.el" 
   ;;
 xdynamic)
@@ -5554,11 +5666,15 @@
 # Check whether --enable-vt100 or --disable-vt100 was given.
 if test "${enable_vt100+set}" = set; then
   enableval="$enable_vt100"
-  :
+  case "x$enable_vt100" in xyes|xdynamic)  ;; esac
 fi
 
 case "x$enable_vt100" in
 xyes)
+  cat >> confdefs.h <<EOF
+#define IA_VT100 1
+EOF
+
   
 
 if true; then
@@ -5568,7 +5684,6 @@
   ENABLE_VT100_TRUE='#'
   ENABLE_VT100_FALSE=
 fi
-  EXTRADEFS="$EXTRADEFS -DIA_VT100"
   
   ;;
 xdynamic)
@@ -5595,14 +5710,21 @@
 # Check whether --enable-xaw or --disable-xaw was given.
 if test "${enable_xaw+set}" = set; then
   enableval="$enable_xaw"
-   if test "x$have_xaw" != "xyes" -a "x$have_xaw" != "x3d"; then
+  case "x$enable_xaw" in xyes|xdynamic)  if test "x$with_x" != xyes; then
+        { echo "configure: error: xaw: --with-x option must be specified" 1>&2; exit 1; }
+    fi
+    if test "x$have_xaw" != "xyes" -a "x$have_xaw" != "x3d"; then
       echo "configure: warning: X Athena Widget library is not found." 1>&2
       enable_xaw=no
-    fi 
+    fi  ;; esac
 fi
 
 case "x$enable_xaw" in
 xyes)
+  cat >> confdefs.h <<EOF
+#define IA_XAW 1
+EOF
+
   
 
 if true; then
@@ -5612,7 +5734,6 @@
   ENABLE_XAW_TRUE='#'
   ENABLE_XAW_FALSE=
 fi
-  EXTRADEFS="$EXTRADEFS -DIA_XAW"
        if test "$have_xext" = "yes"; then
       lib_xext_opt=-lXext
     fi
@@ -5675,13 +5796,17 @@
 # Check whether --enable-xskin or --disable-xskin was given.
 if test "${enable_xskin+set}" = set; then
   enableval="$enable_xskin"
-   if test "x$with_x" != xyes; then
-        echo "configure: warning: --with-x option is not specified" 1>&2
-    fi
+  case "x$enable_xskin" in xyes|xdynamic)  if test "x$with_x" != xyes; then
+        { echo "configure: error: xskin: --with-x option must be specified" 1>&2; exit 1; }
+    fi ;; esac
 fi
 
 case "x$enable_xskin" in
 xyes)
+  cat >> confdefs.h <<EOF
+#define IA_XSKIN 1
+EOF
+
   
 
 if true; then
@@ -5691,12 +5816,11 @@
   ENABLE_XSKIN_TRUE='#'
   ENABLE_XSKIN_FALSE=
 fi
-  EXTRADEFS="$EXTRADEFS -DIA_XSKIN"
   
   ;;
 xdynamic)
   dynamic_targets="$dynamic_targets interface_i.\$(so)"
-  
+  i_so_libs="$ldflags_x_opt -lX11"
   ;;
 *)
   
@@ -5718,7 +5842,7 @@
 # Check whether --enable-gtk or --disable-gtk was given.
 if test "${enable_gtk+set}" = set; then
   enableval="$enable_gtk"
-   # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+  case "x$enable_gtk" in xyes|xdynamic)  # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
   withval="$with_gtk_prefix"
   gtk_config_prefix="$withval"
@@ -5759,7 +5883,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:5763: checking for $ac_word" >&5
+echo "configure:5887: 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
@@ -5790,7 +5914,7 @@
 
   min_gtk_version=1.1.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:5794: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:5918: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -5813,7 +5937,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 5817 "configure"
+#line 5941 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -5879,7 +6003,7 @@
 }
 
 EOF
-if { (eval echo configure:5883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -5913,7 +6037,7 @@
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 5917 "configure"
+#line 6041 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -5923,7 +6047,7 @@
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:5927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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"
@@ -5960,11 +6084,15 @@
   
   
   rm -f conf.gtktest
- 
+  ;; esac
 fi
 
 case "x$enable_gtk" in
 xyes)
+  cat >> confdefs.h <<EOF
+#define IA_GTK 1
+EOF
+
   
 
 if true; then
@@ -5974,7 +6102,6 @@
   ENABLE_GTK_TRUE='#'
   ENABLE_GTK_FALSE=
 fi
-  EXTRADEFS="$EXTRADEFS -DIA_GTK"
    LIBS="$LIBS $GTK_LIBS"
     CFLAGS="$CFLAGS $GTK_CFLAGS" 
   ;;
@@ -5993,22 +6120,22 @@
 # Check whether --enable-ump or --disable-ump was given.
 if test "${enable_ump+set}" = set; then
   enableval="$enable_ump"
-   if test ! -d ump; then
+  case "x$enable_ump" in xyes|xdynamic)  if test ! -d ump; then
 	{ echo "configure: error: UMP Package is not exists.  Can't configure it." 1>&2; exit 1; }
     fi
     ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6
-echo "configure:6002: checking for X11/xpm.h" >&5
+echo "configure:6129: 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 6007 "configure"
+#line 6134 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6031,7 +6158,7 @@
 fi
 
     echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
-echo "configure:6035: checking for XpmCreatePixmapFromData in -lXpm" >&5
+echo "configure:6162: 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
@@ -6039,7 +6166,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6043 "configure"
+#line 6170 "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
@@ -6050,7 +6177,7 @@
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:6054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6078,11 +6205,15 @@
 { echo "configure: error: UMP Package needs libXpm.a, but could not find it." 1>&2; exit 1; }
 fi
 
-  
+   ;; esac
 fi
 
 case "x$enable_ump" in
 xyes)
+  cat >> confdefs.h <<EOF
+#define IA_PLUGIN 1
+EOF
+
   
 
 if true; then
@@ -6092,7 +6223,6 @@
   ENABLE_PLUGIN_TRUE='#'
   ENABLE_PLUGIN_FALSE=
 fi
-  EXTRADEFS="$EXTRADEFS -DIA_PLUGIN"
    LIBS="$LIBS -lXpm" 
   ;;
 xdynamic)
@@ -6119,7 +6249,7 @@
       LDFLAGS="$LDFLAGS -L$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:6123: checking for DndInitialize in -lDnd" >&5
+echo "configure:6253: 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
@@ -6127,7 +6257,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lDnd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6131 "configure"
+#line 6261 "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
@@ -6138,7 +6268,7 @@
 DndInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:6142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6193,9 +6323,10 @@
 # Check whether --enable-spectrogram or --disable-spectrogram was given.
 if test "${enable_spectrogram+set}" = set; then
   enableval="$enable_spectrogram"
-   if test "$no_x" = "yes"; then
-      echo "Sound Spectrogram Viewer needs X Window System"
-    elif test "$enableval" = "yes"; then
+   if test "$enableval" = "yes"; then
+      if test "x$with_x" != xyes; then
+	{ echo "configure: error: spectrogram: --with-x option must be specified" 1>&2; exit 1; }
+      fi
       EXTRADEFS="$EXTRADEFS -DSUPPORT_SOUNDSPEC"
     fi 
 fi
@@ -6213,12 +6344,11 @@
 # Check whether --enable-wrd or --disable-wrd was given.
 if test "${enable_wrd+set}" = set; then
   enableval="$enable_wrd"
-   if test "x$enableval" = "xyes"; then
-      if test "x$with_x" = xyes; then
-        EXTRADEFS="$EXTRADEFS -DWRDT_X"
-      else
-        echo "configure: warning: --with-x option is not specified" 1>&2
+   if test "$enableval" = "yes"; then
+      if test "x$with_x" != xyes; then
+	{ echo "configure: error: wrd: --with-x option must be specified" 1>&2; exit 1; }
       fi
+      EXTRADEFS="$EXTRADEFS -DWRDT_X"
     fi 
 fi
 
@@ -6254,6 +6384,9 @@
 if test "x$with_x" = xyes; then
     LIBS=`echo $LIBS | sed "s/-lX11/$lib_xm_opt $lib_xaw_opt $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11/"`
 fi
+LIBS="$LIBS $lib_dl_opt"
+
+
 
 
 
@@ -6379,7 +6512,7 @@
 utils/Makefile
 doc/Makefile
 doc/C/Makefile
-doc/ja_JP.ujis/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+doc/ja_JP.ujis/Makefile config.h interface.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -6506,6 +6639,8 @@
 s%@SHLD@%$SHLD%g
 s%@dynamic_targets@%$dynamic_targets%g
 s%@so@%$so%g
+s%@WISH@%$WISH%g
+s%@tcltk_dep@%$tcltk_dep%g
 
 CEOF
 EOF
@@ -6639,7 +6774,7 @@
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="config.h"
+  CONFIG_HEADERS="config.h interface.h"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
@@ -6730,7 +6865,15 @@
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+am_indx=1
+for am_file in config.h interface.h; do
+  case " $CONFIG_HEADERS " in
+  *" $am_file "*)
+    echo timestamp > `echo $am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+    ;;
+  esac
+  am_indx=`expr "$am_indx" + 1`
+done
 
 exit 0
 EOF
diff -ruN TiMidity++-1.1.1/configure.in TiMidity++-1.2.0/configure.in
--- TiMidity++-1.1.1/configure.in	Mon Jan 18 22:32:50 1999
+++ TiMidity++-1.2.0/configure.in	Thu Jan 21 01:36:50 1999
@@ -26,10 +26,10 @@
 
 AC_INIT(timidity/timidity.c)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(TiMidity++, 1.1.1, no-define)
+AM_INIT_AUTOMAKE(TiMidity++, 1.2.0, no-define)
 
 dnl use config.h
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(config.h interface.h)
 
 dnl Checks for programs.
 AM_PATH_LISPDIR
@@ -48,7 +48,7 @@
 
 LDFLAGS=${LDFLAGS:--L/usr/local/lib}
 SHLDFLAGS=${LDFLAGS:--L/usr/local/lib}
-CFLAGS="$CFLAGS -I/usr/local/include"
+CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 
 EXTRACFLAGS=
 EXTRADEFS=
@@ -64,64 +64,83 @@
 lib_xprelibs_opt=
 lib_xext_opt=
 
-dnl IRIX cc needs -signed option
+lib_dl_opt=
+
+WISH=${WISH:-wish}
+tcltk_dep=
+
+dnl check gcc environment
+for i in `echo $LIBRARY_PATH|sed -e 's,:, ,g'`; do
+    LDFLAGS="$LDFLAGS -L${i}"
+    SHLDFLAGS="$SHLDFLAGS -L${i}"
+done
+for i in `echo $C_INCLUDE_PATH|sed -e 's,:, ,g'`; do
+    EXTRAINCS="$EXTRAINCS -I${i}"
+done
 
 dnl Target dependent
 case "$target" in
   *-*-hpux*)
-    SHLD="ld -b"
+    test -n "$SHLD" || SHLD="ld -b"
     so="sl"
     ;;
   *-sgi-irix*)
+    dnl IRIX cc needs -signed option
     case ".$CC" in .cc*) EXTRACFLAGS="-signed";; esac
-    SHLD="cc -shared -all"
+    test -n "$SHLD" || SHLD="cc -shared -all"
     so="so"
     ;;
   *-*-netbsd*)
-    SHLD="ld -Bforcearchive -Bshareable"
+    test -n "$SHLD" || SHLD="ld -Bforcearchive -Bshareable"
     so="so"
     ;;
   *-*-freebsd*)
     EXTRALIBS="$EXTRALIB -lxpg4"
+    test -n "$SHLD" || SHLD="ld -Bshareable"
+    so="so"
     ;;
   *-*-cygwin32*)
     EXTRADEFS="-D__WIN32__"
-    SHLD="$CC"
+    test -n "$SHLD" || SHLD="$CC"
     so="dll"
     CYGWIN32=yes
     ;;
   *-dec-*)
     EXTRADEFS="-DDEC"
-    SHLD="ld -Bdynamic -G"
+    test -n "$SHLD" || SHLD="ld -Bdynamic -G"
     so="so"
     ;;
   *-*-solaris*)
     EXTRADEFS="-DSOLARIS"
-    SHLD="ld -Bdynamic -G"
+    test -n "$SHLD" || SHLD="/usr/ccs/bin/ld -G"
     so="so"
     ;;
   *)
-    SHLD="ld -Bdynamic -G"
+    test -n "$SHLD" || SHLD="ld -Bdynamic -G"
     so="so"
     ;;
 esac
 
 AC_CHECK_LIB(m,sqrt)
 AC_CHECK_LIB(socket,socket)
+AC_CHECK_LIB(dl,dlopen,lib_dl_opt=-ldl)
 AC_CHECK_FUNCS(gethostbyname,,[ AC_CHECK_LIB(nsl,gethostbyname) ])
 AC_PATH_XTRA
 
 dnl Start of X configure
 if test "x$with_x" = xyes; then
+  if test "x$have_x" = xno; then
+    AC_MSG_ERROR(Could not configure X)
+  fi
   if test "x$x_libraries" != x; then
     ldflags_x_opt="-L$x_libraries"
     LDFLAGS="$LDFLAGS $ldflags_x_opt"
+    SHLDFLAGS="$SHLDFLAGS $ldflags_x_opt"
   else
     ldflags_x_opt=
   fi
   if test "x$x_includes" != x; then
     CPPFLAGS="$CPPFLAGS -I$x_includes"
-    CFLAGS="$CFLAGS -I$x_includes"
   fi
 
   AC_CHECK_LIB(X11,XOpenDisplay)
@@ -209,7 +228,8 @@
   [ if test ! -d $withval; then
       AC_MSG_ERROR($withval not found.)
     fi
-    tcl_include_dir=$withval ],
+    tcl_include_dir=$withval
+  ],
   [ tcl_include_dir=/usr/local/include ])
 AC_ARG_WITH(tcl-libs,
   [  --with-tcl-libs=dir     Tcl include file path ],
@@ -319,7 +339,7 @@
       if test -f /usr/demo/SOUND/libaudio.a; then
 	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/libaudio.a"
       else
-	AC_MSG_RESULT(Notice: libaudio.a not found)
+	AC_MSG_RESULT(Notice: libaudio.a is not found [(ignore)])
       fi
       ;;
     *-*-solaris*)
@@ -329,7 +349,7 @@
       if test -f /usr/demo/SOUND/lib/libaudio.a; then
 	EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/lib/libaudio.a"
       else
-	AC_MSG_RESULT(Notice: libaudio.a not found)
+	AC_MSG_RESULT(Notice: libaudio.a is not found [(ignore)])
       fi
       ;;
     *-*-netbsd*)
@@ -366,33 +386,42 @@
 esac
 
 if test "$NEEDDLOPEN" = "yes"; then
-  AC_CHECK_LIB(c,LoadLibraryExA,[have_dl=cygwin;dl_extra_lib=''],have_dl=no)
+  have_dl=no
+  AC_CHECK_FUNC(LoadLibraryExA,have_dl=cygwin)
   if test "$have_dl" = "no"; then
-    AC_CHECK_LIB(c,shl_load,[have_dl=hpux;dl_extra_lib=''],have_dl=no)
+    AC_CHECK_FUNC(shl_load,have_dl=hpux)
+  fi
+  if test "$have_dl" = "no" -a "x$ac_cv_lib_dl_dlopen" = xyes; then
+    have_dl=dlopen
   fi
   if test "$have_dl" = "no"; then
-    AC_CHECK_LIB(dl,dlopen,[have_dl=dlopen;LIBS="$LIBS -ldl";dl_extra_lib=-ldl],have_dl=no)
+    AC_CHECK_FUNC(dlopen,have_dl=dlopen)
   fi
   if test "$have_dl" = "no"; then
-    AC_CHECK_LIB(c,dlopen,[have_dl=dlopen;dl_extra_lib=''],have_dl=no)
+    AC_CHECK_FUNC(dld_init,have_dl=dld)
   fi
   if test "$have_dl" = "no"; then
-    AC_CHECK_LIB(c,dld_init,[have_dl=dld;dl_extra_lib=''],have_dl=no)
+    AC_CHECK_LIB(dld,dld_init,have_dl=dld;lib_dl_opt=-ldld)
   fi
 
+  AC_MSG_CHECKING(dynamic link method)
   case "$have_dl" in
     dlopen)
+      AC_MSG_RESULT(use dl_dlopen.c)
       SYSEXTRAS="$SYSEXTRAS dl_dlopen.c"
       CHECK_DLSYM_UNDERSCORE(EXTRADEFS="$EXTRADEFS -DDLSYM_NEEDS_UNDERSCORE")
       ;;
     dld)
+      AC_MSG_RESULT(use dl_dld.c)
       SYSEXTRAS="$SYSEXTRAS dl_dld.c"
       ;;
     hpux)
+      AC_MSG_RESULT(use dl_hpux.c)
       SYSEXTRAS="$SYSEXTRAS dl_hpux.c"
-      LDFLAGS="-Wl,-E $LDFLAGS"
+      LDFLAGS="$LDFLAGS -Wl,-E $LDFLAGS"
       ;;
     cygwin)
+      AC_MSG_RESULT(use dl_cygwin32.c)
       SYSEXTRAS="$SYSEXTRAS dl_cygwin32.c"
       ;;
     *)
@@ -404,8 +433,8 @@
 
 if test "$NEEDDLOPEN" = "yes"; then
   SHARED_LIB_PATH="\$(TIMID_DIR)"
-  EXTRALIBS="$EXTRALIBS $dl_extra_lib"
-  EXTRADEFS="$EXTRADEFS -DIA_DYNAMIC -DSHARED_LIB_EXT=\\\".$so\\\""
+  MY_DEFINE(IA_DYNAMIC)
+  EXTRADEFS="$EXTRADEFS -DSHARED_LIB_EXT=\\\".$so\\\""
   EXTRADEFS="$EXTRADEFS -DSHARED_LIB_PATH=\\\"$SHARED_LIB_PATH\\\""
 fi
 AM_CONDITIONAL(NEEDDLOPEN, test "$NEEDDLOPEN" = "yes")
@@ -419,9 +448,9 @@
 CONFIG_INTERFACE(ncurses,NCURSES,n,
   [  --enable-ncurses        Enable ncurses interface        (default is no)],
   [ AC_CHECK_HEADERS(ncurses.h ncurses/curses.h curses.h)
-    KEEPLIBS=$LIBS
-    AC_CHECK_LIB(ncurses,initscr,,enable_ncurses=no)
-    LIBS=$KEEPLIBS
+    AC_CHECK_LIB(ncurses,initscr,:,
+	[ enable_ncurses=no
+          AC_MSG_WARN(ncurses library is not found) ])
   ],
   [ LIBS="$LIBS -lncurses"
     case "$target" in
@@ -457,7 +486,10 @@
 AM_CONDITIONAL(ENABLE_MOTIF, false)
 CONFIG_INTERFACE(motif,MOTIF,m,
   [  --enable-motif          Enable motif interface          (default is no)],
-  [ if test "$have_xm" != "yes"; then
+  [ if test "x$with_x" != xyes; then
+        AC_MSG_ERROR(motif: --with-x option must be specified)
+    fi
+    if test "$have_xm" != "yes"; then
       AC_MSG_WARN(Motif library is not found.)
       enable_motif=no
     fi ],
@@ -468,23 +500,24 @@
     fi
   ],
   [ if test x$have_xprelibs = xyes; then
-      m_so_libs="-lSM -lICE -lX11"
-    else
-      m_so_libs="-lX11"
+      m_so_libs="-lSM -lICE"
     fi
-    m_so_libs="$ldflags_x_opt -lXm -lXt $m_so_libs"
+    m_so_libs="$ldflags_x_opt -lXm -lXt $m_so_libs -lX11"
   ])
 
 
-
 dnl Tcl/Tk
 AM_CONDITIONAL(ENABLE_TCLTK, false)
 CONFIG_INTERFACE(tcltk,TCLTK,k,
   [  --enable-tcltk          Enable tcltk interface          (default is no)],
-  [ KEEPLIBS=$LIBS
+  [ if test "x$with_x" != xyes; then
+        AC_MSG_ERROR(tcltk: --with-x option must be specified)
+    fi
+    KEEPLIBS=$LIBS
     KEEPCFLAGS=$CFLAGS
     LDFLAGS="$LDFLAGS -L$tcl_lib_dir -L$tk_lib_dir"
     CFLAGS="$CFLAGS -I$tcl_include_dir -I$tk_include_dir"
+    LIBS="$LIBS $lib_dl_opt"
     tcl_lib=
     tk_lib=
     for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do
@@ -499,6 +532,9 @@
     if test "x$tcl_lib" = x -o "x$tk_lib" = x; then
       CFLAGS=$KEEPCFLAGS
       enable_tcltk=no
+      AC_MSG_WARN(tcl/tk is not enable)
+    else
+      tcltk_dep='tclIndex'
     fi
   ],
   [ LIBS=`echo $LIBS | sed "s/-lX11/$tk_lib $tcl_lib -lX11/"`
@@ -511,7 +547,7 @@
     esac ],
   [ EXTRAINCS="$EXTRAINCS -I$tcl_include_dir -I$tk_include_dir"
     EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\""
-    k_so_libs="-L$tcl_lib_dir -L$tk_lib_dir $tcl_lib $tk_lib"
+    k_so_libs="-L$tcl_lib_dir -L$tk_lib_dir $tcl_lib $tk_lib $lib_dl_opt"
     case "$target" in
       *-*-bsdi*)
         k_so_libs="$k_so_libs -lipc"
@@ -541,7 +577,10 @@
 AM_CONDITIONAL(ENABLE_XAW, false)
 CONFIG_INTERFACE(xaw,XAW,a,
   [  --enable-xaw            Enable athena interface         (default is no)],
-  [ if test "x$have_xaw" != "xyes" -a "x$have_xaw" != "x3d"; then
+  [ if test "x$with_x" != xyes; then
+        AC_MSG_ERROR(xaw: --with-x option must be specified)
+    fi
+    if test "x$have_xaw" != "xyes" -a "x$have_xaw" != "x3d"; then
       AC_MSG_WARN(X Athena Widget library is not found.)
       enable_xaw=no
     fi ],
@@ -583,8 +622,10 @@
 CONFIG_INTERFACE(xskin,XSKIN,i,
   [  --enable-xskin          Enable X skin interface         (default is no)],
   [ if test "x$with_x" != xyes; then
-        AC_MSG_WARN(--with-x option is not specified)
-    fi])
+        AC_MSG_ERROR(xskin: --with-x option must be specified)
+    fi],
+  ,
+  [i_so_libs="$ldflags_x_opt -lX11"])
 
 
 dnl GTK+ 
@@ -645,9 +686,10 @@
 dnl Sound Spectrogram Viewer
 AC_ARG_ENABLE(spectrogram,
   [  --enable-spectrogram    Enable Sound Spectrogram Viewer (default is no)],
-  [ if test "$no_x" = "yes"; then
-      echo "Sound Spectrogram Viewer needs X Window System"
-    elif test "$enableval" = "yes"; then
+  [ if test "$enableval" = "yes"; then
+      if test "x$with_x" != xyes; then
+	AC_MSG_ERROR(spectrogram: --with-x option must be specified)
+      fi
       EXTRADEFS="$EXTRADEFS -DSUPPORT_SOUNDSPEC"
     fi ])
 AM_CONDITIONAL(ENABLE_SOUND_SPEC, test "x$enable_spectrogram" = "xyes")
@@ -655,12 +697,11 @@
 dnl WRD interface
 AC_ARG_ENABLE(wrd,
   [  --enable-wrd            Enable WRD interface for X      (default is no)],
-  [ if test "x$enableval" = "xyes"; then
-      if test "x$with_x" = xyes; then
-        EXTRADEFS="$EXTRADEFS -DWRDT_X"
-      else
-        AC_MSG_WARN(--with-x option is not specified)
+  [ if test "$enableval" = "yes"; then
+      if test "x$with_x" != xyes; then
+	AC_MSG_ERROR(wrd: --with-x option must be specified)
       fi
+      EXTRADEFS="$EXTRADEFS -DWRDT_X"
     fi ])
 AM_CONDITIONAL(ENABLE_WRD, test "x$enable_wrd" = "xyes")
 
@@ -675,6 +716,7 @@
   dnl Order of X-library is: -lXm -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11
   LIBS=`echo $LIBS | sed "s/-lX11/$lib_xm_opt $lib_xaw_opt $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11/"`
 fi
+LIBS="$LIBS $lib_dl_opt"
 
 AC_SUBST(SHCFLAGS)
 AC_SUBST(SYSEXTRAS)
@@ -686,6 +728,8 @@
 AC_SUBST(dynamic_targets)
 AC_SUBST(so)
 AC_SUBST(LN_S)
+AC_SUBST(WISH)
+AC_SUBST(tcltk_dep)
 
 AC_OUTPUT([
 Makefile
diff -ruN TiMidity++-1.1.1/doc/C/Makefile.in TiMidity++-1.2.0/doc/C/Makefile.in
--- TiMidity++-1.1.1/doc/C/Makefile.in	Mon Jan 18 22:55:56 1999
+++ TiMidity++-1.2.0/doc/C/Makefile.in	Thu Jan 21 01:59:36 1999
@@ -100,9 +100,11 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 dynamic_targets = @dynamic_targets@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 
 EXTRA_DIST = \
 	timidity.1 \
@@ -114,7 +116,7 @@
 	README.tk \
 	README.xskin
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
+CONFIG_HEADER = ../../config.h ../../interface.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
diff -ruN TiMidity++-1.1.1/doc/Makefile.in TiMidity++-1.2.0/doc/Makefile.in
--- TiMidity++-1.1.1/doc/Makefile.in	Mon Jan 18 22:55:55 1999
+++ TiMidity++-1.2.0/doc/Makefile.in	Thu Jan 21 01:59:35 1999
@@ -100,9 +100,11 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 dynamic_targets = @dynamic_targets@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 SUBDIRS = C ja_JP.ujis
 lang_target = C
 
@@ -110,7 +112,7 @@
 	timidity.1 \
 	timidity.cfg.5
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
+CONFIG_HEADER = ../config.h ../interface.h
 CONFIG_CLEAN_FILES = 
 man1dir = $(mandir)/man1
 man5dir = $(mandir)/man5
diff -ruN TiMidity++-1.1.1/doc/ja_JP.ujis/Makefile.in TiMidity++-1.2.0/doc/ja_JP.ujis/Makefile.in
--- TiMidity++-1.1.1/doc/ja_JP.ujis/Makefile.in	Mon Jan 18 22:55:57 1999
+++ TiMidity++-1.2.0/doc/ja_JP.ujis/Makefile.in	Thu Jan 21 01:59:38 1999
@@ -100,9 +100,11 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 dynamic_targets = @dynamic_targets@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 
 EXTRA_DIST = \
 	timidity.1 \
@@ -112,7 +114,7 @@
 	README.tk \
 	README.xskin
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
+CONFIG_HEADER = ../../config.h ../../interface.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
diff -ruN TiMidity++-1.1.1/interface/Makefile.am TiMidity++-1.2.0/interface/Makefile.am
--- TiMidity++-1.1.1/interface/Makefile.am	Mon Jan 18 19:12:39 1999
+++ TiMidity++-1.2.0/interface/Makefile.am	Thu Jan 21 00:57:28 1999
@@ -159,8 +159,10 @@
 	$(DYNAMIC_OBJS) \
 	$(SOUND_SPEC_OBJS)
 
-dumb_c.o:$(libinterface_a_LIBADD)
-
+libinterface_a_DEPENDENCIES = \
+	$(top_srcdir)/interface.h \
+	$(libinterface_a_LIBADD) \
+	$(tcltk_dep)
 
 # Tcl interface sources
 TCLSRCS = tkmidity.ptcl tkpanel.tcl browser.tcl misc.tcl
@@ -174,7 +176,8 @@
 	browser.tcl \
 	misc.tcl \
 	timidity.el \
-	check.xbm
+	check.xbm \
+	tclIndex
 
 .ptcl.tcl:
 	sed -e s@%TCL_DIR%@$(TCL_DIR)@g -e s@%TIMID_DIR%@$(TIMID_DIR)@g  $< > $@
@@ -184,7 +187,7 @@
 	rm -f *.$(so)
 
 tclIndex: $(TCLF)
-	echo 'auto_mkindex . *.tcl; exit' | wish
+	echo 'auto_mkindex . *.tcl; exit' | $(WISH)
 
 if ENABLE_TCLTK
 install_tk = install.tk
diff -ruN TiMidity++-1.1.1/interface/Makefile.in TiMidity++-1.2.0/interface/Makefile.in
--- TiMidity++-1.1.1/interface/Makefile.in	Mon Jan 18 22:55:43 1999
+++ TiMidity++-1.2.0/interface/Makefile.in	Thu Jan 21 01:59:24 1999
@@ -99,8 +99,10 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 
 SUBDIRS = motif_bitmaps bitmaps pixmaps
 
@@ -219,6 +221,11 @@
 	$(DYNAMIC_OBJS) \
 	$(SOUND_SPEC_OBJS)
 
+libinterface_a_DEPENDENCIES = \
+	$(top_srcdir)/interface.h \
+	$(libinterface_a_LIBADD) \
+	$(tcltk_dep)
+
 # Tcl interface sources
 TCLSRCS = tkmidity.ptcl tkpanel.tcl browser.tcl misc.tcl
 # Tcl/Tk sources
@@ -231,7 +238,8 @@
 	browser.tcl \
 	misc.tcl \
 	timidity.el \
-	check.xbm
+	check.xbm \
+	tclIndex
 
 @ENABLE_TCLTK_TRUE@install_tk = install.tk
 @ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk
@@ -254,12 +262,12 @@
 @NEEDDLOPEN_TRUE@i_so_libs = @i_so_libs@
 @NEEDDLOPEN_TRUE@g_so_libs = @g_so_libs@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
+CONFIG_HEADER = ../config.h ../interface.h
 CONFIG_CLEAN_FILES = 
 LIBRARIES =  $(noinst_LIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -267,41 +275,6 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-@ENABLE_XAW_FALSE@libinterface_a_DEPENDENCIES = 
-@ENABLE_VT100_TRUE@libinterface_a_DEPENDENCIES = 
-@ENABLE_SOUND_SPEC_FALSE@libinterface_a_DEPENDENCIES = 
-@ENABLE_MOTIF_TRUE@libinterface_a_DEPENDENCIES = 
-@ENABLE_SLANG_FALSE@libinterface_a_DEPENDENCIES = 
-gtk_c.o
libinterface_a_DEPENDENCIES =  gtk_i.o
-@ENABLE_TCLTK_TRUE@libinterface_a_DEPENDENCIES =  tk_c.o
-@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = 
-@ENABLE_NCURSES_TRUE@libinterface_a_DEPENDENCIES =  ncurs_c.o
-xskin_loadBMP.o
libinterface_a_DEPENDENCIES =  xskin_spectrum.o
-@ENABLE_VT100_FALSE@libinterface_a_DEPENDENCIES = 
-@ENABLE_GTK_TRUE@libinterface_a_DEPENDENCIES = 
-motif_p.o
libinterface_a_DEPENDENCIES = 
-xskin_c.o
libinterface_a_DEPENDENCIES =  xskin_i.o
-@ENABLE_EMACS_TRUE@libinterface_a_DEPENDENCIES =  emacs_c.o
-@ENABLE_MOTIF_FALSE@libinterface_a_DEPENDENCIES = 
-xaw_c.o
libinterface_a_DEPENDENCIES =  xaw_i.o
-soundspec.olibinterface_a_DEPENDENCIES = 
-@ENABLE_XSKIN_TRUE@libinterface_a_DEPENDENCIES = 
-@ENABLE_WRD_TRUE@libinterface_a_DEPENDENCIES = 
-@ENABLE_TCLTK_FALSE@libinterface_a_DEPENDENCIES = 
-gtk_p.olibinterface_a_DEPENDENCIES = 
-@ENABLE_NCURSES_FALSE@libinterface_a_DEPENDENCIES = 
-@ENABLE_XAW_TRUE@libinterface_a_DEPENDENCIES = 
-wrdt_x.o
libinterface_a_DEPENDENCIES =  x_wrdwindow.o
-@ENABLE_GTK_FALSE@libinterface_a_DEPENDENCIES = 
-@ENABLE_SOUND_SPEC_TRUE@libinterface_a_DEPENDENCIES = 
-vt100.o
libinterface_a_DEPENDENCIES =  vt100_c.o
-@ENABLE_EMACS_FALSE@libinterface_a_DEPENDENCIES = 
-@ENABLE_SLANG_TRUE@libinterface_a_DEPENDENCIES =  slang_c.o
-@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES =  dynamic_c.o
-@ENABLE_XSKIN_FALSE@libinterface_a_DEPENDENCIES = 
-@ENABLE_WRD_FALSE@libinterface_a_DEPENDENCIES = 
-motif_c.o
libinterface_a_DEPENDENCIES =  motif_i.o
-VTPrsTbl.o
libinterface_a_DEPENDENCIES =  x_mag.o
 libinterface_a_OBJECTS =  dumb_c.o wrdt_dumb.o wrdt_tty.o
 AR = ar
 CFLAGS = @CFLAGS@
@@ -634,8 +607,6 @@
 
 include $(top_builddir)/common.makefile
 
-dumb_c.o:$(libinterface_a_LIBADD)
-
 .ptcl.tcl:
 	sed -e s@%TCL_DIR%@$(TCL_DIR)@g -e s@%TIMID_DIR%@$(TIMID_DIR)@g  $< > $@
 clean:
@@ -644,7 +615,7 @@
 	rm -f *.$(so)
 
 tclIndex: $(TCLF)
-	echo 'auto_mkindex . *.tcl; exit' | wish
+	echo 'auto_mkindex . *.tcl; exit' | $(WISH)
 
 install.tk: $(ALLTCLF) install.bitmaps
 	test -d $(DESTDIR)$(TCL_DIR) || mkdir -p $(DESTDIR)$(TCL_DIR)
diff -ruN TiMidity++-1.1.1/interface/bitmaps/Makefile.am TiMidity++-1.2.0/interface/bitmaps/Makefile.am
--- TiMidity++-1.1.1/interface/bitmaps/Makefile.am	Mon Dec 14 15:03:06 1998
+++ TiMidity++-1.2.0/interface/bitmaps/Makefile.am	Wed Jan 20 16:19:50 1999
@@ -27,6 +27,8 @@
 	prev.xbm \
 	quit.xbm \
 	stop.xbm \
+	random.xbm \
+	repeat.xbm \
 	timidity.xbm
 
 EXTRA_DIST = $(BITMAPS)
diff -ruN TiMidity++-1.1.1/interface/bitmaps/Makefile.in TiMidity++-1.2.0/interface/bitmaps/Makefile.in
--- TiMidity++-1.1.1/interface/bitmaps/Makefile.in	Mon Jan 18 22:55:47 1999
+++ TiMidity++-1.2.0/interface/bitmaps/Makefile.in	Thu Jan 21 01:59:28 1999
@@ -100,9 +100,11 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 dynamic_targets = @dynamic_targets@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 
 BITMAPS = \
 	back.xbm \
@@ -113,11 +115,13 @@
 	prev.xbm \
 	quit.xbm \
 	stop.xbm \
+	random.xbm \
+	repeat.xbm \
 	timidity.xbm
 
 EXTRA_DIST = $(BITMAPS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
+CONFIG_HEADER = ../../config.h ../../interface.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
diff -ruN TiMidity++-1.1.1/interface/bitmaps/random.xbm TiMidity++-1.2.0/interface/bitmaps/random.xbm
--- TiMidity++-1.1.1/interface/bitmaps/random.xbm	Thu Jan  1 09:00:00 1970
+++ TiMidity++-1.2.0/interface/bitmaps/random.xbm	Wed Jan 20 16:19:50 1999
@@ -0,0 +1,9 @@
+#define random_width 22
+#define random_height 22
+static unsigned char random_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x63, 0x00,
+  0x00, 0x63, 0x00, 0x00, 0x60, 0x00, 0x00, 0x30, 0x00, 0x00, 0x18, 0x00,
+  0x00, 0x0c, 0x00, 0xf8, 0xcc, 0x07, 0x8c, 0x61, 0x0c, 0x8c, 0x6d, 0x0c,
+  0x80, 0x0d, 0x0c, 0xc0, 0x00, 0x06, 0x60, 0x00, 0x03, 0x30, 0x80, 0x01,
+  0x30, 0x80, 0x01, 0x00, 0x00, 0x00, 0x30, 0x80, 0x01, 0x30, 0x80, 0x01,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff -ruN TiMidity++-1.1.1/interface/bitmaps/repeat.xbm TiMidity++-1.2.0/interface/bitmaps/repeat.xbm
--- TiMidity++-1.1.1/interface/bitmaps/repeat.xbm	Thu Jan  1 09:00:00 1970
+++ TiMidity++-1.2.0/interface/bitmaps/repeat.xbm	Wed Jan 20 16:19:50 1999
@@ -0,0 +1,9 @@
+#define repeat2_width 22
+#define repeat2_height 22
+static unsigned char repeat2_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x0e, 0x06,
+  0xc0, 0x3f, 0x06, 0xf0, 0xff, 0x07, 0x10, 0xf8, 0x07, 0x08, 0xc0, 0x07,
+  0x04, 0xe0, 0x07, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00,
+  0xfc, 0x03, 0x00, 0xf8, 0x01, 0x08, 0xf8, 0x00, 0x04, 0xf8, 0x07, 0x02,
+  0xf8, 0xff, 0x03, 0x18, 0xff, 0x00, 0x18, 0x1c, 0x00, 0x10, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff -ruN TiMidity++-1.1.1/interface/emacs_c.c TiMidity++-1.2.0/interface/emacs_c.c
--- TiMidity++-1.1.1/interface/emacs_c.c	Mon Jan 18 10:26:26 1999
+++ TiMidity++-1.2.0/interface/emacs_c.c	Wed Jan 20 16:09:17 1999
@@ -222,7 +222,7 @@
 	return RC_VOICEDECR;
       case 'd':
 	*valp = n;
-	return RC_TOGGLE_DURMCHAN;
+	return RC_TOGGLE_DRUMCHAN;
       case 'g':
 	return RC_TOGGLE_SNDSPEC;
     }
diff -ruN TiMidity++-1.1.1/interface/gtk_c.c TiMidity++-1.2.0/interface/gtk_c.c
--- TiMidity++-1.1.1/interface/gtk_c.c	Thu Dec 17 13:08:58 1998
+++ TiMidity++-1.2.0/interface/gtk_c.c	Wed Jan 20 18:17:27 1999
@@ -109,7 +109,7 @@
 	fprintf(stderr, "\n");
     }
     else if (ctl.trace_playing) {
-	vsprintf(local, fmt, ap);
+	vsnprintf(local, sizeof(local), fmt, ap);
 	gtk_pipe_int_write(CMSG_MESSAGE);
 	gtk_pipe_int_write(type);
 	gtk_pipe_string_write(local);
@@ -435,6 +435,22 @@
 	case GTK_RWD:
 	    *valp=play_mode->rate;
 	    return RC_BACK;
+
+	case GTK_KEYUP:
+	    *valp = 1;
+	    return RC_KEYUP;
+
+	case GTK_KEYDOWN:
+	    *valp = -1;
+	    return RC_KEYDOWN;
+
+	case GTK_SLOWER:
+	    *valp = 1;
+	    return RC_SPEEDDOWN;
+
+	case GTK_FASTER:
+	    *valp = 1;
+	    return RC_SPEEDUP;
 	}
 	  
 	  
@@ -480,14 +496,16 @@
     int command;
     int32 val;
 
-    /* Pass the list to the interface */
-    gtk_pipe_int_write(FILE_LIST_MESSAGE);
-    gtk_pipe_int_write(number_of_files);
-    for (i=0;i<number_of_files;i++)
-	gtk_pipe_string_write(list_of_files[i]);
+    if( number_of_files > 0 ) {
+	/* Pass the list to the interface */
+	gtk_pipe_int_write(FILE_LIST_MESSAGE);
+	gtk_pipe_int_write(number_of_files);
+	for (i=0;i<number_of_files;i++)
+	    gtk_pipe_string_write(list_of_files[i]);
     
-    /* Ask the interface for a filename to play -> begin to play automatically */
-    gtk_pipe_int_write(NEXT_FILE_MESSAGE);
+	/* Ask the interface for a filename to play -> begin to play automatically */
+	gtk_pipe_int_write(NEXT_FILE_MESSAGE);
+    }
     
     command = ctl_blocking_read(&val);
 
diff -ruN TiMidity++-1.1.1/interface/gtk_h.h TiMidity++-1.2.0/interface/gtk_h.h
--- TiMidity++-1.1.1/interface/gtk_h.h	Thu Dec 10 13:03:56 1998
+++ TiMidity++-1.2.0/interface/gtk_h.h	Wed Jan 20 16:09:17 1999
@@ -46,17 +46,23 @@
 #define PREV_FILE_MESSAGE 19
 #define TUNE_END_MESSAGE 20
 
-#define GTK_CHANGE_VOLUME 1
-#define GTK_CHANGE_LOCATOR 2
-#define GTK_QUIT 3
-#define GTK_PLAY_FILE 4
-#define GTK_NEXT 5
-#define GTK_PREV 6
-#define GTK_RESTART 7
-#define GTK_FWD 8
-#define GTK_RWD 9
-#define GTK_PAUSE 10
-
+typedef enum {
+    GTK_CHANGE_VOLUME = 1,
+    GTK_CHANGE_LOCATOR,
+    GTK_QUIT,
+    GTK_PLAY_FILE,
+    GTK_NEXT,
+    GTK_PREV,
+    GTK_RESTART,
+    GTK_FWD,
+    GTK_RWD,
+    GTK_PAUSE,
+    GTK_KEYUP,
+    GTK_KEYDOWN,
+    GTK_SLOWER,
+    GTK_FASTER,
+    GTK_TOGGLE_DRUMS
+} GtkControls;
 
 /*
  * CONSTANTS FOR MOTIF/GTK+ MENUS
diff -ruN TiMidity++-1.1.1/interface/gtk_i.c TiMidity++-1.2.0/interface/gtk_i.c
--- TiMidity++-1.1.1/interface/gtk_i.c	Thu Dec 17 13:04:18 1998
+++ TiMidity++-1.2.0/interface/gtk_i.c	Wed Jan 20 16:09:17 1999
@@ -41,11 +41,15 @@
 #include "pixmaps/nexttrk.xpm"
 #include "pixmaps/rew.xpm"
 #include "pixmaps/ff.xpm"
-#include "pixmaps/stop.xpm"
+#include "pixmaps/restart.xpm"
 #include "pixmaps/quit.xpm"
 #include "pixmaps/quiet.xpm"
 #include "pixmaps/loud.xpm"
 #include "pixmaps/open.xpm"
+#include "pixmaps/keyup.xpm"
+#include "pixmaps/keydown.xpm"
+#include "pixmaps/slow.xpm"
+#include "pixmaps/fast.xpm"
 
 static GtkWidget *create_menubar(void);
 static GtkWidget *create_button_with_pixmap(GtkWidget *, gchar **, gint, gchar *);
@@ -58,7 +62,6 @@
 static void generic_scale_cb(GtkAdjustment *, gpointer);
 static void open_file_cb(GtkWidget *, gpointer);
 static void file_list_cb(GtkWidget *, gint, gint, GdkEventButton *, gpointer);
-static gint btn_event_cb(GtkWidget *, GdkEventButton *, gpointer);
 static void filer_cb(GtkWidget *, gpointer);
 static void tt_toggle_cb(GtkWidget *, gpointer);
 static void locate_update_cb(GtkWidget *, GdkEventButton *, gpointer);
@@ -69,7 +72,7 @@
 static GtkWidget *tot_lbl, *cnt_lbl, *auto_next, *ttshow;
 static GtkTooltips *ttip;
 static int file_number_to_play; /* Number of the file we're playing in the list */
-static int last_sec, max_sec, is_quitting = 0, locating = 0, local_adjust = 0;
+static int max_sec, is_quitting = 0, locating = 0, local_adjust = 0;
 
 static GtkItemFactoryEntry ife[] = {
     {"/File/Open", "<control>O", open_file_cb, 0, NULL},
@@ -173,20 +176,13 @@
 {
     gchar *fname;
 
-    gtk_clist_get_text(GTK_CLIST(widget), row, column, &fname);
+    gtk_clist_get_text(GTK_CLIST(widget), row, 0, &fname);
     gtk_pipe_int_write(GTK_PLAY_FILE);
     gtk_pipe_string_write(fname);
     file_number_to_play=row;
 }
 
 static gint
-btn_event_cb(GtkWidget *widget, GdkEventButton *ev, gpointer data)
-{
-    fprintf(stderr, "In btn_event_cb.\n");
-    return 0;
-}
-
-static gint
 delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
     return (FALSE);
@@ -314,7 +310,7 @@
     gtk_box_pack_start(GTK_BOX(hbox), swin, TRUE, TRUE, 0);
 
     vbox2 = gtk_vbox_new(FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, FALSE, 0);
     gtk_widget_show(vbox2);
 
     /* This is so the pixmap creation works properly. */
@@ -335,7 +331,7 @@
     gtk_widget_show(vol_scale);
     gtk_tooltips_set_tip(ttip, vol_scale, "Volume control", NULL);
 
-    gtk_box_pack_start(GTK_BOX(vbox2), vol_scale, FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(vbox2), vol_scale, TRUE, TRUE, 0);
 
     gtk_box_pack_start(GTK_BOX(vbox2),
 		       create_pixmap_label(window, quiet_xpm),
@@ -344,7 +340,7 @@
     handlebox = gtk_handle_box_new();
     gtk_box_pack_start(GTK_BOX(hbox), handlebox, FALSE, FALSE, 0);
 
-    table = gtk_table_new(5, 2, TRUE);
+    table = gtk_table_new(7, 2, TRUE);
     gtk_container_add(GTK_CONTAINER(handlebox), table);
 
     button = create_button_with_pixmap(window, playpaus_xpm, GTK_PAUSE,
@@ -372,23 +368,43 @@
     gtk_table_attach_defaults(GTK_TABLE(table), button,
 			      1, 2, 2, 3);
 
-    button = create_button_with_pixmap(window, stop_xpm, GTK_RESTART,
-				       "Restart");
+    button = create_button_with_pixmap(window, keydown_xpm, GTK_KEYDOWN,
+				       "Lower pitch");
     gtk_table_attach_defaults(GTK_TABLE(table), button,
 			      0, 1, 3, 4);
 
+    button = create_button_with_pixmap(window, keyup_xpm, GTK_KEYUP,
+				       "Raise pitch");
+    gtk_table_attach_defaults(GTK_TABLE(table), button,
+			      1, 2, 3, 4);
+
+    button = create_button_with_pixmap(window, slow_xpm, GTK_SLOWER,
+				       "Decrease tempo");
+    gtk_table_attach_defaults(GTK_TABLE(table), button,
+			      0, 1, 4, 5);
+
+    button = create_button_with_pixmap(window, fast_xpm, GTK_FASTER,
+				       "Increase tempo");
+    gtk_table_attach_defaults(GTK_TABLE(table), button,
+			      1, 2, 4, 5);
+
+    button = create_button_with_pixmap(window, restart_xpm, GTK_RESTART,
+				       "Restart");
+    gtk_table_attach_defaults(GTK_TABLE(table), button,
+			      0, 1, 5, 6);
+
     button = create_button_with_pixmap(window, open_xpm, 0,
 				       "Open");
     gtk_signal_disconnect_by_func(GTK_OBJECT(button), generic_cb, 0);
     gtk_signal_connect(GTK_OBJECT(button), "clicked",
 			      GTK_SIGNAL_FUNC(open_file_cb), 0);
     gtk_table_attach_defaults(GTK_TABLE(table), button,
-			      1, 2, 3, 4);
+			      1, 2, 5, 6);
 
     button = create_button_with_pixmap(window, quit_xpm, GTK_QUIT,
 				       "Quit");
     gtk_table_attach_defaults(GTK_TABLE(table), button,
-			      0, 2, 4, 5);
+			      0, 2, 6, 7);
 
     gtk_widget_show(hbox);
     gtk_widget_show(vbox);
@@ -450,12 +466,14 @@
 static GtkWidget *
 create_menubar(void)
 {
-    GtkItemFactory *ifactory;
-    GtkAccelGroup *ag;
+    GtkItemFactory	*ifactory;
+    GtkAccelGroup	*ag;
 
     ag = gtk_accel_group_get_default();
     ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<Main>", ag);
-    gtk_item_factory_create_items(ifactory, 4, ife, NULL);
+    gtk_item_factory_create_items(ifactory,
+				  sizeof(ife) / sizeof(GtkItemFactoryEntry),
+				  ife, NULL);
     gtk_widget_show(ifactory->widget);
 
     auto_next = gtk_item_factory_get_widget(ifactory, "/Options/Auto next");
@@ -471,10 +489,9 @@
 static GtkTooltips *
 create_yellow_tooltips()
 {
-    GdkColor *t_fore, *t_back;
-    GtkTooltips * tip;
+    GdkColor	*t_back;
+    GtkTooltips	*tip;
 
-    t_fore = (GdkColor*)g_malloc( sizeof(GdkColor));
     t_back = (GdkColor*)g_malloc( sizeof(GdkColor));
 
     /* First create a default Tooltip */
@@ -482,9 +499,10 @@
 
     /* Try to get the colors */
     if ( gdk_color_parse("linen", t_back)){
-	if(gdk_color_alloc(gdk_colormap_get_system(), t_back)) {
-	    gdk_color_black(gdk_colormap_get_system(), t_fore);
-	    gtk_tooltips_set_colors(tip, t_back, t_fore);
+	if(gdk_colormap_alloc_color(gdk_colormap_get_system(),
+				    t_back,
+				    FALSE, TRUE)) {
+	    gtk_tooltips_set_colors(tip, t_back, NULL);
 	}
     }
 
@@ -558,7 +576,7 @@
 	    else
 		pc++;
 
-	    sprintf(title, "Timidity %s - %s", timidity_version, filename);
+	    sprintf(title, "Timidity %s - %s", timidity_version, pc);
 	    gtk_window_set_title(GTK_WINDOW(window), title);
 
 	    for (i = 0; i < 30; i++)
@@ -633,10 +651,9 @@
 
     case CURTIME_MESSAGE:
 	{
-	    int cseconds;
-	    int  sec,seconds, minutes;
-	    int nbvoice;
-	    char local_string[20];
+	    int		seconds, minutes;
+	    int		nbvoice;
+	    char	local_string[20];
 
 	    gtk_pipe_int_read(&seconds);
 	    gtk_pipe_int_read(&nbvoice);
@@ -644,24 +661,14 @@
 	    if( is_quitting )
 		return;
 
-	    sec = seconds;
-
-	    /* To avoid blinking */
-	    if (sec!=last_sec)
-	    {
-		minutes=seconds/60;
-		seconds-=minutes*60;
-
-		sprintf(local_string,"%2d:%02d",
-			minutes, seconds);
+	    minutes=seconds/60;
 
-		gtk_label_set(GTK_LABEL(cnt_lbl), local_string);
-	    }
+	    sprintf(local_string,"%2d:%02d", minutes, (int)(seconds % 60));
 
-	    last_sec=sec;
+	    gtk_label_set(GTK_LABEL(cnt_lbl), local_string);
 
 	    /* Readjust the time scale if not dragging the scale */
-	    if( !locating && (cseconds <= max_sec)) {
+	    if( !locating && (seconds <= max_sec)) {
 		GtkAdjustment *adj;
 
 		adj = gtk_range_get_adjustment(GTK_RANGE(locator));
diff -ruN TiMidity++-1.1.1/interface/gtk_p.c TiMidity++-1.2.0/interface/gtk_p.c
--- TiMidity++-1.1.1/interface/gtk_p.c	Thu Dec 10 13:05:04 1998
+++ TiMidity++-1.2.0/interface/gtk_p.c	Wed Jan 20 16:09:17 1999
@@ -142,15 +142,15 @@
 #ifdef DEBUGPIPE
     int code;
 
-    len = read(fpip_in,&code,sizeof(code)); 
+    len = read(fpip_in,&code,sizeof(code));
     if (len!=sizeof(code)) pipe_error("PIPE_STRING_READ");
     if (code!=STRING_CODE) fprintf(stderr,"BUG ALERT ON STRING PIPE %i\n",code);
 #endif
 
-    len = read(fpip_in,&slen,sizeof(slen)); 
+    len = read(fpip_in,&slen,sizeof(slen));
     if (len!=sizeof(slen)) pipe_error("PIPE_STRING_READ");
     
-    len = read(fpip_in,str,slen); 
+    len = read(fpip_in,str,slen);
     if (len!=slen) pipe_error("PIPE_STRING_READ on string part");
     str[slen]='\0';		/* Append a terminal 0 */
 }
diff -ruN TiMidity++-1.1.1/interface/motif_bitmaps/Makefile.in TiMidity++-1.2.0/interface/motif_bitmaps/Makefile.in
--- TiMidity++-1.1.1/interface/motif_bitmaps/Makefile.in	Mon Jan 18 22:55:45 1999
+++ TiMidity++-1.2.0/interface/motif_bitmaps/Makefile.in	Thu Jan 21 01:59:27 1999
@@ -100,9 +100,11 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 dynamic_targets = @dynamic_targets@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 
 BITMAPS = \
 	back.xbm \
@@ -116,7 +118,7 @@
 
 EXTRA_DIST = $(BITMAPS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
+CONFIG_HEADER = ../../config.h ../../interface.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
diff -ruN TiMidity++-1.1.1/interface/ncurs_c.c TiMidity++-1.2.0/interface/ncurs_c.c
--- TiMidity++-1.1.1/interface/ncurs_c.c	Thu Jan 14 17:41:26 1999
+++ TiMidity++-1.2.0/interface/ncurs_c.c	Wed Jan 20 16:09:17 1999
@@ -1812,7 +1812,7 @@
 	    if(ch >= 0 && ISDRUMCHANNEL(ch))
 	    {
 		*val = ch;
-		rc = RC_TOGGLE_DURMCHAN;
+		rc = RC_TOGGLE_DRUMCHAN;
 	    }
 	}
 	else if(*text == '-')
@@ -1821,14 +1821,14 @@
 	    if(ch >= 0 && ISDRUMCHANNEL(ch))
 	    {
 		*val = ch;
-		rc = RC_TOGGLE_DURMCHAN;
+		rc = RC_TOGGLE_DRUMCHAN;
 	    }
 	}
 	else
 	{
 	    *val = atoi(text) - 1;
 	    if(*val >= 0)
-		rc = RC_TOGGLE_DURMCHAN;
+		rc = RC_TOGGLE_DRUMCHAN;
 	}
     }
     mini_buff_clear(command_buffer);
@@ -2172,7 +2172,7 @@
 	  if(ctl_ncurs_mode == NCURS_MODE_TRACE && selected_channel != -1)
 	  {
 	      *valp = selected_channel;
-	      return RC_TOGGLE_DURMCHAN;
+	      return RC_TOGGLE_DRUMCHAN;
 	  }
 	  break;
 	case 'g':
diff -ruN TiMidity++-1.1.1/interface/pixmaps/Makefile.in TiMidity++-1.2.0/interface/pixmaps/Makefile.in
--- TiMidity++-1.1.1/interface/pixmaps/Makefile.in	Mon Jan 18 22:55:48 1999
+++ TiMidity++-1.2.0/interface/pixmaps/Makefile.in	Thu Jan 21 01:59:30 1999
@@ -100,9 +100,11 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 dynamic_targets = @dynamic_targets@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 
 PIXMAPS = \
 	ff.xpm \
@@ -120,7 +122,7 @@
 
 EXTRA_DIST = $(PIXMAPS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
+CONFIG_HEADER = ../../config.h ../../interface.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
diff -ruN TiMidity++-1.1.1/interface/tclIndex TiMidity++-1.2.0/interface/tclIndex
--- TiMidity++-1.1.1/interface/tclIndex	Thu Jan  1 09:00:00 1970
+++ TiMidity++-1.2.0/interface/tclIndex	Thu Jan 21 01:22:30 1999
@@ -0,0 +1,62 @@
+# Tcl autoload index file, version 2.0
+# This file is generated by the "auto_mkindex" command
+# and sourced to set up indexing information for one or
+# more commands.  Typically each line is a command that
+# sets an element in the auto_index array, where the
+# element name is the name of a command and the value is
+# a script that loads the command.
+
+set auto_index(InitGlobal) [list source [file join $dir tkpanel.tcl]]
+set auto_index(HandleInput) [list source [file join $dir tkpanel.tcl]]
+set auto_index(MakeShuffleList) [list source [file join $dir tkpanel.tcl]]
+set auto_index(AppendMsg) [list source [file join $dir tkpanel.tcl]]
+set auto_index(ClearMsg) [list source [file join $dir tkpanel.tcl]]
+set auto_index(SelectNumber) [list source [file join $dir tkpanel.tcl]]
+set auto_index(SetTime) [list source [file join $dir tkpanel.tcl]]
+set auto_index(DispButtonPlay) [list source [file join $dir tkpanel.tcl]]
+set auto_index(SetVolume) [list source [file join $dir tkpanel.tcl]]
+set auto_index(WriteMsg) [list source [file join $dir tkpanel.tcl]]
+set auto_index(JumpCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(VolumeCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(LoadCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(PlayCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(PauseCheck) [list source [file join $dir tkpanel.tcl]]
+set auto_index(PauseCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(StopCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(QuitCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(PrevCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(NextCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(ForwardCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(BackwardCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(VolUpCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(VolDownCmd) [list source [file join $dir tkpanel.tcl]]
+set auto_index(DispTables) [list source [file join $dir tkpanel.tcl]]
+set auto_index(SaveConfig) [list source [file join $dir tkpanel.tcl]]
+set auto_index(LoadConfig) [list source [file join $dir tkpanel.tcl]]
+set auto_index(InitCmdLine) [list source [file join $dir tkpanel.tcl]]
+set auto_index(SelectList) [list source [file join $dir tkpanel.tcl]]
+set auto_index(OpenFiles) [list source [file join $dir tkpanel.tcl]]
+set auto_index(CloseFiles) [list source [file join $dir tkpanel.tcl]]
+set auto_index(ToggleCurFileMode) [list source [file join $dir tkpanel.tcl]]
+set auto_index(CreateWindow) [list source [file join $dir tkpanel.tcl]]
+set auto_index(filebrowser) [list source [file join $dir browser.tcl]]
+set auto_index(fs:init) [list source [file join $dir browser.tcl]]
+set auto_index(fs:init-lbox) [list source [file join $dir browser.tcl]]
+set auto_index(fs:get-cur-lbox) [list source [file join $dir browser.tcl]]
+set auto_index(fs:select) [list source [file join $dir browser.tcl]]
+set auto_index(fs:selall) [list source [file join $dir browser.tcl]]
+set auto_index(fs:updir) [list source [file join $dir browser.tcl]]
+set auto_index(fs:changedir) [list source [file join $dir browser.tcl]]
+set auto_index(fs:update) [list source [file join $dir browser.tcl]]
+set auto_index(retrieve-filename) [list source [file join $dir misc.tcl]]
+set auto_index(sec2time) [list source [file join $dir misc.tcl]]
+set auto_index(numeric-bind) [list source [file join $dir misc.tcl]]
+set auto_index(my-listbox) [list source [file join $dir misc.tcl]]
+set auto_index(my-dialog) [list source [file join $dir misc.tcl]]
+set auto_index(warning) [list source [file join $dir misc.tcl]]
+set auto_index(error) [list source [file join $dir misc.tcl]]
+set auto_index(information) [list source [file join $dir misc.tcl]]
+set auto_index(question) [list source [file join $dir misc.tcl]]
+set auto_index(rootname) [list source [file join $dir misc.tcl]]
+set auto_index(my-random) [list source [file join $dir misc.tcl]]
+set auto_index(init-random) [list source [file join $dir misc.tcl]]
diff -ruN TiMidity++-1.1.1/interface/vt100_c.c TiMidity++-1.2.0/interface/vt100_c.c
--- TiMidity++-1.1.1/interface/vt100_c.c	Thu Jan 14 17:28:44 1999
+++ TiMidity++-1.2.0/interface/vt100_c.c	Wed Jan 20 16:09:17 1999
@@ -697,7 +697,7 @@
 	    if(selected_channel != -1)
 	    {
 		*valp = selected_channel;
-		return RC_TOGGLE_DURMCHAN;
+		return RC_TOGGLE_DRUMCHAN;
 	    }
 	    break;
 	  case 'g':
diff -ruN TiMidity++-1.1.1/interface/xaw.h TiMidity++-1.2.0/interface/xaw.h
--- TiMidity++-1.1.1/interface/xaw.h	Mon Jan 18 20:15:17 1999
+++ TiMidity++-1.2.0/interface/xaw.h	Wed Jan 20 16:19:50 1999
@@ -34,9 +34,6 @@
 /* Define to use Japanese and so on */
 #define I18N
 
-/* Define to use lyric widget */
-#define MSGWINDOW
-
 /* Define to use scrollable Text widget instead of Label widget */
 /* #define WIDGET_IS_LABEL_WIDGET */
 
diff -ruN TiMidity++-1.1.1/interface/xaw_c.c TiMidity++-1.2.0/interface/xaw_c.c
--- TiMidity++-1.1.1/interface/xaw_c.c	Mon Jan 18 22:06:34 1999
+++ TiMidity++-1.2.0/interface/xaw_c.c	Wed Jan 20 16:33:27 1999
@@ -65,10 +65,6 @@
 void a_pipe_write(char *);
 int a_pipe_read(char *,int);
 static void a_pipe_write_msg(char *msg);
-#ifndef MSGWINDOW
-static void a_pipe_int_write(int);
-static void a_pipe_error(char *);
-#endif
 
 static void ctl_event(CtlEvent *e);
 static void ctl_refresh(void);
@@ -119,10 +115,8 @@
 
 static int cmsg(int type, int verbosity_level, char *fmt, ...) {
   va_list ap;
-#ifdef MSGWINDOW
   char *buff;
   MBlockList pool;
-#endif /* MSGWINDOW */
 
   if ((type==CMSG_TEXT || type==CMSG_INFO || type==CMSG_WARNING) &&
       ctl.verbosity<verbosity_level)
@@ -137,33 +131,12 @@
     return 0;
   }
 
-#ifdef MSGWINDOW
   init_mblock(&pool);
   buff = (char *)new_segment(&pool, MIN_MBLOCK_SIZE);
   vsnprintf(buff, MIN_MBLOCK_SIZE, fmt, ap);
-#endif /* MSGWINDOW */
-
-  if (1000 != ctl.opened) {
-#ifdef MSGWINDOW
-      a_pipe_write_msg(buff);
-#else
-      vfprintf(stderr, fmt, ap);
-      fprintf(stderr, NLS);
-#endif /* MSGWINDOW */
-  } else {
-#ifdef MSGWINDOW
-      vfprintf(stderr, fmt, ap);
-      fprintf(stderr, NLS);
-#else
-      a_pipe_int_write(CMSG_MESSAGE);
-      a_pipe_int_write(type);
-      a_pipe_int_write(strlen(buff));
-      a_pipe_write(buff);
-#endif /* MSGWINDOW */
-  }
-#ifdef MSGWINDOW
+  a_pipe_write_msg(buff);
   reuse_mblock(&pool);
-#endif /* MSGWINDOW */
+
   va_end(ap);
   return 0;
 }
@@ -570,15 +543,6 @@
   write(pipe_out_fd,"\n",1);
 }
 
-#ifndef MSGWINDOW
-void a_pipe_int_write(int c) {
-    int len;
-    len = write(pipe_out_fd,&c,sizeof(c));
-    if (len!=sizeof(int))
-	  a_pipe_error("PIPE_INT_WRITE");
-}
-#endif
-
 static int a_pipe_ready(void) {
   fd_set fds;
   static struct timeval tv;
@@ -792,19 +756,3 @@
 {
     return &ctl;
 }
-
-#ifndef MSGWINDOW
-/*
- * error message
- */
-static void a_pipe_error(char *s)
-{
-#ifdef HAVE_STRERROR
-    fprintf(stderr,"connection problem in %s because:%s" NLS, s,
-			strerror(errno));
-#else
-    fprintf(stderr,"connection problem in %s because:%d" NLS, s, errno);
-#endif
-    exit(1);
-}
-#endif /* MSGWINDOW */
diff -ruN TiMidity++-1.1.1/interface/xaw_i.c TiMidity++-1.2.0/interface/xaw_i.c
--- TiMidity++-1.1.1/interface/xaw_i.c	Mon Jan 18 22:53:23 1999
+++ TiMidity++-1.2.0/interface/xaw_i.c	Wed Jan 20 16:45:28 1999
@@ -75,7 +75,7 @@
 #ifndef HAVE_STRNCASECMP
 int strncasecmp(char *s1, char *s2, unsigned int len);
 #endif
-#define TRACE_WIDTH 380
+#define TRACE_WIDTH 372
 #define TRACE_HEIGHT 180
 #define POS_HEIGHT 12
 #define PRG_HEIGHT 16
@@ -119,22 +119,18 @@
 extern void a_pipe_write(char *);
 extern int a_pipe_read(char *,int);
 extern int a_pipe_nread(char *buf, int n);
-void initTraceWindow(Boolean);
+static void initTraceWindow(Boolean);
 
-static Widget title_mb,title_sm,time_l, popup_load, popup_load_f, load_d;
-static Widget load_vport, load_flist, cwd_l, load_info;
-#ifdef MSGWINDOW
-static Widget lyric_t;
-static Widget trace;
-static Widget lyriclist[1], tracelist[1];
+static Widget title_mb,title_sm,time_l,popup_load,popup_load_f,load_d;
+static Widget load_vport,load_flist,cwd_l,load_info;
 static Dimension lyric_height, base_height;
-#endif
+static Widget lyric_t;
 static GC gct;
 static XColor bgcolor,defcolor,fgpan,fgstr,fgtmp;
 static XFontStruct *StatusFont;
 static long barcol[MAX_XAW_MIDI_CHANNELS];
 
-static Widget toplevel, base_f, file_mb, file_sm, bsb, logo_label;
+static Widget toplevel,m_box,base_f,file_mb,file_sm,bsb,trace;
 static Widget quit_b,play_b,pause_b,stop_b,prev_b,next_b,fwd_b,back_b;
 static Widget random_b,repeat_b,b_box,v_box,vol_l,vol_bar;
 static char local_buf[300];
@@ -174,10 +170,10 @@
 Config Cfg = { False, False, True, False, False, True };
 static PanelInfo *Panel;
 
-#define MAXBITMAP 8
+#define MAXBITMAP 10
 static char *bmfname[] = {
   "back.xbm","fwrd.xbm","next.xbm","pause.xbm","play.xbm","prev.xbm",
-  "quit.xbm","stop.xbm",(char *)NULL
+  "quit.xbm","stop.xbm","random.xbm","repeat.xbm",(char *)NULL
 };
 static char *iconname = "timidity.xbm";
 #define BM_BACK			0
@@ -188,6 +184,8 @@
 #define BM_PREV			5
 #define BM_QUIT			6
 #define BM_STOP			7
+#define BM_RANDOM		8
+#define BM_REPEAT		9
 static char *dotfile = NULL;
 
 char *cfg_items[]= {"Tracing", "ConfirmExit", "Disp:file", "Disp:volume",
@@ -240,9 +238,7 @@
     ID_LOAD = 100,
     ID_SAVECONFIG,
     ID_AUTOSTART,
-#ifdef MSGWINDOW
     ID_HIDETXT,
-#endif /* MSGWINDOW */
     ID_HIDETRACE,
     ID_DUMMY,
     ID_QUIT,
@@ -252,9 +248,7 @@
   {ID_LOAD, "load", True, False},
   {ID_SAVECONFIG, "saveconfig", True, False},
   {ID_AUTOSTART, "Auto Start", True, False},
-#ifdef MSGWINDOW
   {ID_HIDETXT, "(Un)Hide Messages", True, False},
-#endif
   {ID_HIDETRACE, "(Un)Hide Trace", True, False},
   {ID_DUMMY, "line", False, False},
   {ID_QUIT, "quit", True, False},
@@ -324,7 +318,6 @@
   if (e->type == KeyPress && s == True) {
 	XtVaGetValues(pause_b,XtNstate,&s,NULL);
 	s ^= True;
-	/*  s = ((s)? False:True);*/
 	XtVaSetValues(pause_b,XtNstate,&s,NULL);
 	a_pipe_write("U");
   }
@@ -550,10 +543,7 @@
 
 static void filemenuCB(Widget w,XtPointer id_data, XtPointer data) {
   int *id = (int *)id_data;
-#ifdef MSGWINDOW
-  Dimension w1,h1,w2,h2;
-#endif
-  Dimension tmp;
+  Dimension w1,h1,w2,h2,tmp;
 
   switch (*id) {
 	case ID_LOAD:
@@ -562,23 +552,20 @@
 	case ID_AUTOSTART:
 	  toggleMark(w,*id);
 	  break;
-#ifdef MSGWINDOW
 	case ID_HIDETRACE:
 	  if(ctl->trace_playing) {
 		XtVaGetValues(toplevel,XtNheight,&h1,NULL);
 		XtVaGetValues(toplevel,XtNwidth,&w1,NULL);
 		if (XtIsManaged(trace)) {
 		  tmp = trace_height + (XtIsManaged(lyric_t) ? 0:lyric_height);
-		  XtUnmanageChildren(tracelist, XtNumber(tracelist));
-		  XtVaSetValues(trace,XtNfromVert,
-						(XtIsManaged(lyric_t) ? lyric_t:v_box),NULL);
+		  XtUnmanageChild(trace);
 		  XtMakeResizeRequest(toplevel,w1,base_height-tmp,&w2,&h2);
 		} else {
-		  XtManageChildren(tracelist, XtNumber(tracelist));
+		  XtManageChild(trace);
 		  XtVaSetValues(trace,XtNfromVert,
 						(XtIsManaged(lyric_t) ? lyric_t:v_box),NULL);
 		  XtMakeResizeRequest(toplevel,w1,h1+trace_height,&w2,&h2);
-		  XtVaSetValues(trace,XtNheight,&trace_height,NULL);
+		  XtVaSetValues(trace,XtNheight,trace_height,NULL);
 		}
 		toggleMark(w,*id);
 	  }
@@ -592,21 +579,20 @@
 		} else {
 		  tmp = lyric_height;
 		}
-		XtUnmanageChildren(lyriclist, XtNumber(lyriclist));
+		XtUnmanageChild(lyric_t);
 		if(ctl->trace_playing && XtIsManaged(trace))
 		  XtVaSetValues(trace,XtNfromVert,v_box,NULL);
 		XtMakeResizeRequest(toplevel,w1,base_height-tmp,&w2,&h2);
 	  } else {
-		XtManageChildren(lyriclist, XtNumber(lyriclist));
+		XtManageChild(lyric_t);
 		if(ctl->trace_playing && XtIsManaged(trace)) {
 		  XtVaSetValues(trace,XtNfromVert,lyric_t,NULL);
 		}
+		XtVaSetValues(lyric_t,XtNheight,lyric_height,NULL);
 		XtMakeResizeRequest(toplevel,w1,h1+lyric_height,&w2,&h2);
-		XtVaSetValues(lyric_t,XtNheight,&lyric_height,NULL);
 	  }
 	  toggleMark(w,*id);
 	  break;
-#endif
 	case ID_SAVECONFIG:
 	  a_saveconfig(dotfile);
 	  break;
@@ -616,7 +602,6 @@
   }
 }
 
-#ifdef MSGWINDOW
 #ifdef WIDGET_IS_LABEL_WIDGET
 static void a_print_msg(Widget w)
 {
@@ -648,24 +633,25 @@
     a_pipe_nread((char *)&msglen, sizeof(int));
     while(msglen > 0)
     {
-	i = msglen;
-	if(i > sizeof(local_buf))
-	    i = sizeof(local_buf);
-	a_pipe_nread(local_buf, i);
-	tb.length = i;
-	XawTextReplace(w, pos, pos, &tb);
-	pos += i;
-	XawTextSetInsertionPoint(w, pos);
-	msglen -= i;
+        i = msglen;
+        if(i > sizeof(local_buf))
+            i = sizeof(local_buf);
+        a_pipe_nread(local_buf, i);
+        tb.length = i;
+        XawTextReplace(w, pos, pos, &tb);
+        pos += i;
+        XawTextSetInsertionPoint(w, pos);
+        msglen -= i;
     }
 }
 #endif /* WIDGET_IS_LABEL_WIDGET */
-#endif /* MSGWINDOW */
 
 #define DELTA_VEL       32
 
 static void
 ctl_channel_note(int ch, int note, int velocity) {
+  
+  if (!ctl->trace_playing) return;
   if (velocity == 0) {
 	if (note == Panel->cnote[ch])	  
 	  Panel->v_flags[ch] = FLAG_NOTE_OFF;
@@ -703,11 +689,9 @@
     }
 	break;
   case 'O' : offPlayButton();break;
-#ifdef MSGWINDOW
   case 'L' :
-	if (XtIsManaged(lyric_t)) a_print_msg(lyric_t);
+	a_print_msg(lyric_t);
 	break;
-#endif
   case 'Q' : exit(0);
   case 'V':
 	i=atoi(local_buf+2);
@@ -981,6 +965,7 @@
 static void drawProg(int ch,Boolean do_clean) {
   char s[3];
 
+  if (!ctl->trace_playing) return;
   if(do_clean) {
 	XSetForeground(disp, gct, bgcolor.pixel);
 	XFillRectangle(XtDisplay(trace),XtWindow(trace),gct,
@@ -999,6 +984,7 @@
   int x;
   static XPoint pp[3];
 
+  if (!ctl->trace_playing) return;
   if (val < 0) return;
   x= TRACE_XOFS+ BAR_SPACE * ch+ 1;
   ap= BAR_WIDTH * val/127;
@@ -1030,9 +1016,10 @@
 static void drawTraceAll(void) {
   int i;
   Dimension w, h;
+
+  if (!ctl->trace_playing) return;
   XtVaGetValues(trace,XtNheight,&h,NULL);
   XtVaGetValues(trace,XtNwidth,&w,NULL);
-  if (!ctl->trace_playing) return;
   XSetForeground(disp, gct, bgcolor.pixel);
   XFillRectangle(XtDisplay(trace),XtWindow(trace),gct,0,0,w,h);
   for(i=0; i<MAX_XAW_MIDI_CHANNELS; i++) {
@@ -1149,11 +1136,9 @@
 		  Cfg->repeat = (Boolean)k; break;
 		case S_AutoStart:
 		  Cfg->autostart = (Boolean)k; break;
-#ifdef MSGWINDOW
 		case S_DispText:
 		  Cfg->hidetext = (Boolean)(k ^ 1);
 		  break;
-#endif
 		case S_ShufflePlay:
 		  Cfg->shuffle = (Boolean)k; break;
 		case S_DispTrace:
@@ -1181,9 +1166,7 @@
 	  fprintf(fp,"set %s %d\n",cfg_items[S_ConfirmExit],(int)Cfg.confirmexit);
 	  fprintf(fp,"set %s %d\n",cfg_items[S_RepeatPlay],(int)s1);
 	  fprintf(fp,"set %s %d\n",cfg_items[S_AutoStart],(int)file_menu[ID_AUTOSTART-100].bmflag);
-#ifdef MSGWINDOW
 	  fprintf(fp,"set %s %d\n",cfg_items[S_DispText],(int)(file_menu[ID_HIDETXT-100].bmflag ^ TRUE));
-#endif
 	  fprintf(fp,"set %s %d\n",cfg_items[S_ShufflePlay],(int)s2);
 	  fprintf(fp,"set %s %d\n",cfg_items[S_DispTrace],((int)file_menu[ID_HIDETRACE-100].bmflag ? 0:1));
 	  fclose(fp);
@@ -1228,13 +1211,14 @@
   return;
 }
 #endif
+
 void a_start_interface(int pipe_in) {
   static XtActionsRec actions[] ={
 	{"do-quit",(XtActionProc)quitCB},
 	{"fix-menu", (XtActionProc)filemenuCB},
 	{"do-complete", (XtActionProc)completeDir},
 	{"do-chgdir", (XtActionProc)setDirAction},
-	{"draw-trace",(XtActionProc) drawTraceAll},
+	{"draw-trace",(XtActionProc)drawTraceAll},
 #ifdef ENABLE_KEY_TRANSLATION
 	{"do-dialog-button",(XtActionProc)popdownLoad},
 	{"do-load",(XtActionProc)popupLoad},
@@ -1255,6 +1239,7 @@
 	{"do-volupdown",(XtActionProc)volupdownAction},
   };
 
+#define XAW_WIDTH "380"
   static String fallback_resources[]={
 	"*Label.font: -adobe-helvetica-bold-o-*-*-14-*-75-75-*-*-*-*",
 	"*Text*fontSet: -misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
@@ -1273,16 +1258,19 @@
 	"*Command.foreground: MediumBlue",
 	"*Toggle.background: gray85",
 	"*Toggle.foreground: MediumBlue",
+	"*random_button.foreground: MidnightBlue",
+	"*repeat_button.foreground: MidnightBlue",
 	"*Command.font: -adobe-helvetica-medium-o-*-*-12-*-75-75-*-*-*-*",
 	"*Toggle.font: -adobe-helvetica-medium-o-*-*-12-*-75-75-*-*-*-*",
 	"*MenuButton.translations:<EnterWindow>:	highlight()\\n\
 		<LeaveWindow>:	reset()\\n\
 		Any<BtnDown>:	reset() fix-menu() PopupMenu()",
 	"*base_form.background: gray75",
+	"*menu_box.background: gray75",
+	"*menu_box.borderWidth: 0",
 	"*button_box.background: gray75",
 	"*button_box.borderWidth: 0",
 	"*button_box.horizDistance: 4",
-	"*button_box.resizable: False",
 	"*file_menubutton.menuName: file_simplemenu",
 	"*file_menubutton.label: file...",
 	"*MenuButton.font: -adobe-helvetica-bold-o-*-*-12-*-75-75-*-*-*-*",
@@ -1294,22 +1282,25 @@
 	"*title_simplemenu.SmeBSB.font: -adobe-helvetica-medium-r-*-*-12-*-75-75-*-*-*-*",
 	"*file_simplemenu.background: Gray85",
 	"*title_simplemenu.background: Gray85",
-	"*file_simplemenu.width: 180",
+	"*file_simplemenu.width: 196",
 	"*title_simplemenu.width: 200",
 	"*title_menubutton.menuName: title_simplemenu",
 	"*title_menubutton.label: ------",
 	"*title_menubutton.width: 200",
 	"*title_menubutton.height: 28",
+	"*title_menubutton.resize: false",
 	"*title_menubutton.horizDistance: 6",
 	"*title_menubutton.vertDistance: 4",
 	"*title_menubutton.fromHoriz: file_menubutton",
-	"*time_label.width: 108",
+	"*time_label.width: 96",
 	"*time_label.height: 28",
+	"*time_label.resize: false",
 	"*time_label.fromHoriz: title_menubutton",
 	"*time_label.horizDistance: 1",
 	"*time_label.vertDistance: 4",
 	"*time_label.label: 00:00 / -----",
 	"*button_box.height: 42",
+	"*button_box.width: " XAW_WIDTH ,
 	"*play_button.width: 32",
 	"*play_button.height: 32",
 	"*play_button.horizDistance: 1",
@@ -1342,19 +1333,16 @@
 	"*quit_button.height: 32",
 	"*quit_button.horizDistance: 1",
 	"*quit_button.vertDistance: 1",
-	"*random_button.width: 60",
-	"*random_button.height: 16",
-	"*random_button.horizDistance: 12",
-	"*random_button.vertDistance: 6",
-	"*random_button.label: random",
-	"*repeat_button.width: 60",
-	"*repeat_button.height: 16",
-	"*repeat_button.horizDistance: 12",
-	"*repeat_button.vertDistance: 2",
-	"*repeat_button.label: repeat",
-#ifdef MSGWINDOW
+	"*random_button.width: 32",
+	"*random_button.height: 32",
+	"*random_button.horizDistance: 4",
+	"*random_button.vertDistance: 1",
+	"*repeat_button.width: 32",
+	"*repeat_button.height: 32",
+	"*repeat_button.horizDistance: 1",
+	"*repeat_button.vertDistance: 1",
 	"*lyric_text.fromVert: volume_box",
-	"*lyric_text.width: 380",
+	"*lyric_text.width: " XAW_WIDTH ,
 	"*lyric_text.vertDistance: 4",
 #ifndef WIDGET_IS_LABEL_WIDGET
 	"*lyric_text.horizDistance: 6",
@@ -1362,32 +1350,26 @@
 	"*lyric_text.background: gray85",
 	"*lyric_text.foreground: black",
 	"*lyric_text.scrollVertical: WhenNeeded",
+	/*	"*lyric_text.resize: XawtextResizeBoth",*/
 #else
 	"*lyric_text.height: 30",
 	"*lyric_text.fontSet: -*-*-medium-r-normal--14-*",
 	"*lyric_text.label: MessageWindow",
-	"*trace.width: 380",
+	"*lyric_text.resize: false",
+	"*trace.width: 372",
 	"*trace.height: 180",
 	"*trace.borderWidth: 1",
 	"*trace.background: gray85",
+	"*trace.vertDistance: 2",
+	"*lyric_text.horizDistance: 6",
 #endif
 #ifdef I18N
 	"*lyric_text.international: True",
 #else
 	"*lyric_text.international: False",
 #endif
-#endif
-	"*logo_label.font: -adobe-helvetica-bold-o-*-*-14-*-75-75-*-*-*-*",
-	"*logo_label.label: Timidity",
-	"*logo_label.foreground: MediumBlue",
-	"*logo_label.background: gray75",
-	"*logo_label.borderWidth: 0",
-	"*logo_label.width: 72",
-	"*logo_label.height: 24",
-	"*logo_label.vertDistance: 8",
-	"*logo_label.horizDistance: 2",
-	"*volume_box.width: 320",
-	"*volume_box.height: 100",
+	"*volume_box.width: " XAW_WIDTH ,
+	"*volume_box.height: 48",
 	"*volume_box.background: gray75",
 	"*volume_label.background: gray75",
 	"*volume_label.vertDistance: 0",
@@ -1396,8 +1378,8 @@
 	"*volume_label.font: -adobe-helvetica-bold-r-*-*-12-*-75-75-*-*-*-*",
 	"*volume_label.borderWidth: 0",
 	"*volume_label.label: Volume 70",
-	"*volume_label.width: 260",
-	"*volume_bar.length: 300",
+	"*volume_label.width: 300",
+	"*volume_bar.length: 350",
 	"*popup_load.title: Timidity <Load File>",
 	"*popup_loadform.height: 400",
 	"*popup_loadform.background: gray75",
@@ -1522,15 +1504,18 @@
   DndRegisterIconDrop(FileDropedHandler);
 #endif
   XtAppAddActions(app_con, actions, XtNumber(actions));
-  base_f=XtVaCreateManagedWidget("base_form",formWidgetClass,toplevel,NULL);
-  file_mb=XtVaCreateManagedWidget("file_menubutton",menuButtonWidgetClass,base_f,NULL);
+  base_f=XtVaCreateManagedWidget("base_form",boxWidgetClass,toplevel,NULL);
+  m_box=XtVaCreateManagedWidget("menu_box",boxWidgetClass,base_f,
+								XtNorientation, XtorientHorizontal,
+								NULL);
+  file_mb=XtVaCreateManagedWidget("file_menubutton",menuButtonWidgetClass,m_box,NULL);
   file_sm=XtVaCreatePopupShell("file_simplemenu",simpleMenuWidgetClass,file_mb,NULL);
-  title_mb=XtVaCreateManagedWidget("title_menubutton",menuButtonWidgetClass,base_f,NULL);
+  title_mb=XtVaCreateManagedWidget("title_menubutton",menuButtonWidgetClass,m_box,NULL);
   title_sm=XtVaCreatePopupShell("title_simplemenu",simpleMenuWidgetClass,title_mb,NULL);
-  time_l=XtVaCreateManagedWidget("time_label",labelWidgetClass,base_f,NULL);
+  time_l=XtVaCreateManagedWidget("time_label",labelWidgetClass,m_box,NULL);
   b_box=XtVaCreateManagedWidget("button_box",boxWidgetClass,base_f,
 								XtNorientation, XtorientHorizontal,
-								XtNfromVert,title_mb,NULL);
+								XtNfromVert,m_box,NULL);
   v_box=XtVaCreateManagedWidget("volume_box",boxWidgetClass,base_f,
 								XtNfromVert,b_box,NULL);
   vol_l=XtVaCreateManagedWidget("volume_label",labelWidgetClass,v_box,
@@ -1572,15 +1557,14 @@
   quit_b=XtVaCreateManagedWidget("quit_button",commandWidgetClass,b_box,
 								 XtNbitmap,bm_Pixmap[BM_QUIT],
 								 XtNfromHoriz,next_b,NULL);
-  random_b=XtVaCreateManagedWidget("random_button",toggleWidgetClass,base_f,
-								   XtNfromHoriz,b_box,
-								   XtNfromVert,time_l,NULL);
-  repeat_b=XtVaCreateManagedWidget("repeat_button",toggleWidgetClass,base_f,
-								   XtNfromHoriz,b_box,
-								   XtNfromVert,random_b,NULL);
-  logo_label=XtVaCreateManagedWidget("logo_label",labelWidgetClass,base_f,
-								   XtNfromHoriz,v_box,
-								   XtNfromVert,repeat_b,NULL);
+  random_b=XtVaCreateManagedWidget("random_button",toggleWidgetClass,b_box,
+								   XtNbitmap,bm_Pixmap[BM_RANDOM],
+								   XtNfromHoriz,quit_b,
+								   NULL);
+  repeat_b=XtVaCreateManagedWidget("repeat_button",toggleWidgetClass,b_box,
+								   XtNbitmap,bm_Pixmap[BM_REPEAT],
+								   XtNfromHoriz,random_b,
+								   NULL);
 
   popup_load=XtVaCreatePopupShell("popup_load",transientShellWidgetClass,toplevel,
 								  NULL);  
@@ -1603,7 +1587,6 @@
 				XtNfromVert,load_vport, NULL);
   XawDialogAddButton(load_d, "OK", popdownLoad,"Y");
   XawDialogAddButton(load_d, "Cancel", popdownLoad,NULL);
-#ifdef MSGWINDOW
 #ifndef WIDGET_IS_LABEL_WIDGET
   lyric_t=XtVaCreateManagedWidget("lyric_text",asciiTextWidgetClass,base_f,
 				XtNwrap,XawtextWrapWord, XtNeditType,XawtextAppend,
@@ -1611,13 +1594,10 @@
 #else
   lyric_t=XtVaCreateManagedWidget("lyric_text",labelWidgetClass,base_f,NULL);
 #endif
-  lyriclist[0] = lyric_t;
-#endif
   if(ctl->trace_playing) {
 	trace=XtVaCreateManagedWidget("trace",widgetClass,base_f,
 								  XtNfromVert,lyric_t,NULL);
 	XtVaSetValues(trace,XtNwidth,trace_width,XtNheight,trace_height,NULL);
-	tracelist[0] = trace;
   }
   XtAddCallback(quit_b,XtNcallback,quitCB,NULL);
   XtAddCallback(play_b,XtNcallback,playCB,NULL);
@@ -1641,9 +1621,7 @@
   lrs.string = "";
   setDirList(load_flist, cwd_l, &lrs);
   XtSetKeyboardFocus(base_f, base_f);
-#ifdef MSGWINDOW
   XtSetKeyboardFocus(lyric_t, base_f);
-#endif
   XtSetKeyboardFocus(popup_load, load_d);
   XtOverrideTranslations (toplevel,
 			XtParseTranslationTable ("<Message>WM_PROTOCOLS: do-quit()"));
@@ -1654,14 +1632,13 @@
   strcpy(window_title,APP_CLASS);
   w_title = strncat(window_title," : ",3);
   w_title += sizeof(APP_CLASS)+ 2;
-#ifdef MSGWINDOW
   XtVaGetValues(toplevel,XtNheight,&base_height,NULL);
   XtVaGetValues(lyric_t,XtNheight,&lyric_height,NULL);
   a_print_text(lyric_t,strcpy(local_buf,"<< Timidity Messages >>"));
-#endif
   a_pipe_write("READY");
 
   if(ctl->trace_playing) {
+	Panel = (PanelInfo *)safe_malloc(sizeof(PanelInfo));
 	gct = XCreateGC(disp, RootWindow(disp, screen), 0, NULL);
 	XAllocNamedColor(disp,DefaultColormap(disp, screen),"green",&fgtmp,&defcolor);
 	XAllocNamedColor(disp,DefaultColormap(disp, screen),"red",&bgcolor,&defcolor);
@@ -1677,16 +1654,13 @@
 	if ((StatusFont = XLoadQueryFont(disp, statusfontstr)) == NULL)
 	  if ((StatusFont = XLoadQueryFont(disp, "fixed")) == NULL)
 		perror("can't load fixed font. \n");
-	XSetFont(XtDisplay(trace), gct, StatusFont->fid);
-	Panel = (PanelInfo *)safe_malloc(sizeof(PanelInfo));
+	XSetFont(XtDisplay(trace), gct, StatusFont->fid);	
 	initTraceWindow(False);
   }
   while (1) {
 	a_pipe_read(local_buf,sizeof(local_buf));
 	if (local_buf[0] < 'A') break;
-#ifdef MSGWINDOW
 	a_print_text(lyric_t,local_buf+2);
-#endif
   }
   bsb=XtVaCreateManagedWidget("dummyfile",smeLineObjectClass,title_sm,NULL);
   max_files=atoi(local_buf);
@@ -1713,10 +1687,8 @@
   }
   if (Cfg.autostart) filemenuCB(file_menu[ID_AUTOSTART-100].widget,
 							&file_menu[ID_AUTOSTART-100].id,NULL);
-#ifdef MSGWINDOW
   if (Cfg.hidetext) filemenuCB(file_menu[ID_HIDETXT-100].widget,
 						   &file_menu[ID_HIDETXT-100].id,NULL);
-#endif
   if (!Cfg.disptrace) filemenuCB(file_menu[ID_HIDETRACE-100].widget,
 							 &file_menu[ID_HIDETRACE-100].id,NULL);
 
diff -ruN TiMidity++-1.1.1/interface/xskin_spectrum.c TiMidity++-1.2.0/interface/xskin_spectrum.c
--- TiMidity++-1.1.1/interface/xskin_spectrum.c	Thu Dec  3 20:27:27 1998
+++ TiMidity++-1.2.0/interface/xskin_spectrum.c	Thu Jan 21 01:58:18 1999
@@ -45,8 +45,10 @@
 extern unsigned int xskin_depth;
 extern Visual *xskin_vis;
 
+#ifdef SUPPORT_SOUNDSPEC
 static void xskin_spe_ana( unsigned char * );
 static void xskin_wave( unsigned char * );
+#endif /* SUPPORT_SOUNDSPEC */
 
 static int foreground;
 static int background;
@@ -184,7 +186,8 @@
   return ;
 }
 
-void xskin_spe_ana( unsigned char *buf ) {
+#ifdef SUPPORT_SOUNDSPEC
+static void xskin_spe_ana( unsigned char *buf ) {
 
   int x,y,i;
   int yt;
@@ -208,7 +211,7 @@
   return;
 }
 
-void xskin_wave( unsigned char *buf ) {
+static void xskin_wave( unsigned char *buf ) {
 
   int x,y,c;
 
@@ -229,3 +232,4 @@
 
   return;
 }
+#endif /* SUPPORT_SOUNDSPEC */
diff -ruN TiMidity++-1.1.1/interface.h.in TiMidity++-1.2.0/interface.h.in
--- TiMidity++-1.1.1/interface.h.in	Thu Jan  1 09:00:00 1970
+++ TiMidity++-1.2.0/interface.h.in	Wed Jan 20 18:40:13 1999
@@ -0,0 +1,35 @@
+/* Define if you have EMACS interface. */
+#undef IA_EMACS
+
+/* Define if you have GTK interface. */
+#undef IA_GTK
+
+/* Define if you have KMIDI interface. */
+#undef IA_KMIDI
+
+/* Define if you have MOTIF interface. */
+#undef IA_MOTIF
+
+/* Define if you have NCURSES interface. */
+#undef IA_NCURSES
+
+/* Define if you have PLUGIN interface. */
+#undef IA_PLUGIN
+
+/* Define if you have SLANG interface. */
+#undef IA_SLANG
+
+/* Define if you have TCLTK interface. */
+#undef IA_TCLTK
+
+/* Define if you have VT100 interface. */
+#undef IA_VT100
+
+/* Define if you have XAW interface. */
+#undef IA_XAW
+
+/* Define if you have XSKIN interface. */
+#undef IA_XSKIN
+
+/* Define if you have DYNAMIC interface. */
+#undef IA_DYNAMIC
diff -ruN TiMidity++-1.1.1/libarc/Makefile.in TiMidity++-1.2.0/libarc/Makefile.in
--- TiMidity++-1.1.1/libarc/Makefile.in	Mon Jan 18 22:55:39 1999
+++ TiMidity++-1.2.0/libarc/Makefile.in	Thu Jan 21 01:59:21 1999
@@ -100,9 +100,11 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 dynamic_targets = @dynamic_targets@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 
 INCLUDES = \
 	-I$(top_srcdir) \
@@ -158,12 +160,12 @@
 libarc_a_LIBADD = $(NET_OBJS)
 libarc_a_DEPENDENCIES = $(NET_OBJS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
+CONFIG_HEADER = ../config.h ../interface.h
 CONFIG_CLEAN_FILES = 
 LIBRARIES =  $(noinst_LIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
diff -ruN TiMidity++-1.1.1/stamp-h.in TiMidity++-1.2.0/stamp-h.in
--- TiMidity++-1.1.1/stamp-h.in	Mon Jan 18 22:36:54 1999
+++ TiMidity++-1.2.0/stamp-h.in	Thu Jan  1 09:00:00 1970
@@ -1 +0,0 @@
-timestamp
diff -ruN TiMidity++-1.1.1/stamp-h1.in TiMidity++-1.2.0/stamp-h1.in
--- TiMidity++-1.1.1/stamp-h1.in	Thu Jan  1 09:00:00 1970
+++ TiMidity++-1.2.0/stamp-h1.in	Thu Jan 21 01:37:40 1999
@@ -0,0 +1 @@
+timestamp
diff -ruN TiMidity++-1.1.1/stamp-h2.in TiMidity++-1.2.0/stamp-h2.in
--- TiMidity++-1.1.1/stamp-h2.in	Thu Jan  1 09:00:00 1970
+++ TiMidity++-1.2.0/stamp-h2.in	Thu Jan 21 01:37:43 1999
@@ -0,0 +1 @@
+timestamp
diff -ruN TiMidity++-1.1.1/timidity/Makefile.am TiMidity++-1.2.0/timidity/Makefile.am
--- TiMidity++-1.1.1/timidity/Makefile.am	Mon Jan 18 09:49:53 1999
+++ TiMidity++-1.2.0/timidity/Makefile.am	Thu Jan 21 00:18:36 1999
@@ -119,13 +119,10 @@
 	$(top_builddir)/utils/libutils.a \
 	@EXTRALIBS@
 
-#should use timidit_DEPENDENCIES?
-timidity.o: $(SYSEXTRAS:.c=.o) \
+timidity_DEPENDENCIES = $(SYSEXTRAS:.c=.o) \
 	$(top_builddir)/interface/libinterface.a \
 	$(top_builddir)/libarc/libarc.a \
 	$(top_builddir)/utils/libutils.a
-
-controls.o: $(top_builddir)/interface/libinterface.a
 
 version.o: version.c Makefile
 	$(CC) $(CFLAGS) -DTIMID_VERSION=\"$(VERSION)\" -c $(srcdir)/version.c
diff -ruN TiMidity++-1.1.1/timidity/Makefile.in TiMidity++-1.2.0/timidity/Makefile.in
--- TiMidity++-1.1.1/timidity/Makefile.in	Mon Jan 18 22:55:50 1999
+++ TiMidity++-1.2.0/timidity/Makefile.in	Thu Jan 21 01:59:31 1999
@@ -100,9 +100,11 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 dynamic_targets = @dynamic_targets@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 
 INCLUDES = \
 	-I$(top_srcdir) \
@@ -203,13 +205,18 @@
 	$(top_builddir)/libarc/libarc.a \
 	$(top_builddir)/utils/libutils.a \
 	@EXTRALIBS@
+
+timidity_DEPENDENCIES = $(SYSEXTRAS:.c=.o) \
+	$(top_builddir)/interface/libinterface.a \
+	$(top_builddir)/libarc/libarc.a \
+	$(top_builddir)/utils/libutils.a
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
+CONFIG_HEADER = ../config.h ../interface.h
 CONFIG_CLEAN_FILES = 
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -222,8 +229,6 @@
 playmidi.o raw_a.o rcp.o readmidi.o recache.o resample.o reverb.o \
 sbkconv.o sffile.o sfitem.o smfconv.o sndfont.o tables.o timidity.o \
 version.o wave_a.o wrd_read.o wrdt.o
-timidity_DEPENDENCIES =  $(top_builddir)/interface/libinterface.a \
-$(top_builddir)/libarc/libarc.a $(top_builddir)/utils/libutils.a
 timidity_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -344,7 +349,7 @@
 common.o: common.c ../config.h timidity.h common.h ../libarc/url.h \
 	../utils/mblock.h output.h controls.h ../libarc/arc.h \
 	../utils/memb.h ../utils/nkflib.h wrd.h
-controls.o: controls.c ../config.h timidity.h controls.h
+controls.o: controls.c ../config.h ../interface.h timidity.h controls.h
 dl_dlopen.o: dl_dlopen.c ../config.h timidity.h dlutils.h
 filter.o: filter.c ../config.h timidity.h common.h ../libarc/url.h \
 	../utils/mblock.h controls.h instrum.h filter.h
@@ -398,11 +403,11 @@
 	sffile.h sflayer.h sfitem.h output.h filter.h resample.h
 tables.o: tables.c ../config.h timidity.h common.h ../libarc/url.h \
 	../utils/mblock.h tables.h
-timidity.o: timidity.c ../config.h timidity.h common.h ../libarc/url.h \
-	../utils/mblock.h instrum.h playmidi.h readmidi.h output.h \
-	controls.h tables.h miditrace.h reverb.h \
+timidity.o: timidity.c ../config.h ../interface.h timidity.h common.h \
+	../libarc/url.h ../utils/mblock.h instrum.h playmidi.h \
+	readmidi.h output.h controls.h tables.h miditrace.h reverb.h \
 	../interface/soundspec.h recache.h ../libarc/arc.h \
-	../utils/memb.h ../utils/strtab.h wrd.h mid.defs
+	../utils/memb.h ../utils/strtab.h wrd.h mid.defs dlutils.h
 wave_a.o: wave_a.c ../config.h timidity.h output.h controls.h
 wrd_read.o: wrd_read.c ../config.h timidity.h common.h ../libarc/url.h \
 	../utils/mblock.h instrum.h playmidi.h readmidi.h controls.h \
@@ -474,14 +479,6 @@
 
 
 include $(top_builddir)/common.makefile
-
-#should use timidit_DEPENDENCIES?
-timidity.o: $(SYSEXTRAS:.c=.o) \
-	$(top_builddir)/interface/libinterface.a \
-	$(top_builddir)/libarc/libarc.a \
-	$(top_builddir)/utils/libutils.a
-
-controls.o: $(top_builddir)/interface/libinterface.a
 
 version.o: version.c Makefile
 	$(CC) $(CFLAGS) -DTIMID_VERSION=\"$(VERSION)\" -c $(srcdir)/version.c
diff -ruN TiMidity++-1.1.1/timidity/alsa_a.c TiMidity++-1.2.0/timidity/alsa_a.c
--- TiMidity++-1.1.1/timidity/alsa_a.c	Thu Dec 17 12:44:20 1998
+++ TiMidity++-1.2.0/timidity/alsa_a.c	Tue Jan 19 14:10:08 1999
@@ -29,6 +29,7 @@
 #endif /* HAVE_CONFIG_H */
 #define _GNU_SOURCE
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 
@@ -159,8 +160,20 @@
   struct snd_ctl_hw_info ctl_hw_info;
   snd_pcm_info_t pcm_info;
   void* ctl_handle;
-  int tmp = snd_cards ();
-
+  const char* env_sound_card = getenv ("TIMIDITY_SOUND_CARD");
+  const char* env_pcm_device = getenv ("TIMIDITY_PCM_DEVICE");
+  int tmp;
+
+  /*specify card*/
+  *card__ = 0;
+  if (env_sound_card != NULL)
+    *card__ = atoi (env_sound_card);
+  /*specify device*/
+  *device__ = 0;
+  if (env_pcm_device != NULL)
+    *device__ = atoi (env_pcm_device);
+  
+  tmp = snd_cards ();
   if (tmp == 0)
     {
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "No sound card found.");
@@ -172,7 +185,7 @@
       return -1;
     }
   
-  if (*card__ >= tmp)
+  if (*card__ < 0 || *card__ >= tmp)
     {
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "There is %d sound cards."
 		" %d is invalid sound card. assuming 0.",
@@ -180,8 +193,7 @@
       *card__ = 0;
     }
 
-  /*XXX specify card*/
-  tmp = snd_ctl_open (&ctl_handle, card);
+  tmp = snd_ctl_open (&ctl_handle, *card__);
   if (tmp != 0)
     {
       error_report (tmp);
@@ -199,8 +211,7 @@
       return -1;
     }
   
-  /*XXX specify device*/
-  if (*device__ >= ctl_hw_info.pcmdevs)
+  if (*device__ < 0 || *device__ >= ctl_hw_info.pcmdevs)
     {
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
 		"%d-th sound cards(%s) has %d pcm device(s)."
diff -ruN TiMidity++-1.1.1/timidity/controls.c TiMidity++-1.2.0/timidity/controls.c
--- TiMidity++-1.1.1/timidity/controls.c	Sun Jan 17 05:52:23 1999
+++ TiMidity++-1.2.0/timidity/controls.c	Wed Jan 20 18:34:55 1999
@@ -25,6 +25,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
+#include "interface.h"
 #include "timidity.h"
 #include "controls.h"
 
diff -ruN TiMidity++-1.1.1/timidity/controls.h TiMidity++-1.2.0/timidity/controls.h
--- TiMidity++-1.1.1/timidity/controls.h	Mon Nov 30 17:34:49 1998
+++ TiMidity++-1.2.0/timidity/controls.h	Wed Jan 20 16:09:17 1999
@@ -50,7 +50,7 @@
 #define RC_SPEEDDOWN	18	/* Speed down */
 #define RC_VOICEINCR	19	/* Increase voices */
 #define RC_VOICEDECR	20	/* Decrease voices */
-#define RC_TOGGLE_DURMCHAN 21	/* Toggle drum channel */
+#define RC_TOGGLE_DRUMCHAN 21	/* Toggle drum channel */
 #define RC_RELOAD	22	/* Reload & Play */
 #define RC_TOGGLE_SNDSPEC 23	/* Open/Close Sound Spectrogram Window */
 #define RC_CHANGE_REV_EFFB 24
diff -ruN TiMidity++-1.1.1/timidity/playmidi.c TiMidity++-1.2.0/timidity/playmidi.c
--- TiMidity++-1.1.1/timidity/playmidi.c	Wed Dec 16 18:47:50 1998
+++ TiMidity++-1.2.0/timidity/playmidi.c	Wed Jan 20 16:09:17 1999
@@ -2278,7 +2278,7 @@
 	    voice_decrement(val);
 	    continue;
 
-	  case RC_TOGGLE_DURMCHAN:
+	  case RC_TOGGLE_DRUMCHAN:
 	    midi_restart_time = current_trace_samples();
 	    if(midi_restart_time == -1)
 		midi_restart_time = current_sample;
diff -ruN TiMidity++-1.1.1/timidity/timidity.c TiMidity++-1.2.0/timidity/timidity.c
--- TiMidity++-1.1.1/timidity/timidity.c	Mon Jan 18 19:13:07 1999
+++ TiMidity++-1.2.0/timidity/timidity.c	Wed Jan 20 18:34:45 1999
@@ -54,6 +54,7 @@
 #include <getopt.h>
 #endif /* HAVE_GETOPT_H */
 
+#include "interface.h"
 #include "timidity.h"
 #include "common.h"
 #include "instrum.h"
@@ -75,7 +76,7 @@
 #include "mid.defs"
 
 #define OPTCOMMANDS "A:aB:b:C:c:D:d:eE:Ffg:hI:i:jL:n:O:o:P:p:Q:R:rS:s:t:UW:w:x:"
-#define INTERACTIVE_INTERFACE_IDS "kmqa"
+#define INTERACTIVE_INTERFACE_IDS "kmqag"
 
 /* main interfaces (To be used another main) */
 #if defined(main) || defined(ANOTHER_MAIN)
@@ -2791,6 +2792,23 @@
     if(strncmp(program_name,"timidity",8) == 0);
     else if(strncmp(program_name,"kmidi",5) == 0) set_ctl("q");
     else if(strncmp(program_name,"tkmidi",6) == 0) set_ctl("k");
+    else if(strncmp(program_name,"xmmidi",6) == 0) set_ctl("m");
+    else if(strncmp(program_name,"xawmidi",7) == 0) set_ctl("a");
+    else if(strncmp(program_name,"xskinmidi",9) == 0) set_ctl("i");
+
+    if(argc == 1 && !strchr(INTERACTIVE_INTERFACE_IDS, ctl->id_character))
+    {
+	interesting_message();
+	return 0;
+    }
+
+    if((program_name=strrchr(argv[0], PATH_SEP))) program_name++;
+    else program_name=argv[0];
+
+    if(strncmp(program_name,"timidity",8) == 0);
+    else if(strncmp(program_name,"kmidi",5) == 0) set_ctl("q");
+    else if(strncmp(program_name,"tkmidi",6) == 0) set_ctl("k");
+    else if(strncmp(program_name,"gtkmidi",6) == 0) set_ctl("g");
     else if(strncmp(program_name,"xmmidi",6) == 0) set_ctl("m");
     else if(strncmp(program_name,"xawmidi",7) == 0) set_ctl("a");
     else if(strncmp(program_name,"xskinmidi",9) == 0) set_ctl("i");
diff -ruN TiMidity++-1.1.1/timidity/wrd_read.c TiMidity++-1.2.0/timidity/wrd_read.c
--- TiMidity++-1.1.1/timidity/wrd_read.c	Tue Nov 24 13:55:05 1998
+++ TiMidity++-1.2.0/timidity/wrd_read.c	Wed Jan 20 16:09:17 1999
@@ -117,15 +117,15 @@
 #define WRD_ADDEVENT(at, cmd, arg) \
     { MidiEvent e; e.time = (at); e.type = ME_WRD; e.channel = (cmd); \
       e.a = (uint8)((arg) & 0xFF); e.b = (uint8)(((arg) >> 8) & 0xFF); \
-      if(mimpi_bug_emulation_level > 0) if(at < last_event_time) e.time = \
-      last_event_time; else last_event_time = e.time; \
+      if(mimpi_bug_emulation_level > 0){ if(at < last_event_time){ e.time = \
+      last_event_time; }else{ last_event_time = e.time; }} \
       readmidi_add_event(&e); }
 
 #define WRD_ADDSTREVENT(at, cmd, str) \
     { MidiEvent e; readmidi_make_string_event(ME_WRD, (str), &e, 0); \
       e.channel = (cmd); e.time = (at); \
-      if(mimpi_bug_emulation_level > 0) if(at < last_event_time) e.time = \
-      last_event_time; else last_event_time = e.time; \
+      if(mimpi_bug_emulation_level > 0){ if(at < last_event_time){ e.time = \
+      last_event_time; }else{ last_event_time = e.time; }} \
       readmidi_add_event(&e); }
 
 #ifdef DEBUG
diff -ruN TiMidity++-1.1.1/utils/Makefile.in TiMidity++-1.2.0/utils/Makefile.in
--- TiMidity++-1.1.1/utils/Makefile.in	Mon Jan 18 22:55:37 1999
+++ TiMidity++-1.2.0/utils/Makefile.in	Thu Jan 21 01:59:18 1999
@@ -100,9 +100,11 @@
 SHLD = @SHLD@
 SYSEXTRAS = @SYSEXTRAS@
 VERSION = @VERSION@
+WISH = @WISH@
 dynamic_targets = @dynamic_targets@
 lispdir = @lispdir@
 so = @so@
+tcltk_dep = @tcltk_dep@
 
 INCLUDES = \
 	-I$(top_srcdir)/libarc \
@@ -154,12 +156,12 @@
 
 libutils_a_DEPENDENCIES = $(libutils_a_LIBADD)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
+CONFIG_HEADER = ../config.h ../interface.h
 CONFIG_CLEAN_FILES = 
 LIBRARIES =  $(noinst_LIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@