diff -ruN TiMidity++-2.0.0/ChangeLog TiMidity++-2.0.1/ChangeLog --- TiMidity++-2.0.0/ChangeLog Sat Apr 17 15:03:49 1999 +++ TiMidity++-2.0.1/ChangeLog Sun Apr 25 08:20:47 1999 @@ -1,3 +1,39 @@ +1999-04-25 Masanao Izumo + + * Version 2.0.1 released. + +1999-04-24 Masanao Izumo + + * configure.in (--enable-dynamic): Bug fix. + +1999-04-23 Masanao Izumo + + * interface/server_c.c (cmd_timebase): Bug fix. + * interface/server_c.c (TMR_TEMPO): Ignore. (What is TMR_TEMPO ?) + +1999-04-21 Masanao Izumo + + * configure.in (HAVE_XMUREGISTEREXTERNALAGENT): Test for + XmuRegisterExternalAgent() + * configure.in (HAVE_X11_XMU_EXTAGENT_H): Test for + * interface/xaw_redef.c: Don't use if XmuRegisterExternalAgent is + not undefined. + * xaw_i.c: Fix bug about directory browsing. + * timidity/timidity.c (read_config_file): Avoid compiler warnings. + timidity/aq.c (do_effect): Likewise. + +1999-04-19 Eric A. Welsh + + * timidity/playmidi.c (play_midi_file): Reset the voice reduction + variables at the beginning of each midi. + +1999-04-18 Masanao Izumo + + * common.makefile interface/Makefile.am doc/Makefile.am: + Use variable `SUFFIXES', not target `.SUFFIXES' (for automake 1.4) + * timidity/resample.c (pre_resample): Fixed interger overflow bug. + * timidity/recache.c (resamp_cache_refer_off): Likewise. + 1999-04-17 Masanao Izumo * Version 2.0.0 released. diff -ruN TiMidity++-2.0.0/INSTALL TiMidity++-2.0.1/INSTALL --- TiMidity++-2.0.0/INSTALL Sat Apr 17 00:47:57 1999 +++ TiMidity++-2.0.1/INSTALL Sun Apr 25 07:08:07 1999 @@ -45,12 +45,12 @@ PREFIX is "/usr/local/". Any files are installed in : PREFIX/bin : executable file - PREFIX/lib : configuration files and patches + PREFIX/lib/timidity : configuration files and patches PREFIX/man : online manual - + Example: % sh configure --prefix=/opt/gnu - # installs to /opt/gnu/bin, /opt/gnu/lib, /opt/gnu/man + # installs to /opt/gnu/bin, /opt/gnu/lib/timidity, /opt/gnu/man --x-includes=DIR Specifies include directory of X library. @@ -61,9 +61,6 @@ --enable-debug Compiles TiMidity++ with debugging methods/informations. - --disable-dynamic - Disables the feature of dynamic loading interface. - --with-x You should specify this option if you have X Window environment. --with-x is `yes' by default. @@ -98,6 +95,9 @@ --enable-esd Enables TiMidity++ to play MIDI files using EsounD. + --enable-dynamic + Enables the feature of dynamic loading interface. + --enable-ncurses Includes Ncurses interface. If you build this interface as dinamic link interface, please specify --enable-ncurses=dynamic. @@ -160,7 +160,7 @@ contents format. - For example, including all functions: + For example: % sh configure --with-x --enable-audio \ --enable-ncurses --enable-slang --enable-motif \ @@ -176,10 +176,10 @@ (for example : super-sparc/gcc) (csh, tcsh) -% env CFLAGS='-O3 -Wall -mv8 -funroll-all-loops -fomit-frame-pointer -msupersparc -DAUDIO_FILLING_MILSEC=5000' sh configure [configure-options]... +% env CFLAGS='-O3 -Wall -mv8 -funroll-all-loops -fomit-frame-pointer -msupersparc sh configure [configure-options]... (sh, bash) -% CFLAGS='-O3 -Wall -mv8 -funroll-all-loops -fomit-frame-pointer -msupersparc -DAUDIO_FILLING_MILSEC=5000' sh configure [configure-options]... +% CFLAGS='-O3 -Wall -mv8 -funroll-all-loops -fomit-frame-pointer -msupersparc sh configure [configure-options]... diff -ruN TiMidity++-2.0.0/common.makefile.in TiMidity++-2.0.1/common.makefile.in --- TiMidity++-2.0.0/common.makefile.in Wed Mar 24 07:00:21 1999 +++ TiMidity++-2.0.1/common.makefile.in Sun Apr 18 15:45:21 1999 @@ -51,6 +51,3 @@ # Where to install the Tcl code, if you use the Tcl code that is. TCL_DIR = $(pkglibdir) - - -.SUFFIXES: .c .h .ptcl .tcl .o .1 .5 .txt .ps .@so@ diff -ruN TiMidity++-2.0.0/config.h.in TiMidity++-2.0.1/config.h.in --- TiMidity++-2.0.0/config.h.in Sun Apr 11 03:59:33 1999 +++ TiMidity++-2.0.1/config.h.in Wed Apr 21 10:50:31 1999 @@ -56,6 +56,9 @@ /* Define if you have the XShmCreatePixmap function. */ #undef HAVE_XSHMCREATEPIXMAP +/* Define if you have the XmuRegisterExternalAgent function. */ +#undef HAVE_XMUREGISTEREXTERNALAGENT + /* Define if you have the getcwd function. */ #undef HAVE_GETCWD @@ -106,6 +109,9 @@ /* Define if you have the vsnprintf function. */ #undef HAVE_VSNPRINTF + +/* Define if you have the header file. */ +#undef HAVE_X11_XMU_EXTAGENT_H /* Define if you have the header file. */ #undef HAVE_X11_EXTENSIONS_XSHM_H diff -ruN TiMidity++-2.0.0/configure TiMidity++-2.0.1/configure --- TiMidity++-2.0.0/configure Sat Apr 17 14:57:32 1999 +++ TiMidity++-2.0.1/configure Sun Apr 25 07:10:31 1999 @@ -46,7 +46,7 @@ ac_help="$ac_help --disable-alsatest Do not try to compile and run a test Alsa program" ac_help="$ac_help - --enable-dynamic Enable dynamic link interface " + --enable-dynamic Enable dynamic link interface (default is no)" ac_help="$ac_help --enable-ncurses Enable ncurses interface (default is no)" ac_help="$ac_help @@ -76,7 +76,7 @@ ac_help="$ac_help --enable-ump UMP configuration (default is no)" ac_help="$ac_help - --enable-server Enable Server interface (default is no)" + --enable-server Enable server interface (default is no)" ac_help="$ac_help --enable-offix Enable offix support (default is no)" ac_help="$ac_help @@ -854,7 +854,7 @@ PACKAGE=TiMidity++ -VERSION=2.0.0 +VERSION=2.0.1 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; } @@ -3053,8 +3053,63 @@ echo "$ac_t""no" 1>&6 fi + for ac_func in XmuRegisterExternalAgent +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:3060: checking for $ac_func" >&5 +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 < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:3088: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 -echo "configure:3058: checking for XawInitializeWidgetSet in -lXaw3d" >&5 +echo "configure:3113: 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 @@ -3062,7 +3117,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:3132: \"$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 @@ -3092,7 +3147,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 -echo "configure:3096: checking for XawInitializeWidgetSet in -lXaw" >&5 +echo "configure:3151: 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 @@ -3100,7 +3155,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:3170: \"$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 @@ -3135,7 +3190,7 @@ fi echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 -echo "configure:3139: checking for XmCreateForm in -lXm" >&5 +echo "configure:3194: 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 @@ -3143,7 +3198,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:3213: \"$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 @@ -3178,12 +3233,12 @@ for ac_func in XShmCreatePixmap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3182: checking for $ac_func" >&5 +echo "configure:3237: 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:3265: \"$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 @@ -3239,12 +3294,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:3243: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3298: 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> @@ -3252,7 +3307,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3277,7 +3332,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:3281: checking for opendir in -ldir" >&5 +echo "configure:3336: 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 @@ -3285,7 +3340,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:3355: \"$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 @@ -3318,7 +3373,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3322: checking for opendir in -lx" >&5 +echo "configure:3377: 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 @@ -3326,7 +3381,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:3396: \"$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 @@ -3360,12 +3415,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3364: checking for ANSI C header files" >&5 +echo "configure:3419: 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 @@ -3373,7 +3428,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3432: \"$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* @@ -3390,7 +3445,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 @@ -3408,7 +3463,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 @@ -3429,7 +3484,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3440,7 +3495,7 @@ exit (0); } EOF -if { (eval echo configure:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3464,12 +3519,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3468: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3523: 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 @@ -3485,7 +3540,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3508,21 +3563,22 @@ for ac_hdr in fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h \ 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 + sys/ipc.h sys/shm.h sys/param.h X11/extensions/XShm.h \ + X11/Xmu/ExtAgent.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3516: checking for $ac_hdr" >&5 +echo "configure:3572: 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:3526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3582: \"$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* @@ -3550,17 +3606,17 @@ ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:3554: checking for string.h" >&5 +echo "configure:3610: 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:3564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3620: \"$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* @@ -3584,12 +3640,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3588: checking for working const" >&5 +echo "configure:3644: 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:3698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3659,14 +3715,14 @@ fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3663: checking whether char is unsigned" >&5 +echo "configure:3719: 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:3758: \"$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 @@ -3722,14 +3778,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3726: checking whether byte ordering is bigendian" >&5 +echo "configure:3782: 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 @@ -3740,11 +3796,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3800: \"$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 @@ -3755,7 +3811,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3775,7 +3831,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:3848: \"$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 @@ -3812,21 +3868,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3816: checking for inline" >&5 +echo "configure:3872: 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:3886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3852,12 +3908,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3856: checking for off_t" >&5 +echo "configure:3912: 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 @@ -3885,12 +3941,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3889: checking for pid_t" >&5 +echo "configure:3945: 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 @@ -3918,12 +3974,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3922: checking for size_t" >&5 +echo "configure:3978: 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 @@ -3951,12 +4007,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3955: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4011: 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 @@ -3965,7 +4021,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3987,19 +4043,19 @@ echo $ac_n "checking volatile declaration""... $ac_c" 1>&6 -echo "configure:3991: checking volatile declaration" >&5 +echo "configure:4047: 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:4059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_volatile=yes else @@ -4017,12 +4073,12 @@ fi echo $ac_n "checking union semun declaration""... $ac_c" 1>&6 -echo "configure:4021: checking union semun declaration" >&5 +echo "configure:4077: 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 @@ -4031,7 +4087,7 @@ union semun x ; return 0; } EOF -if { (eval echo configure:4035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_union_semun=yes else @@ -4050,13 +4106,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4054: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4110: 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 @@ -4074,7 +4130,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -4096,7 +4152,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:4100: checking for 8-bit clean memcmp" >&5 +echo "configure:4156: 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 @@ -4104,7 +4160,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:4174: \"$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 @@ -4135,17 +4191,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4139: checking for $ac_hdr" >&5 +echo "configure:4195: 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:4149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4205: \"$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* @@ -4174,12 +4230,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4178: checking for $ac_func" >&5 +echo "configure:4234: 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:4262: \"$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 @@ -4227,7 +4283,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:4231: checking for working mmap" >&5 +echo "configure:4287: 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 @@ -4235,7 +4291,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:4435: \"$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 @@ -4398,7 +4454,7 @@ fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:4402: checking whether setvbuf arguments are reversed" >&5 +echo "configure:4458: 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 @@ -4406,7 +4462,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. */ @@ -4420,7 +4476,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:4424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4480: \"$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 @@ -4444,12 +4500,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4448: checking return type of signal handlers" >&5 +echo "configure:4504: 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 @@ -4466,7 +4522,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4485,12 +4541,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4489: checking for vprintf" >&5 +echo "configure:4545: 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:4573: \"$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 @@ -4537,12 +4593,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4541: checking for _doprnt" >&5 +echo "configure:4597: 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:4625: \"$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 @@ -4593,12 +4649,12 @@ sleep usleep strncasecmp strerror getopt getcwd popen signal do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4597: checking for $ac_func" >&5 +echo "configure:4653: 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:4681: \"$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 @@ -4650,12 +4706,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:4654: checking for opendir" >&5 +echo "configure:4710: 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:4738: \"$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 @@ -4706,12 +4762,12 @@ esac if test "x$enable_network" = "xyes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4710: checking for socket" >&5 +echo "configure:4766: 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:4794: \"$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 @@ -4752,7 +4808,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6 -echo "configure:4756: checking for WSAStartup in -lwsock32" >&5 +echo "configure:4812: 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 @@ -4760,7 +4816,7 @@ ac_save_LIBS="$LIBS" LIBS="-lwsock32 $LIBS" cat > conftest.$ac_ext < #include @@ -4769,7 +4825,7 @@ WSAStartup(0,0); ; return 0; } EOF -if { (eval echo configure:4773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4829: \"$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 @@ -4902,7 +4958,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:4906: checking for $ac_word" >&5 +echo "configure:4962: 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 @@ -4937,7 +4993,7 @@ min_esd_version=0.2.7 echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 -echo "configure:4941: checking for ESD - version >= $min_esd_version" >&5 +echo "configure:4997: checking for ESD - version >= $min_esd_version" >&5 no_esd="" if test "$ESD_CONFIG" = "no" ; then no_esd=yes @@ -4961,7 +5017,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5019,7 +5075,7 @@ EOF -if { (eval echo configure:5023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5053,7 +5109,7 @@ CFLAGS="$CFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" cat > conftest.$ac_ext < @@ -5063,7 +5119,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:5067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5123: \"$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" @@ -5119,7 +5175,7 @@ echo $ac_n "checking whether to enable audio""... $ac_c" 1>&6 -echo "configure:5123: checking whether to enable audio" >&5 +echo "configure:5179: checking whether to enable audio" >&5 # Check whether --enable-audio or --disable-audio was given. if test "${enable_audio+set}" = set; then enableval="$enable_audio" @@ -5187,7 +5243,7 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:5191: checking for ALSA CFLAGS" >&5 +echo "configure:5247: 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" @@ -5195,7 +5251,7 @@ echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:5199: checking for ALSA LDFLAGS" >&5 +echo "configure:5255: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -5207,7 +5263,7 @@ min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:5211: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:5267: 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/'` @@ -5217,7 +5273,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -5258,7 +5314,7 @@ ; return 0; } EOF -if { (eval echo configure:5262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -5272,7 +5328,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:5276: checking for snd_cards in -lasound" >&5 +echo "configure:5332: 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 @@ -5280,7 +5336,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:5351: \"$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 @@ -5426,9 +5482,9 @@ -# Check whether --with-enable-dynamic or --without-enable-dynamic was given. -if test "${with_enable_dynamic+set}" = set; then - withval="$with_enable_dynamic" +# Check whether --enable-enable-dynamic or --disable-enable-dynamic was given. +if test "${enable_enable_dynamic+set}" = set; then + enableval="$enable_enable_dynamic" test "x$enable_dynamic" = xyes && enable_dynamic=dynamic fi @@ -5446,12 +5502,12 @@ have_dl=no echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6 -echo "configure:5450: checking for LoadLibraryExA" >&5 +echo "configure:5506: checking for LoadLibraryExA" >&5 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibraryExA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5460,7 +5516,7 @@ LoadLibraryExA(0,0,0); ; return 0; } EOF -if { (eval echo configure:5464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wapi_cv_func_LoadLibraryExA=yes else @@ -5483,12 +5539,12 @@ if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:5487: checking for shl_load" >&5 +echo "configure:5543: 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:5571: \"$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 @@ -5536,12 +5592,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:5540: checking for dlopen" >&5 +echo "configure:5596: 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:5624: \"$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 @@ -5586,12 +5642,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:5590: checking for dld_init" >&5 +echo "configure:5646: 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:5674: \"$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 @@ -5636,7 +5692,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:5640: checking for dld_init in -ldld" >&5 +echo "configure:5696: 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 @@ -5644,7 +5700,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:5715: \"$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 @@ -5678,13 +5734,13 @@ fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:5682: checking dynamic link method" >&5 +echo "configure:5738: 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:5688: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:5744: 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 @@ -5832,17 +5888,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5836: checking for $ac_hdr" >&5 +echo "configure:5892: 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:5846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5902: \"$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* @@ -5883,7 +5939,7 @@ esac echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:5887: checking for initscr in -lncurses" >&5 +echo "configure:5943: 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 @@ -5891,7 +5947,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:5962: \"$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 @@ -5921,7 +5977,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:5925: checking for PDC_set_ctrl_break in -lcurses" >&5 +echo "configure:5981: 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 @@ -5929,7 +5985,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:6000: \"$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 @@ -6027,7 +6083,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:6031: checking for SLang_init_tty in -lslang" >&5 +echo "configure:6087: 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 @@ -6035,7 +6091,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:6106: \"$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 @@ -6072,17 +6128,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6076: checking for $ac_hdr" >&5 +echo "configure:6132: 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:6086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6142: \"$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* @@ -6134,7 +6190,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:6138: checking for initscr in -ltermcap" >&5 +echo "configure:6194: 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 @@ -6142,7 +6198,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:6213: \"$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 @@ -6273,7 +6329,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:6277: checking for Tcl_Init in -l$l" >&5 +echo "configure:6333: 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 @@ -6281,7 +6337,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:6352: \"$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 @@ -6316,7 +6372,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:6320: checking for Tk_Init in -l$l" >&5 +echo "configure:6376: 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 @@ -6324,7 +6380,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:6395: \"$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 @@ -6701,7 +6757,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:6705: checking for $ac_word" >&5 +echo "configure:6761: 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 @@ -6736,7 +6792,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6740: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6796: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -6759,7 +6815,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6825,7 +6881,7 @@ } EOF -if { (eval echo configure:6829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6859,7 +6915,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -6869,7 +6925,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:6873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6929: \"$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" @@ -7010,17 +7066,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:7014: checking for X11/xpm.h" >&5 +echo "configure:7070: 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:7024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7080: \"$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* @@ -7043,7 +7099,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:7047: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:7103: 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 @@ -7051,7 +7107,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:7122: \"$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 @@ -7158,17 +7214,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7162: checking for $ac_hdr" >&5 +echo "configure:7218: 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:7172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7228: \"$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* @@ -7219,7 +7275,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:7223: checking for DndInitialize in -lDnd" >&5 +echo "configure:7279: 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 @@ -7227,7 +7283,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:7298: \"$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 @@ -7321,7 +7377,7 @@ EXTRADEFS="$EXTRADEFS -DWRDT_X" enable_sherry_wrd=yes echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6 -echo "configure:7325: checking for zlibVersion in -lz" >&5 +echo "configure:7381: 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 @@ -7329,7 +7385,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:7400: \"$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 @@ -7363,17 +7419,17 @@ ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:7367: checking for png.h" >&5 +echo "configure:7423: 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:7377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7433: \"$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* @@ -7396,7 +7452,7 @@ fi echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6 -echo "configure:7400: checking for png_init_io in -lpng" >&5 +echo "configure:7456: 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 @@ -7404,7 +7460,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:7475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff -ruN TiMidity++-2.0.0/configure.in TiMidity++-2.0.1/configure.in --- TiMidity++-2.0.0/configure.in Sat Apr 17 00:45:14 1999 +++ TiMidity++-2.0.1/configure.in Sun Apr 25 07:06:37 1999 @@ -53,7 +53,7 @@ AC_INIT(timidity/timidity.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.0.0, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.0.1, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -254,6 +254,7 @@ have_xprelibs=no) AC_CHECK_LIB(Xt,XtVaAppInitialize,have_xt=yes; LIBS="-lXt $LIBS",have_xt=no) AC_CHECK_LIB(Xmu,XmuInternAtom,LIBS="-lXmu $LIBS") + AC_CHECK_FUNCS(XmuRegisterExternalAgent) AC_CHECK_LIB(Xaw3d,XawInitializeWidgetSet,have_xaw=3d, [ AC_CHECK_LIB(Xaw,XawInitializeWidgetSet,have_xaw=yes,have_xaw=no) ]) AC_CHECK_LIB(Xm,XmCreateForm,have_xm=yes,have_xm=no) @@ -269,7 +270,8 @@ AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h \ 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) + sys/ipc.h sys/shm.h sys/param.h X11/extensions/XShm.h \ + X11/Xmu/ExtAgent.h) AC_CHECK_HEADER(string.h,, [ EXTRADEFS="$EXTRADEFS -DNO_STRING_H " ]) dnl Checks for typedefs, structures, and compiler characteristics. @@ -530,8 +532,8 @@ dnl Dynamic link configuration -AC_ARG_WITH(enable-dynamic, - [ --enable-dynamic Enable dynamic link interface ], +AC_ARG_ENABLE(enable-dynamic, + [ --enable-dynamic Enable dynamic link interface (default is no)], [ dnl --enable-dynamic=yes to --enable-dynamic=dynamic test "x$enable_dynamic" = xyes && enable_dynamic=dynamic ]) @@ -886,7 +888,7 @@ dnl TiMidity Network MIDI Server AM_CONDITIONAL(ENABLE_SERVER, false) CONFIG_INTERFACE(server,SERVER,r, - [ --enable-server Enable Server interface (default is no)], + [ --enable-server Enable server interface (default is no)], , [ INTERFACE_SRCS="$INTERFACE_SRCS server_c.c" AC_CHECK_HEADERS(sys/soundcard.h) diff -ruN TiMidity++-2.0.0/doc/Makefile.am TiMidity++-2.0.1/doc/Makefile.am --- TiMidity++-2.0.0/doc/Makefile.am Thu Jan 14 12:37:44 1999 +++ TiMidity++-2.0.1/doc/Makefile.am Sun Apr 18 15:55:21 1999 @@ -17,6 +17,8 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include $(top_builddir)/common.makefile +SUFFIXES = .1 .5 .txt .ps + SUBDIRS = C ja_JP.ujis lang_target = C @@ -26,8 +28,11 @@ .1.txt: groff -man -Tlatin1 -P-b -P-u $< >$@ - .1.ps: + groff -man $< >$@ +.5.txt: + groff -man -Tlatin1 -P-b -P-u $< >$@ +.5.ps: groff -man $< >$@ timidity.1: diff -ruN TiMidity++-2.0.0/doc/Makefile.in TiMidity++-2.0.1/doc/Makefile.in --- TiMidity++-2.0.0/doc/Makefile.in Sat Apr 17 21:56:11 1999 +++ TiMidity++-2.0.1/doc/Makefile.in Sun Apr 25 08:21:37 1999 @@ -110,6 +110,8 @@ program_transform_name = @program_transform_name@ so = @so@ tcltk_dep = @tcltk_dep@ +SUFFIXES = .1 .5 .txt .ps + SUBDIRS = C ja_JP.ujis lang_target = C @@ -132,6 +134,7 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: +.SUFFIXES: .1 .5 .ps .txt $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile @@ -401,8 +404,11 @@ .1.txt: groff -man -Tlatin1 -P-b -P-u $< >$@ - .1.ps: + groff -man $< >$@ +.5.txt: + groff -man -Tlatin1 -P-b -P-u $< >$@ +.5.ps: groff -man $< >$@ timidity.1: diff -ruN TiMidity++-2.0.0/interface/Makefile.am TiMidity++-2.0.1/interface/Makefile.am --- TiMidity++-2.0.0/interface/Makefile.am Mon Apr 5 23:54:55 1999 +++ TiMidity++-2.0.1/interface/Makefile.am Sun Apr 18 15:50:49 1999 @@ -18,6 +18,9 @@ include $(top_builddir)/common.makefile +SUFFIXES = .ptcl .tcl .@so@ + + SUBDIRS = motif_bitmaps bitmaps pixmaps INCLUDES = \ diff -ruN TiMidity++-2.0.0/interface/Makefile.in TiMidity++-2.0.1/interface/Makefile.in --- TiMidity++-2.0.0/interface/Makefile.in Sat Apr 17 21:55:55 1999 +++ TiMidity++-2.0.1/interface/Makefile.in Sun Apr 25 08:21:22 1999 @@ -109,6 +109,8 @@ so = @so@ tcltk_dep = @tcltk_dep@ +SUFFIXES = .ptcl .tcl .@so@ + SUBDIRS = motif_bitmaps bitmaps pixmaps INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/timidity -I$(top_srcdir)/libarc -I$(top_srcdir)/utils $(EXTRAINCS) @@ -203,7 +205,7 @@ all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .o .s +.SUFFIXES: .@so@ .S .c .o .ptcl .s .tcl $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps interface/Makefile @@ -471,7 +473,7 @@ ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ ../timidity/instrum.h ../timidity/playmidi.h \ ../timidity/readmidi.h ../timidity/controls.h ../utils/timer.h \ - ../interface.h xaw_redef.c + ../utils/strtab.h ../interface.h xaw_redef.c 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 \ diff -ruN TiMidity++-2.0.0/interface/server_c.c TiMidity++-2.0.1/interface/server_c.c --- TiMidity++-2.0.0/interface/server_c.c Fri Apr 16 21:42:04 1999 +++ TiMidity++-2.0.1/interface/server_c.c Fri Apr 23 21:36:41 1999 @@ -84,6 +84,7 @@ #define DONT_STOP_AUDIO 1 #define DEFAULT_TIMEBASE 100 /* HZ? */ #define MAXTICKDIFF 150 +#define SIG_TIMEOUT_SEC 3 static int cmd_help(int argc, char **argv); @@ -124,8 +125,8 @@ "CLOSE\tShutdown current data connection", 1, 1, cmd_close}, {"TIMEBASE", - "TIMEBASE \n\tSet time base", - 1, 1, cmd_timebase}, + "TIMEBASE [timebase]\n\tSet time base", + 1, 2, cmd_timebase}, {"RESET", "RESET\tInitialize all of MIDI status", 1, 1, cmd_reset}, @@ -347,6 +348,12 @@ return sfd; } +static RETSIGTYPE sig_timeout(int sig) +{ + signal(SIGALRM, sig_timeout); /* For SysV base */ + /* Expect EINTR */ +} + static void doit(void); static int send_status(int status, char *message, ...); static void compute_sample_increment(void); @@ -378,6 +385,8 @@ opt_realtime_playing = 2; /* Enable loading patch while playing */ allocate_cache_size = 0; /* Don't use pre-calclated samples */ /* aq_set_soft_queue(-1.0, 0.0); */ + alarm(0); + signal(SIGALRM, sig_timeout); play_mode->close_output(); while(1) @@ -512,7 +521,7 @@ static void compute_sample_increment(void) { - double a; + double a; a = (double)current_play_tempo * (double)play_mode->rate * (65536.0/500000.0) / (double)curr_timebase, sample_correction = (int32)(a) & 0xFFFF; @@ -856,7 +865,11 @@ memset(&in, 0, addrlen); send_status(200, "%d is ready acceptable", port); - if((data_fd = accept(sock, (struct sockaddr *)&in, &addrlen)) < 0) + alarm(SIG_TIMEOUT_SEC); + data_fd = accept(sock, (struct sockaddr *)&in, &addrlen); + alarm(0); + + if(data_fd < 0) { send_status(512, "Accept error"); close(sock); @@ -917,13 +930,18 @@ static int cmd_timebase(int argc, char **argv) { - int i = atoi(argv[1]); + int i; + + if(argc == 1) + return send_status(200, "%d OK", curr_timebase); + i = atoi(argv[1]); if(i < 1) i = 1; else if(i > 1000) i = 1000; if(i != curr_timebase) { + curr_timebase = i; compute_sample_increment(); tick_offs = curr_tick; start_time = get_current_calender_time(); @@ -1279,6 +1297,7 @@ "Undefined data 0x%02x", data_buffer[offset - 1]); send_status(401, "Wrong data is recieved (seqcmd=0x%02x)", cmd); + stop_playing(); return 1; } #undef READ_NEEDBUF @@ -1443,12 +1462,14 @@ break; case TMR_TEMPO: +#if 0 /* What should TMR_TEMPO work ? */ if(val < 8) val = 8; else if(val > 250) val = 250; - current_play_tempo = 60 * 500000 / val; + current_play_tempo = 60 * 1000000 / val; compute_sample_increment(); +#endif break; case TMR_WAIT_ABS: diff -ruN TiMidity++-2.0.0/interface/xaw_i.c TiMidity++-2.0.1/interface/xaw_i.c --- TiMidity++-2.0.0/interface/xaw_i.c Sat Apr 17 01:34:13 1999 +++ TiMidity++-2.0.1/interface/xaw_i.c Wed Apr 21 17:21:57 1999 @@ -75,6 +75,7 @@ #include "readmidi.h" #include "controls.h" #include "timer.h" +#include "strtab.h" #ifndef S_ISDIR #define S_ISDIR(mode) (((mode)&0xF000) == 0x4000) @@ -227,6 +228,7 @@ extern int a_pipe_nread(char *buf, int n); static void initStatus(void); static void xaw_vendor_setup(void); +static void safe_getcwd(char *cwd, int maxlen); static Widget title_mb,title_sm,time_l,popup_load,popup_load_f,load_d,load_t; static Widget load_vport,load_flist,cwd_l,load_info, lyric_t; @@ -368,19 +370,19 @@ x_hot,y_hot, root_height, root_width; static Pixmap bm_Pixmap[MAXBITMAP]; static int max_files, init_options = 0, init_chorus = 0; -char basepath[PATH_MAX]; -String *dirlist = NULL, *flist = NULL; -Dimension trace_width, trace_height, menu_width; +static char basepath[PATH_MAX]; +static String *dirlist = NULL, dirlist_top, *flist = NULL; +static Dimension trace_width, trace_height, menu_width; static int total_time = 0, curr_time; static float thumbj; static XFontStruct *labelfont,*volumefont,*tracefont; #ifdef I18N -XFontSet ttitlefont; -XFontStruct *ttitlefont0; -char **ml; -XFontStruct **fs_list; +static XFontSet ttitlefont; +static XFontStruct *ttitlefont0; +static char **ml; +static XFontStruct **fs_list; #else -XFontStruct *ttitlefont; +static XFontStruct *ttitlefont; #define ttitlefont0 ttitlefont #endif @@ -1504,6 +1506,63 @@ return(s1); } +/* Canonicalize by removing /. and /foo/.. if they appear. */ +static char *canonicalize_path(char *path) +{ + char *o, *p, *target; + int abspath; + + o = p = path; + while(*p) + { + if(p[0] == '/' && p[1] == '/') + p++; + else + *o++ = *p++; + } + while(path < o-1 && path[o - path - 1] == '/') + o--; + path[o - path] = '\0'; + + if((p = strchr(path, '/')) == NULL) + return path; + abspath = (p == path); + + o = target = p; + while(*p) + { + if(*p != '/') + *o++ = *p++; + else if(p[0] == '/' && p[1] == '.' + && (p[2]=='/' || p[2] == '\0')) + { + /* If "/." is the entire filename, keep the "/". Otherwise, + just delete the whole "/.". */ + if(o == target && p[2] == '\0') + *o++ = *p; + p += 2; + } + else if(p[0] == '/' && p[1] == '.' && p[2] == '.' + /* `/../' is the "superroot" on certain file systems. */ + && o != target + && (p[3]=='/' || p[3] == '\0')) + { + while(o != target && (--o) && *o != '/') + ; + p += 3; + if(o == target && !abspath) + o = target = p; + } + else + *o++ = *p++; + } + + target[o - target] = '\0'; + if(!*path) + strcpy(path, "/"); + return path; +} + static char *expandDir(char *path, DirPath *full) { static char tmp[PATH_MAX]; static char newfull[PATH_MAX]; @@ -1515,7 +1574,7 @@ full->dirname = tmp; full->basename = NULL; strcpy(newfull, tmp); return newfull; - } else if (NULL == (tail = strrchr(path, '/'))) { + } else if (*p != '~' && NULL == (tail = strrchr(path, '/'))) { p = tmp; strcpy(p, basepath); full->dirname = p; @@ -1550,7 +1609,7 @@ snprintf(tmp, sizeof(tmp), "%s/%s", basepath, path); } } - p = tmp; + p = canonicalize_path(tmp); tail = strrchr(p, '/'); *tail++ = '\0'; full->dirname = p; full->basename = tail; @@ -1573,7 +1632,13 @@ strcpy(basepath,p); p = strrchr(basepath, '/'); if (*(p+1) == '\0') *p = '\0'; - lrs.string = ""; dirlist[0] = (char *)NULL; + lrs.string = ""; + if(dirlist != NULL) + { + free(dirlist_top); + free(dirlist); + dirlist = NULL; + } setDirList(load_flist, cwd_l, &lrs); } } @@ -1603,36 +1668,31 @@ static void setDirList(Widget list, Widget label, XawListReturnStruct *lrs) { URL dirp; struct stat st; - char *p, currdir[PATH_MAX], filename[PATH_MAX]; + char currdir[PATH_MAX], filename[PATH_MAX]; int i, d_num, f_num; - strcpy(currdir, basepath); - - if(!strncmp("../", lrs->string, 3)) { - if(currdir != (p = strrchr(currdir, '/'))) - *p = '\0'; - else - currdir[1] = '\0'; - } else { - if(currdir[1] != '\0') strcat(currdir, "/"); - strcat(currdir, lrs->string); - if(stat(currdir, &st) == -1) return; - if(!S_ISDIR(st.st_mode)) { + snprintf(currdir, sizeof(currdir)-1, "%s/%s", basepath, lrs->string); + canonicalize_path(currdir); + if(stat(currdir, &st) == -1) return; + if(!S_ISDIR(st.st_mode)) { XtVaSetValues(load_d,XtNvalue,currdir,NULL); return; - } - currdir[strlen(currdir)-1] = '\0'; - } + } + if (NULL != (dirp=url_dir_open(currdir))) { char *fullpath; MBlockList pool; + StringTable strtab; init_mblock(&pool); - for(i= 0; dirlist[i] != NULL; i++) - XtFree(dirlist[i]); + if(dirlist != NULL) + { + free(dirlist_top); + free(dirlist); + } + init_string_table(&strtab); i = 0; d_num = 0; f_num = 0; - while (url_gets(dirp, filename, sizeof(filename)) != NULL - && i < MAX_DIRECTORY_ENTRY) { + while (url_gets(dirp, filename, sizeof(filename)) != NULL) { fullpath = (char *)new_segment(&pool,strlen(currdir) +strlen(filename) +2); sprintf(fullpath, "%s/%s", currdir, filename); if(stat(fullpath, &st) == -1) continue; @@ -1644,18 +1704,24 @@ } else { f_num++; } - dirlist[i] = XtMalloc(sizeof(char) * (strlen(filename) + 1)); - strcpy(dirlist[i++], filename); + put_string_table(&strtab, filename, strlen(filename)); + i++; } + dirlist = (String *)make_string_array(&strtab); + dirlist_top = (String)dirlist[0]; /* Marking for free() */ qsort (dirlist, i, sizeof (char *), dirlist_cmp); - dirlist[i] = NULL; snprintf(local_buf, sizeof(local_buf), "%d Directories, %d Files", d_num, f_num); XawListChange(list,dirlist,0,0,True); - XtVaSetValues(label,XtNlabel,currdir,NULL); - XtVaSetValues(load_info,XtNlabel,local_buf,NULL); - strcpy(basepath, currdir); - XtVaSetValues(load_d,XtNvalue,currdir,NULL); } + else + strcpy(local_buf, "Can't read directry"); + + XtVaSetValues(load_info,XtNlabel,local_buf,NULL); + XtVaSetValues(label,XtNlabel,currdir,NULL); + strcpy(basepath, currdir); + if(currdir[strlen(currdir) - 1] != '/') + strcat(currdir, "/"); + XtVaSetValues(load_d,XtNvalue,currdir,NULL); } static void drawBar(int ch,int len, int xofs, int column, Pixel color) { @@ -3060,12 +3126,9 @@ XReadBitmapFile(disp,RootWindow(disp,screen),cbuf,&bm_width[i],&bm_height[i], &bm_Pixmap[i],&x_hot,&y_hot); } -#ifndef STDC_HEADERS - getwd(basepath); -#else - getcwd(basepath, sizeof(basepath)); -#endif - if (!strlen(basepath)) strcat(basepath, "/"); + + safe_getcwd(basepath, sizeof(basepath)); + #ifdef OFFIX DndInitialize(toplevel); DndRegisterOtherDrop(FileDropedHandler); @@ -3282,8 +3345,7 @@ XtAddCallback(time_l,XtNcallback,(XtCallbackProc)filemenuAction,NULL); XtRealizeWidget(toplevel); - dirlist =(String *)malloc(sizeof(String)* MAX_DIRECTORY_ENTRY); - dirlist[0] = (char *)NULL; + dirlist = NULL; lrs.string = ""; setDirList(load_flist, cwd_l, &lrs); XtSetKeyboardFocus(base_f, base_f); @@ -3474,6 +3536,19 @@ XtAppMainLoop(app_con); } +static void safe_getcwd(char *cwd, int maxlen) +{ +#ifndef STDC_HEADERS + if(!getwd(cwd)) +#else + if(!getcwd(cwd, maxlen)) +#endif + { + ctl->cmsg(CMSG_WARNING, VERB_NORMAL, + "Warning: Can't get current working directory"); + strcpy(cwd, "."); + } +} #include "interface.h" #if defined(IA_MOTIF) diff -ruN TiMidity++-2.0.0/interface/xaw_redef.c TiMidity++-2.0.1/interface/xaw_redef.c --- TiMidity++-2.0.0/interface/xaw_redef.c Sat Mar 20 07:53:50 1999 +++ TiMidity++-2.0.1/interface/xaw_redef.c Wed Apr 21 11:02:41 1999 @@ -1,3 +1,24 @@ +/* Masanao Izumo : + * + * There is probrem if both -lXm and -lXaw are linked. + * This source code to re-define XAW vendorShell. + * To change motif vendorShell to XAW vendorShell in runtime. + * + * #define vendorShellClassRec xaw_vendorShellClassRec + * #define vendorShellWidgetClass xaw_vendorShellWidgetClass + * #include "xaw_redef.c" + * #undef vendorShellClassRec + * #undef vendorShellWidgetClass + * extern WidgetClass vendorShellWidgetClass; + * extern VendorShellClassRec vendorShellClassRec; + * static void xaw_vendor_setup(void) + * { + * memcpy(&vendorShellClassRec, &xaw_vendorShellClassRec, + * sizeof(VendorShellClassRec)); + * vendorShellWidgetClass = (WidgetClass)&xaw_vendorShellWidgetClass; + * } + */ + /* $XConsortium: Vendor.c,v 1.27 94/04/17 20:13:25 kaleb Exp $ */ /*********************************************************** @@ -65,7 +86,26 @@ #include #include #include + + +#ifdef HAVE_XMUREGISTEREXTERNALAGENT +#ifdef HAVE_X11_XMU_EXTAGENT_H #include +#else +/* There is no ExtAgent.h in openwin package, but XmuRegisterExternalAgent + * is surely defined in libXmu on Solaris 7. + */ +extern void XmuRegisterExternalAgent( +#if NeedFunctionPrototypes + Widget /* w */, + XtPointer /* data */, + XEvent* /* event */, + Boolean* /* cont */ +#endif +); +#endif /* HAVE_X11_XMU_EXTAGENT_H */ +#endif /* HAVE_XMUREGISTEREXTERNALAGENT */ + /* The following two headers are for the input method. */ @@ -642,7 +682,10 @@ Cardinal *num_args; { XtAddEventHandler(new, (EventMask) 0, TRUE, _XEditResCheckMessages, NULL); +#ifdef HAVE_XMUREGISTEREXTERNALAGENT XtAddEventHandler(new, (EventMask) 0, TRUE, XmuRegisterExternalAgent, NULL); +#endif /* HAVE_XMUREGISTEREXTERNALAGENT */ + XtCreateWidget("shellext", xawvendorShellExtWidgetClass, new, args, *num_args); } diff -ruN TiMidity++-2.0.0/timidity/aq.c TiMidity++-2.0.1/timidity/aq.c --- TiMidity++-2.0.0/timidity/aq.c Sat Apr 17 01:09:55 1999 +++ TiMidity++-2.0.1/timidity/aq.c Wed Apr 21 17:37:22 1999 @@ -88,7 +88,7 @@ /* effect.c */ extern void init_effect(void); -extern do_effect(int32* buf, int32 count); +extern int do_effect(int32* buf, int32 count); void aq_setup(void) { diff -ruN TiMidity++-2.0.0/timidity/playmidi.c TiMidity++-2.0.1/timidity/playmidi.c --- TiMidity++-2.0.0/timidity/playmidi.c Sat Apr 17 14:30:07 1999 +++ TiMidity++-2.0.1/timidity/playmidi.c Tue Apr 20 02:55:32 1999 @@ -3472,6 +3472,13 @@ /* Reset restart offset */ midi_restart_time = 0; +#ifdef REDUCE_VOICE_TIME_TUNING + /* Reset voice reduction stuff */ + min_bad_nv = 256; + max_good_nv = 1; + old_rate = -1; +#endif + play_reload: /* Come here to reload MIDI file */ rc = play_midi_load_file(fn, &event, &nsamples); if(RC_IS_SKIP_FILE(rc)) diff -ruN TiMidity++-2.0.0/timidity/recache.c TiMidity++-2.0.1/timidity/recache.c --- TiMidity++-2.0.0/timidity/recache.c Mon Mar 1 20:32:28 1999 +++ TiMidity++-2.0.1/timidity/recache.c Sun Apr 18 15:24:39 1999 @@ -173,7 +173,7 @@ a = ((double)sp->sample_rate * freq_table[note]) / ((double)sp->root_freq * play_mode->rate); - slen = (int32)(sp->data_length / a); + slen = (int32)((sp->data_length >> FRACTION_BITS) / a); if(len > slen) len = slen; } diff -ruN TiMidity++-2.0.0/timidity/resample.c TiMidity++-2.0.1/timidity/resample.c --- TiMidity++-2.0.0/timidity/resample.c Sat Apr 17 13:10:03 1999 +++ TiMidity++-2.0.1/timidity/resample.c Sun Apr 18 15:31:54 1999 @@ -866,6 +866,13 @@ a = ((double) (sp->sample_rate) * freq_table[(int) (sp->note_to_use)]) / ((double) (sp->root_freq) * play_mode->rate); + if(sp->data_length / a >= 0x7fffffffL) + { + /* Too large to compute */ + ctl->cmsg(CMSG_INFO, VERB_DEBUG, " *** Can't pre-resampling for note %d", + sp->note_to_use); + return; + } newlen = (int32)(sp->data_length / a); dest = newdata = (int16 *)safe_malloc((newlen >> (FRACTION_BITS - 1)) + 2); diff -ruN TiMidity++-2.0.0/timidity/timidity.c TiMidity++-2.0.1/timidity/timidity.c --- TiMidity++-2.0.0/timidity/timidity.c Fri Apr 16 18:34:25 1999 +++ TiMidity++-2.0.1/timidity/timidity.c Wed Apr 21 17:38:58 1999 @@ -1127,7 +1127,7 @@ i = 0; } if((cp = strchr(tmp + i, '#')) != NULL) { - if(cp == tmp + i || isspace(cp[-1]) || isspace(cp[1])) + if(cp == tmp + i || isspace((int)cp[-1]) || isspace((int)cp[1])) *cp = '\0'; }