diff -ruN TiMidity++-2.10.3/ChangeLog TiMidity++-2.10.4/ChangeLog --- TiMidity++-2.10.3/ChangeLog Sat Mar 10 18:26:20 2001 +++ TiMidity++-2.10.4/ChangeLog Sun Mar 18 15:32:21 2001 @@ -1,3 +1,16 @@ +2001-03-18 Masanao Izumo + + * Version 2.10.4 released. + +2001-03-13 Masanao Izumo + + * timidity/w32_a.c: decreased acntl() PM_REQ_GETQSIZ size + because of audio blocking. + +2001-03-13 Masanao Izumo + + * Apply lost patches. + 2001-03-10 Masanao Izumo * Version 2.10.3 released. @@ -31,6 +44,22 @@ * libunimod/mlutil.c: fixed false negatives in recognizing STM files. +2000-11-09 Masanao Izumo + + * timidity/playmidi.c: Fixed to update interface display. + * configure.in, timidity/oss_a.c: Added new test for + * timidity/oss_a.c: ioctl() has three arguments. + * configure.in, timidity/oss_a.c: In OpenBSD OSS, + use /dev/audio instead of /dev/dsp + * configure.in, In OpenBSD, Added new test for -lcurses for ncurses + * configure.in, Added new test for -lossaudio + * timidity/{readmidi.c,playmidi.c}: Trial change for GX. + +2000-11-06 Eric A. Welsh + + * timidity/mod.c: The XM E1,E2,EA,EB,X1,X2 effects were all + implemented improperly before. + 2000-11-02 Masanao Izumo * Version 2.10.2 released. diff -ruN TiMidity++-2.10.3/Makefile.in TiMidity++-2.10.4/Makefile.in --- TiMidity++-2.10.3/Makefile.in Sat Mar 10 20:03:00 2001 +++ TiMidity++-2.10.4/Makefile.in Sun Mar 18 15:32:38 2001 @@ -240,7 +240,7 @@ rev="$$subdir $$rev"; \ test "$$subdir" = "." && dot_seen=yes; \ done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ + test "$$dot_seen" = "no" && rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -332,7 +332,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.3/NEWS TiMidity++-2.10.4/NEWS --- TiMidity++-2.10.3/NEWS Sat Mar 10 20:02:54 2001 +++ TiMidity++-2.10.4/NEWS Sun Mar 18 15:32:32 2001 @@ -1,3 +1,6 @@ +03/18, 2001 + * Version 2.10.4 released. + 03/10, 2001 * Version 2.10.3 released. diff -ruN TiMidity++-2.10.3/config.h.in TiMidity++-2.10.4/config.h.in --- TiMidity++-2.10.3/config.h.in Thu Jul 20 23:15:45 2000 +++ TiMidity++-2.10.4/config.h.in Wed Nov 15 12:58:40 2000 @@ -164,6 +164,9 @@ /* Define if you have the header file. */ #undef HAVE_SLANG_SLANG_H +/* Define if you have the header file. */ +#undef HAVE_SOUNDCARD_H + /* Define if you have the header file. */ #undef HAVE_STRINGS_H @@ -223,6 +226,9 @@ /* Define if you have the m library (-lm). */ #undef HAVE_LIBM + +/* Define if you have the ossaudio library (-lossaudio). */ +#undef HAVE_LIBOSSAUDIO /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET diff -ruN TiMidity++-2.10.3/configs/msc-config.h TiMidity++-2.10.4/configs/msc-config.h --- TiMidity++-2.10.3/configs/msc-config.h Sat Mar 10 20:03:08 2001 +++ TiMidity++-2.10.4/configs/msc-config.h Sun Mar 18 15:32:48 2001 @@ -261,7 +261,7 @@ /* In VDS Macro AAA=BBB is not available. */ #define __W32__ -#define TIMID_VERSION "2.10.3" +#define TIMID_VERSION "2.10.4" #define DEFAULT_PATH ".\\" #define AU_W32 #define WINSOCK diff -ruN TiMidity++-2.10.3/configure TiMidity++-2.10.4/configure --- TiMidity++-2.10.3/configure Sat Mar 10 18:45:09 2001 +++ TiMidity++-2.10.4/configure Tue Mar 13 12:55:45 2001 @@ -891,7 +891,7 @@ PACKAGE=TiMidity++ -VERSION=2.10.3 +VERSION=2.10.4 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; } @@ -1081,6 +1081,7 @@ EXTRALIBS= SYSEXTRAS= timidity_LDFLAGS= +oss_device= lib_xm_opt= lib_xaw_opt= @@ -1150,7 +1151,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:1154: checking for $ac_word" >&5 +echo "configure:1155: 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 @@ -1180,7 +1181,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:1184: checking for $ac_word" >&5 +echo "configure:1185: 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 @@ -1231,7 +1232,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1235: checking for $ac_word" >&5 +echo "configure:1236: 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 @@ -1263,7 +1264,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1267: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1268: 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. @@ -1274,12 +1275,12 @@ cat > conftest.$ac_ext << EOF -#line 1278 "configure" +#line 1279 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1305,12 +1306,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:1309: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1310: 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:1314: checking whether we are using GNU C" >&5 +echo "configure:1315: 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 @@ -1319,7 +1320,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1323: \"$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:1324: \"$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 @@ -1338,7 +1339,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1342: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1343: 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 @@ -1381,7 +1382,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:1385: checking for a BSD compatible install" >&5 +echo "configure:1386: 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 @@ -1436,7 +1437,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:1440: checking for $ac_word" >&5 +echo "configure:1441: 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 @@ -1464,7 +1465,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1468: checking whether ln -s works" >&5 +echo "configure:1469: 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 @@ -1485,7 +1486,7 @@ fi echo $ac_n "checking whether -rdynamic option is recognized""... $ac_c" 1>&6 -echo "configure:1489: checking whether -rdynamic option is recognized" >&5 +echo "configure:1490: checking whether -rdynamic option is recognized" >&5 ac_ccoption=`echo rdynamic | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'timidity_cv_ccoption_$ac_ccoption'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1602,7 +1603,7 @@ echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:1606: checking for sqrt in -lm" >&5 +echo "configure:1607: 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 @@ -1610,7 +1611,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1649,7 +1650,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1653: checking for socket in -lsocket" >&5 +echo "configure:1654: 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 @@ -1657,7 +1658,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1696,7 +1697,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1700: checking for dlopen in -ldl" >&5 +echo "configure:1701: 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 @@ -1704,7 +1705,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1738,12 +1739,12 @@ for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1742: checking for $ac_func" >&5 +echo "configure:1743: 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${ac_exeext}; then +if { (eval echo configure:1771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1788,7 +1789,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1792: checking for gethostbyname in -lnsl" >&5 +echo "configure:1793: 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 @@ -1796,7 +1797,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1838,7 +1839,7 @@ done echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1842: checking how to run the C preprocessor" >&5 +echo "configure:1843: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1853,13 +1854,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:1863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1870,13 +1871,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:1880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1887,13 +1888,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1922,7 +1923,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:1926: checking for X" >&5 +echo "configure:1927: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1984,12 +1985,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:1993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2058,14 +2059,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${ac_exeext}; then +if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2171,17 +2172,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:2175: checking whether -R must be followed by a space" >&5 +echo "configure:2176: 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${ac_exeext}; then +if { (eval echo configure:2186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -2197,14 +2198,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -2236,7 +2237,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:2240: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2241: 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 @@ -2244,7 +2245,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2277,7 +2278,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:2281: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2282: 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 @@ -2285,7 +2286,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2325,12 +2326,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:2329: checking for gethostbyname" >&5 +echo "configure:2330: 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${ac_exeext}; then +if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2374,7 +2375,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2378: checking for gethostbyname in -lnsl" >&5 +echo "configure:2379: 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 @@ -2382,7 +2383,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2423,12 +2424,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:2427: checking for connect" >&5 +echo "configure:2428: 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${ac_exeext}; then +if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2472,7 +2473,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2476: checking for connect in -lsocket" >&5 +echo "configure:2477: 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 @@ -2480,7 +2481,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2515,12 +2516,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:2519: checking for remove" >&5 +echo "configure:2520: 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${ac_exeext}; then +if { (eval echo configure:2548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2564,7 +2565,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2568: checking for remove in -lposix" >&5 +echo "configure:2569: 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 @@ -2572,7 +2573,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2607,12 +2608,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2611: checking for shmat" >&5 +echo "configure:2612: 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${ac_exeext}; then +if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2656,7 +2657,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2660: checking for shmat in -lipc" >&5 +echo "configure:2661: 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 @@ -2664,7 +2665,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2708,7 +2709,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:2712: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2713: 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 @@ -2716,7 +2717,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2775,7 +2776,7 @@ fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2779: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2780: 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 @@ -2783,7 +2784,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2822,12 +2823,12 @@ fi echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 -echo "configure:2826: checking X11 version 6" >&5 +echo "configure:2827: 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() { @@ -2837,7 +2838,7 @@ ; return 0; } EOF -if { (eval echo configure:2841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* timidity_cv_x11_version_6=yes else @@ -2857,7 +2858,7 @@ KEEPLIBS=$LIBS echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6 -echo "configure:2861: checking for XShapeCombineMask in -lXext" >&5 +echo "configure:2862: 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 @@ -2865,7 +2866,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2898,7 +2899,7 @@ fi echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2902: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2903: 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 @@ -2906,7 +2907,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2945,7 +2946,7 @@ fi echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6 -echo "configure:2949: checking for SmcOpenConnection in -lSM" >&5 +echo "configure:2950: 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 @@ -2953,7 +2954,7 @@ ac_save_LIBS="$LIBS" LIBS="-lSM $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2986,7 +2987,7 @@ fi echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2990: checking for XtVaAppInitialize in -lXt" >&5 +echo "configure:2991: 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 @@ -2994,7 +2995,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3027,7 +3028,7 @@ fi echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6 -echo "configure:3031: checking for XmuInternAtom in -lXmu" >&5 +echo "configure:3032: 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 @@ -3035,7 +3036,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3069,12 +3070,12 @@ for ac_func in XmuRegisterExternalAgent do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3073: checking for $ac_func" >&5 +echo "configure:3074: 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${ac_exeext}; then +if { (eval echo configure:3102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3122,7 +3123,7 @@ done echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 -echo "configure:3126: checking for XawInitializeWidgetSet in -lXaw3d" >&5 +echo "configure:3127: 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 @@ -3130,7 +3131,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXaw3d $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3160,7 +3161,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 -echo "configure:3164: checking for XawInitializeWidgetSet in -lXaw" >&5 +echo "configure:3165: 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 @@ -3168,7 +3169,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXaw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3203,7 +3204,7 @@ fi echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 -echo "configure:3207: checking for XmCreateForm in -lXm" >&5 +echo "configure:3208: 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 @@ -3211,7 +3212,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3246,12 +3247,12 @@ for ac_func in XShmCreatePixmap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3250: checking for $ac_func" >&5 +echo "configure:3251: 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${ac_exeext}; then +if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3307,12 +3308,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:3311: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3312: 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> @@ -3320,7 +3321,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3345,7 +3346,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:3349: checking for opendir in -ldir" >&5 +echo "configure:3350: 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 @@ -3353,7 +3354,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3386,7 +3387,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3390: checking for opendir in -lx" >&5 +echo "configure:3391: 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 @@ -3394,7 +3395,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3428,12 +3429,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3432: checking for ANSI C header files" >&5 +echo "configure:3433: 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 @@ -3441,7 +3442,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3458,7 +3459,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 @@ -3476,7 +3477,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 @@ -3497,7 +3498,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3508,7 +3509,7 @@ exit (0); } EOF -if { (eval echo configure:3512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3532,12 +3533,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3536: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3537: 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 @@ -3553,7 +3554,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3577,21 +3578,21 @@ unistd.h dlfcn.h glob.h getopt.h errno.h machine/endian.h \ stropts.h sys/audioio.h sun/audioio.h sys/types.h \ sys/ipc.h sys/shm.h sys/param.h X11/extensions/XShm.h \ - X11/Xmu/ExtAgent.h sys/soundcard.h sys/awe_voice.h + X11/Xmu/ExtAgent.h sys/soundcard.h soundcard.h sys/awe_voice.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3585: checking for $ac_hdr" >&5 +echo "configure:3586: 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:3595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3619,17 +3620,17 @@ ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:3623: checking for string.h" >&5 +echo "configure:3624: 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:3633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3653,12 +3654,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3657: checking for working const" >&5 +echo "configure:3658: 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:3712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3728,14 +3729,14 @@ fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3732: checking whether char is unsigned" >&5 +echo "configure:3733: 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${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3791,14 +3792,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3795: checking whether byte ordering is bigendian" >&5 +echo "configure:3796: 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 @@ -3809,11 +3810,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3814: \"$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 @@ -3824,7 +3825,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3844,7 +3845,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${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3881,21 +3882,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3885: checking for inline" >&5 +echo "configure:3886: 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:3900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3921,12 +3922,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3925: checking for off_t" >&5 +echo "configure:3926: 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 @@ -3954,12 +3955,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3958: checking for pid_t" >&5 +echo "configure:3959: 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 @@ -3987,12 +3988,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3991: checking for size_t" >&5 +echo "configure:3992: 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 @@ -4020,12 +4021,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4024: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4025: 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 @@ -4034,7 +4035,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4056,19 +4057,19 @@ echo $ac_n "checking volatile declaration""... $ac_c" 1>&6 -echo "configure:4060: checking volatile declaration" >&5 +echo "configure:4061: 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:4073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_volatile=yes else @@ -4086,12 +4087,12 @@ fi echo $ac_n "checking union semun declaration""... $ac_c" 1>&6 -echo "configure:4090: checking union semun declaration" >&5 +echo "configure:4091: 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 @@ -4100,7 +4101,7 @@ union semun x ; return 0; } EOF -if { (eval echo configure:4104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_union_semun=yes else @@ -4119,20 +4120,20 @@ if test "x$CYGNUS" = xyes; then echo $ac_n "checking Cygwin new mmsystem""... $ac_c" 1>&6 -echo "configure:4123: checking Cygwin new mmsystem" >&5 +echo "configure:4124: checking Cygwin new mmsystem" >&5 if eval "test \"`echo '$''{'timidity_cv_header_new_mmsystem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include int main() { -return WOM_OPEN == 0x3BB +return WOM_OPEN != 0x3BB ; return 0; } EOF -if { (eval echo configure:4136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_header_new_mmsystem=yes else @@ -4152,13 +4153,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4156: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4157: 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 @@ -4176,7 +4177,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -4198,7 +4199,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:4202: checking for 8-bit clean memcmp" >&5 +echo "configure:4203: 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 @@ -4206,7 +4207,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -4237,17 +4238,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4241: checking for $ac_hdr" >&5 +echo "configure:4242: 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:4251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4276,12 +4277,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4280: checking for $ac_func" >&5 +echo "configure:4281: 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${ac_exeext}; then +if { (eval echo configure:4309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4329,7 +4330,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:4333: checking for working mmap" >&5 +echo "configure:4334: 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 @@ -4337,7 +4338,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -4500,7 +4501,7 @@ fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:4504: checking whether setvbuf arguments are reversed" >&5 +echo "configure:4505: 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 @@ -4508,7 +4509,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. */ @@ -4522,7 +4523,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:4526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -4546,12 +4547,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4550: checking return type of signal handlers" >&5 +echo "configure:4551: 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 @@ -4568,7 +4569,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4587,12 +4588,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4591: checking for vprintf" >&5 +echo "configure:4592: 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${ac_exeext}; then +if { (eval echo configure:4620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4639,12 +4640,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4643: checking for _doprnt" >&5 +echo "configure:4644: 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${ac_exeext}; then +if { (eval echo configure:4672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4695,12 +4696,12 @@ sleep usleep strncasecmp strerror getopt getcwd popen signal isatty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4699: checking for $ac_func" >&5 +echo "configure:4700: 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${ac_exeext}; then +if { (eval echo configure:4728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4752,12 +4753,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:4756: checking for opendir" >&5 +echo "configure:4757: 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${ac_exeext}; then +if { (eval echo configure:4785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_opendir=yes" else @@ -4808,12 +4809,12 @@ esac if test "x$enable_network" = "xyes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4812: checking for socket" >&5 +echo "configure:4813: 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${ac_exeext}; then +if { (eval echo configure:4841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -4854,7 +4855,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6 -echo "configure:4858: checking for WSAStartup in -lwsock32" >&5 +echo "configure:4859: 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 @@ -4862,7 +4863,7 @@ ac_save_LIBS="$LIBS" LIBS="-lwsock32 $LIBS" cat > conftest.$ac_ext < #include @@ -4871,7 +4872,7 @@ WSAStartup(0,0); ; return 0; } EOF -if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "wapi_cv_lib_$ac_lib_var=yes" else @@ -5063,7 +5064,7 @@ fi echo $ac_n "checking enable_audio=oss""... $ac_c" 1>&6 -echo "configure:5067: checking enable_audio=oss" >&5 +echo "configure:5068: checking enable_audio=oss" >&5 if test "x$au_enable_oss" = xyes; then EXTRADEFS="$EXTRADEFS -DAU_OSS" SYSEXTRAS="$SYSEXTRAS oss_a.c" @@ -5075,16 +5076,75 @@ echo "$ac_t""yes" 1>&6 ;; *) - echo "configure: warning: is not found" 1>&2 + if test "x$ac_cv_header_soundcard_h" = xyes; then + echo "$ac_t""yes - " 1>&6 + else + echo "configure: warning: is not found" 1>&2 + fi ;; esac fi + echo $ac_n "checking for open in -lossaudio""... $ac_c" 1>&6 +echo "configure:5089: checking for open in -lossaudio" >&5 +ac_lib_var=`echo ossaudio'_'open | 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="-lossaudio $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo ossaudio | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + + case "$target" in + *openbsd*) + if test ! -e "/dev/dsp"; then + oss_device=/dev/audio + fi + ;; + esac else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking enable_audio=sun""... $ac_c" 1>&6 -echo "configure:5088: checking enable_audio=sun" >&5 +echo "configure:5148: checking enable_audio=sun" >&5 if test "x$au_enable_sun" = xyes; then case "$target" in *-*-sunos4*) @@ -5113,7 +5173,7 @@ fi echo $ac_n "checking enable_audio=hpux""... $ac_c" 1>&6 -echo "configure:5117: checking enable_audio=hpux" >&5 +echo "configure:5177: checking enable_audio=hpux" >&5 if test "x$au_enable_hpux" = xyes; then case "$target" in *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; @@ -5126,7 +5186,7 @@ fi echo $ac_n "checking enable_audio=irix""... $ac_c" 1>&6 -echo "configure:5130: checking enable_audio=irix" >&5 +echo "configure:5190: checking enable_audio=irix" >&5 if test "x$au_enable_irix" = xyes; then case "$target" in *-sgi-irix5*|*-sgi-irix6.2) @@ -5146,7 +5206,7 @@ fi echo $ac_n "checking enable_audio=mme""... $ac_c" 1>&6 -echo "configure:5150: checking enable_audio=mme" >&5 +echo "configure:5210: checking enable_audio=mme" >&5 if test "x$au_enable_mme" = xyes; then case "$target" in *-dec-*) echo "$ac_t""yes" 1>&6 ;; @@ -5161,7 +5221,7 @@ fi echo $ac_n "checking enable_audio=sb_dsp""... $ac_c" 1>&6 -echo "configure:5165: checking enable_audio=sb_dsp" >&5 +echo "configure:5225: checking enable_audio=sb_dsp" >&5 if test "x$au_enable_sb_dsp" = xyes; then case "$target" in *-*-bsdi2.0) echo "$ac_t""yes" 1>&6 ;; @@ -5174,7 +5234,7 @@ fi echo $ac_n "checking enable_audio=w32""... $ac_c" 1>&6 -echo "configure:5178: checking enable_audio=w32" >&5 +echo "configure:5238: checking enable_audio=w32" >&5 if test "x$au_enable_w32" = xyes; then case "$target" in *-*-cygwin*) @@ -5197,7 +5257,7 @@ fi echo $ac_n "checking enable_audio=alsa""... $ac_c" 1>&6 -echo "configure:5201: checking enable_audio=alsa" >&5 +echo "configure:5261: checking enable_audio=alsa" >&5 if test "x$au_enable_alsa" = xyes; then echo "$ac_t""" 1>&6 KEEPCFLAGS=$CFLAGS @@ -5230,7 +5290,7 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:5234: checking for ALSA CFLAGS" >&5 +echo "configure:5294: 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" @@ -5238,7 +5298,7 @@ echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:5242: checking for ALSA LDFLAGS" >&5 +echo "configure:5302: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -5250,7 +5310,7 @@ min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:5254: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:5314: 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/'` @@ -5260,7 +5320,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -5301,7 +5361,7 @@ ; return 0; } EOF -if { (eval echo configure:5305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -5315,7 +5375,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:5319: checking for snd_cards in -lasound" >&5 +echo "configure:5379: 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 @@ -5323,7 +5383,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5390,7 +5450,7 @@ fi echo $ac_n "checking enable_audio=alib""... $ac_c" 1>&6 -echo "configure:5394: checking enable_audio=alib" >&5 +echo "configure:5454: checking enable_audio=alib" >&5 if test "x$au_enable_alib" = xyes; then case "$target" in *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; @@ -5410,7 +5470,7 @@ fi echo $ac_n "checking enable_audio=nas""... $ac_c" 1>&6 -echo "configure:5414: checking enable_audio=nas" >&5 +echo "configure:5474: checking enable_audio=nas" >&5 if test "x$au_enable_nas" = xyes; then if test "x$with_x" != xyes; then { echo "configure: error: nas: --with-x option must be specified" 1>&2; exit 1; } @@ -5425,7 +5485,7 @@ else echo "$ac_t""" 1>&6 echo $ac_n "checking for library containing AuOpenServer""... $ac_c" 1>&6 -echo "configure:5429: checking for library containing AuOpenServer" >&5 +echo "configure:5489: checking for library containing AuOpenServer" >&5 if eval "test \"`echo '$''{'timidity_cv_search_AuOpenServer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5436,7 +5496,7 @@ /usr/lib/libaudio.a ; do LIBS="$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* timidity_cv_search_AuOpenServer="$i"; break else @@ -5480,7 +5540,7 @@ fi echo $ac_n "checking enable_audio=esd""... $ac_c" 1>&6 -echo "configure:5484: checking enable_audio=esd" >&5 +echo "configure:5544: checking enable_audio=esd" >&5 if test "x$au_enable_esd" = xyes; then echo "$ac_t""" 1>&6 KEEPCFLAGS=$CFLAGS @@ -5527,7 +5587,7 @@ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5531: checking for $ac_word" >&5 +echo "configure:5591: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5562,7 +5622,7 @@ min_esd_version=0.2.7 echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 -echo "configure:5566: checking for ESD - version >= $min_esd_version" >&5 +echo "configure:5626: checking for ESD - version >= $min_esd_version" >&5 no_esd="" if test "$ESD_CONFIG" = "no" ; then no_esd=yes @@ -5586,7 +5646,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5644,7 +5704,7 @@ EOF -if { (eval echo configure:5648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5678,7 +5738,7 @@ CFLAGS="$CFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" cat > conftest.$ac_ext < @@ -5688,7 +5748,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:5692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding ESD or finding the wrong" @@ -5744,23 +5804,23 @@ fi echo $ac_n "checking enable_audio=vorbis""... $ac_c" 1>&6 -echo "configure:5748: checking enable_audio=vorbis" >&5 +echo "configure:5808: checking enable_audio=vorbis" >&5 if test "x$au_enable_vorbis" = xyes; then echo "$ac_t""" 1>&6 have_vorbis=yes ac_safe=`echo "vorbis/modes.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vorbis/modes.h""... $ac_c" 1>&6 -echo "configure:5754: checking for vorbis/modes.h" >&5 +echo "configure:5814: checking for vorbis/modes.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:5764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5783,7 +5843,7 @@ fi echo $ac_n "checking for vorbis_analysis_init in -lvorbis""... $ac_c" 1>&6 -echo "configure:5787: checking for vorbis_analysis_init in -lvorbis" >&5 +echo "configure:5847: checking for vorbis_analysis_init in -lvorbis" >&5 ac_lib_var=`echo vorbis'_'vorbis_analysis_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 @@ -5791,7 +5851,7 @@ ac_save_LIBS="$LIBS" LIBS="-lvorbis $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5850,7 +5910,7 @@ echo $ac_n "checking default output mode""... $ac_c" 1>&6 -echo "configure:5854: checking default output mode" >&5 +echo "configure:5914: checking default output mode" >&5 if test "x$DEFAULT_PLAYMODE" = x; then DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'` fi @@ -5920,12 +5980,12 @@ have_dl=no echo $ac_n "checking for LoadLibrary""... $ac_c" 1>&6 -echo "configure:5924: checking for LoadLibrary" >&5 +echo "configure:5984: checking for LoadLibrary" >&5 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibrary'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5934,7 +5994,7 @@ LoadLibrary(0); ; return 0; } EOF -if { (eval echo configure:5938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wapi_cv_func_LoadLibrary=yes else @@ -5957,12 +6017,12 @@ if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:5961: checking for shl_load" >&5 +echo "configure:6021: 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${ac_exeext}; then +if { (eval echo configure:6049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -6010,12 +6070,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:6014: checking for dlopen" >&5 +echo "configure:6074: 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${ac_exeext}; then +if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -6060,12 +6120,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:6064: checking for dld_init" >&5 +echo "configure:6124: 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${ac_exeext}; then +if { (eval echo configure:6152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dld_init=yes" else @@ -6110,7 +6170,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:6114: checking for dld_init in -ldld" >&5 +echo "configure:6174: 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 @@ -6118,7 +6178,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6152,13 +6212,13 @@ fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:6156: checking dynamic link method" >&5 +echo "configure:6216: 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:6162: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:6222: 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 @@ -6306,17 +6366,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6310: checking for $ac_hdr" >&5 +echo "configure:6370: 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:6320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6357,7 +6417,7 @@ esac echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:6361: checking for initscr in -lncurses" >&5 +echo "configure:6421: 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 @@ -6365,7 +6425,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6395,7 +6455,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for PDC_set_ctrl_break in -lcurses""... $ac_c" 1>&6 -echo "configure:6399: checking for PDC_set_ctrl_break in -lcurses" >&5 +echo "configure:6459: 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 @@ -6403,7 +6463,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $lib_user32_test $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6436,7 +6496,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for PDC_set_ctrl_break in -lpdcurses""... $ac_c" 1>&6 -echo "configure:6440: checking for PDC_set_ctrl_break in -lpdcurses" >&5 +echo "configure:6500: checking for PDC_set_ctrl_break in -lpdcurses" >&5 ac_lib_var=`echo pdcurses'_'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 @@ -6444,7 +6504,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpdcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6476,8 +6536,55 @@ else echo "$ac_t""no" 1>&6 + case "$target" in + *openbsd*) + echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 +echo "configure:6543: checking for initscr in -lcurses" >&5 +ac_lib_var=`echo curses'_'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 +else + ac_save_LIBS="$LIBS" +LIBS="-lcurses $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + lib_curses_opt=-lcurses +else + echo "$ac_t""no" 1>&6 echo "configure: warning: ncurses interface is not enabled" 1>&2 - enable_ncurses=no + enable_ncurses=no +fi + + ;; + *) echo "configure: warning: ncurses interface is not enabled" 1>&2 + enable_ncurses=no + ;; + esac fi @@ -6545,7 +6652,7 @@ if test "${enable_slang+set}" = set; then enableval="$enable_slang" case "x$enable_slang" in xyes|xdynamic) echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:6549: checking for SLang_init_tty in -lslang" >&5 +echo "configure:6656: 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 @@ -6553,7 +6660,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6590,17 +6697,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6594: checking for $ac_hdr" >&5 +echo "configure:6701: 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:6604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6652,7 +6759,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:6656: checking for initscr in -ltermcap" >&5 +echo "configure:6763: 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 @@ -6660,7 +6767,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6791,7 +6898,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:6795: checking for Tcl_Init in -l$l" >&5 +echo "configure:6902: 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 @@ -6799,7 +6906,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6834,7 +6941,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:6838: checking for Tk_Init in -l$l" >&5 +echo "configure:6945: 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 @@ -6842,7 +6949,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7217,7 +7324,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:7221: checking for $ac_word" >&5 +echo "configure:7328: 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 @@ -7252,7 +7359,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7256: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:7363: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -7275,7 +7382,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -7341,7 +7448,7 @@ } EOF -if { (eval echo configure:7345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7375,7 +7482,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -7385,7 +7492,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:7389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -7514,17 +7621,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7518: checking for $ac_hdr" >&5 +echo "configure:7625: 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:7528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7598,17 +7705,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7602: checking for $ac_hdr" >&5 +echo "configure:7709: 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:7612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7704,17 +7811,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:7708: checking for X11/xpm.h" >&5 +echo "configure:7815: 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:7718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7737,7 +7844,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:7741: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:7848: 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 @@ -7745,7 +7852,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7828,7 +7935,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:7832: checking for DndInitialize in -lDnd" >&5 +echo "configure:7939: 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 @@ -7836,7 +7943,7 @@ ac_save_LIBS="$LIBS" LIBS="-lDnd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7954,7 +8061,7 @@ EXTRADEFS="$EXTRADEFS -DWRDT_X" enable_sherry_wrd=yes echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6 -echo "configure:7958: checking for zlibVersion in -lz" >&5 +echo "configure:8065: checking for zlibVersion in -lz" >&5 ac_lib_var=`echo z'_'zlibVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7962,7 +8069,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7996,17 +8103,17 @@ ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:8000: checking for png.h" >&5 +echo "configure:8107: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8029,7 +8136,7 @@ fi echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6 -echo "configure:8033: checking for png_init_io in -lpng" >&5 +echo "configure:8140: checking for png_init_io in -lpng" >&5 ac_lib_var=`echo png'_'png_init_io | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8037,7 +8144,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng -lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8165,6 +8272,10 @@ CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR) \$(DEF_DEFAULT_PATH)" + +if test "x$oss_device" != x; then + CPPFLAGS="$CPPFLAGS -DOSS_DEVICE=\\\"$oss_device\\\"" +fi if test "x$TIMIDITY_OUTPUT_ID" != x; then CPPFLAGS="$CPPFLAGS -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\"" diff -ruN TiMidity++-2.10.3/configure.in TiMidity++-2.10.4/configure.in --- TiMidity++-2.10.3/configure.in Sat Mar 10 18:44:57 2001 +++ TiMidity++-2.10.4/configure.in Tue Mar 13 12:55:35 2001 @@ -55,7 +55,7 @@ AC_INIT(timidity/timidity.c) SHELL=${CONFIG_SHELL-/bin/sh} AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.10.3, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.10.4, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -78,6 +78,7 @@ EXTRALIBS= SYSEXTRAS= timidity_LDFLAGS= +oss_device= dnl Optional library dependent lib_xm_opt= @@ -306,7 +307,7 @@ unistd.h dlfcn.h glob.h getopt.h errno.h machine/endian.h \ stropts.h sys/audioio.h sun/audioio.h sys/types.h \ sys/ipc.h sys/shm.h sys/param.h X11/extensions/XShm.h \ - X11/Xmu/ExtAgent.h sys/soundcard.h sys/awe_voice.h) + X11/Xmu/ExtAgent.h sys/soundcard.h soundcard.h sys/awe_voice.h) AC_CHECK_HEADER(string.h,, [ EXTRADEFS="$EXTRADEFS -DNO_STRING_H " ]) dnl Checks for typedefs, structures, and compiler characteristics. @@ -342,7 +343,7 @@ AC_TRY_COMPILE( [#include #include ], - return WOM_OPEN == 0x3BB, + return WOM_OPEN != 0x3BB, timidity_cv_header_new_mmsystem=yes,timidity_cv_header_new_mmsystem=no)) if test $timidity_cv_header_new_mmsystem = yes; then EXTRADEFS="$EXTRADEFS -DHAVE_NEW_MMSYSTEM=1" @@ -558,10 +559,24 @@ AC_MSG_RESULT(yes) ;; *) - AC_MSG_WARN( is not found) + if test "x$ac_cv_header_soundcard_h" = xyes; then + AC_MSG_RESULT(yes - ) + else + AC_MSG_WARN( is not found) + fi ;; esac fi + AC_CHECK_LIB(ossaudio,open) + + dnl Why OpenBSD use /dev/audio instead of /dev/dsp for OSS + case "$target" in + *openbsd*) + if test ! -e "/dev/dsp"; then + oss_device=/dev/audio + fi + ;; + esac else AC_MSG_RESULT(no) fi @@ -972,8 +987,17 @@ CPPFLAGS="$CPPFLAGS -DUSE_PDCURSES=1" lib_user32_opt="$lib_user32_test" ], - [ AC_MSG_WARN(ncurses interface is not enabled) - enable_ncurses=no + [ dnl OpenBSD use -lcurses instead of -lncurses. + case "$target" in + *openbsd*) + AC_CHECK_LIB(curses,initscr,lib_curses_opt=-lcurses, + [ AC_MSG_WARN(ncurses interface is not enabled) + enable_ncurses=no ]) + ;; + *) AC_MSG_WARN(ncurses interface is not enabled) + enable_ncurses=no + ;; + esac ]) ], $lib_user32_test) @@ -1346,6 +1370,10 @@ SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS) CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR) \$(DEF_DEFAULT_PATH)" + +if test "x$oss_device" != x; then + CPPFLAGS="$CPPFLAGS -DOSS_DEVICE=\\\"$oss_device\\\"" +fi if test "x$TIMIDITY_OUTPUT_ID" != x; then CPPFLAGS="$CPPFLAGS -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\"" diff -ruN TiMidity++-2.10.3/doc/C/Makefile.in TiMidity++-2.10.4/doc/C/Makefile.in --- TiMidity++-2.10.3/doc/C/Makefile.in Sat Mar 10 20:03:07 2001 +++ TiMidity++-2.10.4/doc/C/Makefile.in Sun Mar 18 15:32:47 2001 @@ -145,7 +145,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.3/doc/Makefile.in TiMidity++-2.10.4/doc/Makefile.in --- TiMidity++-2.10.3/doc/Makefile.in Sat Mar 10 20:03:07 2001 +++ TiMidity++-2.10.4/doc/Makefile.in Sun Mar 18 15:32:46 2001 @@ -254,7 +254,7 @@ rev="$$subdir $$rev"; \ test "$$subdir" = "." && dot_seen=yes; \ done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ + test "$$dot_seen" = "no" && rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -313,7 +313,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.3/doc/ja_JP.ujis/Makefile.in TiMidity++-2.10.4/doc/ja_JP.ujis/Makefile.in --- TiMidity++-2.10.3/doc/ja_JP.ujis/Makefile.in Sat Mar 10 20:03:08 2001 +++ TiMidity++-2.10.4/doc/ja_JP.ujis/Makefile.in Sun Mar 18 15:32:47 2001 @@ -145,7 +145,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.3/interface/Makefile.in TiMidity++-2.10.4/interface/Makefile.in --- TiMidity++-2.10.3/interface/Makefile.in Sat Mar 10 20:03:02 2001 +++ TiMidity++-2.10.4/interface/Makefile.in Sun Mar 18 15:32:41 2001 @@ -284,7 +284,7 @@ rev="$$subdir $$rev"; \ test "$$subdir" = "." && dot_seen=yes; \ done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ + test "$$dot_seen" = "no" && rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -343,7 +343,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -366,25 +366,6 @@ ../timidity/output.h ../timidity/controls.h \ ../timidity/instrum.h ../timidity/playmidi.h \ ../timidity/readmidi.h -emacs_c.o: emacs_c.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/output.h ../timidity/controls.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/miditrace.h -gtk_c.o: gtk_c.c ../config.h ../timidity/timidity.h ../utils/support.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/output.h ../timidity/controls.h gtk_h.h \ - ../timidity/readmidi.h -gtk_i.o: gtk_i.c ../config.h ../timidity/timidity.h ../utils/support.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h gtk_h.h \ - pixmaps/playpaus.xpm pixmaps/prevtrk.xpm pixmaps/nexttrk.xpm \ - pixmaps/rew.xpm pixmaps/ff.xpm pixmaps/restart.xpm \ - pixmaps/quit.xpm pixmaps/quiet.xpm pixmaps/loud.xpm \ - pixmaps/open.xpm pixmaps/keyup.xpm pixmaps/keydown.xpm \ - pixmaps/slow.xpm pixmaps/fast.xpm pixmaps/timidity.xpm -gtk_p.o: gtk_p.c ../config.h ../timidity/timidity.h ../utils/support.h \ - ../timidity/controls.h gtk_h.h ncurs_c.o: ncurs_c.c ../config.h ../timidity/timidity.h \ ../utils/support.h ../timidity/common.h ../libarc/url.h \ ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ @@ -392,35 +373,6 @@ ../timidity/controls.h ../timidity/miditrace.h ../utils/timer.h \ ../utils/bitset.h ../libarc/arc.h ../timidity/aq.h \ ../timidity/mid-j.defs -server_c.o: server_c.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/controls.h ../timidity/instrum.h \ - ../timidity/playmidi.h ../timidity/readmidi.h \ - ../timidity/recache.h ../timidity/output.h ../timidity/aq.h \ - ../utils/timer.h -slang_c.o: slang_c.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h ../utils/timer.h -soundspec.o: soundspec.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/output.h ../timidity/controls.h soundspec.h \ - ../utils/fft.h ../timidity/miditrace.h -tk_c.o: tk_c.c ../config.h ../timidity/timidity.h ../utils/support.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h ../timidity/aq.h -vt100.o: vt100.c ../config.h ../timidity/timidity.h ../utils/support.h \ - vt100.h -vt100_c.o: vt100_c.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h vt100.h \ - ../utils/timer.h ../utils/bitset.h ../timidity/aq.h wrdt_dumb.o: wrdt_dumb.c ../config.h ../timidity/timidity.h \ ../utils/support.h ../timidity/common.h ../libarc/url.h \ ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ @@ -445,37 +397,6 @@ ../utils/support.h ../timidity/common.h ../libarc/url.h \ ../utils/mblock.h x_mag.h x_wrdwindow.h VTparse.h \ ../timidity/wrd.h ../timidity/controls.h ../timidity/aq.h -xaw_c.o: xaw_c.c ../config.h ../timidity/timidity.h ../utils/support.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h ../utils/timer.h \ - xaw.h -xaw_i.o: xaw_i.c ../config.h xaw.h ../timidity/timidity.h \ - ../utils/support.h check.xbm arrow.xbm on.xbm off.xbm \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/controls.h ../utils/timer.h \ - ../utils/strtab.h ../interface.h -xskin_c.o: xskin_c.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h xskin.h -xskin_i.o: xskin_i.c xskin.h ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/output.h ../timidity/controls.h \ - ../timidity/miditrace.h -xskin_loadBMP.o: xskin_loadBMP.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/controls.h ../timidity/output.h ../libarc/arc.h -xskin_spectrum.o: xskin_spectrum.c xskin.h ../config.h \ - ../timidity/timidity.h ../utils/support.h ../timidity/common.h \ - ../libarc/url.h ../utils/mblock.h ../timidity/instrum.h \ - ../timidity/playmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h info-am: info: info-recursive diff -ruN TiMidity++-2.10.3/interface/bitmaps/Makefile.in TiMidity++-2.10.4/interface/bitmaps/Makefile.in --- TiMidity++-2.10.3/interface/bitmaps/Makefile.in Sat Mar 10 20:03:03 2001 +++ TiMidity++-2.10.4/interface/bitmaps/Makefile.in Sun Mar 18 15:32:42 2001 @@ -147,7 +147,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.3/interface/motif_bitmaps/Makefile.in TiMidity++-2.10.4/interface/motif_bitmaps/Makefile.in --- TiMidity++-2.10.3/interface/motif_bitmaps/Makefile.in Sat Mar 10 20:03:03 2001 +++ TiMidity++-2.10.4/interface/motif_bitmaps/Makefile.in Sun Mar 18 15:32:42 2001 @@ -147,7 +147,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.3/interface/pixmaps/Makefile.in TiMidity++-2.10.4/interface/pixmaps/Makefile.in --- TiMidity++-2.10.3/interface/pixmaps/Makefile.in Sat Mar 10 20:03:04 2001 +++ TiMidity++-2.10.4/interface/pixmaps/Makefile.in Sun Mar 18 15:32:43 2001 @@ -147,7 +147,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.3/libarc/Makefile.in TiMidity++-2.10.4/libarc/Makefile.in --- TiMidity++-2.10.3/libarc/Makefile.in Sat Mar 10 20:03:01 2001 +++ TiMidity++-2.10.4/libarc/Makefile.in Sun Mar 18 15:32:40 2001 @@ -241,7 +241,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -278,20 +278,12 @@ ../utils/support.h url.h ../utils/strtab.h ../utils/mblock.h url_file.o: url_file.c ../config.h ../timidity/timidity.h \ ../utils/support.h url.h -url_ftp.o: url_ftp.c ../config.h ../timidity/timidity.h \ - ../utils/support.h url.h ../utils/net.h url_hqxdecode.o: url_hqxdecode.c ../config.h ../timidity/timidity.h \ ../utils/support.h url.h -url_http.o: url_http.c ../config.h ../timidity/timidity.h \ - ../utils/support.h url.h ../utils/net.h url_inflate.o: url_inflate.c ../config.h ../timidity/timidity.h \ ../utils/support.h url.h ../utils/mblock.h zip.h url_mem.o: url_mem.c ../config.h ../timidity/timidity.h \ ../utils/support.h url.h -url_news.o: url_news.c ../config.h ../timidity/timidity.h \ - ../utils/support.h url.h ../utils/net.h -url_newsgroup.o: url_newsgroup.c ../config.h ../timidity/timidity.h \ - ../utils/support.h url.h ../utils/net.h url_pipe.o: url_pipe.c ../config.h ../timidity/timidity.h \ ../utils/support.h url.h url_qsdecode.o: url_qsdecode.c ../config.h ../timidity/timidity.h \ diff -ruN TiMidity++-2.10.3/libunimod/Makefile.in TiMidity++-2.10.4/libunimod/Makefile.in --- TiMidity++-2.10.3/libunimod/Makefile.in Sat Mar 10 20:03:05 2001 +++ TiMidity++-2.10.4/libunimod/Makefile.in Sun Mar 18 15:32:44 2001 @@ -234,7 +234,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.3/timidity/Makefile.in TiMidity++-2.10.4/timidity/Makefile.in --- TiMidity++-2.10.3/timidity/Makefile.in Sat Mar 10 20:03:06 2001 +++ TiMidity++-2.10.4/timidity/Makefile.in Sun Mar 18 15:32:45 2001 @@ -259,7 +259,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -284,9 +284,6 @@ ../utils/support.h controls.h effect.o: effect.c ../config.h timidity.h ../utils/support.h instrum.h \ playmidi.h output.h reverb.h -esd_a.o: esd_a.c ../config.h timidity.h ../utils/support.h common.h \ - ../libarc/url.h ../utils/mblock.h output.h controls.h \ - ../utils/timer.h instrum.h playmidi.h miditrace.h filter.o: filter.c ../config.h timidity.h ../utils/support.h common.h \ ../libarc/url.h ../utils/mblock.h controls.h instrum.h filter.h instrum.o: instrum.c ../config.h timidity.h ../utils/support.h common.h \ diff -ruN TiMidity++-2.10.3/timidity/mod.c TiMidity++-2.10.4/timidity/mod.c --- TiMidity++-2.10.3/timidity/mod.c Sat Mar 10 18:10:52 2001 +++ TiMidity++-2.10.4/timidity/mod.c Tue Mar 13 10:01:19 2001 @@ -1998,6 +1998,8 @@ DoXMVolSlide (UniGetByte ()); break; case UNI_XMEFFECTE1: /* XM fineslide up */ + if (mp.vbtick) + break; dat = UniGetByte (); if (!mp.vbtick) { @@ -2008,6 +2010,8 @@ } break; case UNI_XMEFFECTE2: /* XM fineslide dn */ + if (mp.vbtick) + break; dat = UniGetByte (); if (!mp.vbtick) { @@ -2018,19 +2022,21 @@ } break; case UNI_XMEFFECTEA: /* fine volume slide up */ + if (mp.vbtick) + break; dat = UniGetByte (); - if (!mp.vbtick) - if (dat) - a->fslideupspd = dat; + if (dat) + a->fslideupspd = dat; a->tmpvolume += a->fslideupspd; if (a->tmpvolume > 64) a->tmpvolume = 64; break; case UNI_XMEFFECTEB: /* fine volume slide dn */ + if (mp.vbtick) + break; dat = UniGetByte (); - if (!mp.vbtick) - if (dat) - a->fslidednspd = dat; + if (dat) + a->fslidednspd = dat; a->tmpvolume -= a->fslidednspd; if (a->tmpvolume < 0) a->tmpvolume = 0; @@ -2069,6 +2075,8 @@ DoXMPanSlide (dat); break; case UNI_XMEFFECTX1: + if (mp.vbtick) + break; dat = UniGetByte (); if (dat) a->ffportupspd = dat; @@ -2081,6 +2089,8 @@ } break; case UNI_XMEFFECTX2: + if (mp.vbtick) + break; dat = UniGetByte (); if (dat) a->ffportdnspd = dat; diff -ruN TiMidity++-2.10.3/timidity/oss_a.c TiMidity++-2.10.4/timidity/oss_a.c --- TiMidity++-2.10.3/timidity/oss_a.c Sat Mar 10 18:10:33 2001 +++ TiMidity++-2.10.4/timidity/oss_a.c Tue Mar 13 10:01:19 2001 @@ -45,6 +45,8 @@ #elif defined(__FreeBSD__) #include #include +#elif defined(HAVE_SOUNDCARD_H) +#include #else #include #endif /* HAVE_SYS_SOUNDCARD_H */ @@ -84,7 +86,11 @@ -1, {0}, /* default: get all the buffer fragments you can */ "dsp device", 'd', +#ifdef OSS_DEVICE + OSS_DEVICE, +#else "/dev/dsp", +#endif open_output, close_output, output_data, @@ -313,11 +319,11 @@ #ifdef SNDCTL_DSP_GETODELAY case PM_REQ_DISCARD: output_counter = 0; - return ioctl(dpm.fd, SNDCTL_DSP_RESET); + return ioctl(dpm.fd, SNDCTL_DSP_RESET, NULL); case PM_REQ_FLUSH: output_counter = 0; - return ioctl(dpm.fd, SNDCTL_DSP_SYNC); + return ioctl(dpm.fd, SNDCTL_DSP_SYNC, NULL); case PM_REQ_GETFILLED: if(total_bytes <= 0 || ioctl(dpm.fd, SNDCTL_DSP_GETODELAY, &i) == -1) @@ -349,7 +355,7 @@ #else /* SNDCTL_DSP_GETODELAY */ case PM_REQ_DISCARD: - if(ioctl(dpm.fd, SNDCTL_DSP_RESET) == -1) + if(ioctl(dpm.fd, SNDCTL_DSP_RESET, NULL) == -1) return -1; if(ioctl(dpm.fd, SNDCTL_DSP_GETOPTR, &cinfo) == -1) return -1; @@ -357,7 +363,7 @@ return 0; case PM_REQ_FLUSH: - if(ioctl(dpm.fd, SNDCTL_DSP_SYNC) == -1) + if(ioctl(dpm.fd, SNDCTL_DSP_SYNC, NULL) == -1) return -1; if(ioctl(dpm.fd, SNDCTL_DSP_GETOPTR, &cinfo) == -1) return -1; diff -ruN TiMidity++-2.10.3/timidity/playmidi.c TiMidity++-2.10.4/timidity/playmidi.c --- TiMidity++-2.10.3/timidity/playmidi.c Sat Mar 10 18:10:19 2001 +++ TiMidity++-2.10.4/timidity/playmidi.c Tue Mar 13 10:28:28 2001 @@ -2131,8 +2131,13 @@ switch(channel[ch].bank_msb) { case 0: /* Normal */ - midi_drumpart_change(ch, 0); - channel[ch].mapID = XG_NORMAL_MAP; + if(ch == 9 && channel[ch].bank_lsb == 127 && channel[ch].mapID == XG_DRUM_MAP) { + /* FIXME: Why this part is drum? Is this correct? */ + ; + } else { + midi_drumpart_change(ch, 0); + channel[ch].mapID = XG_NORMAL_MAP; + } break; case 64: /* SFX voice */ midi_drumpart_change(ch, 0); @@ -2165,6 +2170,7 @@ channel[ch].altassign = drumset[0]->alt; else channel[ch].altassign = drumset[prog]->alt; + ctl_mode_event(CTLE_DRUMPART, 1, ch, 1); } else { @@ -2172,6 +2178,7 @@ newbank = special_tonebank; channel[ch].bank = newbank; channel[ch].altassign = NULL; + ctl_mode_event(CTLE_DRUMPART, 1, ch, 0); } if(!dr && default_program[ch] == SPECIAL_PROGRAM) @@ -3606,7 +3613,8 @@ /* Auto voice reduce implementation by Masanao Izumo */ if(reduce_voice_threshold && (play_mode->flag & PF_CAN_TRACE) && - !aq_fill_buffer_flag) + !aq_fill_buffer_flag && + aq_get_dev_queuesize() > 0) { /* Reduce voices if there is not enough audio device buffer */ @@ -4238,6 +4246,12 @@ return rc; skip_to(midi_restart_time); + + if(midi_restart_time > 0) { /* Need to update interface display */ + int i; + for(i = 0; i < MAX_CHANNELS; i++) + redraw_controllers(i); + } rc = RC_NONE; for(;;) { @@ -4525,6 +4539,7 @@ free(event); if(rc == RC_RELOAD) goto play_reload; + if(rc == RC_ERROR) { if(current_file_info->file_type == IS_OTHER_FILE) diff -ruN TiMidity++-2.10.3/timidity/readmidi.c TiMidity++-2.10.4/timidity/readmidi.c --- TiMidity++-2.10.3/timidity/readmidi.c Sat Mar 10 18:10:00 2001 +++ TiMidity++-2.10.4/timidity/readmidi.c Tue Mar 13 10:01:19 2001 @@ -1845,10 +1845,17 @@ switch(bank_msb[ch]) { case 0: /* Normal */ - ctl->cmsg(CMSG_INFO, VERB_DEBUG, "(XG ch=%d Normal voice)", - ch); - midi_drumpart_change(ch, 0); - mapID[ch] = XG_NORMAL_MAP; + if(ch == 9 && bank_lsb[ch] == 127 && mapID[ch] == XG_DRUM_MAP) { + /* FIXME: Why this part is drum? Is this correct? */ + ctl->cmsg(CMSG_WARNING, VERB_NORMAL, + "Warning: XG bank 0/127 is found. It may be not correctly played."); + ; + } else { + ctl->cmsg(CMSG_INFO, VERB_DEBUG, "(XG ch=%d Normal voice)", + ch); + midi_drumpart_change(ch, 0); + mapID[ch] = XG_NORMAL_MAP; + } break; case 64: /* SFX voice */ ctl->cmsg(CMSG_INFO, VERB_DEBUG, "(XG ch=%d SFX voice)", diff -ruN TiMidity++-2.10.3/timidity/timpp32g.ini TiMidity++-2.10.4/timidity/timpp32g.ini --- TiMidity++-2.10.3/timidity/timpp32g.ini Tue Oct 5 16:00:49 1999 +++ TiMidity++-2.10.4/timidity/timpp32g.ini Tue Mar 13 15:18:13 2001 @@ -1,5 +1,5 @@ [PLAYER] -IniVersion=2.1 +IniVersion=2.2 InitMinimizeFlag=0 DebugWndStartFlag=1 ConsoleWndStartFlag=0 @@ -43,6 +43,7 @@ DocWndIndependent=0 SeachDirRecursive=0 IniFileAutoSave=1 +SecondMode=0 [TIMIDITY] amplification=70 @@ -115,5 +116,5 @@ output_text_code=SJIS free_instruments_afterwards=0 out_wrd=- -data_block_time=400 -data_block_num=20 +data_block_bits=12 +data_block_num=64 diff -ruN TiMidity++-2.10.3/timidity/w32_a.c TiMidity++-2.10.4/timidity/w32_a.c --- TiMidity++-2.10.3/timidity/w32_a.c Sat Mar 10 18:40:06 2001 +++ TiMidity++-2.10.4/timidity/w32_a.c Tue Mar 13 14:34:39 2001 @@ -463,14 +463,13 @@ switch(request) { case PM_REQ_GETQSIZ: - *(int *)arg = DATA_BLOCK_NUM * AUDIO_BUFFER_SIZE; + *(int *)arg = (DATA_BLOCK_NUM-1) * AUDIO_BUFFER_SIZE; if (NOT (dpm.encoding & PE_MONO)) *(int *)arg *= 2; if (dpm.encoding & PE_16BIT) *(int *)arg *= 2; - return 0; case PM_REQ_DISCARD: diff -ruN TiMidity++-2.10.3/timidity/w32g_a.c TiMidity++-2.10.4/timidity/w32g_a.c --- TiMidity++-2.10.3/timidity/w32g_a.c Sat Mar 10 18:40:11 2001 +++ TiMidity++-2.10.4/timidity/w32g_a.c Tue Mar 13 15:18:06 2001 @@ -85,7 +85,7 @@ WORD nBlockAlign; WORD wBitsPerSample; WORD cbSize; -} WAVEFORMAT; +} WAVEFORMATEX; typedef struct waveoutcaps_tag { WORD wMid; @@ -99,12 +99,12 @@ } WAVEOUTCAPS; typedef WAVEHDR *LPWAVEHDR; -typedef WAVEFORMAT *LPWAVEFORMAT; +typedef WAVEFORMATEX *LPWAVEFORMATEX; typedef WAVEOUTCAPS *LPWAVEOUTCAPS; typedef UINT MMRESULT; MMRESULT WINAPI waveOutOpen(LPHWAVEOUT, UINT, - LPWAVEFORMAT, DWORD, DWORD, DWORD); + LPWAVEFORMATEX, DWORD, DWORD, DWORD); MMRESULT WINAPI waveOutClose(HWAVEOUT); MMRESULT WINAPI waveOutPrepareHeader(HWAVEOUT, LPWAVEHDR, UINT); MMRESULT WINAPI waveOutUnprepareHeader(HWAVEOUT, LPWAVEHDR, UINT); @@ -119,17 +119,6 @@ #endif #else #include -#ifdef HAVE_MMSYSTEM_H -typedef struct { - WORD wFormatTag; - WORD nChannels; - DWORD nSamplesPerSec; - DWORD nAvgBytesPerSec; - WORD nBlockAlign; - WORD wBitsPerSample; - WORD cbSize; -} WAVEFORMAT_; -#endif /* HAVE_MMSYSTEM_H */ #endif /* __CYGWIN32__ */ #include "timidity.h" @@ -296,11 +285,7 @@ static int open_output(void) { int i, j, mono, eight_bit, warnings = 0; -#ifdef HAVE_MMSYSTEM_H - WAVEFORMAT_ wf; -#else - WAVEFORMAT wf; -#endif /* HAVE_MMSYSTEM_H */ + WAVEFORMATEX wf; WAVEOUTCAPS caps; MMRESULT res; UINT devid; @@ -348,22 +333,18 @@ wf.nAvgBytesPerSec = i; wf.nBlockAlign = j; wf.wBitsPerSample = eight_bit ? 8 : 16; -#ifdef HAVE_MMSYSTEM_H - wf.cbSize=sizeof(WAVEFORMAT_); -#else - wf.cbSize=sizeof(WAVEFORMAT); -#endif /* HAVE_MMSYSTEM_H */ + wf.cbSize=sizeof(WAVEFORMATEX); dev = 0; #ifdef USE_WAVEFORMTHREAD InitWaveformThread(); #endif if (w32_wave_allowsync) - res = waveOutOpen (&dev, WAVE_MAPPER, (LPWAVEFORMAT)&wf, + res = waveOutOpen (&dev, WAVE_MAPPER, &wf, (DWORD)wave_callback, 0, CALLBACK_FUNCTION | WAVE_ALLOWSYNC); else - res = waveOutOpen (&dev, WAVE_MAPPER, (LPWAVEFORMAT)&wf, + res = waveOutOpen (&dev, WAVE_MAPPER, &wf, (DWORD)wave_callback, 0, CALLBACK_FUNCTION); if (res) { diff -ruN TiMidity++-2.10.3/utils/Makefile.in TiMidity++-2.10.4/utils/Makefile.in --- TiMidity++-2.10.3/utils/Makefile.in Sat Mar 10 20:03:00 2001 +++ TiMidity++-2.10.4/utils/Makefile.in Sun Mar 18 15:32:39 2001 @@ -245,7 +245,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -254,12 +254,9 @@ done bitset.o: bitset.c ../config.h ../timidity/timidity.h support.h \ ../timidity/common.h ../libarc/url.h mblock.h bitset.h -fft.o: fft.c ../config.h ../timidity/timidity.h support.h \ - ../timidity/common.h ../libarc/url.h mblock.h fft.h mblock.o: mblock.c ../config.h ../timidity/timidity.h support.h mblock.h memb.o: memb.c ../config.h ../timidity/timidity.h support.h memb.h \ mblock.h ../libarc/url.h -net.o: net.c ../config.h ../timidity/timidity.h support.h net.h nkflib.o: nkflib.c ../config.h ../timidity/timidity.h support.h \ ../timidity/common.h ../libarc/url.h mblock.h nkflib.h strtab.o: strtab.c ../config.h ../timidity/timidity.h support.h mblock.h \