diff -ruN TiMidity++-2.6.0-beta2/ChangeLog TiMidity++-2.6.0-beta3/ChangeLog --- TiMidity++-2.6.0-beta2/ChangeLog Wed Sep 1 02:39:30 1999 +++ TiMidity++-2.6.0-beta3/ChangeLog Sun Sep 5 21:29:22 1999 @@ -1,3 +1,61 @@ +1999-09-05 Masanao Izumo + + * Version 2.6.0-beta3 released for test version. + +1999-09-05 Masanao Izumo + + * timidity/{readmidi.c,playmidi.c}: On XG mode, ignore the program + change without bank select LSB. + +1999-09-05 Yasuhide Oomori + + * interface/gtk_i.c (gtk_set_locale): Enable locale. + +1999-09-04 Masanao Izumo + + * timidity/{common.c,common.h} (pathcmp): New function to compare the path. + * timidity/{common.c,common.h} (pathcasecmp): Obsoleted. + * timidity/common.c (add_to_pathlist): Remove the duplicated path + from `pathlist'. + * interface/w32g_playlist.c: Use pathcmp() to compare the path. + +1999-09-03 Masanao Izumo + + * configure.in (PKGDATADIR, PKGLIBDIR): New macro which is for + $(pkgdatadir) and $(pkglibdir). + * interface/xaw_i.c (XAW_BITMAP_DIR): New macro. + XAW bitmap files are in XAW_BITMAP_DIR. + * configure.in, timidity/timidity.h (TCL_DIR): Remove it from cpp flag. + * configure.in,interface/tk_c.c (TKPROGPATH): Remove it from cpp flag. + Add the definition in tk_c.c. + * configure.in,timidity/timidity.c: SHARED_LIB_PATH -> SHLIB_DIR + +1999-09-02 Masanao Izumo + + * timidity/dl_cygwin32.c -> timidity/dl_w32.c + * timidity/{dl_w32.c,dl_dld.c,dl_dlopen.c,dl_hpux.c,dlutils.h} (dl_free): + New function to unload dynamic link handler. + * interface/dynamic_c.c: Make a hook to call dl_free() on ctl->close(). + * acinclude.m4,configure.in: Search and test for NAS library. + * configure.in: Add --with-nas-library=library to specify NAS + library with absolute path. Note that -laudio can not be used + because it is possible -laudio is not NAS library. + * configure.in: Add --with-nas-includes=dir to specify the NAS + include directory. + * libarc/url_file.c: Use mapped-file to read the file. + * timidity/timidity.c (handler): Only mark `intr'. + * interface/w32g_i.c: Use WaitSingleObject() to wait to terminate + the thread. + +1999-09-02 Yasuhide Oomori + + * INSTALL,INSTALL.jp: Update documentation to match new configuration + mechanism. + +1999-09-01 Masanao Izumo + + * configure.in: Modify action of --enable-dynamic[=mode_list]. + 1999-09-01 Masanao Izumo * Version 2.6.0-beta2 released for test version. @@ -5,8 +63,11 @@ 1999-09-01 Masanao Izumo * configure.in: Modify action of --enable-audio[=mode_list]. - * configure.in,timidity/timidity.c: Remove TIMIDITY_OUTPUT_ID macro - if any audio are not enabled. + * configure.in (--enable-interface[=interface_list]): New configure + option. Specify comma separated interface list. For example: + --enable-interface=ncurses,tcltk,gtk + * configure.in,timidity/timidity.c: If default audio is not specified, + remove TIMIDITY_OUTPUT_ID macro from compiler option. 1999-08-31 Yasuhide Oomori @@ -14,7 +75,7 @@ 1999-08-31 Kei Hibino - * configure.in (SHELL): AC_SUBST() for autoconf-1.12 + * configure.in (SHELL): AC_SUBST() for autoconf-2.12 * configure.in (slang.h): Add new test. 1999-08-31 Katsuhiro Ueno @@ -242,7 +303,7 @@ the interface. * timidity/{common.c,timidity.c} (open_file_noise_mode): new global variable to pass `noise_mode' of open_file() to arc_error_handler. - * wrdt.c: Make more elevant. + * wrdt.c: Make more elegant. * x_wrdwindow.c (gscreen_plane_mask): Bug fix. 1999-08-10 Masanao Izumo @@ -417,6 +478,7 @@ to pipe "PAGER" to display help message. For example: > set PAGER=more > timidity -h + Bug fixed (isatty). * configure.in (isatty): Check for `isatty' function. * utils/{nkflib.c,net.c}, libarc/arc_zip.c, interface/{xaw_i.c,gtk_i.c,x_wrdwindow.c,wrdt_x.c,ncurs_c.c}, diff -ruN TiMidity++-2.6.0-beta2/INSTALL TiMidity++-2.6.0-beta3/INSTALL --- TiMidity++-2.6.0-beta2/INSTALL Tue Apr 27 23:42:24 1999 +++ TiMidity++-2.6.0-beta3/INSTALL Thu Sep 2 23:48:45 1999 @@ -3,18 +3,18 @@ Installation guide Masanao Izumo - Last updated on Apr.28.1999 + Last updated on Sep.2.1999 ============================================================================== - This document describes how to install TiMidity++(version 2.0.0 or + This document describes how to install TiMidity++(version 2.6.0 or later) for your UNIX-like machine. Methods for Macintosh are not described in this document. - It is enabled to configure and make timidity.exe on CYGNUS + -egcs-compiler(gcc) environment of Windows98/95/NT. If you are in -Windows, install cygnus and egcs (or mingw) if you don't have them -(which is available from http://www.cygnus.com/), and run `cygnus', -and make symbolik link /bin/sh to bash. + It is enabled to configure and make timidity.exe on the Cygwin +environment of Windows98/95/NT. If you are in Windows, install cygnus +and egcs (or mingw) if you don't have them (which is available from +http://sourceware.cygnus.com/cygwin/), and run `cygnus', and make +symbolik link /bin/sh to bash. Installing process: @@ -225,7 +225,7 @@ TiMidity++ uses GUS/patch (Glavis Ultrasound) as the voice data to play. You must get GUS/patch files, and make the configuration file. You must make the configuration file (*.cfg). By default, -timidity.cfg is /usr/local/lib/timidity/timidity.cfg (or +timidity.cfg is /usr/local/share/timidity/timidity.cfg (or C:\WINDOWS\TIMIDITY.CFG on Windows). And please check the following sites for many voice(patch) data: diff -ruN TiMidity++-2.6.0-beta2/INSTALL.jp TiMidity++-2.6.0-beta3/INSTALL.jp --- TiMidity++-2.6.0-beta2/INSTALL.jp Wed Apr 28 00:10:16 1999 +++ TiMidity++-2.6.0-beta3/INSTALL.jp Sun Sep 5 21:09:17 1999 @@ -3,16 +3,16 @@ TiMidity++ のインストール 出雲正尚 - 最終修正日 1999年2月4日 + 最終修正日 1999年9月2日 ============================================================================== -このドキュメントは TiMidity++ (バージョンは 2.0.0 以降) の UNIX 上での +このドキュメントは TiMidity++ (バージョンは 2.6.0 以降) の UNIX 上での インストール方法を説明しています。Macintosh のインストール方法は、 本ドキュメントでは説明されていません。 -TiMidity++ は、Windows 上の CYGNUS + egcs(gcc) 環境で configure が動作し、 -timidity.exe を作成することが可能です。もし、cygnus がない場合は、 -http://www.cygnus.com/ 等から入手してインストールしてください。 +TiMidity++ は、Windows 上の Cygwin 環境でも configure が動作し、 +timidity.exe を作成することが可能です。もし、cygwin がない場合は、 +http://sourceware.cygnus.com/cygwin/ から入手してインストールしてください。 そして、CYGNUS を起動し、/bin/sh に bash への シンボリックリンクを作成しておいてください。 @@ -192,10 +192,11 @@ のようにします。 + 2. common.makefile, Makefile, timidity.h の編集 ------------------------------- -もし、正しくコンパイルできない場合は、common.makefile, Makefile, timidity.h -内のパラメタを修正してください。 +----------------------------------------------- +もし、正しくコンパイルできない場合や、様々なパラメタを修正したい場合は、 +common.makefile, Makefile, timidity.h 内のパラメタを修正してください。 3. make ------- @@ -231,7 +232,7 @@ このパッケージの TiMidity をインストールしただけでは、音がなりません。 演奏するには、GUS の音源ファイルを入手し、設定ファイルである timidity.cfg を作成しなければなりません。デフォルトでは、 -/usr/local/lib/timidity/timidity.cfg になります(ただし、Windows 上では、 +/usr/local/share/timidity/timidity.cfg になります(ただし、Windows 上では、 (C:/WINDOWS/TIMIDITY.CFG)。パッチを探すのに、以下のサイトを訪れてみて下さい。 http://www.goice.co.jp/member/mo/timidity/link.html#gus diff -ruN TiMidity++-2.6.0-beta2/NEWS TiMidity++-2.6.0-beta3/NEWS --- TiMidity++-2.6.0-beta2/NEWS Mon Aug 30 18:55:53 1999 +++ TiMidity++-2.6.0-beta3/NEWS Sun Sep 5 21:29:51 1999 @@ -1,3 +1,8 @@ +??/??, 1999 + * Version 2.6.0 released. + * Some configurations and installations are changed. + * Bug fix. + 8/27, 1999 * Version 2.5.1 released. * Bug fix. diff -ruN TiMidity++-2.6.0-beta2/acinclude.m4 TiMidity++-2.6.0-beta3/acinclude.m4 --- TiMidity++-2.6.0-beta2/acinclude.m4 Wed Sep 1 01:44:14 1999 +++ TiMidity++-2.6.0-beta3/acinclude.m4 Wed Sep 1 14:25:53 1999 @@ -553,3 +553,23 @@ ]) fi ]) + + +dnl MY_SEARCH_LIBS(FUNCTION, LIBRARIES [, ACTION-IF-FOUND +dnl [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) +dnl Search for a library defining FUNC, if it's not already available. + +AC_DEFUN(MY_SEARCH_LIBS, +[AC_CACHE_CHECK([for library containing $1], [timidity_cv_search_$1], +[ac_func_search_save_LIBS="$LIBS" +timidity_cv_search_$1="no" +for i in $2; do + LIBS="$i $5 $ac_func_search_save_LIBS" + AC_TRY_LINK_FUNC([$1], [timidity_cv_search_$1="$i"; break]) +done +LIBS="$ac_func_search_save_LIBS"]) +if test "$timidity_cv_search_$1" != "no"; then + $3 +else : + $4 +fi]) diff -ruN TiMidity++-2.6.0-beta2/aclocal.m4 TiMidity++-2.6.0-beta3/aclocal.m4 --- TiMidity++-2.6.0-beta2/aclocal.m4 Wed Sep 1 02:50:49 1999 +++ TiMidity++-2.6.0-beta3/aclocal.m4 Sat Sep 4 07:16:38 1999 @@ -566,6 +566,26 @@ fi ]) + +dnl MY_SEARCH_LIBS(FUNCTION, LIBRARIES [, ACTION-IF-FOUND +dnl [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) +dnl Search for a library defining FUNC, if it's not already available. + +AC_DEFUN(MY_SEARCH_LIBS, +[AC_CACHE_CHECK([for library containing $1], [timidity_cv_search_$1], +[ac_func_search_save_LIBS="$LIBS" +timidity_cv_search_$1="no" +for i in $2; do + LIBS="$i $5 $ac_func_search_save_LIBS" + AC_TRY_LINK_FUNC([$1], [timidity_cv_search_$1="$i"; break]) +done +LIBS="$ac_func_search_save_LIBS"]) +if test "$timidity_cv_search_$1" != "no"; then + $3 +else : + $4 +fi]) + # Define a conditional. AC_DEFUN(AM_CONDITIONAL, diff -ruN TiMidity++-2.6.0-beta2/common.makefile.in TiMidity++-2.6.0-beta3/common.makefile.in --- TiMidity++-2.6.0-beta2/common.makefile.in Sat Aug 28 22:17:05 1999 +++ TiMidity++-2.6.0-beta3/common.makefile.in Sun Sep 5 14:23:15 1999 @@ -17,6 +17,8 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Define follows if you want to change. +# Note that the definition of beginning with just one `#' implies +# default value from configure. SHELL=@SHELL@ @@ -26,8 +28,8 @@ #CC= @CC@ #CFLAGS = @CFLAGS@ # For pentium gcc -#CFLAGS = -O3 -mpentium -march=pentium -fomit-frame-pointer \ -# -funroll-all-loops -malign-double -ffast-math +##CFLAGS = -O3 -mpentium -march=pentium -fomit-frame-pointer \ +## -funroll-all-loops -malign-double -ffast-math #CPPFLAGS = @CPPFLAGS@ #DEFS = @DEFS@ @@ -49,11 +51,30 @@ pkgdatadir = $(datadir)/timidity #INSTALL = @INSTALL@ -# Where to install the patches, config files, and MIDI files. -# If you change this, it's a good idea to recompile the binary, -# or you'll need to invoke timidity with the -L option. -TIMID_DIR = $(pkgdatadir) +# Where to install the patches, config files. +PKGDATADIR = $(pkgdatadir) + +# Where to install the Tcl code and the bitmaps. +# It also contains bitmaps which are shared with XAW interface. +PKGLIBDIR = $(pkglibdir) + +# Where to install the dynamic link interface. SHLIB_DIR = $(pkglibdir) -# Where to install the Tcl code, if you use the Tcl code that is. -TCL_DIR = $(pkglibdir) +# Where to install timidity.el +ELISP_DIR = $(pkgdatadir) + +# Define the timidity default file search path. (optional) +DEF_DEFAULT_PATH = -DDEFAULT_PATH=\"$(PKGDATADIR)\" + +# If you want to change TCL_DIR, please do follows. +# * Add -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\" to CPPFLAGS. +# * Make a symbolic link $(PKGLIBDIR)/bitmaps to $(TCL_DIR)/bitmaps +TCL_DIR = $(PKGLIBDIR) +##CPPFLAGS += -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\" + +# You sould not change follows definitions. +DEF_PKGDATADIR = -DPKGDATADIR=\"$(PKGDATADIR)\" +DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDIR)\" +DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\" +BITMAP_DIR = $(TCL_DIR)/bitmaps diff -ruN TiMidity++-2.6.0-beta2/configs/msc-config.h TiMidity++-2.6.0-beta3/configs/msc-config.h --- TiMidity++-2.6.0-beta2/configs/msc-config.h Wed Sep 1 02:58:20 1999 +++ TiMidity++-2.6.0-beta3/configs/msc-config.h Sun Sep 5 21:30:27 1999 @@ -217,7 +217,7 @@ #define HAVE_MMSYSTEM_H /* In VDS Macro AAA=BBB is not available. */ -#define TIMID_VERSION "2.6.0-beta2" +#define TIMID_VERSION "2.6.0-beta3" #define DEFAULT_PATH ".\\" #define AU_W32 #define WINSOCK diff -ruN TiMidity++-2.6.0-beta2/configure TiMidity++-2.6.0-beta3/configure --- TiMidity++-2.6.0-beta2/configure Wed Sep 1 02:50:52 1999 +++ TiMidity++-2.6.0-beta3/configure Sat Sep 4 07:16:41 1999 @@ -18,24 +18,28 @@ ac_help="$ac_help --with-x use the X Window System" ac_help="$ac_help - --with-tcl-includes=dir Tcl include file path " + --with-tcl-includes=DIR Tcl include file path " ac_help="$ac_help - --with-tcl-libs=dir Tcl include file path " + --with-tcl-libs=DIR Tcl library file path " ac_help="$ac_help - --with-tk-includes=dir Tk include file path " + --with-tk-includes=DIR Tk include file path " ac_help="$ac_help - --with-tk-libs=dir Tk include file path " + --with-tk-libs=DIR Tk library file path " ac_help="$ac_help - --with-offix-includes=dir Offix include file path " + --with-offix-includes=DIR Offix include file path " ac_help="$ac_help - --with-offix-libs=dir Offix include file path " + --with-offix-libs=DIR Offix include file path " +ac_help="$ac_help + --with-nas-library=library NAS absolute library path (Don't use -laudio)" +ac_help="$ac_help + --with-nas-includes=DIR NAS include files are in dir" ac_help="$ac_help --enable-audio[=mode_list] Enable audio (Specify comma separated mode list): default: Automatically select audio device. oss: OSS /dev/dsp sun: SunOS /dev/audio hpux: HPUX /dev/audio - irix: IRIX audio + irix: IRIX audio library mme: OSF/1 MME sb_dsp: BSD/OS 2.0 /dev/sb_dsp w32: Windows MMS @@ -67,7 +71,8 @@ ac_help="$ac_help --enable-interface=[interface_list] Comma separated interface list " ac_help="$ac_help - --enable-dynamic Enable dynamic link interface (default is no)" + --enable-dynamic Enable dynamic link interface (default is no) + --enable-dynamic=dynamic_list Comma separated dynamic interface list" ac_help="$ac_help --enable-ncurses Enable ncurses interface (default is no)" ac_help="$ac_help @@ -616,6 +621,7 @@ fi +SHELL=${CONFIG_SHELL-/bin/sh} ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -663,7 +669,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:667: checking host system type" >&5 +echo "configure:673: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -684,7 +690,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:688: checking target system type" >&5 +echo "configure:694: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -702,7 +708,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:706: checking build system type" >&5 +echo "configure:712: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -736,7 +742,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:740: checking for a BSD compatible install" >&5 +echo "configure:746: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -789,7 +795,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:793: checking whether build environment is sane" >&5 +echo "configure:799: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -846,7 +852,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:850: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:856: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -875,7 +881,7 @@ PACKAGE=TiMidity++ -VERSION=2.6.0-beta2 +VERSION=2.6.0-beta3 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; } @@ -885,7 +891,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:889: checking for working aclocal" >&5 +echo "configure:895: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -898,7 +904,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:902: checking for working autoconf" >&5 +echo "configure:908: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -911,7 +917,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:915: checking for working automake" >&5 +echo "configure:921: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -924,7 +930,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:928: checking for working autoheader" >&5 +echo "configure:934: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -937,7 +943,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:941: checking for working makeinfo" >&5 +echo "configure:947: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -952,7 +958,7 @@ echo $ac_n "checking whether grep returns status""... $ac_c" 1>&6 -echo "configure:956: checking whether grep returns status" >&5 +echo "configure:962: checking whether grep returns status" >&5 echo "grimblepritz" >grimble if grep blurfldyick grimble >/dev/null 2>&1 ; then contains="./contains" @@ -987,7 +993,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:991: checking for $ac_word" >&5 +echo "configure:997: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1025,7 +1031,7 @@ if test $EMACS != "no"; then echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:1029: checking where .elc files should go" >&5 +echo "configure:1035: checking where .elc files should go" >&5 lispdir="\$(datadir)/emacs/site-lisp" emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'` if test "x$prefix" = "xNONE"; then @@ -1111,7 +1117,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1115: checking for $ac_word" >&5 +echo "configure:1121: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1141,7 +1147,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1145: checking for $ac_word" >&5 +echo "configure:1151: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1192,7 +1198,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1196: checking for $ac_word" >&5 +echo "configure:1202: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1224,7 +1230,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1228: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1234: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1235,12 +1241,12 @@ cat > conftest.$ac_ext << EOF -#line 1239 "configure" +#line 1245 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1266,12 +1272,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1270: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1276: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1275: checking whether we are using GNU C" >&5 +echo "configure:1281: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1280,7 +1286,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1299,7 +1305,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1303: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1309: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1342,7 +1348,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1346: checking for a BSD compatible install" >&5 +echo "configure:1352: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1397,7 +1403,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1401: checking for $ac_word" >&5 +echo "configure:1407: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1425,7 +1431,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1429: checking whether ln -s works" >&5 +echo "configure:1435: 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 @@ -1446,7 +1452,7 @@ fi echo $ac_n "checking whether -rdynamic option is recognized""... $ac_c" 1>&6 -echo "configure:1450: checking whether -rdynamic option is recognized" >&5 +echo "configure:1456: checking whether -rdynamic option is recognized" >&5 ac_ccoption=`echo rdynamic | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'timidity_cv_ccoption_$ac_ccoption'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1563,7 +1569,7 @@ echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:1567: checking for sqrt in -lm" >&5 +echo "configure:1573: 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 @@ -1571,7 +1577,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1610,7 +1616,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1614: checking for socket in -lsocket" >&5 +echo "configure:1620: 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 @@ -1618,7 +1624,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1657,7 +1663,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1661: checking for dlopen in -ldl" >&5 +echo "configure:1667: 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 @@ -1665,7 +1671,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1699,12 +1705,12 @@ for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1703: checking for $ac_func" >&5 +echo "configure:1709: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1749,7 +1755,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1753: checking for gethostbyname in -lnsl" >&5 +echo "configure:1759: 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 @@ -1757,7 +1763,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1799,7 +1805,7 @@ done echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1803: checking how to run the C preprocessor" >&5 +echo "configure:1809: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1814,13 +1820,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:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1831,13 +1837,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:1841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1848,13 +1854,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1883,7 +1889,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:1887: checking for X" >&5 +echo "configure:1893: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1945,12 +1951,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:1954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2019,14 +2025,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2132,17 +2138,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:2136: checking whether -R must be followed by a space" >&5 +echo "configure:2142: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -2158,14 +2164,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -2197,7 +2203,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:2201: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2207: 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 @@ -2205,7 +2211,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2238,7 +2244,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:2242: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2248: 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 @@ -2246,7 +2252,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2286,12 +2292,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:2290: checking for gethostbyname" >&5 +echo "configure:2296: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2335,7 +2341,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2339: checking for gethostbyname in -lnsl" >&5 +echo "configure:2345: 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 @@ -2343,7 +2349,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2384,12 +2390,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:2388: checking for connect" >&5 +echo "configure:2394: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2433,7 +2439,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2437: checking for connect in -lsocket" >&5 +echo "configure:2443: 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 @@ -2441,7 +2447,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2476,12 +2482,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:2480: checking for remove" >&5 +echo "configure:2486: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2525,7 +2531,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2529: checking for remove in -lposix" >&5 +echo "configure:2535: 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 @@ -2533,7 +2539,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2568,12 +2574,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2572: checking for shmat" >&5 +echo "configure:2578: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2617,7 +2623,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2621: checking for shmat in -lipc" >&5 +echo "configure:2627: 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 @@ -2625,7 +2631,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2669,7 +2675,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:2673: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2679: 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 @@ -2677,7 +2683,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2736,7 +2742,7 @@ fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2740: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2746: 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 @@ -2744,7 +2750,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2783,12 +2789,12 @@ fi echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 -echo "configure:2787: checking X11 version 6" >&5 +echo "configure:2793: 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() { @@ -2798,7 +2804,7 @@ ; return 0; } EOF -if { (eval echo configure:2802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* timidity_cv_x11_version_6=yes else @@ -2818,7 +2824,7 @@ KEEPLIBS=$LIBS echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6 -echo "configure:2822: checking for XShapeCombineMask in -lXext" >&5 +echo "configure:2828: 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 @@ -2826,7 +2832,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2859,7 +2865,7 @@ fi echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2863: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2869: 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 @@ -2867,7 +2873,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2906,7 +2912,7 @@ fi echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6 -echo "configure:2910: checking for SmcOpenConnection in -lSM" >&5 +echo "configure:2916: 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 @@ -2914,7 +2920,7 @@ ac_save_LIBS="$LIBS" LIBS="-lSM $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2947,7 +2953,7 @@ fi echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2951: checking for XtVaAppInitialize in -lXt" >&5 +echo "configure:2957: 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 @@ -2955,7 +2961,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2988,7 +2994,7 @@ fi echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6 -echo "configure:2992: checking for XmuInternAtom in -lXmu" >&5 +echo "configure:2998: 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 @@ -2996,7 +3002,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3030,12 +3036,12 @@ for ac_func in XmuRegisterExternalAgent do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3034: checking for $ac_func" >&5 +echo "configure:3040: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3083,7 +3089,7 @@ done echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 -echo "configure:3087: checking for XawInitializeWidgetSet in -lXaw3d" >&5 +echo "configure:3093: 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 @@ -3091,7 +3097,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXaw3d $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3121,7 +3127,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 -echo "configure:3125: checking for XawInitializeWidgetSet in -lXaw" >&5 +echo "configure:3131: 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 @@ -3129,7 +3135,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXaw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3164,7 +3170,7 @@ fi echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 -echo "configure:3168: checking for XmCreateForm in -lXm" >&5 +echo "configure:3174: 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 @@ -3172,7 +3178,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3207,12 +3213,12 @@ for ac_func in XShmCreatePixmap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3211: checking for $ac_func" >&5 +echo "configure:3217: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3268,12 +3274,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:3272: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3278: 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> @@ -3281,7 +3287,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3306,7 +3312,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:3310: checking for opendir in -ldir" >&5 +echo "configure:3316: 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 @@ -3314,7 +3320,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3347,7 +3353,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3351: checking for opendir in -lx" >&5 +echo "configure:3357: 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 @@ -3355,7 +3361,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3389,12 +3395,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3393: checking for ANSI C header files" >&5 +echo "configure:3399: 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 @@ -3402,7 +3408,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3419,7 +3425,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 @@ -3437,7 +3443,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 @@ -3458,7 +3464,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3469,7 +3475,7 @@ exit (0); } EOF -if { (eval echo configure:3473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3493,12 +3499,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3497: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3503: 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 @@ -3514,7 +3520,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3542,17 +3548,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3546: checking for $ac_hdr" >&5 +echo "configure:3552: 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:3556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3580,17 +3586,17 @@ ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:3584: checking for string.h" >&5 +echo "configure:3590: 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:3594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3614,12 +3620,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3618: checking for working const" >&5 +echo "configure:3624: 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:3678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3689,14 +3695,14 @@ fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3693: checking whether char is unsigned" >&5 +echo "configure:3699: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3752,14 +3758,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3756: checking whether byte ordering is bigendian" >&5 +echo "configure:3762: 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 @@ -3770,11 +3776,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3780: \"$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 @@ -3785,7 +3791,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3805,7 +3811,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3842,21 +3848,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3846: checking for inline" >&5 +echo "configure:3852: 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:3866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3882,12 +3888,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3886: checking for off_t" >&5 +echo "configure:3892: 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 @@ -3915,12 +3921,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3919: checking for pid_t" >&5 +echo "configure:3925: 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 @@ -3948,12 +3954,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3952: checking for size_t" >&5 +echo "configure:3958: 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 @@ -3981,12 +3987,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3985: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3991: 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 @@ -3995,7 +4001,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4017,19 +4023,19 @@ echo $ac_n "checking volatile declaration""... $ac_c" 1>&6 -echo "configure:4021: checking volatile declaration" >&5 +echo "configure:4027: checking volatile declaration" >&5 if eval "test \"`echo '$''{'timidity_cv_type_volatile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_volatile=yes else @@ -4047,12 +4053,12 @@ fi echo $ac_n "checking union semun declaration""... $ac_c" 1>&6 -echo "configure:4051: checking union semun declaration" >&5 +echo "configure:4057: checking union semun declaration" >&5 if eval "test \"`echo '$''{'timidity_cv_type_union_semun'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4061,7 +4067,7 @@ union semun x ; return 0; } EOF -if { (eval echo configure:4065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_union_semun=yes else @@ -4080,13 +4086,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4084: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4090: 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 @@ -4104,7 +4110,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -4126,7 +4132,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:4130: checking for 8-bit clean memcmp" >&5 +echo "configure:4136: 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 @@ -4134,7 +4140,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -4165,17 +4171,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4169: checking for $ac_hdr" >&5 +echo "configure:4175: 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:4179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4204,12 +4210,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4208: checking for $ac_func" >&5 +echo "configure:4214: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4257,7 +4263,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:4261: checking for working mmap" >&5 +echo "configure:4267: 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 @@ -4265,7 +4271,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -4428,7 +4434,7 @@ fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:4432: checking whether setvbuf arguments are reversed" >&5 +echo "configure:4438: 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 @@ -4436,7 +4442,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. */ @@ -4450,7 +4456,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:4454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -4474,12 +4480,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4478: checking return type of signal handlers" >&5 +echo "configure:4484: 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 @@ -4496,7 +4502,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4515,12 +4521,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4519: checking for vprintf" >&5 +echo "configure:4525: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4567,12 +4573,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4571: checking for _doprnt" >&5 +echo "configure:4577: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4623,12 +4629,12 @@ sleep usleep strncasecmp strerror getopt getcwd popen signal isatty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4627: checking for $ac_func" >&5 +echo "configure:4633: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4680,12 +4686,12 @@ case "$ac_cv_header_dirent_dirent_h$ac_cv_header_dirent_sys_ndir_h$ac_cv_header_dirent_sys_dir_h$ac_cv_header_dirent_ndir_h" in *yes*) echo $ac_n "checking for opendir""... $ac_c" 1>&6 -echo "configure:4684: checking for opendir" >&5 +echo "configure:4690: checking for opendir" >&5 if eval "test \"`echo '$''{'ac_cv_func_opendir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_opendir=yes" else @@ -4736,12 +4742,12 @@ esac if test "x$enable_network" = "xyes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4740: checking for socket" >&5 +echo "configure:4746: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -4782,7 +4788,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6 -echo "configure:4786: checking for WSAStartup in -lwsock32" >&5 +echo "configure:4792: checking for WSAStartup in -lwsock32" >&5 ac_lib_var=`echo wsock32'_'WSAStartup | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'wapi_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4790,7 +4796,7 @@ ac_save_LIBS="$LIBS" LIBS="-lwsock32 $LIBS" cat > conftest.$ac_ext < #include @@ -4799,7 +4805,7 @@ WSAStartup(0,0); ; return 0; } EOF -if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "wapi_cv_lib_$ac_lib_var=yes" else @@ -4887,6 +4893,20 @@ audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd' +# Check whether --with-nas-library or --without-nas-library was given. +if test "${with_nas_library+set}" = set; then + withval="$with_nas_library" + : +fi + +# Check whether --with-nas-includes or --without-nas-includes was given. +if test "${with_nas_includes+set}" = set; then + withval="$with_nas_includes" + : +fi + + + # Check whether --enable-audio or --disable-audio was given. if test "${enable_audio+set}" = set; then enableval="$enable_audio" @@ -4979,7 +4999,7 @@ fi echo $ac_n "checking enable_audio=oss""... $ac_c" 1>&6 -echo "configure:4983: checking enable_audio=oss" >&5 +echo "configure:5003: checking enable_audio=oss" >&5 if test "x$au_enable_oss" = xyes; then EXTRADEFS="$EXTRADEFS -DAU_OSS" SYSEXTRAS="$SYSEXTRAS oss_a.c" @@ -5000,7 +5020,7 @@ fi echo $ac_n "checking enable_audio=sun""... $ac_c" 1>&6 -echo "configure:5004: checking enable_audio=sun" >&5 +echo "configure:5024: checking enable_audio=sun" >&5 if test "x$au_enable_sun" = xyes; then case "$target" in *-*-sunos4*) @@ -5029,7 +5049,7 @@ fi echo $ac_n "checking enable_audio=hpux""... $ac_c" 1>&6 -echo "configure:5033: checking enable_audio=hpux" >&5 +echo "configure:5053: checking enable_audio=hpux" >&5 if test "x$au_enable_hpux" = xyes; then case "$target" in *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; @@ -5042,7 +5062,7 @@ fi echo $ac_n "checking enable_audio=irix""... $ac_c" 1>&6 -echo "configure:5046: checking enable_audio=irix" >&5 +echo "configure:5066: checking enable_audio=irix" >&5 if test "x$au_enable_irix" = xyes; then case "$target" in *-sgi-irix5*|*-sgi-irix6.2) @@ -5062,7 +5082,7 @@ fi echo $ac_n "checking enable_audio=mme""... $ac_c" 1>&6 -echo "configure:5066: checking enable_audio=mme" >&5 +echo "configure:5086: checking enable_audio=mme" >&5 if test "x$au_enable_mme" = xyes; then case "$target" in *-dec-*) echo "$ac_t""yes" 1>&6 ;; @@ -5077,7 +5097,7 @@ fi echo $ac_n "checking enable_audio=sb_dsp""... $ac_c" 1>&6 -echo "configure:5081: checking enable_audio=sb_dsp" >&5 +echo "configure:5101: checking enable_audio=sb_dsp" >&5 if test "x$au_enable_sb_dsp" = xyes; then case "$target" in *-*-bsdi2.0) echo "$ac_t""yes" 1>&6 ;; @@ -5090,7 +5110,7 @@ fi echo $ac_n "checking enable_audio=w32""... $ac_c" 1>&6 -echo "configure:5094: checking enable_audio=w32" >&5 +echo "configure:5114: checking enable_audio=w32" >&5 if test "x$au_enable_w32" = xyes; then case "$target" in *-*-cygwin32*) @@ -5113,7 +5133,7 @@ fi echo $ac_n "checking enable_audio=alsa""... $ac_c" 1>&6 -echo "configure:5117: checking enable_audio=alsa" >&5 +echo "configure:5137: checking enable_audio=alsa" >&5 if test "x$au_enable_alsa" = xyes; then echo "$ac_t""" 1>&6 KEEPCFLAGS=$CFLAGS @@ -5146,7 +5166,7 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:5150: checking for ALSA CFLAGS" >&5 +echo "configure:5170: checking for ALSA CFLAGS" >&5 if test "$alsa_inc_prefix" != "" ; then ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" CFLAGS="$CFLAGS -I$alsa_inc_prefix" @@ -5154,7 +5174,7 @@ echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:5158: checking for ALSA LDFLAGS" >&5 +echo "configure:5178: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -5166,7 +5186,7 @@ min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:5170: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:5190: 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/'` @@ -5176,7 +5196,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -5217,7 +5237,7 @@ ; return 0; } EOF -if { (eval echo configure:5221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -5231,7 +5251,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:5235: checking for snd_cards in -lasound" >&5 +echo "configure:5255: 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 @@ -5239,7 +5259,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5306,7 +5326,7 @@ fi echo $ac_n "checking enable_audio=alib""... $ac_c" 1>&6 -echo "configure:5310: checking enable_audio=alib" >&5 +echo "configure:5330: checking enable_audio=alib" >&5 if test "x$au_enable_alib" = xyes; then case "$target" in *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; @@ -5326,19 +5346,64 @@ fi echo $ac_n "checking enable_audio=nas""... $ac_c" 1>&6 -echo "configure:5330: checking enable_audio=nas" >&5 +echo "configure:5350: checking enable_audio=nas" >&5 if test "x$au_enable_nas" = xyes; then if test "x$with_x" != xyes; then { echo "configure: error: nas: --with-x option must be specified" 1>&2; exit 1; } fi EXTRADEFS="$EXTRADEFS -DAU_NAS" SYSEXTRAS="$SYSEXTRAS nas_a.c" - EXTRALIBS="$EXTRALIBS $x_libraries/libaudio.a" - if test -f "$x_libraries/libaudio.a"; then - echo "$ac_t""yes - $x_libraries/libaudio.a" 1>&6 + + + if test "x$with_nas_library" != x; then + echo "$ac_t""$with_nas_library" 1>&6; + EXTRALIBS="$EXTRALIBS $with_nas_library" else - echo "configure: warning: $x_libraries/libaudio.a: Not found" 1>&2 + echo "$ac_t""" 1>&6 + echo $ac_n "checking for library containing AuOpenServer""... $ac_c" 1>&6 +echo "configure:5365: checking for library containing AuOpenServer" >&5 +if eval "test \"`echo '$''{'timidity_cv_search_AuOpenServer'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_func_search_save_LIBS="$LIBS" +timidity_cv_search_AuOpenServer="no" +for i in $x_libraries/libaudio.a \ + /usr/lib/libaudio.so \ + /usr/lib/libaudio.a ; do + LIBS="$i $ac_func_search_save_LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + timidity_cv_search_AuOpenServer="$i"; break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done +LIBS="$ac_func_search_save_LIBS" +fi + +echo "$ac_t""$timidity_cv_search_AuOpenServer" 1>&6 +if test "$timidity_cv_search_AuOpenServer" != "no"; then + echo "$ac_t""NAS: $timidity_cv_search_AuOpenServer" 1>&6 + EXTRALIBS="$EXTRALIBS $timidity_cv_search_AuOpenServer" +else : + echo "configure: warning: NAS library is not found." 1>&2 +fi fi + test "x$with_nas_includes" != x && CPPFLAGS="$CPPFLAGS -I$with_nas_includes" lib_xt_opt=-lXt if test "x$have_xext" = xyes; then lib_xext_opt=-lXext @@ -5351,7 +5416,7 @@ fi echo $ac_n "checking enable_audio=esd""... $ac_c" 1>&6 -echo "configure:5355: checking enable_audio=esd" >&5 +echo "configure:5420: checking enable_audio=esd" >&5 if test "x$au_enable_esd" = xyes; then echo "$ac_t""" 1>&6 KEEPCFLAGS=$CFLAGS @@ -5398,7 +5463,7 @@ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5402: checking for $ac_word" >&5 +echo "configure:5467: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5433,7 +5498,7 @@ min_esd_version=0.2.7 echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 -echo "configure:5437: checking for ESD - version >= $min_esd_version" >&5 +echo "configure:5502: checking for ESD - version >= $min_esd_version" >&5 no_esd="" if test "$ESD_CONFIG" = "no" ; then no_esd=yes @@ -5457,7 +5522,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5515,7 +5580,7 @@ EOF -if { (eval echo configure:5519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5549,7 +5614,7 @@ CFLAGS="$CFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" cat > conftest.$ac_ext < @@ -5559,7 +5624,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:5563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding ESD or finding the wrong" @@ -5621,7 +5686,7 @@ echo $ac_n "checking default output mode""... $ac_c" 1>&6 -echo "configure:5625: checking default output mode" >&5 +echo "configure:5690: checking default output mode" >&5 if test "x$DEFAULT_PLAYMODE" = x; then DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'` fi @@ -5651,12 +5716,10 @@ interface_targets='dynamic ncurses slang motif tcltk emacs vt100 xaw xskin gtk' -echo "###--enable-interface###" # Check whether --enable-interface or --disable-interface was given. if test "${enable_interface+set}" = set; then enableval="$enable_interface" - echo "###$enableval###" - for i in `echo $enableval | sed 's/,/ /g'`; do + for i in `echo $enableval | sed 's/,/ /g'`; do eval "enable_$i=yes" done fi @@ -5665,8 +5728,13 @@ # Check whether --enable-dynamic or --disable-dynamic was given. if test "${enable_dynamic+set}" = set; then enableval="$enable_dynamic" - test "x$enable_dynamic" = xyes && enable_dynamic=dynamic - + if test "x$enable_dynamic" = xyes; then + enable_dynamic=dynamic + elif test "x$enable_dynamic" != xno; then + for i in `echo $enableval | sed 's/,/ /g'`; do + eval "enable_$i=dynamic" + done + fi fi @@ -5686,50 +5754,50 @@ if test "$NEEDDLOPEN" = "yes"; then have_dl=no - echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6 -echo "configure:5691: checking for LoadLibraryExA" >&5 -if eval "test \"`echo '$''{'wapi_cv_func_LoadLibraryExA'+set}'`\" = set"; then + echo $ac_n "checking for LoadLibrary""... $ac_c" 1>&6 +echo "configure:5759: checking for LoadLibrary" >&5 +if eval "test \"`echo '$''{'wapi_cv_func_LoadLibrary'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { -LoadLibraryExA(0,0,0); +LoadLibrary(0); ; return 0; } EOF -if { (eval echo configure:5705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - wapi_cv_func_LoadLibraryExA=yes + wapi_cv_func_LoadLibrary=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - wapi_cv_func_LoadLibraryExA=no + wapi_cv_func_LoadLibrary=no fi rm -f conftest* fi -if eval "test \"`echo '$wapi_cv_func_'LoadLibraryExA`\" = yes"; then +if eval "test \"`echo '$wapi_cv_func_'LoadLibrary`\" = yes"; then echo "$ac_t""yes" 1>&6 - have_dl=cygwin + have_dl=w32 else echo "$ac_t""no" 1>&6 fi - test $wapi_cv_func_LoadLibraryExA = yes && have_dl=cygwin + test $wapi_cv_func_LoadLibrary = yes && have_dl=w32 if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:5728: checking for shl_load" >&5 +echo "configure:5796: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -5777,12 +5845,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:5781: checking for dlopen" >&5 +echo "configure:5849: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -5827,12 +5895,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:5831: checking for dld_init" >&5 +echo "configure:5899: checking for dld_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_dld_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dld_init=yes" else @@ -5877,7 +5945,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:5881: checking for dld_init in -ldld" >&5 +echo "configure:5949: checking for dld_init in -ldld" >&5 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5885,7 +5953,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5919,13 +5987,13 @@ fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:5923: checking dynamic link method" >&5 +echo "configure:5991: checking dynamic link method" >&5 case "$have_dl" in dlopen) echo "$ac_t""use dl_dlopen.c" 1>&6 SYSEXTRAS="$SYSEXTRAS dl_dlopen.c" echo $ac_n "checking whether your dlsym() needs a leading underscore""... $ac_c" 1>&6 -echo "configure:5929: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:5997: 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 @@ -6024,9 +6092,9 @@ SYSEXTRAS="$SYSEXTRAS dl_hpux.c" LDFLAGS="$LDFLAGS -Wl,-E $LDFLAGS" ;; - cygwin) - echo "$ac_t""use dl_cygwin32.c" 1>&6 - SYSEXTRAS="$SYSEXTRAS dl_cygwin32.c" + w32) + echo "$ac_t""use dl_w32.c" 1>&6 + SYSEXTRAS="$SYSEXTRAS dl_w32.c" ;; *) NEEDDLOPEN="no" @@ -6036,13 +6104,12 @@ fi if test "$NEEDDLOPEN" = "yes"; then - SHARED_LIB_PATH="\$(SHLIB_DIR)" cat >> confdefs.h <&6 -echo "configure:6078: checking for $ac_hdr" >&5 +echo "configure:6145: 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:6088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6125,7 +6192,7 @@ esac echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:6129: checking for initscr in -lncurses" >&5 +echo "configure:6196: 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 @@ -6133,7 +6200,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6163,7 +6230,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for PDC_set_ctrl_break in -lcurses""... $ac_c" 1>&6 -echo "configure:6167: checking for PDC_set_ctrl_break in -lcurses" >&5 +echo "configure:6234: checking for PDC_set_ctrl_break in -lcurses" >&5 ac_lib_var=`echo curses'_'PDC_set_ctrl_break | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6171,7 +6238,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $lib_user32_test $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6269,7 +6336,7 @@ if test "${enable_slang+set}" = set; then enableval="$enable_slang" case "x$enable_slang" in xyes|xdynamic) echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:6273: checking for SLang_init_tty in -lslang" >&5 +echo "configure:6340: 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 @@ -6277,7 +6344,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6314,17 +6381,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6318: checking for $ac_hdr" >&5 +echo "configure:6385: 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:6328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6376,7 +6443,7 @@ dynamic_targets="$dynamic_targets interface_s.\$(so)" s_so_libs="-lslang" echo $ac_n "checking for initscr in -ltermcap""... $ac_c" 1>&6 -echo "configure:6380: checking for initscr in -ltermcap" >&5 +echo "configure:6447: 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 @@ -6384,7 +6451,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6515,7 +6582,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:6519: checking for Tcl_Init in -l$l" >&5 +echo "configure:6586: 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 @@ -6523,7 +6590,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6558,7 +6625,7 @@ LIBS="$LIBS $tcl_lib" for l in tk tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do case "x$tk_lib" in x) echo $ac_n "checking for Tk_Init in -l$l""... $ac_c" 1>&6 -echo "configure:6562: checking for Tk_Init in -l$l" >&5 +echo "configure:6629: 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 @@ -6566,7 +6633,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6627,7 +6694,6 @@ ENABLE_TCLTK_FALSE= fi LIBS=`echo $LIBS | sed "s/-lX11/$tk_lib $tcl_lib -lX11/"` - EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" case "$target" in *-*-bsdi*) EXTRALIBS="$EXTRALIBS -lipc" @@ -6638,8 +6704,7 @@ ;; xdynamic) dynamic_targets="$dynamic_targets interface_k.\$(so)" - EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" - k_so_libs="$tcl_libdir $tk_libdir $tcl_lib $tk_lib $lib_dl_opt" + k_so_libs="$tcl_libdir $tk_libdir $tcl_lib $tk_lib $lib_dl_opt" case "$target" in *-*-bsdi*) k_so_libs="$k_so_libs -lipc" @@ -6943,7 +7008,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:6947: checking for $ac_word" >&5 +echo "configure:7012: 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 @@ -6978,7 +7043,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6982: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:7047: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -7001,7 +7066,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -7067,7 +7132,7 @@ } EOF -if { (eval echo configure:7071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7101,7 +7166,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -7111,7 +7176,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:7115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -7261,17 +7326,17 @@ fi ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:7265: checking for X11/xpm.h" >&5 +echo "configure:7330: checking for X11/xpm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7294,7 +7359,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:7298: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:7363: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7302,7 +7367,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7409,17 +7474,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7413: checking for $ac_hdr" >&5 +echo "configure:7478: 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:7423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7470,7 +7535,7 @@ LDFLAGS="$LDFLAGS $offix_lib_dir" LIBS="$LIBS $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11" echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6 -echo "configure:7474: checking for DndInitialize in -lDnd" >&5 +echo "configure:7539: checking for DndInitialize in -lDnd" >&5 ac_lib_var=`echo Dnd'_'DndInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7478,7 +7543,7 @@ ac_save_LIBS="$LIBS" LIBS="-lDnd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7572,7 +7637,7 @@ EXTRADEFS="$EXTRADEFS -DWRDT_X" enable_sherry_wrd=yes echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6 -echo "configure:7576: checking for zlibVersion in -lz" >&5 +echo "configure:7641: checking for zlibVersion in -lz" >&5 ac_lib_var=`echo z'_'zlibVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7580,7 +7645,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7614,17 +7679,17 @@ ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:7618: checking for png.h" >&5 +echo "configure:7683: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7647,7 +7712,7 @@ fi echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6 -echo "configure:7651: checking for png_init_io in -lpng" >&5 +echo "configure:7716: checking for png_init_io in -lpng" >&5 ac_lib_var=`echo png'_'png_init_io | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7655,7 +7720,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng -lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7781,7 +7846,10 @@ CPPFLAGS="$val" rm -f wordtmp >/dev/null 2>&1 -CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\"" +#CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\"" + +CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR)" + if test "x$TIMIDITY_OUTPUT_ID" != x; then CPPFLAGS="$CPPFLAGS -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\"" fi diff -ruN TiMidity++-2.6.0-beta2/configure.in TiMidity++-2.6.0-beta3/configure.in --- TiMidity++-2.6.0-beta2/configure.in Wed Sep 1 02:50:34 1999 +++ TiMidity++-2.6.0-beta3/configure.in Sat Sep 4 06:38:03 1999 @@ -44,18 +44,18 @@ dnl WISH - wish dnl LN_S - ln -s dnl tcltk_dep - make dependencies for tcl/tk interface - +dnl dnl so - File extension of shared object library. dnl SHLD - Linker to make shared object library. dnl SHLDFLAGS - Link flags to link shared object library. dnl SHCFLAGS - Additional flags to compile shared object library. - (such as -fPIC) - -SHELL=${CONFIG_SHELL-/bin/sh} +dnl (such as -fPIC) +dnl AC_INIT(timidity/timidity.c) +SHELL=${CONFIG_SHELL-/bin/sh} AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.6.0-beta2, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.6.0-beta3, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -354,26 +354,26 @@ dnl tcltk path AC_ARG_WITH(tcl-includes, - [ --with-tcl-includes=dir Tcl include file path ], + [ --with-tcl-includes=DIR Tcl include file path ], [ if test ! -d $withval; then AC_MSG_WARN($withval is not found.) fi tcl_include_dir="-I$withval" ]) AC_ARG_WITH(tcl-libs, - [ --with-tcl-libs=dir Tcl include file path ], + [ --with-tcl-libs=DIR Tcl library file path ], [ if test ! -d $withval; then AC_MSG_WARN($withval is not found.) fi tcl_libdir="-L$withval" ]) AC_ARG_WITH(tk-includes, - [ --with-tk-includes=dir Tk include file path ], + [ --with-tk-includes=DIR Tk include file path ], [ if test ! -d $withval; then AC_MSG_WARN($withval is not found.) fi tk_includes="-I$withval" ]) AC_ARG_WITH(tk-libs, - [ --with-tk-libs=dir Tk include file path ], + [ --with-tk-libs=DIR Tk library file path ], [ if test ! -d $withval; then AC_MSG_WARN($withval is not found.) fi @@ -381,13 +381,13 @@ dnl offix paths AC_ARG_WITH(offix-includes, - [ --with-offix-includes=dir Offix include file path ], + [ --with-offix-includes=DIR Offix include file path ], [ if test ! -d $withval; then AC_MSG_WARN($withval is not found.) fi offix_include_dir="-I$withval" ]) AC_ARG_WITH(offix-libs, - [ --with-offix-libs=dir Offix include file path ], + [ --with-offix-libs=DIR Offix include file path ], [ if test ! -d $withval; then AC_MSG_WARN($withval is not found.) fi @@ -413,13 +413,19 @@ audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd' +AC_ARG_WITH(nas-library, + [ --with-nas-library=library NAS absolute library path (Don't use -laudio)]) +AC_ARG_WITH(nas-includes, + [ --with-nas-includes=DIR NAS include files are in dir]) + + AC_ARG_ENABLE(audio, [ --enable-audio[=mode_list] Enable audio (Specify comma separated mode list): default: Automatically select audio device. oss: OSS /dev/dsp sun: SunOS /dev/audio hpux: HPUX /dev/audio - irix: IRIX audio + irix: IRIX audio library mme: OSF/1 MME sb_dsp: BSD/OS 2.0 /dev/sb_dsp w32: Windows MMS @@ -686,15 +692,24 @@ fi EXTRADEFS="$EXTRADEFS -DAU_NAS" SYSEXTRAS="$SYSEXTRAS nas_a.c" + dnl -laudio conflicts another audio library, - dnl so I specify NAS library directly - EXTRALIBS="$EXTRALIBS $x_libraries/libaudio.a" - dnl FIXME: It is needed to test NAS library. - if test -f "$x_libraries/libaudio.a"; then - AC_MSG_RESULT(yes - $x_libraries/libaudio.a) + dnl so I specify NAS library with absolete path. + + if test "x$with_nas_library" != x; then + AC_MSG_RESULT($with_nas_library); + EXTRALIBS="$EXTRALIBS $with_nas_library" else - AC_MSG_WARN($x_libraries/libaudio.a: Not found) + AC_MSG_RESULT() + MY_SEARCH_LIBS(AuOpenServer, + [$x_libraries/libaudio.a \ + /usr/lib/libaudio.so \ + /usr/lib/libaudio.a ], + [ AC_MSG_RESULT(NAS: $timidity_cv_search_AuOpenServer) + EXTRALIBS="$EXTRALIBS $timidity_cv_search_AuOpenServer"], + [AC_MSG_WARN(NAS library is not found.)]) fi + test "x$with_nas_includes" != x && CPPFLAGS="$CPPFLAGS -I$with_nas_includes" lib_xt_opt=-lXt if test "x$have_xext" = xyes; then lib_xext_opt=-lXext @@ -772,11 +787,9 @@ interface_targets='dynamic ncurses slang motif tcltk emacs vt100 xaw xskin gtk' -echo "###--enable-interface###" AC_ARG_ENABLE(interface, [ --enable-interface=[interface_list] Comma separated interface list ], - [ echo "###$enableval###" - for i in `echo $enableval | sed 's/,/ /g'`; do + [ for i in `echo $enableval | sed 's/,/ /g'`; do eval "enable_$i=yes" done ]) @@ -784,10 +797,16 @@ dnl Dynamic link configuration dnl AC_ARG_ENABLE(dynamic, - [ --enable-dynamic Enable dynamic link interface (default is no)], + [ --enable-dynamic Enable dynamic link interface (default is no) + --enable-dynamic=dynamic_list Comma separated dynamic interface list], [ dnl --enable-dynamic=yes to --enable-dynamic=dynamic - test "x$enable_dynamic" = xyes && enable_dynamic=dynamic - ]) + if test "x$enable_dynamic" = xyes; then + enable_dynamic=dynamic + elif test "x$enable_dynamic" != xno; then + for i in `echo $enableval | sed 's/,/ /g'`; do + eval "enable_$i=dynamic" + done + fi]) join_targets= for i in $interface_targets; do @@ -806,8 +825,8 @@ if test "$NEEDDLOPEN" = "yes"; then have_dl=no - WAPI_CHECK_FUNC(LoadLibraryExA,,[LoadLibraryExA(0,0,0);],have_dl=cygwin) - test $wapi_cv_func_LoadLibraryExA = yes && have_dl=cygwin + WAPI_CHECK_FUNC(LoadLibrary,,[LoadLibrary(0);],have_dl=w32) + test $wapi_cv_func_LoadLibrary = yes && have_dl=w32 if test "$have_dl" = "no"; then AC_CHECK_FUNC(shl_load,have_dl=hpux) @@ -841,9 +860,9 @@ SYSEXTRAS="$SYSEXTRAS dl_hpux.c" LDFLAGS="$LDFLAGS -Wl,-E $LDFLAGS" ;; - cygwin) - AC_MSG_RESULT(use dl_cygwin32.c) - SYSEXTRAS="$SYSEXTRAS dl_cygwin32.c" + w32) + AC_MSG_RESULT(use dl_w32.c) + SYSEXTRAS="$SYSEXTRAS dl_w32.c" ;; *) NEEDDLOPEN="no" @@ -853,10 +872,9 @@ fi if test "$NEEDDLOPEN" = "yes"; then - SHARED_LIB_PATH="\$(SHLIB_DIR)" MY_DEFINE(IA_DYNAMIC) EXTRADEFS="$EXTRADEFS -DSHARED_LIB_EXT=\\\".$so\\\"" - EXTRADEFS="$EXTRADEFS -DSHARED_LIB_PATH=\\\"$SHARED_LIB_PATH\\\"" + EXTRADEFS="$EXTRADEFS \$(DEF_SHLIB_DIR)" test "x$GCC" = xyes -a "x$timidity_cv_ccoption_rdynamic" = xyes && timidity_LDFLAGS="-rdynamic" fi @@ -1003,7 +1021,6 @@ fi ], [ LIBS=`echo $LIBS | sed "s/-lX11/$tk_lib $tcl_lib -lX11/"` - EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" case "$target" in *-*-bsdi*) EXTRALIBS="$EXTRALIBS -lipc" @@ -1011,8 +1028,7 @@ esac INTERFACE_SRCS="$INTERFACE_SRCS tk_c.c" ], - [ EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" - k_so_libs="$tcl_libdir $tk_libdir $tcl_lib $tk_lib $lib_dl_opt" + [ k_so_libs="$tcl_libdir $tk_libdir $tcl_lib $tk_lib $lib_dl_opt" case "$target" in *-*-bsdi*) k_so_libs="$k_so_libs -lipc" @@ -1239,7 +1255,10 @@ SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS) SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS) SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS) -CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\"" +#CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\"" + +CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR)" + if test "x$TIMIDITY_OUTPUT_ID" != x; then CPPFLAGS="$CPPFLAGS -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\"" fi diff -ruN TiMidity++-2.6.0-beta2/interface/Makefile.am TiMidity++-2.6.0-beta3/interface/Makefile.am --- TiMidity++-2.6.0-beta2/interface/Makefile.am Sat Aug 28 22:17:05 1999 +++ TiMidity++-2.6.0-beta3/interface/Makefile.am Sat Sep 4 07:45:54 1999 @@ -166,7 +166,7 @@ timidity.el .ptcl.tcl: - sed -e s@%TCL_DIR%@$(TCL_DIR)@g -e s@%TIMID_DIR%@$(TIMID_DIR)@g $< > $@ + sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@ clean: rm -f tkmidity.tcl rm -f *.o @@ -205,13 +205,12 @@ endif install.el: $(ELFILES) - test -d $(DESTDIR)$(TIMID_DIR) || mkdir -p $(DESTDIR)$(TIMID_DIR) - for f in $(ELFILES) ''; do case ".$$f" in .);; *) $(INSTALL_DATA) $$f $(DESTDIR)$(TIMID_DIR);; esac; done + test -d $(DESTDIR)$(ELISP_DIR) || mkdir -p $(DESTDIR)$(ELISP_DIR) + for f in $(ELFILES) ''; do case ".$$f" in .);; *) $(INSTALL_DATA) $$f $(DESTDIR)$(ELISP_DIR);; esac; done w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \ w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp windres -o $@ -O coff w32g_res.rc - ### ### For dynamic interfaces diff -ruN TiMidity++-2.6.0-beta2/interface/Makefile.in TiMidity++-2.6.0-beta3/interface/Makefile.in --- TiMidity++-2.6.0-beta2/interface/Makefile.in Wed Sep 1 02:57:59 1999 +++ TiMidity++-2.6.0-beta3/interface/Makefile.in Sun Sep 5 21:30:07 1999 @@ -575,7 +575,7 @@ include $(top_builddir)/common.makefile .ptcl.tcl: - sed -e s@%TCL_DIR%@$(TCL_DIR)@g -e s@%TIMID_DIR%@$(TIMID_DIR)@g $< > $@ + sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@ clean: rm -f tkmidity.tcl rm -f *.o @@ -594,8 +594,8 @@ cd bitmaps; $(MAKE) install.bitmaps install.el: $(ELFILES) - test -d $(DESTDIR)$(TIMID_DIR) || mkdir -p $(DESTDIR)$(TIMID_DIR) - for f in $(ELFILES) ''; do case ".$$f" in .);; *) $(INSTALL_DATA) $$f $(DESTDIR)$(TIMID_DIR);; esac; done + test -d $(DESTDIR)$(ELISP_DIR) || mkdir -p $(DESTDIR)$(ELISP_DIR) + for f in $(ELFILES) ''; do case ".$$f" in .);; *) $(INSTALL_DATA) $$f $(DESTDIR)$(ELISP_DIR);; esac; done w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \ w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp diff -ruN TiMidity++-2.6.0-beta2/interface/bitmaps/Makefile.am TiMidity++-2.6.0-beta3/interface/bitmaps/Makefile.am --- TiMidity++-2.6.0-beta2/interface/bitmaps/Makefile.am Sat Aug 28 22:17:05 1999 +++ TiMidity++-2.6.0-beta3/interface/bitmaps/Makefile.am Sat Sep 4 07:47:26 1999 @@ -34,5 +34,5 @@ EXTRA_DIST = $(BITMAPS) install.bitmaps: $(BITMAPS) - test -d $(DESTDIR)$(TCL_DIR)/bitmaps || mkdir -p $(DESTDIR)$(TCL_DIR)/bitmaps - for f in $(BITMAPS) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(TCL_DIR)/bitmaps;; esac; done + test -d $(DESTDIR)$(BITMAP_DIR) || mkdir -p $(DESTDIR)$(BITMAP_DIR) + for f in $(BITMAPS) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(BITMAP_DIR);; esac; done diff -ruN TiMidity++-2.6.0-beta2/interface/bitmaps/Makefile.in TiMidity++-2.6.0-beta3/interface/bitmaps/Makefile.in --- TiMidity++-2.6.0-beta2/interface/bitmaps/Makefile.in Wed Sep 1 02:58:05 1999 +++ TiMidity++-2.6.0-beta3/interface/bitmaps/Makefile.in Sun Sep 5 21:30:13 1999 @@ -218,8 +218,8 @@ include $(top_builddir)/common.makefile install.bitmaps: $(BITMAPS) - test -d $(DESTDIR)$(TCL_DIR)/bitmaps || mkdir -p $(DESTDIR)$(TCL_DIR)/bitmaps - for f in $(BITMAPS) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(TCL_DIR)/bitmaps;; esac; done + test -d $(DESTDIR)$(BITMAP_DIR) || mkdir -p $(DESTDIR)$(BITMAP_DIR) + for f in $(BITMAPS) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(BITMAP_DIR);; esac; done # 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++-2.6.0-beta2/interface/dynamic_c.c TiMidity++-2.6.0-beta3/interface/dynamic_c.c --- TiMidity++-2.6.0-beta2/interface/dynamic_c.c Sat Aug 28 22:17:05 1999 +++ TiMidity++-2.6.0-beta3/interface/dynamic_c.c Fri Sep 3 00:46:23 1999 @@ -44,15 +44,18 @@ #include "dlutils.h" static int ctl_open(int using_stdin, int using_stdout); +static void ctl_close(void); extern char *dynamic_interface_module(int id); static void ctl_event(){} /* Do nothing */ static int cmsg(int type, int verbosity_level, char *fmt, ...); +static void *libhandle; +static void (* ctl_close_hook)(void); ControlMode dynamic_control_mode = { "Dynamic interface", 0, 1,0,0,0, - ctl_open, NULL, NULL, NULL, cmsg, ctl_event, + ctl_open, ctl_close, NULL, NULL, cmsg, ctl_event, }; static int cmsg(int type, int verbosity_level, char *fmt, ...) @@ -80,7 +83,6 @@ static int ctl_open(int using_stdin, int using_stdout) { - void *libhandle; ControlMode *(* inferface_loader)(void); char *path; char buff[256]; @@ -111,6 +113,18 @@ ctl->verbosity = dynamic_control_mode.verbosity; ctl->trace_playing = dynamic_control_mode.trace_playing; ctl->flags = dynamic_control_mode.flags; + ctl_close_hook = ctl->close; + ctl->close = dynamic_control_mode.close; /* ctl_close() */ return ctl->open(using_stdin, using_stdout); +} + +static void ctl_close(void) +{ + if(ctl_close_hook) + { + ctl_close_hook(); + dl_free(libhandle); + ctl_close_hook = NULL; + } } diff -ruN TiMidity++-2.6.0-beta2/interface/gtk_i.c TiMidity++-2.6.0-beta3/interface/gtk_i.c --- TiMidity++-2.6.0-beta2/interface/gtk_i.c Sat Jul 17 18:25:06 1999 +++ TiMidity++-2.6.0-beta3/interface/gtk_i.c Sun Sep 5 13:44:15 1999 @@ -343,6 +343,9 @@ GtkWidget *vbox, *hbox, *vscrollbar, *vbox2; GtkObject *adj; + /* enable locale */ + gtk_set_locale (); + gtk_init (&argc, NULL); ttip = create_yellow_tooltips(); diff -ruN TiMidity++-2.6.0-beta2/interface/tk_c.c TiMidity++-2.6.0-beta3/interface/tk_c.c --- TiMidity++-2.6.0-beta2/interface/tk_c.c Sat Apr 10 00:40:30 1999 +++ TiMidity++-2.6.0-beta3/interface/tk_c.c Sat Sep 4 06:38:52 1999 @@ -65,6 +65,11 @@ #include "miditrace.h" #include "aq.h" +#ifndef TKPROGPATH +#define TKPROGPATH PKGLIBDIR "/tkmidity.tcl" +#endif /* TKPROGPATH */ + + static void ctl_refresh(void); static void ctl_total_time(int tt); static void ctl_master_volume(int mv); diff -ruN TiMidity++-2.6.0-beta2/interface/w32g_i.c TiMidity++-2.6.0-beta3/interface/w32g_i.c --- TiMidity++-2.6.0-beta2/interface/w32g_i.c Wed Aug 25 15:36:42 1999 +++ TiMidity++-2.6.0-beta3/interface/w32g_i.c Fri Sep 3 03:01:05 1999 @@ -137,7 +137,6 @@ HANDLE hMainThreadInfo = 0; DWORD dwMainThreadID = 0; static volatile int wait_thread_flag = 1; -volatile int IsMainThreadExit = 0; typedef struct MAINTHREAD_ARGS_ { int *pArgc; char ***pArgv; @@ -3107,7 +3106,6 @@ { MSG msg; - IsMainThreadExit = 0; ThreadNumMax++; #ifdef W32GUI_DEBUG @@ -3153,7 +3151,6 @@ OnExitReady(); w32g_send_rc(RC_QUIT, 0); } - IsMainThreadExit = 1; crt_endthread(); } @@ -3613,17 +3610,29 @@ return 0; } -void w32g_close(void) +static void terminate_main_thread(void) { - if(!IsMainThreadExit) + DWORD status; + + switch(WaitForSingleObject(hMainThread, 0)) { + case WAIT_OBJECT_0: + break; + case WAIT_TIMEOUT: OnQuit(); - do - { - sleep(100); - VOLATILE_TOUCH(IsMainThreadExit); - } while(!IsMainThreadExit); + status = WaitForSingleObject(hMainThread, 5000); + if(status == WAIT_TIMEOUT) + TerminateThread(hMainThread, 0); + break; + default: + TerminateThread(hMainThread, 0); + break; } +} + +void w32g_close(void) +{ + terminate_main_thread(); CloseHandle(w32g_lock_sem); CloseHandle(w32g_empty_sem); } @@ -3631,17 +3640,7 @@ void w32g_restart(void) { w32g_restart_gui_flag = 1; - - /* Terminate MainThread */ - if(!IsMainThreadExit) - { - OnQuit(); - do - { - usleep(200); - } while(!IsMainThreadExit); - } - + terminate_main_thread(); CloseHandle(w32g_lock_sem); CloseHandle(w32g_empty_sem); diff -ruN TiMidity++-2.6.0-beta2/interface/w32g_ini.c TiMidity++-2.6.0-beta3/interface/w32g_ini.c --- TiMidity++-2.6.0-beta2/interface/w32g_ini.c Wed Aug 25 13:20:44 1999 +++ TiMidity++-2.6.0-beta3/interface/w32g_ini.c Fri Sep 3 13:57:19 1999 @@ -210,11 +210,7 @@ IniPutKeyInt(INI_SEC_PLAYER,"WrdWndFlag",&(sp->WrdWndFlag)); IniPutKeyInt(INI_SEC_PLAYER,"SoundSpecWndFlag",&(sp->SoundSpecWndFlag)); IniPutKeyInt(INI_SEC_PLAYER,"SubWindowMax",&(sp->SubWindowMax)); -//#### -// if(sp->ConfigFile[0]) - IniPutKeyStringN(INI_SEC_PLAYER,"ConfigFile",sp->ConfigFile,MAXPATH + 32); -// else -// IniPutKeyStringN(INI_SEC_PLAYER,"ConfigFile",W32G_TIMIDITY_CFG,MAXPATH + 32); + IniPutKeyStringN(INI_SEC_PLAYER,"ConfigFile",sp->ConfigFile,MAXPATH + 32); IniPutKeyStringN(INI_SEC_PLAYER,"PlaylistFile",sp->PlaylistFile,MAXPATH + 32); IniPutKeyStringN(INI_SEC_PLAYER,"PlaylistHistoryFile",sp->PlaylistHistoryFile,MAXPATH + 32); IniPutKeyStringN(INI_SEC_PLAYER,"MidiFileOpenDir",sp->MidiFileOpenDir,MAXPATH + 32); diff -ruN TiMidity++-2.6.0-beta2/interface/w32g_playlist.c TiMidity++-2.6.0-beta3/interface/w32g_playlist.c --- TiMidity++-2.6.0-beta2/interface/w32g_playlist.c Wed Aug 25 11:22:06 1999 +++ TiMidity++-2.6.0-beta3/interface/w32g_playlist.c Sun Sep 5 13:48:52 1999 @@ -66,7 +66,7 @@ { int i; for(i = 0; i < playlist.nfiles; i++) - if(strcasecmp(filename, playlist.list[i].filename) == 0) + if(pathcmp(filename, playlist.list[i].filename, 0) == 0) return 0; } @@ -111,12 +111,10 @@ if(SeachDirRecursive) { -//printf("## dir expand: %d\n"); new_files1 = FilesExpandDir(&nfiles, files); if(new_files1 == NULL) return 0; expand_flag = 1; -//printf("## dir expand done %d\n", nfiles); } else new_files1 = files; @@ -125,9 +123,7 @@ new_files2 = new_files1; else { -//printf("## expand...%d\n", nfiles); new_files2 = expand_file_archives(new_files1, &nfiles); -//printf("## expand...done (%d)\n", nfiles); if(new_files2 == NULL) { if(new_files1 != files) @@ -138,11 +134,9 @@ } } -//printf("## checking files...\n", nfiles); n = 0; for(i = 0; i < nfiles; i++) n += w32g_add_playlist1(new_files2[i], uniq, refine); -//printf("## checking files...done\n", nfiles); if(new_files2 != new_files1) { @@ -155,10 +149,8 @@ free(new_files1); } -//printf("## update...\n", nfiles); if(n > 0) w32g_update_playlist(); -//printf("## update...done\n", nfiles); return n; } @@ -391,8 +383,8 @@ save_n = n; while(j2 < save_n) /* j1 <= j2 */ { - if(strcasecmp(playlist.list[i].filename, - playlist.list[j2].filename) == 0) + if(pathcmp(playlist.list[i].filename, + playlist.list[j2].filename, 0) == 0) { nremoved++; n--; diff -ruN TiMidity++-2.6.0-beta2/interface/w32g_utl.c TiMidity++-2.6.0-beta3/interface/w32g_utl.c --- TiMidity++-2.6.0-beta2/interface/w32g_utl.c Thu Aug 26 16:28:58 1999 +++ TiMidity++-2.6.0-beta3/interface/w32g_utl.c Fri Sep 3 13:58:02 1999 @@ -33,7 +33,6 @@ #else #include #endif -//#####include #include #include "timidity.h" diff -ruN TiMidity++-2.6.0-beta2/interface/xaw_i.c TiMidity++-2.6.0-beta3/interface/xaw_i.c --- TiMidity++-2.6.0-beta2/interface/xaw_i.c Tue Aug 24 20:23:53 1999 +++ TiMidity++-2.6.0-beta3/interface/xaw_i.c Sat Sep 4 07:12:09 1999 @@ -254,7 +254,12 @@ static char local_buf[300]; static char window_title[300], *w_title; int amplitude = DEFAULT_AMPLIFICATION; -String bitmapdir = DEFAULT_PATH "/bitmaps"; + +#ifndef XAW_BITMAP_DIR +#define XAW_BITMAP_DIR PKGLIBDIR "/bitmaps" +#endif /* XAW_BITMAP_DIR */ + +String bitmapdir = XAW_BITMAP_DIR; Boolean arrangetitle,savelist; static char **current_flist = NULL; static int voices = 0, last_voice = 0, voices_num_width; @@ -407,7 +412,7 @@ static XtResource xaw_resources[] ={ #define offset(entry) XtOffset(struct _app_resources*, entry) {"bitmapDir", "BitmapDir", XtRString, sizeof(String), - offset(bitmap_dir), XtRString, DEFAULT_PATH "/bitmaps"}, + offset(bitmap_dir), XtRString, XAW_BITMAP_DIR }, {"arrangeTitle", "ArrangeTitle", XtRBoolean, sizeof(Boolean), offset(arrange_title), XtRImmediate, (XtPointer)False}, {"saveList", "SaveList", XtRBoolean, sizeof(Boolean), @@ -2899,7 +2904,7 @@ "*cwd_label.font: -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*", "*time_label*cwd_info.font: -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*", "*time_label.font: -adobe-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*", - "*BitmapDir: " DEFAULT_PATH "/bitmaps/", + "*BitmapDir: " XAW_BITMAP_DIR "/", #ifdef XAW3D "*volume_bar.translations: #override\\n\ ~Ctrl Shift: do-volupdown(-50)\\n\ diff -ruN TiMidity++-2.6.0-beta2/libarc/url.h TiMidity++-2.6.0-beta3/libarc/url.h --- TiMidity++-2.6.0-beta2/libarc/url.h Wed Aug 25 09:50:10 1999 +++ TiMidity++-2.6.0-beta3/libarc/url.h Fri Sep 3 02:30:27 1999 @@ -6,7 +6,7 @@ * http://www.goice.co.jp/member/mo/release/index.html#liburl */ -#define URL_LIB_VERSION "1.9.3" +#define URL_LIB_VERSION "1.9.4" /* Define if you want to enable pipe command scheme ("command|") */ #define PIPE_SCHEME_ENABLE diff -ruN TiMidity++-2.6.0-beta2/libarc/url_file.c TiMidity++-2.6.0-beta3/libarc/url_file.c --- TiMidity++-2.6.0-beta2/libarc/url_file.c Wed Aug 18 02:08:56 1999 +++ TiMidity++-2.6.0-beta3/libarc/url_file.c Fri Sep 3 02:31:39 1999 @@ -14,6 +14,10 @@ #include #endif /* HAVE_UNISTD_H */ +#ifdef __W32__ +#include +#endif /* __W32__ */ + #include "timidity.h" #ifdef HAVE_MMAP @@ -26,8 +30,13 @@ #else /* mmap is not supported */ +#ifdef __W32__ +#define try_mmap(fname, size_ret) w32_mmap(fname, size_ret, &hFile, &hMap) +#define munmap(addr, size) w32_munmap(addr, size, hFile, hMap) +#else #define try_mmap(dmy1, dmy2) NULL #define munmap(addr, size) /* Do nothing */ +#endif /* __W32__ */ #endif #include "url.h" @@ -47,6 +56,10 @@ long mapsize; long pos; +#ifdef __W32__ + HANDLE hFile, hMap; +#endif /* __W32__ */ + FILE *fp; /* Non NULL if mmap is failure */ } URL_file; @@ -125,6 +138,43 @@ *size = (long)st.st_size; return p; } +#elif defined(__W32__) +static void *w32_mmap(char *fname, long *size_ret, HANDLE *hFilePtr, HANDLE *hMapPtr) +{ + void *map; + + *hFilePtr = CreateFile(fname, GENERIC_READ, 0, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(*hFilePtr == INVALID_HANDLE_VALUE) + return NULL; + *size_ret = GetFileSize(*hFilePtr, NULL); + if(*size_ret == 0xffffffff) + { + CloseHandle(*hFilePtr); + return NULL; + } + *hMapPtr = CreateFileMapping(*hFilePtr, NULL, PAGE_READONLY, + 0, 0, NULL); + if(*hMapPtr == NULL) + { + CloseHandle(*hFilePtr); + return NULL; + } + map = MapViewOfFile(*hMapPtr, FILE_MAP_READ, 0, 0, 0); + if(map == NULL) + { + CloseHandle(*hMapPtr); + CloseHandle(*hFilePtr); + return NULL; + } + return map; +} +static void w32_munmap(void *ptr, long size, HANDLE hFile, HANDLE hMap) +{ + UnmapViewOfFile(ptr); + CloseHandle(hMap); + CloseHandle(hFile); +} #endif /* HAVE_MMAP */ URL url_file_open(char *fname) @@ -133,6 +183,9 @@ char *mapptr; /* Non NULL if mmap is success */ long mapsize; FILE *fp; /* Non NULL if mmap is failure */ +#ifdef __W32__ + HANDLE hFile, hMap; +#endif /* __W32__ */ #ifdef DEBUG printf("url_file_open(%s)\n", fname); @@ -233,6 +286,10 @@ url->mapsize = mapsize; url->pos = 0; url->fp = fp; +#ifdef __W32__ + url->hFile = hFile; + url->hMap = hMap; +#endif /* __W32__ */ return (URL)url; } @@ -321,7 +378,13 @@ URL_file *urlp = (URL_file *)url; if(urlp->mapptr != NULL) + { +#ifdef __W32__ + HANDLE hFile = urlp->hFile; + HANDLE hMap = urlp->hMap; +#endif /* __W32__ */ munmap(urlp->mapptr, urlp->mapsize); + } if(urlp->fp != NULL) { if(urlp->fp == stdin) diff -ruN TiMidity++-2.6.0-beta2/timidity/Makefile.am TiMidity++-2.6.0-beta3/timidity/Makefile.am --- TiMidity++-2.6.0-beta2/timidity/Makefile.am Mon Aug 30 17:11:04 1999 +++ TiMidity++-2.6.0-beta3/timidity/Makefile.am Thu Sep 2 23:05:51 1999 @@ -96,7 +96,7 @@ audriv_al.c \ audriv_mme.c \ audriv_none.c \ - dl_cygwin32.c \ + dl_w32.c \ dl_dld.c \ dl_dlopen.c \ dl_hpux.c \ diff -ruN TiMidity++-2.6.0-beta2/timidity/Makefile.in TiMidity++-2.6.0-beta3/timidity/Makefile.in --- TiMidity++-2.6.0-beta2/timidity/Makefile.in Wed Sep 1 02:58:09 1999 +++ TiMidity++-2.6.0-beta3/timidity/Makefile.in Sun Sep 5 21:30:17 1999 @@ -120,7 +120,7 @@ timidity_SOURCES = aenc.h aiff_a.c aq.c aq.h au_a.c audio_cnv.c audio_cnv.h common.c common.h controls.c controls.h dlutils.h effect.c filter.c filter.h instrum.c instrum.h list_a.c load_mod.c loadtab.c mid-j.defs mid.defs miditrace.c miditrace.h mix.c mix.h mod.c mod.h output.c output.h playmidi.c playmidi.h raw_a.c rcp.c readmidi.c readmidi.h recache.c recache.h resample.c resample.h reverb.c reverb.h sbkconv.c sffile.c sffile.h sfitem.c sfitem.h sflayer.h smfconv.c smfconv.h sndfont.c tables.c tables.h timidity.c timidity.h version.c wave_a.c wrd.h wrd_read.c wrdt.c -EXTRA_timidity_SOURCES = alsa_a.c audriv.h audriv_a.c audriv_al.c audriv_mme.c audriv_none.c dl_cygwin32.c dl_dld.c dl_dlopen.c dl_hpux.c bsd20_a.c esd_a.c hpux_a.c hpux_d_a.c oss_a.c mac_a.c mac_qt_a.c mac_com.h mac_dlog.c mac_main.c mac_main.h mac_soundspec.c mfnode.c mfnode.h nas_a.c sun_a.c w32_a.c w32g_a.c timpp32g.ini +EXTRA_timidity_SOURCES = alsa_a.c audriv.h audriv_a.c audriv_al.c audriv_mme.c audriv_none.c dl_w32.c dl_dld.c dl_dlopen.c dl_hpux.c bsd20_a.c esd_a.c hpux_a.c hpux_d_a.c oss_a.c mac_a.c mac_qt_a.c mac_com.h mac_dlog.c mac_main.c mac_main.h mac_soundspec.c mfnode.c mfnode.h nas_a.c sun_a.c w32_a.c w32g_a.c timpp32g.ini @ENABLE_W32GUI_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res @@ -351,7 +351,7 @@ ../utils/support.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/strtab.h wrd.h mid.defs aq.h + ../utils/strtab.h wrd.h mid.defs aq.h dlutils.h wave_a.o: wave_a.c ../config.h timidity.h ../utils/support.h output.h \ controls.h wrd_read.o: wrd_read.c ../config.h timidity.h ../utils/support.h \ diff -ruN TiMidity++-2.6.0-beta2/timidity/common.c TiMidity++-2.6.0-beta3/timidity/common.c --- TiMidity++-2.6.0-beta2/timidity/common.c Thu Aug 19 02:18:33 1999 +++ TiMidity++-2.6.0-beta3/timidity/common.c Sat Sep 4 07:21:03 1999 @@ -558,10 +558,33 @@ /* This adds a directory to the path list */ void add_to_pathlist(char *s) { - PathList *plp=safe_malloc(sizeof(PathList)); - strcpy((plp->path=safe_malloc(strlen(s)+1)),s); - plp->next=pathlist; - pathlist=plp; + PathList *cur, *prev, *plp; + + /* Check duplicated path in the pathlist. */ + plp = prev = NULL; + for(cur = pathlist; cur; prev = cur, cur = cur->next) + if(pathcmp(s, cur->path, 0) == 0) + { + plp = cur; + break; + } + + if(plp) /* found */ + { + if(prev == NULL) /* first */ + pathlist = pathlist->next; + else + prev->next = plp->next; + } + else + { + /* Allocate new path */ + plp = safe_malloc(sizeof(PathList)); + plp->path = safe_strdup(s); + } + + plp->next = pathlist; + pathlist = plp; } #ifndef HAVE_VOLATILE @@ -970,34 +993,51 @@ } } -int pathcasecmp(const char *p1, const char *p2) +int pathcmp(const char *p1, const char *p2, int ignore_case) { - const unsigned char *s1, *s2; int c1, c2; - s1 = *(const unsigned char **)p1; - s2 = *(const unsigned char **)p2; - while(*s1 && *s2) +#ifdef __W32__ + ignore_case = 1; /* Always ignore the case */ +#endif + + while(*p1 && *p2) { - c1 = tolower((int)*s1); - c2 = tolower((int)*s2); + c1 = *p1++ & 0xff; + c2 = *p2++ & 0xff; + if(ignore_case) + { + c1 = tolower(c1); + c2 = tolower(c2); + } if(IS_PATH_SEP(c1)) c1 = 0; if(IS_PATH_SEP(c2)) c2 = 0; if(c1 != c2) return c1 - c2; - s1++; - s2++; } - c1 = tolower((int)*s1); - c2 = tolower((int)*s2); + c1 = *p1 & 0xff; + c2 = *p2 & 0xff; + if(ignore_case) + { + c1 = tolower(c1); + c2 = tolower(c2); + } + if(IS_PATH_SEP(c1)) c1 = 0; + if(IS_PATH_SEP(c2)) c2 = 0; return c1 - c2; } +static int pathcmp_qsort(const char **p1, + const char **p2) +{ + return pathcmp(*(const char **)p1, *(const char **)p2, 1); +} + void sort_pathname(char **files, int nfiles) { qsort(files, nfiles, sizeof(char *), - (int (*)(const void *, const void *))pathcasecmp); + (int (*)(const void *, const void *))pathcmp_qsort); } char *pathsep_strchr(char *path) diff -ruN TiMidity++-2.6.0-beta2/timidity/common.h TiMidity++-2.6.0-beta3/timidity/common.h --- TiMidity++-2.6.0-beta2/timidity/common.h Wed Aug 18 02:08:56 1999 +++ TiMidity++-2.6.0-beta3/timidity/common.h Sat Sep 4 06:57:58 1999 @@ -69,7 +69,7 @@ extern char *safe_strdup(char *s); extern char **expand_file_archives(char **files, int *nfiles_in_out); extern void randomize_string_list(char **strlist, int nstr); -extern int pathcasecmp(const char *path1, const char *path2); +extern int pathcmp(const char *path1, const char *path2, int ignore_case); extern void sort_pathname(char **files, int nfiles); extern int load_table(char *file); extern char *pathsep_strrchr(char *path); diff -ruN TiMidity++-2.6.0-beta2/timidity/dl_cygwin32.c TiMidity++-2.6.0-beta3/timidity/dl_cygwin32.c --- TiMidity++-2.6.0-beta2/timidity/dl_cygwin32.c Thu Feb 4 15:46:44 1999 +++ TiMidity++-2.6.0-beta3/timidity/dl_cygwin32.c Thu Jan 1 09:00:00 1970 @@ -1,113 +0,0 @@ -/* - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ -#define WIN32_LEAN_AND_MEAN -// Defines from windows needed for this function only. Can't include full -// Cygwin32 windows headers because of problems with CONTEXT redefinition -// Removed logic to tell not dynamically load static modules. It is assumed that all -// modules are dynamically built. This should be similar to the behavoir on sunOS. -// Leaving in the logic would have required changes to the standard perlmain.c code -// -// // Includes call a dll function to initialize it's impure_ptr. -#include -void (*impure_setupptr)(struct _reent *); // pointer to the impure_setup routine - -//#include -#define LOAD_WITH_ALTERED_SEARCH_PATH (8) -typedef void *HANDLE; -typedef HANDLE HINSTANCE; -#define STDCALL __attribute__ ((stdcall)) -typedef int STDCALL (*FARPROC)(); - -HINSTANCE -STDCALL -LoadLibraryExA( - char *lpLibFileName, - HANDLE hFile, - unsigned int dwFlags - ); -unsigned int -STDCALL -GetLastError( - void - ); -FARPROC -STDCALL -GetProcAddress( - HINSTANCE hModule, - char *lpProcName - ); - -#ifndef NO_STRING_H -#include -#else -#include -#endif -#include "timidity.h" -#include "dlutils.h" - -/*ARGSUSED*/ -void dl_init(int argc, char **argv) -{ -} - -void *dl_load_file(char *filename) -{ - int flags = 0; - void *RETVAL; - - RETVAL = (void*) LoadLibraryExA(filename, NULL, - LOAD_WITH_ALTERED_SEARCH_PATH); - if(RETVAL == NULL) - fprintf(stderr, "%d", GetLastError()); - -#if 0 - else - { - // setup the dll's impure_ptr: - impure_setupptr = GetProcAddress(RETVAL, "impure_setup"); - if(impure_setupptr == NULL) - { - fprintf(stderr, - "Cygwin32 dynaloader error: could not load impure_setup symbol\n"); - RETVAL = NULL; - } - else{ - // setup the DLLs impure_ptr: - (*impure_setupptr)(_impure_ptr); - } - } -#endif - - return RETVAL; -} - -void *dl_find_symbol(void *libhandle, char *symbolname) -{ - RETVAL = (void*) GetProcAddress((HINSTANCE) libhandle, symbolname); - if(RETVAL == NULL) - fprintf(stderr, "%d", GetLastError()); - return RETVAL; -} diff -ruN TiMidity++-2.6.0-beta2/timidity/dl_dld.c TiMidity++-2.6.0-beta3/timidity/dl_dld.c --- TiMidity++-2.6.0-beta2/timidity/dl_dld.c Mon Nov 30 17:35:30 1998 +++ TiMidity++-2.6.0-beta3/timidity/dl_dld.c Thu Sep 2 23:03:38 1999 @@ -75,3 +75,7 @@ } return RETVAL; } + +void dl_free(void *libhandle) +{ +} diff -ruN TiMidity++-2.6.0-beta2/timidity/dl_dlopen.c TiMidity++-2.6.0-beta3/timidity/dl_dlopen.c --- TiMidity++-2.6.0-beta2/timidity/dl_dlopen.c Tue Feb 2 15:55:26 1999 +++ TiMidity++-2.6.0-beta3/timidity/dl_dlopen.c Thu Sep 2 23:03:40 1999 @@ -56,3 +56,8 @@ fprintf(stderr, "%s\n", dlerror()); return RETVAL; } + +void dl_free(void *libhandle) +{ + dlclose(libhandle); +} diff -ruN TiMidity++-2.6.0-beta2/timidity/dl_hpux.c TiMidity++-2.6.0-beta3/timidity/dl_hpux.c --- TiMidity++-2.6.0-beta2/timidity/dl_hpux.c Tue Feb 2 16:06:32 1999 +++ TiMidity++-2.6.0-beta3/timidity/dl_hpux.c Thu Sep 2 23:03:40 1999 @@ -83,3 +83,7 @@ } return symaddr; } + +void dl_free(void *libhandle) +{ +} diff -ruN TiMidity++-2.6.0-beta2/timidity/dl_w32.c TiMidity++-2.6.0-beta3/timidity/dl_w32.c --- TiMidity++-2.6.0-beta2/timidity/dl_w32.c Thu Jan 1 09:00:00 1970 +++ TiMidity++-2.6.0-beta3/timidity/dl_w32.c Thu Sep 2 23:03:40 1999 @@ -0,0 +1,61 @@ +/* + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ + +#include +#include +#ifndef NO_STRING_H +#include +#else +#include +#endif +#include "timidity.h" +#include "dlutils.h" + +/*ARGSUSED*/ +void dl_init(int argc, char **argv) +{ +} + +void *dl_load_file(char *filename) +{ + void *RETVAL; + + RETVAL = (void*)LoadLibrary(filename); + return RETVAL; +} + +void *dl_find_symbol(void *libhandle, char *symbolname) +{ + void *RETVAL; + + RETVAL = (void*) GetProcAddress((HINSTANCE) libhandle, symbolname); + return RETVAL; +} + +void dl_free(void *libhandle) +{ + FreeLibrary((HINSTANCE)libhandle); +} diff -ruN TiMidity++-2.6.0-beta2/timidity/dlutils.h TiMidity++-2.6.0-beta3/timidity/dlutils.h --- TiMidity++-2.6.0-beta2/timidity/dlutils.h Mon Nov 30 17:35:50 1998 +++ TiMidity++-2.6.0-beta3/timidity/dlutils.h Thu Sep 2 23:03:40 1999 @@ -26,5 +26,6 @@ extern void dl_init(int argc, char **argv); extern void *dl_load_file(char *path); extern void *dl_find_symbol(void *libhandle, char *symbol); +extern void dl_free(void *libhandle); #endif /* ___DLUTILS_H_ */ diff -ruN TiMidity++-2.6.0-beta2/timidity/playmidi.c TiMidity++-2.6.0-beta3/timidity/playmidi.c --- TiMidity++-2.6.0-beta2/timidity/playmidi.c Mon Aug 30 10:24:28 1999 +++ TiMidity++-2.6.0-beta3/timidity/playmidi.c Sun Sep 5 13:40:09 1999 @@ -1919,33 +1919,31 @@ break; case XG_SYSTEM_MODE: /* XG */ + if(channel[ch].bank_lsb == -1) + return; switch(channel[ch].bank_msb) { case 0: /* Normal */ midi_drumpart_change(ch, 0); channel[ch].mapID = XG_NORMAL_MAP; - dr = 0; break; case 64: /* SFX voice */ midi_drumpart_change(ch, 0); channel[ch].mapID = XG_SFX64_MAP; - dr = 0; break; case 126: /* SFX kit */ midi_drumpart_change(ch, 1); channel[ch].mapID = XG_SFX126_MAP; - dr = 1; break; case 127: /* Drumset */ midi_drumpart_change(ch, 1); channel[ch].mapID = XG_DRUM_MAP; - dr = 1; break; default: break; } - if(channel[ch].bank_lsb >= 0) - newbank = channel[ch].bank_lsb; + dr = ISDRUMCHANNEL(ch); + newbank = channel[ch].bank_lsb; break; default: @@ -1970,7 +1968,7 @@ channel[ch].altassign = NULL; } - if(!ISDRUMCHANNEL(ch) && default_program[ch] == SPECIAL_PROGRAM) + if(!dr && default_program[ch] == SPECIAL_PROGRAM) channel[ch].program = SPECIAL_PROGRAM; else channel[ch].program = prog; diff -ruN TiMidity++-2.6.0-beta2/timidity/readmidi.c TiMidity++-2.6.0-beta3/timidity/readmidi.c --- TiMidity++-2.6.0-beta2/timidity/readmidi.c Wed Aug 11 11:48:42 1999 +++ TiMidity++-2.6.0-beta3/timidity/readmidi.c Sun Sep 5 13:24:08 1999 @@ -1633,6 +1633,8 @@ break; case XG_SYSTEM_MODE: /* XG */ + if(bank_lsb[ch] == -1) + goto end_of_event_switch; switch(bank_msb[ch]) { case 0: /* Normal */ @@ -1790,6 +1792,7 @@ skip_this_event = 1; break; } + end_of_event_switch: /* Recompute time in samples*/ if((dt = meep->event.time - at) && !counting_time) diff -ruN TiMidity++-2.6.0-beta2/timidity/timidity.c TiMidity++-2.6.0-beta3/timidity/timidity.c --- TiMidity++-2.6.0-beta2/timidity/timidity.c Wed Sep 1 02:32:53 1999 +++ TiMidity++-2.6.0-beta3/timidity/timidity.c Sat Sep 4 07:09:50 1999 @@ -156,11 +156,10 @@ #ifdef IA_DYNAMIC #include "dlutils.h" -#ifdef SHARED_LIB_PATH -static char *dynamic_lib_root = SHARED_LIB_PATH; -#else -static char *dynamic_lib_root = "."; +#ifndef SHARED_LIB_PATH +#define SHARED_LIB_PATH PKGLIBDIR #endif /* SHARED_LIB_PATH */ +static char *dynamic_lib_root = SHARED_LIB_PATH; #endif /* IA_DYNAMIC */ #ifndef MAXPATHLEN @@ -175,17 +174,11 @@ CRITICAL_SECTION critSect; #pragma argsused -static BOOL WINAPI handler (DWORD dw) +static BOOL WINAPI handler(DWORD dw) { - if(dw == CTRL_C_EVENT || dw == CTRL_BREAK_EVENT) - printf ("***BREAK" NLS); fflush(stdout); - intr = TRUE; - aq_flush(1); - play_mode->close_output(); - ctl->close(); - wrdt->close(); - ExitProcess(-1); - return TRUE; + printf ("***BREAK" NLS); fflush(stdout); + intr++; + return TRUE; } #endif @@ -3030,18 +3023,18 @@ { #endif /* BORLANDC_EXCEPTION */ #ifdef __W32__ + #ifdef HAVE_SIGNAL - signal(SIGINT, sigterm_exit); signal(SIGTERM, sigterm_exit); #endif + SetConsoleCtrlHandler(handler, TRUE); ctl->cmsg(CMSG_INFO, VERB_DEBUG_SILLY, "Initialize for Critical Section"); - SetConsoleCtrlHandler (handler, TRUE); - InitializeCriticalSection (&critSect); + InitializeCriticalSection(&critSect); if(opt_evil_mode) - if (!SetThreadPriority(GetCurrentThread(), - THREAD_PRIORITY_ABOVE_NORMAL)) + if(!SetThreadPriority(GetCurrentThread(), + THREAD_PRIORITY_ABOVE_NORMAL)) ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "Error raising process priority"); @@ -3105,6 +3098,9 @@ "pass_playing_list() nfiles=%d", nfiles); ctl->pass_playing_list(nfiles, files); + + if(intr) + aq_flush(1); #ifdef XP_UNIX return 0; diff -ruN TiMidity++-2.6.0-beta2/timidity/timidity.h TiMidity++-2.6.0-beta3/timidity/timidity.h --- TiMidity++-2.6.0-beta2/timidity/timidity.h Wed Aug 25 18:17:10 1999 +++ TiMidity++-2.6.0-beta3/timidity/timidity.h Sat Sep 4 06:41:36 1999 @@ -29,8 +29,14 @@ /* You could specify a complete path, e.g. "/etc/timidity.cfg", and then specify the library directory in the configuration file. */ /* #define CONFIG_FILE "/etc/timidity.cfg" */ -#define CONFIG_FILE DEFAULT_PATH "/timidity.cfg" +#ifndef CONFIG_FILE +#ifdef DEFAULT_PATH +#define CONFIG_FILE DEFAULT_PATH "/timidity.cfg" +#else +#define CONFIG_FILE PKGDATADIR "/timidity.cfg" +#endif /* DEFAULT_PATH */ +#endif /* CONFIG_FILE */ /* Filename extension, followed by command to run decompressor so that output is written to stdout. Terminate the list with a 0.