diff -ruN TiMidity++-1.0.0/ChangeLog TiMidity++-1.0.1/ChangeLog --- TiMidity++-1.0.0/ChangeLog Wed Jan 6 16:21:50 1999 +++ TiMidity++-1.0.1/ChangeLog Thu Jan 14 17:54:35 1999 @@ -1,4 +1,54 @@ -* 1/6, 1999 +-- 1.0.1 +Summary: + * Define function of vsnprintf() and snprintf() if it is not exists. + * Fixed message transfer probrem with '\n' for some interface. + * Modified manual installation. + * Check libXaw3d before checking libXaw. + * Fixed ALSA configuration probrem. + * Modified for OffiX interface. + * Tcl/tk interface can start with no midi file arguments. + * Modified doc/C/README.xskin + +Date: Thu Jan 14, 1999 +From: Masanao Izumo +Files: timidity/common.c interface/{motif_c.c,slang_c.c,vt100_c,ncurs_c.c,c, + xaw_i.c,xaw_c.c,tk_c.c,wrdt_x.c} + Define function of vsnprintf() and snprintf() if it is not exists. + And use it some where. + Fixed Tck/Tk message transfer probrem with '\n' (Not completed) +Files: interface/xaw_c.c interface/xaw_i.c + Fixed XAW message transfer probrem with '\n'. +Files: configure.in doc/Makefile* doc/*/Makefile* + Modified manual installation. +Files: configure.in interface/xaw.h + Check libXaw3d before checking libXaw. + Modified the comment in xaw.h + +Date: Tue, 12 Jan 1999 22:00:26 +0900 +From: Yamahata Isaku +Files: configure.in acinclude.m4 + Fixed ALSA configuration probrem. + +Date: Tue, 12 Jan 1999 21:25:32 +0900 +From: Takanori Watanabe +Files: interface/xaw.h interface/xaw_i.c + Modified for OffiX file drag & drop interface for xaw. (need libDnd) + This interface is not enabled by default. If you want build this, + define OFFIX in interface/xaw.h and link libDnd. + xaw.h:WIDGET_IS_LABEL_WIDGET is undefined by default. + +Date: Tue, 12 Jan 1999 11:38:16 +0900 +From: "KINOSHITA, K." +Files: interface/tk_c.c interface/tkpanel.tcl interface/timidity.c + Tcl/tk interface can start with no midi file arguments. + +Date: Sun, 10 Jan 1999 18:58:17 +0900 (JST) +From: Yoshishige Arai +Files: doc/C/README.xskin + Fixed spelling and syntax. + +-- 1.0.0 +1/6, 1999 Major changes from 0.2i: * Install with `configure' script. * Synchronization for audio and interface controls. diff -ruN TiMidity++-1.0.0/Makefile.am TiMidity++-1.0.1/Makefile.am --- TiMidity++-1.0.0/Makefile.am Wed Jan 6 17:43:11 1999 +++ TiMidity++-1.0.1/Makefile.am Thu Jan 14 12:10:34 1999 @@ -53,5 +53,5 @@ cd timidity; $(MAKE) install dist-hook: - chmod -R a+r TiMidity++-1.0.0 + chmod -R a+r $(distdir) $(TAR) chof - $(distdir) | bzip2 -9 --repetitive-best - > $(distdir).tar.bz2 diff -ruN TiMidity++-1.0.0/Makefile.in TiMidity++-1.0.1/Makefile.in --- TiMidity++-1.0.0/Makefile.in Wed Jan 6 17:43:18 1999 +++ TiMidity++-1.0.1/Makefile.in Thu Jan 14 17:56:46 1999 @@ -93,6 +93,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ @@ -385,7 +386,7 @@ cd timidity; $(MAKE) install dist-hook: - chmod -R a+r TiMidity++-1.0.0 + chmod -R a+r $(distdir) $(TAR) chof - $(distdir) | bzip2 -9 --repetitive-best - > $(distdir).tar.bz2 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -ruN TiMidity++-1.0.0/NEWS TiMidity++-1.0.1/NEWS --- TiMidity++-1.0.0/NEWS Wed Jan 6 16:15:04 1999 +++ TiMidity++-1.0.1/NEWS Thu Jan 14 12:15:10 1999 @@ -1,3 +1,7 @@ +* 1/14, 1999 + Modfied for OffiX file drag & drop interface for xaw. If you want + build this, define OFFIX in interface/xaw.h and link libDnd. + * 1/6, 1999 TiMidity++-1.0.0 is released. See `ChangeLog' for major changes from the original of TiMidity 0.2i diff -ruN TiMidity++-1.0.0/acinclude.m4 TiMidity++-1.0.1/acinclude.m4 --- TiMidity++-1.0.0/acinclude.m4 Wed Jan 6 14:09:39 1999 +++ TiMidity++-1.0.1/acinclude.m4 Thu Jan 14 11:03:00 1999 @@ -38,17 +38,17 @@ dnl Get the clfags and libraries for alsa dnl have_alsa=no -AC_ARG_WITH(alsa-prefix,[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], +AC_ARG_WITH(alsa-prefix,[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], [alsa_prefix="$withval"], [alsa_prefix=""]) -AC_ARG_WITH(alsa-inc-prefix, [ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], +AC_ARG_WITH(alsa-inc-prefix, [ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], [alsa_inc_prefix="$withval"], [alsa_inc_prefix=""]) -AC_ARG_ENABLE(alsatest, [ --disable-alsatest Do not try to compile and run a test Alsa program], [enable_alsatest=no], [enable_alsatest=yes]) +AC_ARG_ENABLE(alsatest, [ --disable-alsatest Do not try to compile and run a test Alsa program], [enable_alsatest=no], [enable_alsatest=yes]) dnl Add any special include directories AC_MSG_CHECKING(for ALSA CFLAGS) if test "$alsa_inc_prefix" != "" ; then ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" - CFLAGS="-I$alsa_inc_prefix" + CFLAGS="$CFLAGS -I$alsa_inc_prefix" fi AC_MSG_RESULT($ALSA_CFLAGS) @@ -61,7 +61,6 @@ dnl add the alsa library ALSA_LIBS="$ALSA_LIBS -lasound" -LDFLAGS="$ALSA_LIBS -lasound" AC_MSG_RESULT($ALSA_LIBS) dnl Check for the presence of the library @@ -205,7 +204,7 @@ } EOM : Call the object file tmp-dyna.o in case dlext=o. -if ${CC-cc} $CFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 && +if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 && mv dyna.o tmp-dyna.o > /dev/null 2>&1 && $SHLD $SHLDFLAGS -o dyna.$sharedLibExtension tmp-dyna.o > /dev/null 2>&1 && ${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.$ac_ext $LIBS > /dev/null 2>&1; then diff -ruN TiMidity++-1.0.0/aclocal.m4 TiMidity++-1.0.1/aclocal.m4 --- TiMidity++-1.0.0/aclocal.m4 Wed Jan 6 17:41:29 1999 +++ TiMidity++-1.0.1/aclocal.m4 Thu Jan 14 12:38:33 1999 @@ -50,17 +50,17 @@ dnl Get the clfags and libraries for alsa dnl have_alsa=no -AC_ARG_WITH(alsa-prefix,[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], +AC_ARG_WITH(alsa-prefix,[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], [alsa_prefix="$withval"], [alsa_prefix=""]) -AC_ARG_WITH(alsa-inc-prefix, [ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], +AC_ARG_WITH(alsa-inc-prefix, [ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], [alsa_inc_prefix="$withval"], [alsa_inc_prefix=""]) -AC_ARG_ENABLE(alsatest, [ --disable-alsatest Do not try to compile and run a test Alsa program], [enable_alsatest=no], [enable_alsatest=yes]) +AC_ARG_ENABLE(alsatest, [ --disable-alsatest Do not try to compile and run a test Alsa program], [enable_alsatest=no], [enable_alsatest=yes]) dnl Add any special include directories AC_MSG_CHECKING(for ALSA CFLAGS) if test "$alsa_inc_prefix" != "" ; then ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" - CFLAGS="-I$alsa_inc_prefix" + CFLAGS="$CFLAGS -I$alsa_inc_prefix" fi AC_MSG_RESULT($ALSA_CFLAGS) @@ -73,7 +73,6 @@ dnl add the alsa library ALSA_LIBS="$ALSA_LIBS -lasound" -LDFLAGS="$ALSA_LIBS -lasound" AC_MSG_RESULT($ALSA_LIBS) dnl Check for the presence of the library @@ -217,7 +216,7 @@ } EOM : Call the object file tmp-dyna.o in case dlext=o. -if ${CC-cc} $CFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 && +if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 && mv dyna.o tmp-dyna.o > /dev/null 2>&1 && $SHLD $SHLDFLAGS -o dyna.$sharedLibExtension tmp-dyna.o > /dev/null 2>&1 && ${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.$ac_ext $LIBS > /dev/null 2>&1; then diff -ruN TiMidity++-1.0.0/configure TiMidity++-1.0.1/configure --- TiMidity++-1.0.0/configure Wed Jan 6 17:41:31 1999 +++ TiMidity++-1.0.1/configure Thu Jan 14 12:38:35 1999 @@ -26,11 +26,11 @@ ac_help="$ac_help --enable-audio Enable audio (default if you use supported platform) " ac_help="$ac_help - --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)" + --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)" ac_help="$ac_help - --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)" + --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)" ac_help="$ac_help - --disable-alsatest Do not try to compile and run a test Alsa program" + --disable-alsatest Do not try to compile and run a test Alsa program" ac_help="$ac_help --enable-ncurses Enable ncurses interface (default is no)" ac_help="$ac_help @@ -44,9 +44,9 @@ ac_help="$ac_help --enable-vt100 Enable VT100 interface (default is no)" ac_help="$ac_help - --enable-xaw Enable athena interface (default is no)" + --enable-xaw Enable athena interface (default is no)" ac_help="$ac_help - --enable-xskin Enable X skin interface (default is no)" + --enable-xskin Enable X skin interface (default is no)" ac_help="$ac_help --enable-gtk Enable GTK+ interface (default is no)" ac_help="$ac_help @@ -826,7 +826,7 @@ PACKAGE=TiMidity++ -VERSION=1.0.0 +VERSION=1.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; } @@ -1236,6 +1236,27 @@ echo "$ac_t""no" 1>&6 fi +echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +echo "configure:1241: 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 + rm -f conftestdata +if ln -s X conftestdata 2>/dev/null +then + rm -f conftestdata + ac_cv_prog_LN_S="ln -s" +else + ac_cv_prog_LN_S=ln +fi +fi +LN_S="$ac_cv_prog_LN_S" +if test "$ac_cv_prog_LN_S" = "ln -s"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + LDFLAGS=${LDFLAGS:--L/usr/local/lib} SHLDFLAGS=${LDFLAGS:--L/usr/local/lib} @@ -1258,7 +1279,7 @@ esac echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1262: checking how to run the C preprocessor" >&5 +echo "configure:1283: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1273,13 +1294,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:1283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1290,13 +1311,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:1300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1323,7 +1344,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:1327: checking for X" >&5 +echo "configure:1348: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1385,12 +1406,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:1394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1459,14 +1480,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1572,17 +1593,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:1576: checking whether -R must be followed by a space" >&5 +echo "configure:1597: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -1598,14 +1619,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -1637,7 +1658,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:1641: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1662: 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 @@ -1645,7 +1666,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1678,7 +1699,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:1682: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1703: 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 @@ -1686,7 +1707,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1726,12 +1747,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:1730: checking for gethostbyname" >&5 +echo "configure:1751: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1775,7 +1796,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1779: checking for gethostbyname in -lnsl" >&5 +echo "configure:1800: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1783,7 +1804,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1824,12 +1845,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:1828: checking for connect" >&5 +echo "configure:1849: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1873,7 +1894,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1877: checking for connect in -lsocket" >&5 +echo "configure:1898: 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 @@ -1881,7 +1902,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1916,12 +1937,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:1920: checking for remove" >&5 +echo "configure:1941: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -1965,7 +1986,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1969: checking for remove in -lposix" >&5 +echo "configure:1990: 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 @@ -1973,7 +1994,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2008,12 +2029,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2012: checking for shmat" >&5 +echo "configure:2033: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2057,7 +2078,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2061: checking for shmat in -lipc" >&5 +echo "configure:2082: 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 @@ -2065,7 +2086,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2109,7 +2130,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:2113: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2134: 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 @@ -2117,7 +2138,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2163,7 +2184,7 @@ CFLAGS="$EXTRACFLAGS $CFLAGS -I$x_includes" fi echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:2167: checking for sqrt in -lm" >&5 +echo "configure:2188: 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 @@ -2171,7 +2192,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2210,7 +2231,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2214: checking for socket in -lsocket" >&5 +echo "configure:2235: 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 @@ -2218,7 +2239,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2259,12 +2280,12 @@ for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2263: checking for $ac_func" >&5 +echo "configure:2284: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2309,7 +2330,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2313: checking for gethostbyname in -lnsl" >&5 +echo "configure:2334: 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 @@ -2317,7 +2338,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2359,7 +2380,7 @@ done echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2363: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2384: 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 @@ -2367,7 +2388,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2406,12 +2427,12 @@ fi echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 -echo "configure:2410: checking X11 version 6" >&5 +echo "configure:2431: 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() { @@ -2421,7 +2442,7 @@ ; return 0; } EOF -if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* timidity_cv_x11_version_6=yes else @@ -2441,7 +2462,7 @@ KEEPLIBS=$LIBS echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6 -echo "configure:2445: checking for XShapeCombineMask in -lXext" >&5 +echo "configure:2466: 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 @@ -2449,7 +2470,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2482,7 +2503,7 @@ fi echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2486: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2507: 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 @@ -2490,7 +2511,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2529,7 +2550,7 @@ fi echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6 -echo "configure:2533: checking for SmcOpenConnection in -lSM" >&5 +echo "configure:2554: 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 @@ -2537,7 +2558,7 @@ ac_save_LIBS="$LIBS" LIBS="-lSM $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2570,7 +2591,7 @@ fi echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2574: checking for XtVaAppInitialize in -lXt" >&5 +echo "configure:2595: 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 @@ -2578,7 +2599,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2611,7 +2632,7 @@ fi echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6 -echo "configure:2615: checking for XmuInternAtom in -lXmu" >&5 +echo "configure:2636: 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 @@ -2619,7 +2640,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2650,16 +2671,16 @@ echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 -echo "configure:2655: checking for XawInitializeWidgetSet in -lXaw" >&5 -ac_lib_var=`echo Xaw'_'XawInitializeWidgetSet | sed 'y%./+-%__p_%'` +echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 +echo "configure:2676: 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 else ac_save_LIBS="$LIBS" -LIBS="-lXaw $LIBS" +LIBS="-lXaw3d $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2685,19 +2706,19 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - have_xaw=yes + have_xaw=3d else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 -echo "configure:2693: checking for XawInitializeWidgetSet in -lXaw3d" >&5 -ac_lib_var=`echo Xaw3d'_'XawInitializeWidgetSet | sed 'y%./+-%__p_%'` + echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 +echo "configure:2714: 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 else ac_save_LIBS="$LIBS" -LIBS="-lXaw3d $LIBS" +LIBS="-lXaw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2723,7 +2744,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - have_xaw=3d + have_xaw=yes else echo "$ac_t""no" 1>&6 have_xaw=no @@ -2732,7 +2753,7 @@ fi echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 -echo "configure:2736: checking for XmCreateForm in -lXm" >&5 +echo "configure:2757: 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 @@ -2740,7 +2761,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2779,12 +2800,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:2783: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2804: 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> @@ -2792,7 +2813,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2817,7 +2838,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:2821: checking for opendir in -ldir" >&5 +echo "configure:2842: 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 @@ -2825,7 +2846,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2858,7 +2879,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2862: checking for opendir in -lx" >&5 +echo "configure:2883: 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 @@ -2866,7 +2887,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2900,12 +2921,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2904: checking for ANSI C header files" >&5 +echo "configure:2925: 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 @@ -2913,7 +2934,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2930,7 +2951,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 @@ -2948,7 +2969,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 @@ -2969,7 +2990,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2980,7 +3001,7 @@ exit (0); } EOF -if { (eval echo configure:2984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -3004,12 +3025,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3008: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3029: 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 @@ -3025,7 +3046,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3049,17 +3070,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3053: checking for $ac_hdr" >&5 +echo "configure:3074: 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:3063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3087,17 +3108,17 @@ ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:3091: checking for string.h" >&5 +echo "configure:3112: 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:3101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3121,12 +3142,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3125: checking for working const" >&5 +echo "configure:3146: 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:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3196,14 +3217,14 @@ fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3200: checking whether char is unsigned" >&5 +echo "configure:3221: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3259,14 +3280,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3263: checking whether byte ordering is bigendian" >&5 +echo "configure:3284: 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 @@ -3277,11 +3298,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3302: \"$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 @@ -3292,7 +3313,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3312,7 +3333,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3349,21 +3370,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3353: checking for inline" >&5 +echo "configure:3374: 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:3388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3389,12 +3410,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3393: checking for off_t" >&5 +echo "configure:3414: 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 @@ -3422,12 +3443,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3426: checking for pid_t" >&5 +echo "configure:3447: 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 @@ -3455,12 +3476,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3459: checking for size_t" >&5 +echo "configure:3480: 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 @@ -3488,12 +3509,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3492: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3513: 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 @@ -3502,7 +3523,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3524,16 +3545,16 @@ echo $ac_n "checking volatile declaration""... $ac_c" 1>&6 -echo "configure:3528: checking volatile declaration" >&5 +echo "configure:3549: checking volatile declaration" >&5 cat > conftest.$ac_ext <&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* echo "$ac_t""yes" 1>&6 else @@ -3546,9 +3567,9 @@ rm -f conftest* echo $ac_n "checking union semun declaration""... $ac_c" 1>&6 -echo "configure:3550: checking union semun declaration" >&5 +echo "configure:3571: checking union semun declaration" >&5 cat > conftest.$ac_ext < #include @@ -3557,7 +3578,7 @@ union semun x ; return 0; } EOF -if { (eval echo configure:3561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 EXTRACFLAGS="$EXTRACFLAGS -DHAVE_UNION_SEMUN" @@ -3571,13 +3592,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:3575: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:3596: 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 @@ -3595,7 +3616,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -3617,7 +3638,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3621: checking for 8-bit clean memcmp" >&5 +echo "configure:3642: 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 @@ -3625,7 +3646,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3656,17 +3677,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3660: checking for $ac_hdr" >&5 +echo "configure:3681: 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:3670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3695,12 +3716,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3699: checking for $ac_func" >&5 +echo "configure:3720: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3748,7 +3769,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3752: checking for working mmap" >&5 +echo "configure:3773: 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 @@ -3756,7 +3777,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -3919,7 +3940,7 @@ fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:3923: checking whether setvbuf arguments are reversed" >&5 +echo "configure:3944: 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 @@ -3927,7 +3948,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. */ @@ -3941,7 +3962,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:3945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -3965,12 +3986,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3969: checking return type of signal handlers" >&5 +echo "configure:3990: 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 @@ -3987,7 +4008,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:3991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4006,12 +4027,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4010: checking for vprintf" >&5 +echo "configure:4031: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4058,12 +4079,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4062: checking for _doprnt" >&5 +echo "configure:4083: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4113,12 +4134,12 @@ for ac_func in gettimeofday select socket strdup strstr vsnprintf snprintf usleep strncasecmp strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4117: checking for $ac_func" >&5 +echo "configure:4138: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4168,12 +4189,12 @@ # check getopt echo $ac_n "checking for getopt""... $ac_c" 1>&6 -echo "configure:4172: checking for getopt" >&5 +echo "configure:4193: checking for getopt" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_getopt=yes" else @@ -4278,7 +4299,7 @@ echo $ac_n "checking whether to enable audio""... $ac_c" 1>&6 -echo "configure:4282: checking whether to enable audio" >&5 +echo "configure:4303: 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" @@ -4296,6 +4317,7 @@ echo "$ac_t""yes linux" 1>&6 KEEPCFLAGS=$CFLAGS KEEPLIBS=$LIBS + KEEPLDFLAGS=$LDFLAGS have_alsa=no # Check whether --with-alsa-prefix or --without-alsa-prefix was given. if test "${with_alsa_prefix+set}" = set; then @@ -4323,28 +4345,27 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:4327: checking for ALSA CFLAGS" >&5 +echo "configure:4349: checking for ALSA CFLAGS" >&5 if test "$alsa_inc_prefix" != "" ; then ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" - CFLAGS="-I$alsa_inc_prefix" + CFLAGS="$CFLAGS -I$alsa_inc_prefix" fi echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:4335: checking for ALSA LDFLAGS" >&5 +echo "configure:4357: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" fi ALSA_LIBS="$ALSA_LIBS -lasound" -LDFLAGS="$ALSA_LIBS -lasound" echo "$ac_t""$ALSA_LIBS" 1>&6 min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:4348: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:4369: 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/'` @@ -4354,7 +4375,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -4395,7 +4416,7 @@ ; return 0; } EOF -if { (eval echo configure:4399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -4409,7 +4430,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:4413: checking for snd_cards in -lasound" >&5 +echo "configure:4434: 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 @@ -4417,7 +4438,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4463,6 +4484,7 @@ CFLAGS=$KEEPCFLAGS LIBS=$KEEPLIBS + LDFLAGS=$KEEPLDFLAGS if test "x$have_alsa" = "xyes"; then SYSTEM="$SYSTEM -DAU_ALSA" SYSEXTRAS="$SYSEXTRAS alsa_a.c" @@ -4547,7 +4569,7 @@ fi echo $ac_n "checking for LoadLibraryExA in -lc""... $ac_c" 1>&6 -echo "configure:4551: checking for LoadLibraryExA in -lc" >&5 +echo "configure:4573: checking for LoadLibraryExA in -lc" >&5 ac_lib_var=`echo c'_'LoadLibraryExA | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4555,7 +4577,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4589,7 +4611,7 @@ if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load in -lc""... $ac_c" 1>&6 -echo "configure:4593: checking for shl_load in -lc" >&5 +echo "configure:4615: checking for shl_load in -lc" >&5 ac_lib_var=`echo c'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4597,7 +4619,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4632,7 +4654,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4636: checking for dlopen in -ldl" >&5 +echo "configure:4658: 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 @@ -4640,7 +4662,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4675,7 +4697,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:4679: checking for dlopen in -lc" >&5 +echo "configure:4701: checking for dlopen in -lc" >&5 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4683,7 +4705,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4718,7 +4740,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -lc""... $ac_c" 1>&6 -echo "configure:4722: checking for dld_init in -lc" >&5 +echo "configure:4744: checking for dld_init in -lc" >&5 ac_lib_var=`echo c'_'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 @@ -4726,7 +4748,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4761,7 +4783,7 @@ fi echo $ac_n "checking dynamic loader""... $ac_c" 1>&6 -echo "configure:4765: checking dynamic loader" >&5 +echo "configure:4787: checking dynamic loader" >&5 case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_skin" in *dynamic*) SHARED=yes;; @@ -4818,7 +4840,7 @@ SYSTEM="$SYSTEM -DIA_DYNAMIC -DSHARED_LIB_EXT=\\\".$sharedLibExtension\\\"" SYSTEM="$SYSTEM -DSHARED_LIB_PATH=\\\"$SHARED_LIB_PATH\\\"" case "$have_dl" in dlopen) echo $ac_n "checking whether your dlsym() needs a leading underscore""... $ac_c" 1>&6 -echo "configure:4822: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:4844: 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 @@ -4876,7 +4898,7 @@ } EOM : Call the object file tmp-dyna.o in case dlext=o. -if ${CC-cc} $CFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 && +if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 && mv dyna.o tmp-dyna.o > /dev/null 2>&1 && $SHLD $SHLDFLAGS -o dyna.$sharedLibExtension tmp-dyna.o > /dev/null 2>&1 && ${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.$ac_ext $LIBS > /dev/null 2>&1; then @@ -4942,17 +4964,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4946: checking for $ac_hdr" >&5 +echo "configure:4968: 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:4956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4980,7 +5002,7 @@ KEEPLIBS=$LIBS echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:4984: checking for initscr in -lncurses" >&5 +echo "configure:5006: 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 @@ -4988,7 +5010,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5082,7 +5104,7 @@ enableval="$enable_slang" KEEPLIBS=$LIBS echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:5086: checking for SLang_init_tty in -lslang" >&5 +echo "configure:5108: 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 @@ -5090,7 +5112,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5151,7 +5173,7 @@ dynamic_targets="$dynamic_targets interface_s.\$(sharedLibExtension)" s_so_libs="$SHLDFLAGS -lslang" echo $ac_n "checking for initscr in -ltermcap""... $ac_c" 1>&6 -echo "configure:5155: checking for initscr in -ltermcap" >&5 +echo "configure:5177: 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 @@ -5159,7 +5181,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5283,7 +5305,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:5287: checking for Tcl_Init in -l$l" >&5 +echo "configure:5309: 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 @@ -5291,7 +5313,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5325,7 +5347,7 @@ done 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:5329: checking for Tk_Init in -l$l" >&5 +echo "configure:5351: 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 @@ -5333,7 +5355,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5696,7 +5718,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:5700: checking for $ac_word" >&5 +echo "configure:5722: 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 @@ -5727,7 +5749,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:5731: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:5753: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -5750,7 +5772,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5816,7 +5838,7 @@ } EOF -if { (eval echo configure:5820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -5850,7 +5872,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -5860,7 +5882,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:5864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -6010,6 +6032,7 @@ + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -6183,6 +6206,7 @@ s%@lispdir@%$lispdir%g s%@CC@%$CC%g s%@RANLIB@%$RANLIB%g +s%@LN_S@%$LN_S%g s%@CPP@%$CPP%g s%@X_CFLAGS@%$X_CFLAGS%g s%@X_PRE_LIBS@%$X_PRE_LIBS%g diff -ruN TiMidity++-1.0.0/configure.in TiMidity++-1.0.1/configure.in --- TiMidity++-1.0.0/configure.in Wed Jan 6 14:28:43 1999 +++ TiMidity++-1.0.1/configure.in Thu Jan 14 12:27:25 1999 @@ -25,7 +25,7 @@ AC_INIT(timidity/timidity.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 1.0.0, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 1.0.1, no-define) dnl use config.h AM_CONFIG_HEADER(config.h) @@ -43,6 +43,7 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_RANLIB +AC_PROG_LN_S LDFLAGS=${LDFLAGS:--L/usr/local/lib} SHLDFLAGS=${LDFLAGS:--L/usr/local/lib} @@ -104,8 +105,8 @@ 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_LIB(Xaw,XawInitializeWidgetSet,have_xaw=yes, - [ AC_CHECK_LIB(Xaw3d,XawInitializeWidgetSet,have_xaw=3d,have_xaw=no) ]) +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) LIBS=$KEEPLIBS @@ -205,9 +206,11 @@ AC_MSG_RESULT(yes linux) KEEPCFLAGS=$CFLAGS KEEPLIBS=$LIBS + KEEPLDFLAGS=$LDFLAGS AM_PATH_ALSA_LOCAL() CFLAGS=$KEEPCFLAGS LIBS=$KEEPLIBS + LDFLAGS=$KEEPLDFLAGS if test "x$have_alsa" = "xyes"; then SYSTEM="$SYSTEM -DAU_ALSA" SYSEXTRAS="$SYSEXTRAS alsa_a.c" @@ -508,7 +511,7 @@ dnl X Athena Widget AM_CONDITIONAL(ENABLE_XAW, false) CONFIG_INTERFACE(xaw,XAW,a, - [ --enable-xaw Enable athena interface (default is no)], + [ --enable-xaw Enable athena interface (default is no)], [ if test "$have_xaw" = "no"; then enable_xaw=no fi ], @@ -552,7 +555,7 @@ dnl X skin AM_CONDITIONAL(ENABLE_XSKIN, false) CONFIG_INTERFACE(xskin,XSKIN,i, - [ --enable-xskin Enable X skin interface (default is no)], + [ --enable-xskin Enable X skin interface (default is no)], , , [ if test "$have_xprelibs" = "yes"; then @@ -622,6 +625,7 @@ AC_SUBST(SHLD) AC_SUBST(dynamic_targets) AC_SUBST(sharedLibExtension) +AC_SUBST(LN_S) AC_OUTPUT([ Makefile diff -ruN TiMidity++-1.0.0/doc/C/Makefile.am TiMidity++-1.0.1/doc/C/Makefile.am --- TiMidity++-1.0.0/doc/C/Makefile.am Wed Jan 6 10:53:30 1999 +++ TiMidity++-1.0.1/doc/C/Makefile.am Thu Jan 14 12:39:18 1999 @@ -18,23 +18,12 @@ include $(top_builddir)/common.makefile -man_MANS = \ - timidity.1 \ - timidity.cfg.5 - EXTRA_DIST = \ - $(man_MANS) \ + timidity.1 \ + timidity.cfg.5 \ CHANGES.02i \ FAQ \ README.dl \ README.sf \ README.tk \ README.xskin - -.1.txt: - groff -man -Tlatin1 -P-b -P-u $< >$@ - -.1.ps: - groff -man $< >$@ - -install.man: install-man diff -ruN TiMidity++-1.0.0/doc/C/Makefile.in TiMidity++-1.0.1/doc/C/Makefile.in --- TiMidity++-1.0.0/doc/C/Makefile.in Wed Jan 6 17:43:40 1999 +++ TiMidity++-1.0.1/doc/C/Makefile.in Thu Jan 14 17:57:06 1999 @@ -91,6 +91,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ @@ -104,12 +105,9 @@ lispdir = @lispdir@ sharedLibExtension = @sharedLibExtension@ -man_MANS = \ - timidity.1 \ - timidity.cfg.5 - EXTRA_DIST = \ - $(man_MANS) \ + timidity.1 \ + timidity.cfg.5 \ CHANGES.02i \ FAQ \ README.dl \ @@ -119,11 +117,6 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = -man1dir = $(mandir)/man1 -man5dir = $(mandir)/man5 -MANS = $(man_MANS) - -NROFF = nroff DIST_COMMON = Makefile.am Makefile.in @@ -131,7 +124,7 @@ TAR = gtar GZIP = --best -all: Makefile $(MANS) +all: Makefile .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) @@ -141,78 +134,6 @@ cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -install-man1: - $(mkinstalldirs) $(DESTDIR)$(man1dir) - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ - done - -uninstall-man1: - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ - done - -install-man5: - $(mkinstalldirs) $(DESTDIR)$(man5dir) - @list='$(man5_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.5*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ - done - -uninstall-man5: - @list='$(man5_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.5*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \ - rm -f $(DESTDIR)$(man5dir)/$$inst; \ - done -install-man: $(MANS) - @$(NORMAL_INSTALL) - $(MAKE) install-man1 install-man5 -uninstall-man: - @$(NORMAL_UNINSTALL) - $(MAKE) uninstall-man1 uninstall-man5 tags: TAGS TAGS: @@ -236,18 +157,17 @@ install-exec: @$(NORMAL_INSTALL) -install-data: install-man +install-data: @$(NORMAL_INSTALL) install: install-exec install-data all @: -uninstall: uninstall-man +uninstall: install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 mostlyclean-generic: @@ -275,22 +195,13 @@ @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: install-man1 uninstall-man1 install-man5 uninstall-man5 \ -install-man uninstall-man tags distdir info dvi installcheck \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +.PHONY: tags distdir info dvi installcheck install-exec install-data \ +install uninstall all installdirs mostlyclean-generic distclean-generic \ +clean-generic maintainer-clean-generic clean mostlyclean distclean \ +maintainer-clean include $(top_builddir)/common.makefile - -.1.txt: - groff -man -Tlatin1 -P-b -P-u $< >$@ - -.1.ps: - groff -man $< >$@ - -install.man: install-man # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -ruN TiMidity++-1.0.0/doc/Makefile.am TiMidity++-1.0.1/doc/Makefile.am --- TiMidity++-1.0.0/doc/Makefile.am Wed Jan 6 14:17:51 1999 +++ TiMidity++-1.0.1/doc/Makefile.am Thu Jan 14 12:37:44 1999 @@ -17,7 +17,35 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include $(top_builddir)/common.makefile - SUBDIRS = C ja_JP.ujis -install.man: cd C; $(MAKE) install.man -install.manj: cd ja_JP.ujis; $(MAKE) install.man +lang_target = C + +man_MANS = \ + timidity.1 \ + timidity.cfg.5 + +.1.txt: + groff -man -Tlatin1 -P-b -P-u $< >$@ + +.1.ps: + groff -man $< >$@ + +timidity.1: + rm -f timidity.1; $(LN_S) $(lang_target)/timidity.1 . + +timidity.cfg.5: + rm -f timidity.cfg.5; $(LN_S) $(lang_target)/timidity.cfg.5 . + +remake-mans: + rm -f timidity.1; $(LN_S) $(lang_target)/timidity.1 . + rm -f timidity.cfg.5; $(LN_S) $(lang_target)/timidity.cfg.5 . + +install.man: + $(MAKE) remake-mans lang_target=C; $(MAKE) install-man + +install.manj: + $(MAKE) remake-mans lang_target=ja_JP.ujis; $(MAKE) install-man + +clean: + rm -f timidity.1 + rm -f timidity.cfg.5 diff -ruN TiMidity++-1.0.0/doc/Makefile.in TiMidity++-1.0.1/doc/Makefile.in --- TiMidity++-1.0.0/doc/Makefile.in Wed Jan 6 17:43:39 1999 +++ TiMidity++-1.0.1/doc/Makefile.in Thu Jan 14 17:57:05 1999 @@ -91,6 +91,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ @@ -103,11 +104,20 @@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ sharedLibExtension = @sharedLibExtension@ - SUBDIRS = C ja_JP.ujis +lang_target = C + +man_MANS = \ + timidity.1 \ + timidity.cfg.5 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = +man1dir = $(mandir)/man1 +man5dir = $(mandir)/man5 +MANS = $(man_MANS) + +NROFF = nroff DIST_COMMON = Makefile.am Makefile.in @@ -126,6 +136,78 @@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +install-man1: + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done + +uninstall-man1: + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done + +install-man5: + $(mkinstalldirs) $(DESTDIR)$(man5dir) + @list='$(man5_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ + done + +uninstall-man5: + @list='$(man5_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \ + rm -f $(DESTDIR)$(man5dir)/$$inst; \ + done +install-man: $(MANS) + @$(NORMAL_INSTALL) + $(MAKE) install-man1 install-man5 +uninstall-man: + @$(NORMAL_UNINSTALL) + $(MAKE) uninstall-man1 uninstall-man5 + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -215,22 +297,27 @@ check: all-am $(MAKE) check-recursive installcheck: installcheck-recursive -all-am: Makefile +all-am: Makefile $(MANS) + +install-data-am: install-man + +uninstall-am: uninstall-man install-exec: install-exec-recursive @$(NORMAL_INSTALL) -install-data: install-data-recursive +install-data: install-data-recursive install-data-am @$(NORMAL_INSTALL) -install: install-recursive +install: install-recursive install-data-am @: -uninstall: uninstall-recursive +uninstall: uninstall-recursive uninstall-am install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: installdirs-recursive + $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 mostlyclean-generic: @@ -267,21 +354,47 @@ @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: install-man1 uninstall-man1 install-man5 uninstall-man5 \ +install-man uninstall-man install-data-recursive \ +uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck all-am install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +installcheck all-am install-data-am uninstall-am install-exec \ +install-data install uninstall all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean include $(top_builddir)/common.makefile -install.man: cd C; $(MAKE) install.man -install.manj: cd ja_JP.ujis; $(MAKE) install.man + +.1.txt: + groff -man -Tlatin1 -P-b -P-u $< >$@ + +.1.ps: + groff -man $< >$@ + +timidity.1: + rm -f timidity.1; $(LN_S) $(lang_target)/timidity.1 . + +timidity.cfg.5: + rm -f timidity.cfg.5; $(LN_S) $(lang_target)/timidity.cfg.5 . + +remake-mans: + rm -f timidity.1; $(LN_S) $(lang_target)/timidity.1 . + rm -f timidity.cfg.5; $(LN_S) $(lang_target)/timidity.cfg.5 . + +install.man: + $(MAKE) remake-mans lang_target=C; $(MAKE) install-man + +install.manj: + $(MAKE) remake-mans lang_target=ja_JP.ujis; $(MAKE) install-man + +clean: + rm -f timidity.1 + rm -f timidity.cfg.5 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -ruN TiMidity++-1.0.0/doc/ja_JP.ujis/Makefile.am TiMidity++-1.0.1/doc/ja_JP.ujis/Makefile.am --- TiMidity++-1.0.0/doc/ja_JP.ujis/Makefile.am Wed Jan 6 10:54:31 1999 +++ TiMidity++-1.0.1/doc/ja_JP.ujis/Makefile.am Thu Jan 14 11:59:08 1999 @@ -18,21 +18,10 @@ include $(top_builddir)/common.makefile -man_MANS = \ - timidity.1 \ - timidity.cfg.5 - EXTRA_DIST = \ - $(man_MANS) \ + timidity.1 \ + timidity.cfg.5 \ README.dl \ README.sf \ README.tk \ README.xskin - -.1.txt: - groff -man -Tlatin1 -P-b -P-u $< >$@ - -.1.ps: - groff -man $< >$@ - -install.man: install-man diff -ruN TiMidity++-1.0.0/doc/ja_JP.ujis/Makefile.in TiMidity++-1.0.1/doc/ja_JP.ujis/Makefile.in --- TiMidity++-1.0.0/doc/ja_JP.ujis/Makefile.in Wed Jan 6 17:43:42 1999 +++ TiMidity++-1.0.1/doc/ja_JP.ujis/Makefile.in Thu Jan 14 17:57:08 1999 @@ -91,6 +91,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ @@ -104,12 +105,9 @@ lispdir = @lispdir@ sharedLibExtension = @sharedLibExtension@ -man_MANS = \ - timidity.1 \ - timidity.cfg.5 - EXTRA_DIST = \ - $(man_MANS) \ + timidity.1 \ + timidity.cfg.5 \ README.dl \ README.sf \ README.tk \ @@ -117,11 +115,6 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = -man1dir = $(mandir)/man1 -man5dir = $(mandir)/man5 -MANS = $(man_MANS) - -NROFF = nroff DIST_COMMON = Makefile.am Makefile.in @@ -129,7 +122,7 @@ TAR = gtar GZIP = --best -all: Makefile $(MANS) +all: Makefile .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) @@ -139,78 +132,6 @@ cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -install-man1: - $(mkinstalldirs) $(DESTDIR)$(man1dir) - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ - done - -uninstall-man1: - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ - done - -install-man5: - $(mkinstalldirs) $(DESTDIR)$(man5dir) - @list='$(man5_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.5*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ - done - -uninstall-man5: - @list='$(man5_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.5*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \ - rm -f $(DESTDIR)$(man5dir)/$$inst; \ - done -install-man: $(MANS) - @$(NORMAL_INSTALL) - $(MAKE) install-man1 install-man5 -uninstall-man: - @$(NORMAL_UNINSTALL) - $(MAKE) uninstall-man1 uninstall-man5 tags: TAGS TAGS: @@ -234,18 +155,17 @@ install-exec: @$(NORMAL_INSTALL) -install-data: install-man +install-data: @$(NORMAL_INSTALL) install: install-exec install-data all @: -uninstall: uninstall-man +uninstall: install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 mostlyclean-generic: @@ -273,22 +193,13 @@ @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: install-man1 uninstall-man1 install-man5 uninstall-man5 \ -install-man uninstall-man tags distdir info dvi installcheck \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +.PHONY: tags distdir info dvi installcheck install-exec install-data \ +install uninstall all installdirs mostlyclean-generic distclean-generic \ +clean-generic maintainer-clean-generic clean mostlyclean distclean \ +maintainer-clean include $(top_builddir)/common.makefile - -.1.txt: - groff -man -Tlatin1 -P-b -P-u $< >$@ - -.1.ps: - groff -man $< >$@ - -install.man: install-man # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -ruN TiMidity++-1.0.0/interface/Makefile.in TiMidity++-1.0.1/interface/Makefile.in --- TiMidity++-1.0.0/interface/Makefile.in Wed Jan 6 17:43:27 1999 +++ TiMidity++-1.0.1/interface/Makefile.in Thu Jan 14 17:56:54 1999 @@ -90,6 +90,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ @@ -452,10 +453,6 @@ ../timidity/output.h ../timidity/controls.h \ ../timidity/instrum.h ../timidity/playmidi.h \ ../timidity/readmidi.h -dynamic_c.o: dynamic_c.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/output.h ../timidity/controls.h \ - ../timidity/dlutils.h emacs_c.o: emacs_c.c ../config.h ../timidity/timidity.h \ ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ ../timidity/output.h ../timidity/controls.h \ @@ -530,9 +527,9 @@ ../timidity/playmidi.h ../timidity/readmidi.h \ ../timidity/output.h ../timidity/controls.h \ ../timidity/miditrace.h xaw.h -xaw_i.o: xaw_i.c ../config.h check.xbm ../timidity/timidity.h \ +xaw_i.o: xaw_i.c ../config.h xaw.h check.xbm ../timidity/timidity.h \ ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/controls.h xaw.h + ../timidity/controls.h xskin_c.o: xskin_c.c ../config.h ../timidity/timidity.h \ ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ ../timidity/instrum.h ../timidity/playmidi.h \ diff -ruN TiMidity++-1.0.0/interface/bitmaps/Makefile.in TiMidity++-1.0.1/interface/bitmaps/Makefile.in --- TiMidity++-1.0.0/interface/bitmaps/Makefile.in Wed Jan 6 17:43:31 1999 +++ TiMidity++-1.0.1/interface/bitmaps/Makefile.in Thu Jan 14 17:56:57 1999 @@ -91,6 +91,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ diff -ruN TiMidity++-1.0.0/interface/motif_bitmaps/Makefile.in TiMidity++-1.0.1/interface/motif_bitmaps/Makefile.in --- TiMidity++-1.0.0/interface/motif_bitmaps/Makefile.in Wed Jan 6 17:43:30 1999 +++ TiMidity++-1.0.1/interface/motif_bitmaps/Makefile.in Thu Jan 14 17:56:56 1999 @@ -91,6 +91,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ diff -ruN TiMidity++-1.0.0/interface/motif_c.c TiMidity++-1.0.1/interface/motif_c.c --- TiMidity++-1.0.0/interface/motif_c.c Wed Dec 16 16:28:34 1998 +++ TiMidity++-1.0.1/interface/motif_c.c Thu Jan 14 17:34:06 1999 @@ -104,7 +104,7 @@ } else { - vsprintf(local, fmt, ap); + vsnprintf(local, sizeof(local), fmt, ap); m_pipe_int_write(CMSG_MESSAGE); m_pipe_int_write(type); m_pipe_string_write(local); @@ -166,31 +166,31 @@ return; if(lyric[1] == '/' || lyric[1] == '\\') { - sprintf(lyric_buf, "\n%s", lyric + 2); + snprintf(lyric_buf, sizeof(lyric_buf), "\n%s", lyric + 2); m_pipe_int_write(LYRIC_MESSAGE); m_pipe_string_write(lyric_buf); } else if(lyric[1] == '@') { if(lyric[2] == 'L') - sprintf(lyric_buf, "Language: %s\n", lyric + 3); + snprintf(lyric_buf, sizeof(lyric_buf), "Language: %s\n", lyric + 3); else if(lyric[2] == 'T') - sprintf(lyric_buf, "Title: %s\n", lyric + 3); + snprintf(lyric_buf, sizeof(lyric_buf), "Title: %s\n", lyric + 3); else - sprintf(lyric_buf, "%s\n", lyric + 1); + snprintf(lyric_buf, sizeof(lyric_buf), "%s\n", lyric + 1); m_pipe_int_write(LYRIC_MESSAGE); m_pipe_string_write(lyric_buf); } else { - sprintf(lyric_buf, "%s", lyric + 1); + strncpy(lyric_buf, lyric + 1, sizeof(lyric_buf)); m_pipe_int_write(LYRIC_MESSAGE); m_pipe_string_write(lyric_buf); } } else { - sprintf(lyric_buf,"%s", lyric + 1); + strncpy(lyric_buf, lyric + 1, sizeof(lyric_buf)); m_pipe_int_write(LYRIC_MESSAGE); m_pipe_string_write(lyric_buf); } diff -ruN TiMidity++-1.0.0/interface/ncurs_c.c TiMidity++-1.0.1/interface/ncurs_c.c --- TiMidity++-1.0.0/interface/ncurs_c.c Wed Jan 6 15:31:22 1999 +++ TiMidity++-1.0.1/interface/ncurs_c.c Thu Jan 14 17:41:26 1999 @@ -2355,12 +2355,7 @@ init_mblock(&pool); buff = (char *)new_segment(&pool, MIN_MBLOCK_SIZE); -#ifdef HAVE_VSNPRINTF - vsnprintf(buff, MIN_MBLOCK_SIZE - 1, fmt, ap); -#else - vsprintf(buff, fmt, ap); -#endif /* HAVE_VSNPRINTF */ - buff[MIN_MBLOCK_SIZE - 1] = '\0'; + vsnprintf(buff, MIN_MBLOCK_SIZE, fmt, ap); waddstr(w, buff); reuse_mblock(&pool); } @@ -2393,13 +2388,7 @@ init_mblock(&pool); buff = (char *)new_segment(&pool, MIN_MBLOCK_SIZE); -#ifdef HAVE_VSNPRINTF - vsnprintf(buff, MIN_MBLOCK_SIZE - 1, fmt, ap); -#else - vsprintf(buff, fmt, ap); -#endif /* HAVE_VSNPRINTF */ - buff[MIN_MBLOCK_SIZE - 1] = '\0'; - + vsnprintf(buff, MIN_MBLOCK_SIZE, fmt, ap); for(i = 0; i < COLS - 1 && buff[i]; i++) if(buff[i] == '\n' || buff[i] == '\r' || buff[i] == '\t') buff[i] = ' '; @@ -2750,7 +2739,7 @@ i = instr_comment[current_indicator_chan].prog; if(!IS_CURRENT_MOD_FILE) i += progbase; - sprintf(current_indicator_message, "%03d:%s ", + snprintf(current_indicator_message, indicator_width, "%03d:%s ", i, instr_comment[current_indicator_chan].comm); instr_comment[current_indicator_chan].disp_cnt++; indicator_msgptr = current_indicator_message; diff -ruN TiMidity++-1.0.0/interface/pixmaps/Makefile.in TiMidity++-1.0.1/interface/pixmaps/Makefile.in --- TiMidity++-1.0.0/interface/pixmaps/Makefile.in Wed Jan 6 17:43:32 1999 +++ TiMidity++-1.0.1/interface/pixmaps/Makefile.in Thu Jan 14 17:56:59 1999 @@ -91,6 +91,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ diff -ruN TiMidity++-1.0.0/interface/slang_c.c TiMidity++-1.0.1/interface/slang_c.c --- TiMidity++-1.0.0/interface/slang_c.c Wed Jan 6 14:57:09 1999 +++ TiMidity++-1.0.1/interface/slang_c.c Thu Jan 14 17:30:16 1999 @@ -168,7 +168,7 @@ SLsmg_gotorc( r, c); va_start(ap, fmt); - vsprintf(p, fmt, ap); + vsnprintf(p, sizeof(p), fmt, ap); va_end(ap); SLsmg_write_string (p); @@ -651,7 +651,7 @@ SLsmg_gotorc(2,0); SLsmg_erase_eol(); SLsmg_bold(); - vsprintf(p, fmt, ap); + vsnprintf(p, sizeof(p), fmt, ap); SLsmg_write_string(p); SLsmg_normal(); _ctl_refresh(); @@ -679,14 +679,14 @@ switch(type) { default: - vsprintf(p, fmt, ap); + vsnprintf(p, sizeof(p), fmt, ap); SLsmg_write_string(p); _ctl_refresh(); break; case CMSG_WARNING: SLsmg_bold(); - vsprintf(p, fmt, ap); + vsnprintf(p, sizeof(p), fmt, ap); SLsmg_write_string(p); SLsmg_normal(); _ctl_refresh(); @@ -695,7 +695,7 @@ case CMSG_ERROR: case CMSG_FATAL: SLsmg_bold(); - vsprintf(p, fmt, ap); + vsnprintf(p, sizeof(p), fmt, ap); SLsmg_write_string(p); SLsmg_normal(); _ctl_refresh(); @@ -793,7 +793,7 @@ *instr_comment[current_indicator_chan].comm == '\0') return; - sprintf(current_indicator_message, "%03d:%s ", + snprintf(current_indicator_message, indicator_width, "%03d:%s ", instr_comment[current_indicator_chan].prog, instr_comment[current_indicator_chan].comm); instr_comment[current_indicator_chan].disp_cnt++; diff -ruN TiMidity++-1.0.0/interface/tk_c.c TiMidity++-1.0.1/interface/tk_c.c --- TiMidity++-1.0.0/interface/tk_c.c Mon Dec 21 11:05:11 1998 +++ TiMidity++-1.0.1/interface/tk_c.c Thu Jan 14 17:21:13 1999 @@ -216,13 +216,13 @@ fprintf(stderr, "\n"); } else if (type == CMSG_ERROR) { int32 val; - vsprintf(local, fmt, ap); + vsnprintf(local, sizeof(local), fmt, ap); k_pipe_printf("CERR %d", type); k_pipe_puts(local); while (ctl_blocking_read(&val) != RC_NEXT) ; } else { - vsprintf(local, fmt, ap); + vsnprintf(local, sizeof(local), fmt, ap); k_pipe_printf("CMSG %d", type); k_pipe_puts(local); } @@ -369,7 +369,7 @@ static void ctl_lyric(int lyricid) { char *lyric; -return; + lyric = event2string(lyricid); if(lyric != NULL) { @@ -492,7 +492,7 @@ static int ctl_blocking_read(int32 *valp) { - char buf[256], *tok, *arg; + char buf[8192], *tok, *arg; int new_volume; int new_centiseconds; char *args[64], **files; @@ -734,15 +734,27 @@ char buf[256]; va_list ap; va_start(ap, fmt); - vsprintf(buf, fmt, ap); + vsnprintf(buf, sizeof(buf), fmt, ap); k_pipe_puts(buf); } +static int line_strlen(char *str) +{ + int len; + + len = 0; + while(*str && *str != '\r' && *str != '\n') { + str++; + len++; + } + return len; +} + static void k_pipe_puts(char *str) { int len; char lf = '\n'; - len = strlen(str); + len = line_strlen(str); write(fpip_out, str, len); write(fpip_out, &lf, 1); } @@ -896,7 +908,7 @@ char buf[256]; va_list ap; va_start(ap, fmt); - vsprintf(buf, fmt, ap); + vsnprintf(buf, sizeof(buf), fmt, ap); Tcl_Eval(my_interp, buf); va_end(ap); return my_interp->result; diff -ruN TiMidity++-1.0.0/interface/tkpanel.tcl TiMidity++-1.0.1/interface/tkpanel.tcl --- TiMidity++-1.0.0/interface/tkpanel.tcl Mon Dec 21 11:05:46 1998 +++ TiMidity++-1.0.1/interface/tkpanel.tcl Tue Jan 12 11:36:17 1999 @@ -426,7 +426,6 @@ WriteMsg "LOAD" WriteMsg [lindex $Stat(FileList) $idx] AppendMsg "" - VolumeCmd $Config(CurVol) 1 } # @@ -505,22 +504,24 @@ # play previous file # proc PrevCmd {} { - global Stat + global Stat Config if {$Stat(Playing)} { WriteMsg "PREV" PauseCheck } + VolumeCmd $Config(CurVol) 1 } # # play next file # proc NextCmd {} { - global Stat + global Stat Config if {$Stat(Playing)} { WriteMsg "NEXT" PauseCheck } + VolumeCmd $Config(CurVol) 1 } # @@ -812,6 +813,7 @@ -showvalue true -label "Volume"\ -command VolumeCmd pack .body.volume.scale -side bottom -expand 1 -fill x + .body.volume.scale set $Config(CurVol) # buttons global bitmap_path diff -ruN TiMidity++-1.0.0/interface/vt100_c.c TiMidity++-1.0.1/interface/vt100_c.c --- TiMidity++-1.0.0/interface/vt100_c.c Wed Jan 6 14:57:00 1999 +++ TiMidity++-1.0.1/interface/vt100_c.c Thu Jan 14 17:28:44 1999 @@ -747,12 +747,7 @@ init_mblock(&pool); buff = (char *)new_segment(&pool, MIN_MBLOCK_SIZE); -#ifdef HAVE_VSNPRINTF - vsnprintf(buff, MIN_MBLOCK_SIZE - 1, fmt, ap); -#else - vsprintf(buff, fmt, ap); -#endif - buff[MIN_MBLOCK_SIZE - 1] = '\0'; + vsnprintf(buff, MIN_MBLOCK_SIZE, fmt, ap); for(i = 0; i < VT100_COLS - 1 && buff[i]; i++) if(buff[i] == '\n' || buff[i] == '\r' || buff[i] == '\t') buff[i] = ' '; @@ -898,7 +893,7 @@ *instr_comment[current_indicator_chan].comm == '\0') return; - sprintf(current_indicator_message, "%03d:%s ", + snprintf(current_indicator_message, indicator_width, "%03d:%s ", instr_comment[current_indicator_chan].prog, instr_comment[current_indicator_chan].comm); instr_comment[current_indicator_chan].disp_cnt++; diff -ruN TiMidity++-1.0.0/interface/wrdt_x.c TiMidity++-1.0.1/interface/wrdt_x.c --- TiMidity++-1.0.0/interface/wrdt_x.c Mon Nov 30 18:02:49 1998 +++ TiMidity++-1.0.1/interface/wrdt_x.c Thu Jan 14 17:49:43 1999 @@ -223,11 +223,7 @@ case WRD_COLOR: txtclr_preserve=wrd_args[0]; /*This length is at most 20 ; this is much lesser than LINEBUF*/ -#ifdef HAVE_VSNPRINTF snprintf(file_buf,LINEBUF,"\033[%dm", txtclr_preserve); -#else - sprintf(file_buf,"\033[%dm", txtclr_preserve); -#endif /* HAVE_VSNPRINTF */ AddLine(file_buf,0); break; case WRD_END: /* Never call */ @@ -310,11 +306,7 @@ break; case WRD_LOCATE: /*Length is At most 40*/ -#ifdef HAVE_VSNPRINTF snprintf(file_buf,LINEBUF,"\033[%d;%dH", wrd_args[1], wrd_args[0]); -#else - sprintf(file_buf,"\033[%d;%dH", wrd_args[1], wrd_args[0]); -#endif /* HAVE_VSNPRINTF */ AddLine(file_buf,0); break; case WRD_LOOP: /* Never call */ @@ -421,11 +413,7 @@ memset(fillbuf,wrd_args[5],xdiff);/*X2-X1*/ fillbuf[xdiff]=0; for(i=wrd_args[1];i<=wrd_args[3];i++){/*Y1 to Y2*/ -#ifdef HAVE_VSNPRINTF snprintf(file_buf,LINEBUF,"\033[%d;%dH",i,wrd_args[0]); -#else - sprintf(file_buf,"\033[%d;%dH",i,wrd_args[0]); -#endif /* HAVE_VSNPRINTF */ /*X1to....*/ AddLine(file_buf,0); AddLine(fillbuf,0); diff -ruN TiMidity++-1.0.0/interface/xaw.h TiMidity++-1.0.1/interface/xaw.h --- TiMidity++-1.0.0/interface/xaw.h Wed Jan 6 09:52:44 1999 +++ TiMidity++-1.0.1/interface/xaw.h Thu Jan 14 11:18:09 1999 @@ -2,8 +2,9 @@ #define _XAW_H_ /* - TiMidity -- Experimental MIDI to WAVE converter - Copyright (C) 1995 Tuukka Toivonen + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,23 +24,31 @@ */ -/*** Uncomment this to use libXaw3d ***/ +/* + * XAW configurations + */ + +/* Define to use libXaw3d */ /* #define XAW3D */ -/*** Uncomment this to use Japanese and so on ***/ +/* Define to use Japanese and so on */ #define I18N -/*** Uncomment following not to use lyric widget ***/ +/* Define to use lyric widget */ #define MSGWINDOW -/*** Comment out following to use scrollable Text widget instead of Label widget ***/ -#define WIDGET_IS_LABEL_WIDGET +/* Define to use scrollable Text widget instead of Label widget */ +/* #define WIDGET_IS_LABEL_WIDGET */ -/*** Comment following not to use short cut keys ***/ +/* Define to use short cut keys */ #define ENABLE_KEY_TRANSLATION +/** Define to use OffiX file manager. */ +/* #define OFFIX */ + /*** Initial dot file name at home directory ***/ #define INITIAL_CONFIG ".xtimidity" + /* * CONSTANTS FOR XAW MENUS diff -ruN TiMidity++-1.0.0/interface/xaw_c.c TiMidity++-1.0.1/interface/xaw_c.c --- TiMidity++-1.0.0/interface/xaw_c.c Tue Dec 22 01:22:09 1998 +++ TiMidity++-1.0.1/interface/xaw_c.c Thu Jan 14 17:26:14 1999 @@ -63,6 +63,7 @@ static void ctl_total_time(int); void a_pipe_write(char *); int a_pipe_read(char *,int); +static void a_pipe_write_msg(char *msg); #ifndef MSGWINDOW static void a_pipe_int_write(int); static void a_pipe_error(char *); @@ -101,10 +102,11 @@ #define CMSG_MESSAGE 16 static int cmsg(int type, int verbosity_level, char *fmt, ...) { -#ifndef MSGWINDOW - char local[255]; -#endif va_list ap; +#ifdef MSGWINDOW + char *buff; + MBlockList pool; +#endif /* MSGWINDOW */ if ((type==CMSG_TEXT || type==CMSG_INFO || type==CMSG_WARNING) && ctl.verbosity 0 && (i = read(pipe_in_fd, buf + j, n - j)) > 0) + j += i; + return j; +} + +static void a_pipe_write_msg(char *msg) +{ + int msglen; + char buf[2 + sizeof(int)], *p, *q; + + /* strip '\r' */ + p = q = msg; + while(*q) { + if(*q != '\r') + *p++ = *q; + q++; + } + *p = '\0'; + + msglen = strlen(msg) + 1; /* +1 for '\n' */ + buf[0] = 'L'; + buf[1] = '\n'; + + memcpy(buf + 2, &msglen, sizeof(int)); + write(pipe_out_fd, buf, sizeof(buf)); + write(pipe_out_fd, msg, msglen - 1); + write(pipe_out_fd, "\n", 1); } static void ctl_event(CtlEvent *e) diff -ruN TiMidity++-1.0.0/interface/xaw_i.c TiMidity++-1.0.1/interface/xaw_i.c --- TiMidity++-1.0.0/interface/xaw_i.c Wed Jan 6 09:54:33 1999 +++ TiMidity++-1.0.1/interface/xaw_i.c Thu Jan 14 17:47:03 1999 @@ -40,6 +40,7 @@ #include #include #include +#include "xaw.h" #include #include #include @@ -49,6 +50,11 @@ #ifndef WIDGET_IS_LABEL_WIDGET #include #endif + +#ifdef OFFIX +#include +#include +#endif #include #include #include @@ -63,7 +69,6 @@ #include "timidity.h" #include "common.h" #include "controls.h" -#include "xaw.h" #if HAVE_STRSTR #define strstr(s,c) index(s,c) #endif @@ -100,6 +105,7 @@ extern void a_pipe_write(char *); extern int a_pipe_read(char *,int); +extern int a_pipe_nread(char *buf, int n); static Widget title_mb,title_sm,time_l, popup_load, popup_load_f, load_d; static Widget load_vport, load_flist, cwd_l, load_info; @@ -171,7 +177,7 @@ x_hot,y_hot, root_height, root_width; static Pixmap bm_Pixmap[MAXBITMAP]; static int max_files; -char basepath[PATH_MAX]; +static char basepath[PATH_MAX]; String *dirlist = NULL; /*static struct _app_resources { @@ -476,7 +482,7 @@ p = p2; if(stat(p, &st) != -1) { if (st.st_mode & S_IFMT & (S_IFDIR|S_IFREG|S_IFLNK)) { - sprintf(local_buf,"X %s\n",p); + snprintf(local_buf,sizeof(local_buf),"X %s\n",p); a_pipe_write(local_buf); } } @@ -528,6 +534,34 @@ } } +#ifdef MSGWINDOW +static void a_print_msg(Widget w) +{ + int i, msglen; + XawTextPosition pos; + XawTextBlock tb; + + tb.firstPos = 0; + tb.ptr = local_buf; + tb.format = FMT8BIT; + pos = XawTextGetInsertionPoint(w); + + a_pipe_nread((char *)&msglen, sizeof(int)); + while(msglen > 0) + { + i = msglen; + if(i > sizeof(local_buf)) + i = sizeof(local_buf); + a_pipe_nread(local_buf, i); + tb.length = i; + XawTextReplace(w, pos, pos, &tb); + pos += i; + XawTextSetInsertionPoint(w, pos); + msglen -= i; + } +} +#endif /* MSGWINDOW */ + /*ARGSUSED*/ static void handle_input(XtPointer data,int *source,XtInputId *id) { char s[16]; @@ -540,14 +574,14 @@ case 'E' : XtVaSetValues(title_mb,XtNlabel,(char *)strrchr(local_buf+2,' ')+1,NULL); if (arrangetitle) { - sprintf(window_title, "%s : %s", APP_CLASS, local_buf+2); + snprintf(window_title, sizeof(window_title), "%s : %s", APP_CLASS, local_buf+2); XtVaSetValues(toplevel,XtNtitle,window_title,NULL); } break; case 'O' : offPlayButton();break; #ifdef MSGWINDOW case 'L' : - if (XtIsManaged(lyric_t)) a_print_text(lyric_t, local_buf+2); + if (XtIsManaged(lyric_t)) a_print_msg(lyric_t); break; #endif case 'Q' : exit(0); @@ -634,7 +668,7 @@ full->dirname = p; while (*p++ != '\0') ; strcpy(p, path); - sprintf(newfull,"%s/%s", basepath, path); + snprintf(newfull,sizeof(newfull),"%s/%s", basepath, path); full->basename = p; return newfull; } if (*p == '/') { @@ -658,16 +692,16 @@ "something wrong with getting path."); return NULL; } while (*p == '/') p++; - sprintf(tmp, "%s/%s", pw->pw_dir, p); + snprintf(tmp, sizeof(tmp), "%s/%s", pw->pw_dir, p); } else { /* *p != '~' */ - sprintf(tmp, "%s/%s", basepath, path); + snprintf(tmp, sizeof(tmp), "%s/%s", basepath, path); } } p = tmp; tail = strrchr(p, '/'); *tail++ = '\0'; full->dirname = p; full->basename = tail; - sprintf(newfull,"%s/%s", p, tail); + snprintf(newfull,sizeof(newfull),"%s/%s", p, tail); return newfull; } @@ -738,7 +772,7 @@ strcpy(dirlist[i++], filename); } dirlist[i] = NULL; - sprintf(local_buf, "%d Directories, %d Files", d_num, f_num); + 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); @@ -758,7 +792,7 @@ if(full.basename != NULL) { int len, match = 0; char filename[PATH_MAX], matchstr[PATH_MAX]; - char *fullpath; + char *fullpath = filename; URL dirp; len = strlen(full.basename); @@ -808,7 +842,7 @@ if (NULL == (home=getenv("HOME"))) home=getenv("home"); if (home != NULL) { dotfile = (char *)XtMalloc(sizeof(char) * PATH_MAX); - sprintf(dotfile, "%s/%s", home, INITIAL_CONFIG); + snprintf(dotfile, PATH_MAX, "%s/%s", home, INITIAL_CONFIG); if (NULL != (fp=fopen(dotfile, "r"))) { while (c != EOF) { p = s; @@ -864,7 +898,42 @@ } } } - +#ifdef OFFIX +static void FileDropedHandler(Widget widget ,XtPointer data,XEvent *event,Boolean *b) +{ + char *filename; + unsigned char *Data; + unsigned long Size; + char local_buffer[PATH_MAX]; + int i; + static const int AcceptType[]={DndFile,DndFiles,DndDir,DndLink,DndExe,DndURL, + DndNotDnd}; + int Type; + Type=DndDataType(event); + for(i=0;AcceptType[i]!=DndNotDnd;i++){ + if(AcceptType[i]==Type) + goto OK; + } + fprintf(stderr,"NOT ACCEPT\n"); + /*Not Acceptable,so Do Nothing*/ + return; +OK: + DndGetData(&Data,&Size); + if(Type==DndFiles){ + filename = Data; + while (filename[0] != '\0'){ + snprintf(local_buffer,sizeof(local_buffer),"X %s\n",filename); + a_pipe_write(local_buffer); + filename = filename + strlen(filename) + 1; + } + } + else{ + snprintf(local_buffer,sizeof(local_buffer),"X %s%s\n",Data,(Type==DndDir)?"/":""); + a_pipe_write(local_buffer); + } + return; +} +#endif void a_start_interface(int pipe_in) { static XtActionsRec actions[] ={ {"do-quit",(XtActionProc)quitCB}, @@ -1135,7 +1204,7 @@ (char *) check_bits, check_width,check_height); for(i= 0; i < MAXBITMAP; i++) { - sprintf(cbuf,"%s/%s",bitmapdir,bmfname[i]); + snprintf(cbuf,sizeof(cbuf),"%s/%s",bitmapdir,bmfname[i]); XReadBitmapFile(disp,RootWindow(disp,screen),cbuf,&bm_width[i],&bm_height[i], &bm_Pixmap[i],&x_hot,&y_hot); } @@ -1145,7 +1214,11 @@ getcwd(basepath, sizeof(basepath)); #endif if (!strlen(basepath)) strcat(basepath, "/"); - +#ifdef OFFIX + DndInitialize(toplevel); + DndRegisterOtherDrop(FileDropedHandler); + DndRegisterIconDrop(FileDropedHandler); +#endif XtAppAddActions(app_con, actions, XtNumber(actions)); base_f=XtVaCreateManagedWidget("base_form",formWidgetClass,toplevel,NULL); file_mb=XtVaCreateManagedWidget("file_menubutton",menuButtonWidgetClass,base_f,NULL); @@ -1267,7 +1340,7 @@ XtSetKeyboardFocus(popup_load, load_d); XtOverrideTranslations (toplevel, XtParseTranslationTable ("WM_PROTOCOLS: do-quit()")); - sprintf(cbuf,"%s/%s",bitmapdir,iconname); + snprintf(cbuf,sizeof(cbuf),"%s/%s",bitmapdir,iconname); XReadBitmapFile(disp,RootWindow(disp,screen),cbuf, &bmwidth,&bmheight,&bmPixmap,&x_hot,&y_hot); XtVaSetValues(toplevel,XtNiconPixmap,bmPixmap,NULL); diff -ruN TiMidity++-1.0.0/interface/xskin_c.c TiMidity++-1.0.1/interface/xskin_c.c --- TiMidity++-1.0.0/interface/xskin_c.c Wed Dec 9 19:41:45 1998 +++ TiMidity++-1.0.1/interface/xskin_c.c Thu Jan 14 17:50:21 1999 @@ -119,21 +119,7 @@ return 0; } -#ifdef HAVE_VSNPRINTF vsnprintf(local_buf+2,100,fmt,ap); -#else - { - char *buff; - MBlockList pool; - init_mblock(&pool); - buff = (char *)new_segment(&pool, MIN_MBLOCK_SIZE); - vsprintf(buff, fmt, ap); - buff[MIN_MBLOCK_SIZE - 1] = '\0'; - strncpy(local_buf + 2, buff, 100); - local_buf[97] = '\0'; - reuse_mblock(&pool); - } -#endif /* HAVE_VSNPRINTF */ if(pipe_out_fd==-1) { fputs(local_buf + 2, stderr); fputs(NLS, stderr); diff -ruN TiMidity++-1.0.0/libarc/Makefile.in TiMidity++-1.0.1/libarc/Makefile.in --- TiMidity++-1.0.0/libarc/Makefile.in Wed Jan 6 17:43:23 1999 +++ TiMidity++-1.0.1/libarc/Makefile.in Thu Jan 14 17:56:50 1999 @@ -91,6 +91,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ diff -ruN TiMidity++-1.0.0/timidity/Makefile.in TiMidity++-1.0.1/timidity/Makefile.in --- TiMidity++-1.0.0/timidity/Makefile.in Wed Jan 6 17:43:34 1999 +++ TiMidity++-1.0.1/timidity/Makefile.in Thu Jan 14 17:57:01 1999 @@ -91,6 +91,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ @@ -345,7 +346,6 @@ ../utils/mblock.h output.h controls.h ../libarc/arc.h \ ../utils/memb.h ../utils/nkflib.h wrd.h controls.o: controls.c ../config.h timidity.h controls.h -dl_dlopen.o: dl_dlopen.c ../config.h timidity.h dlutils.h filter.o: filter.c ../config.h timidity.h common.h ../libarc/url.h \ ../utils/mblock.h controls.h instrum.h filter.h instrum.o: instrum.c ../config.h timidity.h common.h ../libarc/url.h \ @@ -370,7 +370,8 @@ playmidi.o: playmidi.c ../config.h timidity.h common.h ../libarc/url.h \ ../utils/mblock.h instrum.h playmidi.h readmidi.h output.h \ mix.h controls.h miditrace.h recache.h ../libarc/arc.h \ - ../utils/memb.h reverb.h wrd.h tables.h + ../utils/memb.h reverb.h wrd.h ../interface/soundspec.h \ + tables.h raw_a.o: raw_a.c ../config.h timidity.h output.h controls.h rcp.o: rcp.c ../config.h timidity.h common.h ../libarc/url.h \ ../utils/mblock.h instrum.h playmidi.h readmidi.h controls.h @@ -399,9 +400,9 @@ ../utils/mblock.h tables.h timidity.o: timidity.c ../config.h timidity.h common.h ../libarc/url.h \ ../utils/mblock.h instrum.h playmidi.h readmidi.h output.h \ - controls.h tables.h miditrace.h reverb.h recache.h \ - ../libarc/arc.h ../utils/memb.h ../utils/strtab.h wrd.h \ - mid.defs dlutils.h + controls.h tables.h miditrace.h reverb.h \ + ../interface/soundspec.h recache.h ../libarc/arc.h \ + ../utils/memb.h ../utils/strtab.h wrd.h mid.defs wave_a.o: wave_a.c ../config.h timidity.h output.h controls.h wrd_read.o: wrd_read.c ../config.h timidity.h common.h ../libarc/url.h \ ../utils/mblock.h instrum.h playmidi.h readmidi.h controls.h \ diff -ruN TiMidity++-1.0.0/timidity/common.c TiMidity++-1.0.1/timidity/common.c --- TiMidity++-1.0.0/timidity/common.c Mon Nov 30 17:33:50 1998 +++ TiMidity++-1.0.1/timidity/common.c Thu Jan 14 17:26:34 1999 @@ -27,6 +27,7 @@ #endif /* HAVE_CONFIG_H */ #include #include +#include #include #ifndef NO_STRING_H #include @@ -859,3 +860,33 @@ } return 0; } + +#ifndef HAVE_VSNPRINTF +void vsnprintf(char *buff, size_t bufsiz, const char *fmt, va_list ap) +{ + MBlockList pool; + char *tmpbuf = buff; + + if(bufsiz < MIN_MBLOCK_SIZE) + { + init_mblock(&pool); + tmpbuf = (char *)new_segment(&pool, MIN_MBLOCK_SIZE); + } + vsprintf(tmpbuf, fmt, ap); + if(tmpbuf != buff) + { + strncpy(buff, tmpbuf, bufsiz); + reuse_mblock(&pool); + } +} +#endif /* HAVE_VSNPRINTF */ + +#ifndef HAVE_SNPRINTF +void snprintf(char *buff, size_t bufsiz, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vsnprintf(buff, bufsiz, fmt, ap); + va_end(ap); +} +#endif /* HAVE_VSNPRINTF */ diff -ruN TiMidity++-1.0.0/timidity/common.h TiMidity++-1.0.1/timidity/common.h --- TiMidity++-1.0.0/timidity/common.h Mon Nov 30 17:34:08 1998 +++ TiMidity++-1.0.1/timidity/common.h Thu Jan 14 17:26:47 1999 @@ -78,6 +78,10 @@ extern void code_convert(char *in, char *out, int outsiz, char *in_code, char *out_code); +#ifndef HAVE_SNPRINTF +void snprintf(char *buff, size_t bufsiz, const char *fmt, ...); +#endif + extern char *timidity_version; extern MBlockList tmpbuffer; extern char *output_text_code; diff -ruN TiMidity++-1.0.0/timidity/timidity.c TiMidity++-1.0.1/timidity/timidity.c --- TiMidity++-1.0.0/timidity/timidity.c Wed Jan 6 09:16:05 1999 +++ TiMidity++-1.0.1/timidity/timidity.c Tue Jan 12 11:36:17 1999 @@ -71,7 +71,7 @@ #include "mid.defs" #define OPTCOMMANDS "A:aB:b:C:c:D:d:eE:Ffg:hI:i:jL:n:O:o:P:p:Q:R:rS:s:t:UW:w:x:" -#define INTERACTIVE_INTERFACE_IDS "qm" +#define INTERACTIVE_INTERFACE_IDS "kmq" /* main interfaces (To be used another main) */ #if defined(main) || defined(ANOTHER_MAIN) @@ -2798,30 +2798,6 @@ } timidity_start_initialize(); - -#ifdef IA_KMIDI -{ -#ifndef KMIDI_CONFIG_SUBDIR -#define KMIDI_CONFIG_SUBDIR "/share/apps/kmidi/config" -#endif /* KMIDI_CONFIG_SUBDIR */ - - char *KDEdir; - char *kmidi_config; - - if ( ! (KDEdir = getenv("KDEDIR"))) - { - kmidi_config = DEFAULT_PATH; - } - else - { - kmidi_config = safe_malloc(strlen(KDEdir) - + strlen(KMIDI_CONFIG_SUBDIR)+1); - strcpy(kmidi_config, KDEdir); - strcat(kmidi_config, KMIDI_CONFIG_SUBDIR); - add_to_pathlist(kmidi_config); - } -} -#endif /* IA_KMIDI */ if((err = timidity_pre_load_configuration()) != 0) return err; diff -ruN TiMidity++-1.0.0/utils/Makefile.in TiMidity++-1.0.1/utils/Makefile.in --- TiMidity++-1.0.0/utils/Makefile.in Wed Jan 6 17:43:21 1999 +++ TiMidity++-1.0.1/utils/Makefile.in Thu Jan 14 17:56:48 1999 @@ -91,6 +91,7 @@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@