diff -ruN TiMidity++-1.3.6/AUTHORS TiMidity++-1.3.7/AUTHORS --- TiMidity++-1.3.6/AUTHORS Mon Mar 1 19:49:36 1999 +++ TiMidity++-1.3.7/AUTHORS Mon Mar 29 19:28:13 1999 @@ -7,7 +7,7 @@ Riccardo Facchetti TiMidity++: - Masanao Izumo + Maintained by Masanao Izumo Tomokazu Harada Keiichirou Yamate Masaki Kiryu @@ -25,4 +25,5 @@ Yoshishige Arai Glenn Trigg Colour window manager icon by Tim Allen + Eric A. Welsh and other many people sends information and bug-fix codes. diff -ruN TiMidity++-1.3.6/ChangeLog TiMidity++-1.3.7/ChangeLog --- TiMidity++-1.3.6/ChangeLog Tue Mar 23 13:49:40 1999 +++ TiMidity++-1.3.7/ChangeLog Tue Mar 30 19:49:31 1999 @@ -1,3 +1,51 @@ +-- 1.3.7 +Summary: +Tue Mar 30 1999 + * Fixed some bugs or probrems. + * In GTK interface, enabled to delete loaded files from the play list. + +Date: Tue Mar 30 1999 +From: Masanao Izumo +Files: interface/gtk_p.c interface/motif_p.c + Used select() instead of ioctl/FIONREAD. + +Date: Mon, 29 Mar 1999 21:08:16 +1000 (EST) +From: ggt@netspace.net.au (Glenn Trigg) + Enabled loaded files to be deleted from the play list by + double-right-clicking on the list entry. + +From: Masanao Izumo +Date: Mon Mar 29 1999 +Files: timidity/support.h + Fixed prototype mismatch probrem for getopt(). +Files: configure.in interface/ncurs_c.c + Added configure test for PDcurses. + Increased COMMAND_BUFFER_SIZE to 4096. + +Date: Sat Mar 27 1999 +From: Masanao Izumo +Files: timidity/playmidi.c + Fixed to ignore LSB data entry. +Files: timidity/readmidi.c + Turned the control MIDI event value to 127 if the value is more than 127. +Files: timidity/readmidi.c + Fixed not to change to GM_SYSTEM_MODE if play_system_mode is not + DEFAULT_SYSTEM_MODE. + +Date: Thu, 25 Mar 1999 23:41:46 -0600 (CST) +From: "Eric A. Welsh" +Files: interface/ncurs_c.c + In cmsg(), in ncurs_c.c, there is an #ifdef __BORLANDC__ which adds in + a nl(). This should be changed to include __WIN32__ && ! __CYGWIN32__, + since standard Win32 does not do a \r when a \n is issued. +Files: interface/ncurs_c.c interface/vt100_c.c + Fixed a bug in the lyric display for non .KAR files that have lyrics. + In every non .KAR file that I have that has lyrics, '\n' are where '\r' + should be, and '\r' are in very strange places that result in very bad + positions to do carriage returns. The '\n' also do bad things to the -int + display, since the '\n' caues the text to go below the single line of + output. + Summary: Tue Mar 23 1999 * In XAW interface, Added new user interfaces. @@ -15,8 +63,8 @@ From: Franklin Chen Files: configure.in interface/slang_c.c On Linux Red Hat 5.2: must change to . - Added configure test for , and included if it is found - by Masanao Izumo + Added configure test for , and included it + if it is found (by Masanao Izumo ) Date: Mon Mar 15 1999 From: Masanao Izumo diff -ruN TiMidity++-1.3.6/NEWS TiMidity++-1.3.7/NEWS --- TiMidity++-1.3.6/NEWS Tue Mar 23 13:53:29 1999 +++ TiMidity++-1.3.7/NEWS Tue Mar 30 19:49:35 1999 @@ -1,3 +1,8 @@ +* 3/30, 1999 + Released TiMidity++ v1.3.7. + * Fixed some bugs or probrems. + * In GTK interface, enabled to delete loaded files from the play list. + * 3/23, 1999 Released TiMidity++ v1.3.6. * In XAW interface, added new user interfaces. diff -ruN TiMidity++-1.3.6/aclocal.m4 TiMidity++-1.3.7/aclocal.m4 --- TiMidity++-1.3.6/aclocal.m4 Tue Mar 23 13:51:27 1999 +++ TiMidity++-1.3.7/aclocal.m4 Tue Mar 30 19:10:07 1999 @@ -652,7 +652,7 @@ ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" + LIBS="$GTK_LIBS $LIBS" dnl dnl Now check if the installed GTK is sufficiently new. (Also sanity dnl checks the results of gtk-config to some extent @@ -661,6 +661,7 @@ AC_TRY_RUN([ #include #include +#include int main () @@ -693,6 +694,17 @@ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); printf("*** before re-running configure\n"); } +#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } +#endif /* defined (GTK_MAJOR_VERSION) ... */ else { if ((gtk_major_version > major) || diff -ruN TiMidity++-1.3.6/configure TiMidity++-1.3.7/configure --- TiMidity++-1.3.6/configure Tue Mar 23 13:51:31 1999 +++ TiMidity++-1.3.7/configure Tue Mar 30 19:10:11 1999 @@ -836,7 +836,7 @@ PACKAGE=TiMidity++ -VERSION=1.3.6 +VERSION=1.3.7 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; } @@ -1022,8 +1022,10 @@ lib_xt_opt= lib_xprelibs_opt= lib_xext_opt= - lib_dl_opt= +lib_curses_opt= +lib_user32_opt= +lib_user32_test= WISH=${WISH:-wish} tcltk_dep= @@ -1049,7 +1051,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1053: checking for $ac_word" >&5 +echo "configure:1055: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1078,7 +1080,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1082: checking for $ac_word" >&5 +echo "configure:1084: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1126,7 +1128,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1130: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1132: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1136,11 +1138,11 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1160,12 +1162,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1164: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1166: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1169: checking whether we are using GNU C" >&5 +echo "configure:1171: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1174,7 +1176,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1189,7 +1191,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1193: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1195: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1227,7 +1229,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1231: checking for a BSD compatible install" >&5 +echo "configure:1233: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1279,7 +1281,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1283: checking for $ac_word" >&5 +echo "configure:1285: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1306,7 +1308,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1310: checking whether ln -s works" >&5 +echo "configure:1312: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1373,6 +1375,7 @@ esac so="dll" CYGNUS=yes + lib_user32_test=-luser32 ;; *-dec-*) EXTRADEFS="-DDEC" @@ -1391,19 +1394,19 @@ esac echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:1395: checking for Cygwin32 environment" >&5 +echo "configure:1398: checking for Cygwin32 environment" >&5 if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_cygwin32=yes else @@ -1420,19 +1423,19 @@ CYGWIN32= test "$am_cv_cygwin32" = yes && CYGWIN32=yes echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6 -echo "configure:1424: checking for Mingw32 environment" >&5 +echo "configure:1427: checking for Mingw32 environment" >&5 if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_mingw32=yes else @@ -1451,7 +1454,7 @@ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1455: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1483,7 +1486,7 @@ echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:1487: checking for sqrt in -lm" >&5 +echo "configure:1490: 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 @@ -1491,7 +1494,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1509: \"$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 @@ -1530,7 +1533,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1534: checking for socket in -lsocket" >&5 +echo "configure:1537: 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 @@ -1538,7 +1541,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1556: \"$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 @@ -1577,7 +1580,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1581: checking for dlopen in -ldl" >&5 +echo "configure:1584: 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 @@ -1585,7 +1588,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1603: \"$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 @@ -1619,12 +1622,12 @@ for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1623: checking for $ac_func" >&5 +echo "configure:1626: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1669,7 +1672,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1673: checking for gethostbyname in -lnsl" >&5 +echo "configure:1676: 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 @@ -1677,7 +1680,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1695: \"$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 @@ -1719,7 +1722,7 @@ done echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1723: checking how to run the C preprocessor" >&5 +echo "configure:1726: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1734,13 +1737,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1751,13 +1754,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1784,7 +1787,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:1788: checking for X" >&5 +echo "configure:1791: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1846,12 +1849,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1920,14 +1923,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1934: \"$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. @@ -2033,17 +2036,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:2037: checking whether -R must be followed by a space" >&5 +echo "configure:2040: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -2059,14 +2062,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -2098,7 +2101,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:2102: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2105: 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 @@ -2106,7 +2109,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2124: \"$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 @@ -2139,7 +2142,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:2143: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2146: 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 @@ -2147,7 +2150,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2165: \"$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 @@ -2187,12 +2190,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:2191: checking for gethostbyname" >&5 +echo "configure:2194: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2236,7 +2239,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2240: checking for gethostbyname in -lnsl" >&5 +echo "configure:2243: 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 @@ -2244,7 +2247,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2262: \"$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 @@ -2285,12 +2288,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:2289: checking for connect" >&5 +echo "configure:2292: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2334,7 +2337,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2338: checking for connect in -lsocket" >&5 +echo "configure:2341: 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 @@ -2342,7 +2345,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2360: \"$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 @@ -2377,12 +2380,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:2381: checking for remove" >&5 +echo "configure:2384: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2426,7 +2429,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2430: checking for remove in -lposix" >&5 +echo "configure:2433: 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 @@ -2434,7 +2437,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2452: \"$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 @@ -2469,12 +2472,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2473: checking for shmat" >&5 +echo "configure:2476: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2518,7 +2521,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2522: checking for shmat in -lipc" >&5 +echo "configure:2525: 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 @@ -2526,7 +2529,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2544: \"$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 @@ -2570,7 +2573,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:2574: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2577: 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 @@ -2578,7 +2581,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2596: \"$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 @@ -2630,7 +2633,7 @@ fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2634: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2637: 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 @@ -2638,7 +2641,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2656: \"$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 @@ -2677,12 +2680,12 @@ fi echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 -echo "configure:2681: checking X11 version 6" >&5 +echo "configure:2684: 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 < int main() { @@ -2692,7 +2695,7 @@ ; return 0; } EOF -if { (eval echo configure:2696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* timidity_cv_x11_version_6=yes else @@ -2712,7 +2715,7 @@ KEEPLIBS=$LIBS echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6 -echo "configure:2716: checking for XShapeCombineMask in -lXext" >&5 +echo "configure:2719: 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 @@ -2720,7 +2723,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2738: \"$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 @@ -2753,7 +2756,7 @@ fi echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2757: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2760: 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 @@ -2761,7 +2764,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2779: \"$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 @@ -2800,7 +2803,7 @@ fi echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6 -echo "configure:2804: checking for SmcOpenConnection in -lSM" >&5 +echo "configure:2807: 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 @@ -2808,7 +2811,7 @@ ac_save_LIBS="$LIBS" LIBS="-lSM $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2826: \"$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 @@ -2841,7 +2844,7 @@ fi echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2845: checking for XtVaAppInitialize in -lXt" >&5 +echo "configure:2848: 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 @@ -2849,7 +2852,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2867: \"$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 @@ -2882,7 +2885,7 @@ fi echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6 -echo "configure:2886: checking for XmuInternAtom in -lXmu" >&5 +echo "configure:2889: 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 @@ -2890,7 +2893,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2908: \"$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 @@ -2922,7 +2925,7 @@ fi echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 -echo "configure:2926: checking for XawInitializeWidgetSet in -lXaw3d" >&5 +echo "configure:2929: 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 @@ -2930,7 +2933,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXaw3d $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2948: \"$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 @@ -2960,7 +2963,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 -echo "configure:2964: checking for XawInitializeWidgetSet in -lXaw" >&5 +echo "configure:2967: 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 @@ -2968,7 +2971,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXaw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2986: \"$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 @@ -3003,7 +3006,7 @@ fi echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 -echo "configure:3007: checking for XmCreateForm in -lXm" >&5 +echo "configure:3010: 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 @@ -3011,7 +3014,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3029: \"$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 @@ -3052,12 +3055,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:3056: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3059: 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 < #include <$ac_hdr> @@ -3065,7 +3068,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3090,7 +3093,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:3094: checking for opendir in -ldir" >&5 +echo "configure:3097: 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 @@ -3098,7 +3101,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3116: \"$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 @@ -3131,7 +3134,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3135: checking for opendir in -lx" >&5 +echo "configure:3138: 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 @@ -3139,7 +3142,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3157: \"$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 @@ -3173,12 +3176,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3177: checking for ANSI C header files" >&5 +echo "configure:3180: 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 < #include @@ -3186,7 +3189,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3203,7 +3206,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 @@ -3221,7 +3224,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 @@ -3242,7 +3245,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3253,7 +3256,7 @@ exit (0); } EOF -if { (eval echo configure:3257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -3277,12 +3280,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3281: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3284: 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 < #include @@ -3298,7 +3301,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3324,17 +3327,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3328: checking for $ac_hdr" >&5 +echo "configure:3331: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3362,17 +3365,17 @@ ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:3366: checking for string.h" >&5 +echo "configure:3369: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3396,12 +3399,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3400: checking for working const" >&5 +echo "configure:3403: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3471,14 +3474,14 @@ fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3475: checking whether char is unsigned" >&5 +echo "configure:3478: 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 <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3517: \"$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 @@ -3534,14 +3537,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3538: checking whether byte ordering is bigendian" >&5 +echo "configure:3541: 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 < #include @@ -3552,11 +3555,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3559: \"$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 < #include @@ -3567,7 +3570,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3587,7 +3590,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3624,21 +3627,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3628: checking for inline" >&5 +echo "configure:3631: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3664,12 +3667,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3668: checking for off_t" >&5 +echo "configure:3671: 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 < #if STDC_HEADERS @@ -3697,12 +3700,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3701: checking for pid_t" >&5 +echo "configure:3704: 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 < #if STDC_HEADERS @@ -3730,12 +3733,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3734: checking for size_t" >&5 +echo "configure:3737: 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 < #if STDC_HEADERS @@ -3763,12 +3766,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3767: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3770: 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 < #include @@ -3777,7 +3780,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3799,19 +3802,19 @@ echo $ac_n "checking volatile declaration""... $ac_c" 1>&6 -echo "configure:3803: checking volatile declaration" >&5 +echo "configure:3806: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_volatile=yes else @@ -3829,12 +3832,12 @@ fi echo $ac_n "checking union semun declaration""... $ac_c" 1>&6 -echo "configure:3833: checking union semun declaration" >&5 +echo "configure:3836: 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 < #include @@ -3843,7 +3846,7 @@ union semun x ; return 0; } EOF -if { (eval echo configure:3847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_union_semun=yes else @@ -3864,13 +3867,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:3868: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:3871: 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 < Autoconf TIOCGETP @@ -3888,7 +3891,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -3910,7 +3913,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3914: checking for 8-bit clean memcmp" >&5 +echo "configure:3917: 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 @@ -3918,7 +3921,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3935: \"$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 @@ -3949,17 +3952,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3953: checking for $ac_hdr" >&5 +echo "configure:3956: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3988,12 +3991,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3992: checking for $ac_func" >&5 +echo "configure:3995: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4041,7 +4044,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:4045: checking for working mmap" >&5 +echo "configure:4048: 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 @@ -4049,7 +4052,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4196: \"$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 @@ -4212,7 +4215,7 @@ fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:4216: checking whether setvbuf arguments are reversed" >&5 +echo "configure:4219: 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 @@ -4220,7 +4223,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -4234,7 +4237,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:4238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4241: \"$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 @@ -4258,12 +4261,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4262: checking return type of signal handlers" >&5 +echo "configure:4265: 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 < #include @@ -4280,7 +4283,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4299,12 +4302,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4303: checking for vprintf" >&5 +echo "configure:4306: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4351,12 +4354,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4355: checking for _doprnt" >&5 +echo "configure:4358: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4407,12 +4410,12 @@ sleep usleep strncasecmp strerror getopt getcwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4411: checking for $ac_func" >&5 +echo "configure:4414: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4465,12 +4468,12 @@ case "$ac_cv_header_dirent_dirent_h$ac_cv_header_dirent_sys_ndir_h$ac_cv_header_dirent_sys_dir_h$ac_cv_header_dirent_ndir_h" in *yes*) echo $ac_n "checking for opendir""... $ac_c" 1>&6 -echo "configure:4469: checking for opendir" >&5 +echo "configure:4472: checking for opendir" >&5 if eval "test \"`echo '$''{'ac_cv_func_opendir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_opendir=yes" else @@ -4521,12 +4524,12 @@ esac if test "x$enable_network" = "xyes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4525: checking for socket" >&5 +echo "configure:4528: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -4567,7 +4570,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6 -echo "configure:4571: checking for WSAStartup in -lwsock32" >&5 +echo "configure:4574: checking for WSAStartup in -lwsock32" >&5 ac_lib_var=`echo wsock32'_'WSAStartup | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'wapi_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4575,7 +4578,7 @@ ac_save_LIBS="$LIBS" LIBS="-lwsock32 $LIBS" cat > conftest.$ac_ext < #include @@ -4584,7 +4587,7 @@ WSAStartup(0,0); ; return 0; } EOF -if { (eval echo configure:4588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "wapi_cv_lib_$ac_lib_var=yes" else @@ -4670,7 +4673,7 @@ echo $ac_n "checking whether to enable audio""... $ac_c" 1>&6 -echo "configure:4674: checking whether to enable audio" >&5 +echo "configure:4677: 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" @@ -4716,7 +4719,7 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:4720: checking for ALSA CFLAGS" >&5 +echo "configure:4723: 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" @@ -4724,7 +4727,7 @@ echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:4728: checking for ALSA LDFLAGS" >&5 +echo "configure:4731: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -4736,7 +4739,7 @@ min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:4740: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:4743: 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/'` @@ -4746,7 +4749,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -4787,7 +4790,7 @@ ; return 0; } EOF -if { (eval echo configure:4791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -4801,7 +4804,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:4805: checking for snd_cards in -lasound" >&5 +echo "configure:4808: 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 @@ -4809,7 +4812,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4827: \"$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 @@ -4974,12 +4977,12 @@ have_dl=no echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6 -echo "configure:4978: checking for LoadLibraryExA" >&5 +echo "configure:4981: checking for LoadLibraryExA" >&5 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibraryExA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4988,7 +4991,7 @@ LoadLibraryExA(0,0,0); ; return 0; } EOF -if { (eval echo configure:4992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* wapi_cv_func_LoadLibraryExA=yes else @@ -5011,12 +5014,12 @@ if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:5015: checking for shl_load" >&5 +echo "configure:5018: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -5064,12 +5067,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:5068: checking for dlopen" >&5 +echo "configure:5071: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -5114,12 +5117,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:5118: checking for dld_init" >&5 +echo "configure:5121: checking for dld_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_dld_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dld_init=yes" else @@ -5164,7 +5167,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:5168: checking for dld_init in -ldld" >&5 +echo "configure:5171: 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 @@ -5172,7 +5175,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5190: \"$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 @@ -5206,13 +5209,13 @@ fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:5210: checking dynamic link method" >&5 +echo "configure:5213: 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:5216: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:5219: 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 @@ -5360,17 +5363,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5364: checking for $ac_hdr" >&5 +echo "configure:5367: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5397,7 +5400,7 @@ done echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:5401: checking for initscr in -lncurses" >&5 +echo "configure:5404: 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 @@ -5405,7 +5408,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5423: \"$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 @@ -5431,11 +5434,56 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - : + lib_curses_opt=-lncurses +else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for PDC_set_ctrl_break in -lcurses""... $ac_c" 1>&6 +echo "configure:5442: checking for PDC_set_ctrl_break in -lcurses" >&5 +ac_lib_var=`echo curses'_'PDC_set_ctrl_break | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lcurses $lib_user32_test $LIBS" +cat > conftest.$ac_ext <&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_curses_opt=-lcurses + CPPFLAGS="$CPPFLAGS -DUSE_PDCURSES=1" + lib_user32_opt="$lib_user32_test" + else echo "$ac_t""no" 1>&6 - enable_ncurses=no - echo "configure: warning: ncurses library is not found" 1>&2 + echo "configure: warning: ncurses interface is not enabled" 1>&2 + enable_ncurses=no + +fi + + fi ;; esac @@ -5456,7 +5504,7 @@ ENABLE_NCURSES_TRUE='#' ENABLE_NCURSES_FALSE= fi - LIBS="$LIBS -lncurses" + LIBS="$LIBS $lib_curses_opt" case "$target" in *-*-freebsd*) EXTRALIBS="$EXTRALIBS -lmytinfo" @@ -5465,7 +5513,7 @@ ;; xdynamic) dynamic_targets="$dynamic_targets interface_n.\$(so)" - n_so_libs="-lncurses" + n_so_libs="$lib_curses_opt" case "$target" in *-*-freebsd*) n_so_libs="$n_so_libs -lmytinfo" @@ -5495,7 +5543,7 @@ enableval="$enable_slang" 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:5499: checking for SLang_init_tty in -lslang" >&5 +echo "configure:5547: 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 @@ -5503,7 +5551,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5566: \"$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 @@ -5546,17 +5594,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5550: checking for $ac_hdr" >&5 +echo "configure:5598: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5607,7 +5655,7 @@ dynamic_targets="$dynamic_targets interface_s.\$(so)" s_so_libs="-lslang" echo $ac_n "checking for initscr in -ltermcap""... $ac_c" 1>&6 -echo "configure:5611: checking for initscr in -ltermcap" >&5 +echo "configure:5659: 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 @@ -5615,7 +5663,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5678: \"$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 @@ -5744,7 +5792,7 @@ tk_lib= for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do case "x$tcl_lib" in x) echo $ac_n "checking for Tcl_Init in -l$l""... $ac_c" 1>&6 -echo "configure:5748: checking for Tcl_Init in -l$l" >&5 +echo "configure:5796: 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 @@ -5752,7 +5800,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5815: \"$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 @@ -5787,7 +5835,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:5791: checking for Tk_Init in -l$l" >&5 +echo "configure:5839: 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 @@ -5795,7 +5843,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5858: \"$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 @@ -6167,7 +6215,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:6171: checking for $ac_word" >&5 +echo "configure:6219: 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 @@ -6198,7 +6246,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6202: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6250: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -6215,17 +6263,18 @@ ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" + LIBS="$GTK_LIBS $LIBS" rm -f conf.gtktest if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < #include +#include int main () @@ -6258,6 +6307,17 @@ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); printf("*** before re-running configure\n"); } +#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } +#endif /* defined (GTK_MAJOR_VERSION) ... */ else { if ((gtk_major_version > major) || @@ -6287,7 +6347,7 @@ } EOF -if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6321,7 +6381,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -6331,7 +6391,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:6335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6395: \"$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" @@ -6422,17 +6482,17 @@ fi ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:6426: checking for X11/xpm.h" >&5 +echo "configure:6486: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6455,7 +6515,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:6459: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:6519: 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 @@ -6463,7 +6523,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6538: \"$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 @@ -6546,7 +6606,7 @@ LDFLAGS="$LDFLAGS $offix_lib_dir" LIBS="$LIBS $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11" echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6 -echo "configure:6550: checking for DndInitialize in -lDnd" >&5 +echo "configure:6610: 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 @@ -6554,7 +6614,7 @@ ac_save_LIBS="$LIBS" LIBS="-lDnd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6629: \"$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 @@ -6738,7 +6798,7 @@ 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" +LIBS="$LIBS $lib_dl_opt $lib_user32_opt" SHLD="$SHLD $SHLDFLAGS" diff -ruN TiMidity++-1.3.6/configure.in TiMidity++-1.3.7/configure.in --- TiMidity++-1.3.6/configure.in Tue Mar 23 13:44:09 1999 +++ TiMidity++-1.3.7/configure.in Tue Mar 30 18:57:08 1999 @@ -54,7 +54,7 @@ AC_INIT(timidity/timidity.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 1.3.6, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 1.3.7, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -84,8 +84,10 @@ lib_xt_opt= lib_xprelibs_opt= lib_xext_opt= - lib_dl_opt= +lib_curses_opt= +lib_user32_opt= +lib_user32_test= WISH=${WISH:-wish} tcltk_dep= @@ -164,6 +166,7 @@ esac so="dll" CYGNUS=yes + lib_user32_test=-luser32 ;; *-dec-*) EXTRADEFS="-DDEC" @@ -545,17 +548,26 @@ CONFIG_INTERFACE(ncurses,NCURSES,n, [ --enable-ncurses Enable ncurses interface (default is no)], [ AC_CHECK_HEADERS(ncurses.h ncurses/curses.h curses.h) - AC_CHECK_LIB(ncurses,initscr,:, - [ enable_ncurses=no - AC_MSG_WARN(ncurses library is not found) ]) + AC_CHECK_LIB(ncurses,initscr,lib_curses_opt=-lncurses, + [ dnl checking pdcurses + AC_CHECK_LIB(curses,PDC_set_ctrl_break, + [ lib_curses_opt=-lcurses + CPPFLAGS="$CPPFLAGS -DUSE_PDCURSES=1" + lib_user32_opt="$lib_user32_test" + ], + [ AC_MSG_WARN(ncurses interface is not enabled) + enable_ncurses=no + ], + $lib_user32_test) + ]) ], - [ LIBS="$LIBS -lncurses" + [ LIBS="$LIBS $lib_curses_opt" case "$target" in *-*-freebsd*) EXTRALIBS="$EXTRALIBS -lmytinfo" ;; esac ], - [ n_so_libs="-lncurses" + [ n_so_libs="$lib_curses_opt" case "$target" in *-*-freebsd*) n_so_libs="$n_so_libs -lmytinfo" @@ -834,7 +846,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" +LIBS="$LIBS $lib_dl_opt $lib_user32_opt" SHLD="$SHLD $SHLDFLAGS" AC_SUBST(SYSEXTRAS) diff -ruN TiMidity++-1.3.6/interface/gtk_i.c TiMidity++-1.3.7/interface/gtk_i.c --- TiMidity++-1.3.6/interface/gtk_i.c Mon Mar 1 19:49:36 1999 +++ TiMidity++-1.3.7/interface/gtk_i.c Mon Mar 29 20:20:55 1999 @@ -176,12 +176,23 @@ file_list_cb(GtkWidget *widget, gint row, gint column, GdkEventButton *event, gpointer data) { - gchar *fname; + gint retval; + gchar *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; + if(event && (event->button == 3)) { + if(event->type == GDK_2BUTTON_PRESS) { + gtk_clist_remove(clist, row); + } + else { + return; + } + } + retval = gtk_clist_get_text(GTK_CLIST(widget), row, 0, &fname); + if(retval) { + gtk_pipe_int_write(GTK_PLAY_FILE); + gtk_pipe_string_write(fname); + file_number_to_play=row; + } } static gint @@ -305,7 +316,11 @@ gtk_widget_show(swin); gtk_widget_show(clist); gtk_widget_set_usize(clist, 200, 10); - gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_BROWSE); + gtk_clist_set_reorderable(GTK_CLIST(clist), TRUE); + gtk_clist_set_button_actions(GTK_CLIST(clist), 0, GTK_BUTTON_SELECTS); + gtk_clist_set_button_actions(GTK_CLIST(clist), 1, GTK_BUTTON_DRAGS); + gtk_clist_set_button_actions(GTK_CLIST(clist), 2, GTK_BUTTON_SELECTS); + gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_SINGLE); gtk_clist_set_column_auto_resize(GTK_CLIST(clist), 1, TRUE); gtk_signal_connect(GTK_OBJECT(clist), "select_row", GTK_SIGNAL_FUNC(file_list_cb), NULL); diff -ruN TiMidity++-1.3.6/interface/gtk_p.c TiMidity++-1.3.7/interface/gtk_p.c --- TiMidity++-1.3.6/interface/gtk_p.c Sun Feb 21 20:11:06 1999 +++ TiMidity++-1.3.7/interface/gtk_p.c Tue Mar 30 18:55:08 1999 @@ -44,6 +44,8 @@ #else #include #endif +#include +#include #include "timidity.h" @@ -164,10 +166,20 @@ int gtk_pipe_read_ready(void) { - int num; - - ioctl(fpip_in, FIONREAD, &num); /* see how many chars in buffer. */ - return num; + fd_set fds; + int cnt; + struct timeval timeout; + + FD_ZERO(&fds); + FD_SET(fpip_in, &fds); + timeout.tv_sec = timeout.tv_usec = 0; + if((cnt = select(fpip_in + 1, &fds, NULL, NULL, &timeout)) < 0) + { + perror("select"); + return -1; + } + + return cnt > 0 && FD_ISSET(fpip_in, &fds) != 0; } void diff -ruN TiMidity++-1.3.6/interface/motif_p.c TiMidity++-1.3.7/interface/motif_p.c --- TiMidity++-1.3.6/interface/motif_p.c Sun Feb 21 20:11:04 1999 +++ TiMidity++-1.3.7/interface/motif_p.c Tue Mar 30 18:54:13 1999 @@ -40,6 +40,8 @@ #else #include #endif +#include +#include #include "timidity.h" #include "controls.h" @@ -153,14 +155,8 @@ str[slen]='\0'; /* Append a terminal 0 */ } - -#if defined(sgi) -#include -#endif - int m_pipe_read_ready(void) { -#if defined(sgi) fd_set fds; int cnt; struct timeval timeout; @@ -175,16 +171,6 @@ } return cnt > 0 && FD_ISSET(fpip_in, &fds) != 0; -#else - int num; - - if(ioctl(fpip_in,FIONREAD,&num) < 0) /* see how many chars in buffer. */ - { - perror("ioctl: FIONREAD"); - return -1; - } - return num; -#endif } void m_pipe_open(void) diff -ruN TiMidity++-1.3.6/interface/ncurs_c.c TiMidity++-1.3.7/interface/ncurs_c.c --- TiMidity++-1.3.6/interface/ncurs_c.c Wed Feb 24 21:28:45 1999 +++ TiMidity++-1.3.7/interface/ncurs_c.c Tue Mar 30 17:28:08 1999 @@ -27,7 +27,12 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ #include + +#if defined(__MINGW32__) && defined(USE_PDCURSES) +#define _NO_OLDNAMES 1 /* avoid type mismatch of beep() */ +#endif /* USE_PDCURSES */ #include + #include #include #ifndef NO_STRING_H @@ -39,6 +44,8 @@ #ifndef __WIN32__ #include +#endif + #ifdef HAVE_NCURSES_H #include #elif defined(HAVE_NCURSES_CURSES_H) @@ -46,12 +53,6 @@ #else #include #endif -#else -/* Windows */ -#include -#include -#define PD_curses -#endif /* __WIN32__ */ #include "timidity.h" #include "common.h" @@ -72,7 +73,7 @@ #define MIDI_TITLE #define DISPLAY_MID_MODE -#define COMMAND_BUFFER_SIZE 1024 +#define COMMAND_BUFFER_SIZE 4096 #define MINI_BUFF_MORE_C '$' #define LYRIC_OUT_THRESHOLD 10.0 #define CHECK_NOTE_SLEEP_TIME 5.0 @@ -1378,6 +1379,16 @@ lyric = event2string(lyricid); if(lyric != NULL) { + /* EAW -- if not a true KAR lyric, ignore \r, treat \n as \r */ + if (*lyric != ME_KARAOKE_LYRIC) { + while (strchr(lyric, '\r')) { + *(strchr(lyric, '\r')) = ' '; + } + while (strchr(lyric, '\n')) { + *(strchr(lyric, '\n')) = '\r'; + } + } + if(ctl.trace_playing) { if(*lyric == ME_KARAOKE_LYRIC) @@ -1431,9 +1442,9 @@ SCREEN *dftscr; #endif -#ifdef PDCURSES +#ifdef USE_PDCURSES PDC_set_ctrl_break(1); -#endif /* PD_curses */ +#endif /* USE_PDCURSES */ if(!open_init_flag) { @@ -2346,7 +2357,7 @@ return RC_NONE; } -#ifdef PDCURSES +#ifdef USE_PDCURSES static void vwprintw(WINDOW *w, char *fmt, va_list ap) { char *buff; @@ -2359,7 +2370,7 @@ waddstr(w, buff); reuse_mblock(&pool); } -#endif /* PDCURSES */ +#endif /* USE_PDCURSES */ static int cmsg(int type, int verbosity_level, char *fmt, ...) { @@ -2377,9 +2388,9 @@ } else { -#ifdef __BORLANDC__ +#if defined(__WIN32__) && !defined(__CYGWIN32__) nl(); -#endif /* __BORLANDC__ */ +#endif if(ctl.trace_playing) { char *buff; diff -ruN TiMidity++-1.3.6/interface/vt100_c.c TiMidity++-1.3.7/interface/vt100_c.c --- TiMidity++-1.3.6/interface/vt100_c.c Sun Feb 21 20:11:05 1999 +++ TiMidity++-1.3.7/interface/vt100_c.c Sun Mar 28 19:12:13 1999 @@ -407,6 +407,16 @@ lyric = event2string(lyricid); if(lyric != NULL) { + /* EAW -- if not a true KAR lyric, ignore \r, treat \n as \r */ + if (*lyric != ME_KARAOKE_LYRIC) { + while (strchr(lyric, '\r')) { + *(strchr(lyric, '\r')) = ' '; + } + while (strchr(lyric, '\n')) { + *(strchr(lyric, '\n')) = '\r'; + } + } + if(*lyric == ME_KARAOKE_LYRIC) { if(lyric[1] == '/') diff -ruN TiMidity++-1.3.6/timidity/playmidi.c TiMidity++-1.3.7/timidity/playmidi.c --- TiMidity++-1.3.6/timidity/playmidi.c Wed Feb 17 12:23:48 1999 +++ TiMidity++-1.3.7/timidity/playmidi.c Sat Mar 27 16:30:22 1999 @@ -207,8 +207,8 @@ EVENT_NAME(ME_PORTAMENTO_TIME); EVENT_NAME(ME_PORTAMENTO); EVENT_NAME(ME_DATA_ENTRY_MSB); -#if 0 EVENT_NAME(ME_DATA_ENTRY_LSB); +#if 0 EVENT_NAME(ME_SUSTENUTO); EVENT_NAME(ME_SOFT_PEDAL); EVENT_NAME(ME_HARMONIC_CONTENT); @@ -1652,6 +1652,8 @@ {-1, -1, 0} }; + if(channel[ch].nrpn == -1) + return -1; lsb = channel[ch].lastlrpn; msb = channel[ch].lastmrpn; addr = (msb << 8 | lsb); @@ -1908,6 +1910,12 @@ update_rpn_map(ch, i, 0); } break; + case ME_DATA_ENTRY_LSB: + if(channel[ch].rpn_7f7f_flag) /* disable */ + break; + /* Ignore */ + channel[ch].nrpn = -1; + break; case ME_REVERB_EFFECT: set_reverb_level(ch, current_event->a); @@ -3051,6 +3059,13 @@ channel[ch].rpnmap[i] = ev->a; update_rpn_map(ch, i, 1); } + break; + + case ME_DATA_ENTRY_LSB: + if(channel[ch].rpn_7f7f_flag) /* disable */ + break; + /* Ignore */ + channel[ch].nrpn = -1; break; case ME_REVERB_EFFECT: diff -ruN TiMidity++-1.3.6/timidity/playmidi.h TiMidity++-1.3.7/timidity/playmidi.h --- TiMidity++-1.3.6/timidity/playmidi.h Mon Nov 30 17:42:30 1998 +++ TiMidity++-1.3.7/timidity/playmidi.h Sat Mar 27 16:45:49 1999 @@ -68,8 +68,8 @@ ME_PORTAMENTO_TIME, ME_PORTAMENTO, ME_DATA_ENTRY_MSB, + ME_DATA_ENTRY_LSB, #if 0 - ME_DATA_ENTRY_LSB, /* Not supported */ ME_SUSTENUTO, /* Not supported */ ME_SOFT_PEDAL, /* Not supported */ ME_HARMONIC_CONTENT, /* Not supported */ @@ -203,8 +203,8 @@ int vibrato_depth; uint8 rpnmap[RPN_MAX_DATA_ADDR]; /* pseudo RPN address map */ - uint8 lastlrpn, lastmrpn, - nrpn; /* 0:RPN, 1:NRPN */ + uint8 lastlrpn, lastmrpn; + int8 nrpn; /* 0:RPN, 1:NRPN, -1:Undefined */ struct ReverbControls *rb; /* Not used current version */ diff -ruN TiMidity++-1.3.6/timidity/readmidi.c TiMidity++-1.3.7/timidity/readmidi.c --- TiMidity++-1.3.6/timidity/readmidi.c Mon Feb 22 17:43:14 1999 +++ TiMidity++-1.3.7/timidity/readmidi.c Sat Mar 27 16:57:05 1999 @@ -194,7 +194,8 @@ int type; ch &= 0xff; - b &= 0x7f; + if(b > 127) + b = 127; type = -1; switch(a) { @@ -205,6 +206,7 @@ case 10: type = ME_PAN; break; case 11: type = ME_EXPRESSION; break; case 32: type = ME_TONE_BANK_LSB; break; + case 38: type = ME_DATA_ENTRY_LSB; break; case 64: type = ME_SUSTAIN; b = (b >= 64); break; case 65: type = ME_PORTAMENTO; b = (b >= 64); break; case 91: type = ME_REVERB_EFFECT; break; @@ -1195,7 +1197,7 @@ break; case 3: /* Control change */ - b = tf_getc(tf) & 0x7F; + b = tf_getc(tf); readmidi_add_ctl_event(smf_at_time, lastchan, a, b); break; @@ -1358,6 +1360,9 @@ switch(mode) { case GM_SYSTEM_MODE: + if(play_system_mode == DEFAULT_SYSTEM_MODE) + play_system_mode = GM_SYSTEM_MODE; + break; case GS_SYSTEM_MODE: case XG_SYSTEM_MODE: play_system_mode = mode;