diff -ruN TiMidity++-1.2.0/ChangeLog TiMidity++-1.2.1/ChangeLog --- TiMidity++-1.2.0/ChangeLog Thu Jan 21 01:48:22 1999 +++ TiMidity++-1.2.1/ChangeLog Mon Jan 25 20:40:11 1999 @@ -1,3 +1,46 @@ +-- 1.2.1 +Mon Jan 25 1999 +Summary: + * Added missing files. + * Fixed some configuration probrems. + * Added --enable-dynamic `configure' option. + +Date: Mon Jan 25 1999 +From: Masanao Izumo +Files: acinclude.m4 configure.in + Fixed some probrems of configuration: + * Remove duplicated -lXpm option. + * Not to change the order of comple flags. + * and so on... +Files: interface/gtk_c.c + Implemented interface_g_loader() +Files: timidity/dl_dlopen.c + Added "\n" to error message of dl_find_symbol() + +Date: Mon, 25 Jan 1999 01:18:27 +0900 (JST) +From: nork@lb.u-tokai.ac.jp (Norikatsu Shigemura) +Files: configure.in + Pached for making FreeBSD UMP. + +Date: Fri Jan 22 1999 +From: Masanao Izumo +Files: configure.in + Added --enable-dynamic configure option. It is enable to always compile + dynamic link codes. +Files: timidity/gtk_i.c + On Solaris, glob()'s flag is different in the interface. + So I just changed not to call glob() on Solaris. + +Date: Thu, 21 Jan 1999 12:53:18 +0900 +From: "KINOSHITA, K." +Files: timidity/timidity.c + Removed no effect statements. + +Date: Thu, 21 Jan 1999 03:40:38 +0900 +From: Ueyama Rui +Files: interface/pixmaps/{fast,slow,restart,keyup,keydown}.xpm + Reported some files for Gtk pixmaps are missing. Added them. + -- 1.2.0 Thu Jan 21 JST 1999 Summary: @@ -9,7 +52,7 @@ - Added buttons (& implementation) for increasing/decreasing the tempo. * Lookup TIMIDITY_SOUND_CARD and TIMIDITY_PCM_DEVICE environment variable to select the PCM device of ALSA. - * Added interface.h to define IA_* macro for TiMidity interface. This + * Made interface.h to define IA_* macro for TiMidity interface. This file is generated automatically by configure. * Fixed some bugs. diff -ruN TiMidity++-1.2.0/NEWS TiMidity++-1.2.1/NEWS --- TiMidity++-1.2.0/NEWS Thu Jan 21 01:08:34 1999 +++ TiMidity++-1.2.1/NEWS Mon Jan 25 20:39:05 1999 @@ -1,5 +1,11 @@ -* 1/20, 1999 - TiMidity++ v1.2.0 is released. +* 1/25, 1999 + Released TiMidity++ v1.2.1. + Added missing files. + Fixed some configuration probrems. + Added --enable-dynamic configure option. + +* 1/21, 1999 + Released TiMidity++ v1.2.0. New features and major change from v1.1.x: * XAW interface: - Changed button bitmap of random & repeat @@ -13,21 +19,21 @@ file is generated automatically by configure. * 1/18, 1999 - TiMidity++ v1.1.1 is released. + Released TiMidity++ v1.1.1. v1.1.0 had configuration probrems, so v1.1.1 was released immediately. Fixed some configure bugs. Modified that xaw interface is enable to run without any midi files. * 1/18, 1999 - TiMidity++ v1.1.0 is released. + Released TiMidity++ v1.1.0. Support OffiX file drag & drop interface for xaw. Support UMP configuration. * 1/14, 1999 - TiMidity++ v1.0.1 is released. + Released TiMidity++ v1.0.1. Modfied for OffiX file drag & drop interface for xaw. If you want build this, define OFFIX in interface/xaw.h and link libDnd. * 1/6, 1999 - TiMidity++ v1.0.0 is released. + Released TiMidity++ v1.0.0. See `ChangeLog' for major changes from the original of TiMidity 0.2i diff -ruN TiMidity++-1.2.0/acinclude.m4 TiMidity++-1.2.1/acinclude.m4 --- TiMidity++-1.2.0/acinclude.m4 Wed Jan 20 18:22:59 1999 +++ TiMidity++-1.2.1/acinclude.m4 Mon Jan 25 21:14:28 1999 @@ -248,8 +248,52 @@ ]) -dnl SET_SORT_UNIQ_WORD(shell-variable,words...) -AC_DEFUN(SET_SORT_UNIQ_WORD, -[$1=`for f in $2; do echo $f; done | sort | uniq` -$1=`echo $$1` +dnl contains program from perl5 +dnl CONTAINS_INIT() +AC_DEFUN(CONTAINS_INIT, +[dnl Some greps do not return status, grrr. +AC_MSG_CHECKING(whether grep returns status) +echo "grimblepritz" >grimble +if grep blurfldyick grimble >/dev/null 2>&1 ; then + contains="./contains" +elif grep grimblepritz grimble >/dev/null 2>&1 ; then + contains=grep +else + contains="./contains" +fi +rm -f grimble +dnl the following should work in any shell +case "$contains" in +grep) AC_MSG_RESULT(yes) + ;; +./contains) + AC_MSG_RESULT(AGH! Grep doesn't return a status. Attempting remedial action.) + cat >./contains <<'EOSS' +grep "[$]1" "[$]2" >.greptmp && cat .greptmp && test -s .greptmp +EOSS + chmod +x "./contains" + ;; +esac +]) + + +dnl CONTAINS(word,filename,action-if-found,action-if-not-found) +AC_DEFUN(CONTAINS, +[if $contains "^[$1]"'[$]' $2 >/dev/null 2>&1; then + [$3] +else + [$4] +fi +]) + + +dnl SET_UNIQ_WORDS(shell-variable,words...) +AC_DEFUN(SET_UNIQ_WORDS, +[rm -f wordtmp >/dev/null 2>&1 +val='' +for f in $2; do + CONTAINS([$f],wordtmp,:,[echo $f >>wordtmp; val="$val $f"]) +done +$1="$val" +rm -f wordtmp >/dev/null 2>&1 ]) diff -ruN TiMidity++-1.2.0/aclocal.m4 TiMidity++-1.2.1/aclocal.m4 --- TiMidity++-1.2.0/aclocal.m4 Thu Jan 21 01:37:03 1999 +++ TiMidity++-1.2.1/aclocal.m4 Mon Jan 25 21:23:04 1999 @@ -260,10 +260,54 @@ ]) -dnl SET_SORT_UNIQ_WORD(shell-variable,words...) -AC_DEFUN(SET_SORT_UNIQ_WORD, -[$1=`for f in $2; do echo $f; done | sort | uniq` -$1=`echo $$1` +dnl contains program from perl5 +dnl CONTAINS_INIT() +AC_DEFUN(CONTAINS_INIT, +[dnl Some greps do not return status, grrr. +AC_MSG_CHECKING(whether grep returns status) +echo "grimblepritz" >grimble +if grep blurfldyick grimble >/dev/null 2>&1 ; then + contains="./contains" +elif grep grimblepritz grimble >/dev/null 2>&1 ; then + contains=grep +else + contains="./contains" +fi +rm -f grimble +dnl the following should work in any shell +case "$contains" in +grep) AC_MSG_RESULT(yes) + ;; +./contains) + AC_MSG_RESULT(AGH! Grep doesn't return a status. Attempting remedial action.) + cat >./contains <<'EOSS' +grep "[$]1" "[$]2" >.greptmp && cat .greptmp && test -s .greptmp +EOSS + chmod +x "./contains" + ;; +esac +]) + + +dnl CONTAINS(word,filename,action-if-found,action-if-not-found) +AC_DEFUN(CONTAINS, +[if $contains "^[$1]"'[$]' $2 >/dev/null 2>&1; then + [$3] +else + [$4] +fi +]) + + +dnl SET_UNIQ_WORDS(shell-variable,words...) +AC_DEFUN(SET_UNIQ_WORDS, +[rm -f wordtmp >/dev/null 2>&1 +val='' +for f in $2; do + CONTAINS([$f],wordtmp,:,[echo $f >>wordtmp; val="$val $f"]) +done +$1="$val" +rm -f wordtmp >/dev/null 2>&1 ]) # Define a conditional. diff -ruN TiMidity++-1.2.0/common.makefile.in TiMidity++-1.2.1/common.makefile.in --- TiMidity++-1.2.0/common.makefile.in Wed Jan 20 18:17:12 1999 +++ TiMidity++-1.2.1/common.makefile.in Mon Jan 25 19:58:51 1999 @@ -16,6 +16,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Define follows if you want to change. + #SHELL=/bin/sh ########### Compiler and flags. @@ -45,9 +47,14 @@ #CC= @CC@ #CFLAGS = @CFLAGS@ +#CPPFLAGS = @CPPFLAGS@ #DEFS = @DEFS@ -#LIBS = @LIBS@ +#EXTRADEFS = @EXTRADEFS@ #LDFLAGS = @LDFLAGS@ +#LIBS = @LIBS@ +#EXTRALIBS = @EXTRALIBS@ +SHLD = @SHLD@ +SHCFLAGS = @SHCFLAGS@ DEBUGFLAGS = -Wall ########### Install. @@ -65,5 +72,6 @@ CFLAGS += $(DEBUGFLAGS) DEFS += $(EXTRADEFS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" +LIBS += $(EXTRALIBS) .SUFFIXES: .c .h .ptcl .tcl .o .1 .txt .ps .@so@ diff -ruN TiMidity++-1.2.0/config.h.in TiMidity++-1.2.1/config.h.in --- TiMidity++-1.2.0/config.h.in Wed Jan 20 18:17:12 1999 +++ TiMidity++-1.2.1/config.h.in Mon Jan 25 15:20:49 1999 @@ -146,9 +146,6 @@ /* Define if you have the X11 library (-lX11). */ #undef HAVE_LIBX11 -/* Define if you have the Xpm library (-lXpm). */ -#undef HAVE_LIBXPM - /* Define if you have the asound library (-lasound). */ #undef HAVE_LIBASOUND diff -ruN TiMidity++-1.2.0/configure TiMidity++-1.2.1/configure --- TiMidity++-1.2.0/configure Thu Jan 21 01:37:07 1999 +++ TiMidity++-1.2.1/configure Mon Jan 25 21:23:06 1999 @@ -36,6 +36,8 @@ ac_help="$ac_help --disable-alsatest Do not try to compile and run a test Alsa program" ac_help="$ac_help + --enable-dynamic Enable dynamic link interface " +ac_help="$ac_help --enable-ncurses Enable ncurses interface (default is no)" ac_help="$ac_help --enable-slang Enable slang interface (default is no)" @@ -623,7 +625,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:627: checking host system type" >&5 +echo "configure:629: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -644,7 +646,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:648: checking target system type" >&5 +echo "configure:650: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -662,7 +664,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:666: checking build system type" >&5 +echo "configure:668: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -695,7 +697,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:699: checking for a BSD compatible install" >&5 +echo "configure:701: 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 @@ -748,7 +750,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:752: checking whether build environment is sane" >&5 +echo "configure:754: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -805,7 +807,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:809: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:811: 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 @@ -834,7 +836,7 @@ PACKAGE=TiMidity++ -VERSION=1.2.0 +VERSION=1.2.1 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -844,7 +846,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:848: checking for working aclocal" >&5 +echo "configure:850: 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. @@ -857,7 +859,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:861: checking for working autoconf" >&5 +echo "configure:863: 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. @@ -870,7 +872,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:874: checking for working automake" >&5 +echo "configure:876: 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. @@ -883,7 +885,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:887: checking for working autoheader" >&5 +echo "configure:889: 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. @@ -896,7 +898,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:900: checking for working makeinfo" >&5 +echo "configure:902: 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. @@ -910,6 +912,30 @@ +echo $ac_n "checking whether grep returns status""... $ac_c" 1>&6 +echo "configure:917: checking whether grep returns status" >&5 +echo "grimblepritz" >grimble +if grep blurfldyick grimble >/dev/null 2>&1 ; then + contains="./contains" +elif grep grimblepritz grimble >/dev/null 2>&1 ; then + contains=grep +else + contains="./contains" +fi +rm -f grimble +case "$contains" in +grep) echo "$ac_t""yes" 1>&6 + ;; +./contains) + echo "$ac_t""AGH! Grep doesn't return a status. Attempting remedial action." 1>&6 + cat >./contains <<'EOSS' +grep "$1" "$2" >.greptmp && cat .greptmp && test -s .greptmp +EOSS + chmod +x "./contains" + ;; +esac + + @@ -920,7 +946,7 @@ # Extract the first word of "emacs xemacs", so it can be a program name with args. set dummy emacs xemacs; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:924: checking for $ac_word" >&5 +echo "configure:950: 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 @@ -951,7 +977,7 @@ if test $EMACS != "no"; then echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:955: checking where .elc files should go" >&5 +echo "configure:981: checking where .elc files should go" >&5 lispdir="\$(datadir)/emacs/site-lisp" if test "x$prefix" = "xNONE"; then if test -d $ac_default_prefix/share/emacs/site-lisp; then @@ -985,10 +1011,45 @@ fi +EXTRACFLAGS= +EXTRADEFS= +EXTRALIBS= +SYSEXTRAS= + +lib_xm_opt= +lib_xaw_opt= +lib_xmu_opt= +lib_xt_opt= +lib_xprelibs_opt= +lib_xext_opt= + +lib_dl_opt= + +WISH=${WISH:-wish} +tcltk_dep= + +for i in `echo $LIBRARY_PATH|sed -e 's,:, ,g'`; do + LDFLAGS="$LDFLAGS -L${i}" +done +for i in `echo $C_INCLUDE_PATH|sed -e 's,:, ,g'`; do + CPPFLAGS="$CPPFLAGS -I${i}" +done + +LDFLAGS="$LDFLAGS -L/usr/local/lib" +CPPFLAGS="$CPPFLAGS -I/usr/local/include" +SHLDFLAGS=${SHLDFLAGS:-$LDFLAGS} + +if test "x$prefix" != xNONE -a "x$prefix" != "x$ac_default_prefix"; then + LDFLAGS="-L$prefix/lib $LDFLAGS" + SHLDFLAGS="-L$prefix/lib $SHLDFLAGS" + CPPFLAGS="-I$prefix/include $CPPFLAGS" +fi + + # 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:992: checking for $ac_word" >&5 +echo "configure:1053: 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 @@ -1017,7 +1078,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:1021: checking for $ac_word" >&5 +echo "configure:1082: 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 @@ -1065,7 +1126,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1069: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1130: 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. @@ -1075,11 +1136,11 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1099,12 +1160,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:1103: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1164: 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:1108: checking whether we are using GNU C" >&5 +echo "configure:1169: 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 @@ -1113,7 +1174,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1117: \"$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:1178: \"$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 @@ -1128,7 +1189,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1132: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1193: 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 @@ -1166,7 +1227,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:1170: checking for a BSD compatible install" >&5 +echo "configure:1231: 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 @@ -1218,7 +1279,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:1222: checking for $ac_word" >&5 +echo "configure:1283: 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 @@ -1245,7 +1306,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1249: checking whether ln -s works" >&5 +echo "configure:1310: 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 @@ -1266,35 +1327,6 @@ fi -LDFLAGS=${LDFLAGS:--L/usr/local/lib} -SHLDFLAGS=${LDFLAGS:--L/usr/local/lib} -CPPFLAGS="$CPPFLAGS -I/usr/local/include" - -EXTRACFLAGS= -EXTRADEFS= -SYSEXTRAS= -EXTRALIBS= -EXTRAINCS= - -lib_xm_opt= -lib_xaw_opt= -lib_xmu_opt= -lib_xt_opt= -lib_xprelibs_opt= -lib_xext_opt= - -lib_dl_opt= - -WISH=${WISH:-wish} -tcltk_dep= - -for i in `echo $LIBRARY_PATH|sed -e 's,:, ,g'`; do - LDFLAGS="$LDFLAGS -L${i}" - SHLDFLAGS="$SHLDFLAGS -L${i}" -done -for i in `echo $C_INCLUDE_PATH|sed -e 's,:, ,g'`; do - EXTRAINCS="$EXTRAINCS -I${i}" -done case "$target" in *-*-hpux*) @@ -1310,14 +1342,27 @@ test -n "$SHLD" || SHLD="ld -Bforcearchive -Bshareable" so="so" ;; - *-*-freebsd*) - EXTRALIBS="$EXTRALIB -lxpg4" + *-*-freebsd2*) + EXTRALIBS="$EXTRALIBS -lxpg4" test -n "$SHLD" || SHLD="ld -Bshareable" so="so" ;; + *-*-freebsd*) + EXTRACFLAGS=-aout + EXTRALIBS="$EXTRALIBS -lxpg4" + SHLDFLAGS="-L/usr/X11R6/aout $SHLDFLAGS" + test -n "$SHLD" || SHLD="env OBJFORMAT=aout ld -shared" + so="so" + ;; *-*-cygwin32*) EXTRADEFS="-D__WIN32__" - test -n "$SHLD" || SHLD="$CC" + # ?? + case "x${CC} " in + "xbcc32 "*) test -n "$SHLD" || SHLD="tlink32 -Tpd" ;; + "xcl "*) test -n "$SHLD" || SHLD="link -dll" ;; + "xgcc "*) test -n "$SHLD" || SHLD="gcc -mdll" ;; + *) test -n "$SHLD" || SHLD="unknown" ;; + esac so="dll" CYGWIN32=yes ;; @@ -1338,7 +1383,7 @@ esac echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:1342: checking for sqrt in -lm" >&5 +echo "configure:1387: 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 @@ -1346,7 +1391,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1385,7 +1430,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1389: checking for socket in -lsocket" >&5 +echo "configure:1434: 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 @@ -1393,7 +1438,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1432,7 +1477,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1436: checking for dlopen in -ldl" >&5 +echo "configure:1481: 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 @@ -1440,7 +1485,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1474,12 +1519,12 @@ for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1478: checking for $ac_func" >&5 +echo "configure:1523: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1524,7 +1569,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1528: checking for gethostbyname in -lnsl" >&5 +echo "configure:1573: 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 @@ -1532,7 +1577,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1574,7 +1619,7 @@ done echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1578: checking how to run the C preprocessor" >&5 +echo "configure:1623: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1589,13 +1634,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:1599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1606,13 +1651,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:1616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1639,7 +1684,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:1643: checking for X" >&5 +echo "configure:1688: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1701,12 +1746,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:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1775,14 +1820,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1888,17 +1933,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:1892: checking whether -R must be followed by a space" >&5 +echo "configure:1937: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -1914,14 +1959,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -1953,7 +1998,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:1957: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2002: 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 @@ -1961,7 +2006,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1994,7 +2039,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:1998: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2043: 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 @@ -2002,7 +2047,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2042,12 +2087,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:2046: checking for gethostbyname" >&5 +echo "configure:2091: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2091,7 +2136,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2095: checking for gethostbyname in -lnsl" >&5 +echo "configure:2140: 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 @@ -2099,7 +2144,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2140,12 +2185,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:2144: checking for connect" >&5 +echo "configure:2189: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2189,7 +2234,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2193: checking for connect in -lsocket" >&5 +echo "configure:2238: 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 @@ -2197,7 +2242,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2232,12 +2277,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:2236: checking for remove" >&5 +echo "configure:2281: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2281,7 +2326,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2285: checking for remove in -lposix" >&5 +echo "configure:2330: 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 @@ -2289,7 +2334,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2324,12 +2369,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2328: checking for shmat" >&5 +echo "configure:2373: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2373,7 +2418,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2377: checking for shmat in -lipc" >&5 +echo "configure:2422: 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 @@ -2381,7 +2426,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2425,7 +2470,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:2429: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2474: 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 @@ -2433,7 +2478,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2485,7 +2530,7 @@ fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2489: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2534: 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 @@ -2493,7 +2538,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2532,12 +2577,12 @@ fi echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 -echo "configure:2536: checking X11 version 6" >&5 +echo "configure:2581: 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() { @@ -2547,7 +2592,7 @@ ; return 0; } EOF -if { (eval echo configure:2551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* timidity_cv_x11_version_6=yes else @@ -2567,7 +2612,7 @@ KEEPLIBS=$LIBS echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6 -echo "configure:2571: checking for XShapeCombineMask in -lXext" >&5 +echo "configure:2616: 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 @@ -2575,7 +2620,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2608,7 +2653,7 @@ fi echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2612: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2657: 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 @@ -2616,7 +2661,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2655,7 +2700,7 @@ fi echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6 -echo "configure:2659: checking for SmcOpenConnection in -lSM" >&5 +echo "configure:2704: 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 @@ -2663,7 +2708,7 @@ ac_save_LIBS="$LIBS" LIBS="-lSM $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2696,7 +2741,7 @@ fi echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2700: checking for XtVaAppInitialize in -lXt" >&5 +echo "configure:2745: 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 @@ -2704,7 +2749,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2737,7 +2782,7 @@ fi echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6 -echo "configure:2741: checking for XmuInternAtom in -lXmu" >&5 +echo "configure:2786: 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 @@ -2745,7 +2790,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2777,7 +2822,7 @@ fi echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 -echo "configure:2781: checking for XawInitializeWidgetSet in -lXaw3d" >&5 +echo "configure:2826: 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 @@ -2785,7 +2830,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXaw3d $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2815,7 +2860,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 -echo "configure:2819: checking for XawInitializeWidgetSet in -lXaw" >&5 +echo "configure:2864: 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 @@ -2823,7 +2868,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXaw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2858,7 +2903,7 @@ fi echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 -echo "configure:2862: checking for XmCreateForm in -lXm" >&5 +echo "configure:2907: 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 @@ -2866,7 +2911,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2907,12 +2952,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:2911: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2956: 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> @@ -2920,7 +2965,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2945,7 +2990,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:2949: checking for opendir in -ldir" >&5 +echo "configure:2994: 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 @@ -2953,7 +2998,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2986,7 +3031,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2990: checking for opendir in -lx" >&5 +echo "configure:3035: 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 @@ -2994,7 +3039,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3028,12 +3073,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3032: checking for ANSI C header files" >&5 +echo "configure:3077: 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 @@ -3041,7 +3086,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3058,7 +3103,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 @@ -3076,7 +3121,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 @@ -3097,7 +3142,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3108,7 +3153,7 @@ exit (0); } EOF -if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -3132,12 +3177,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3136: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3181: 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 @@ -3153,7 +3198,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3177,17 +3222,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3181: checking for $ac_hdr" >&5 +echo "configure:3226: 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:3191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3215,17 +3260,17 @@ ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:3219: checking for string.h" >&5 +echo "configure:3264: 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:3229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3249,12 +3294,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3253: checking for working const" >&5 +echo "configure:3298: 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:3352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3324,14 +3369,14 @@ fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3328: checking whether char is unsigned" >&5 +echo "configure:3373: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3387,14 +3432,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3391: checking whether byte ordering is bigendian" >&5 +echo "configure:3436: 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 @@ -3405,11 +3450,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3454: \"$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 @@ -3420,7 +3465,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3440,7 +3485,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3477,21 +3522,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3481: checking for inline" >&5 +echo "configure:3526: 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:3540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3517,12 +3562,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3521: checking for off_t" >&5 +echo "configure:3566: 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 @@ -3550,12 +3595,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3554: checking for pid_t" >&5 +echo "configure:3599: 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 @@ -3583,12 +3628,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3587: checking for size_t" >&5 +echo "configure:3632: 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 @@ -3616,12 +3661,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3620: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3665: 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 @@ -3630,7 +3675,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3652,19 +3697,19 @@ echo $ac_n "checking volatile declaration""... $ac_c" 1>&6 -echo "configure:3656: checking volatile declaration" >&5 +echo "configure:3701: 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:3713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_volatile=yes else @@ -3682,12 +3727,12 @@ fi echo $ac_n "checking union semun declaration""... $ac_c" 1>&6 -echo "configure:3686: checking union semun declaration" >&5 +echo "configure:3731: 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 @@ -3696,7 +3741,7 @@ union semun x ; return 0; } EOF -if { (eval echo configure:3700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_union_semun=yes else @@ -3715,13 +3760,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:3719: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:3764: 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 @@ -3739,7 +3784,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -3761,7 +3806,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3765: checking for 8-bit clean memcmp" >&5 +echo "configure:3810: 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 @@ -3769,7 +3814,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3800,17 +3845,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3804: checking for $ac_hdr" >&5 +echo "configure:3849: 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:3814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3839,12 +3884,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3843: checking for $ac_func" >&5 +echo "configure:3888: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3892,7 +3937,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3896: checking for working mmap" >&5 +echo "configure:3941: 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 @@ -3900,7 +3945,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -4063,7 +4108,7 @@ fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:4067: checking whether setvbuf arguments are reversed" >&5 +echo "configure:4112: 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 @@ -4071,7 +4116,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. */ @@ -4085,7 +4130,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -4109,12 +4154,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4113: checking return type of signal handlers" >&5 +echo "configure:4158: 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 @@ -4131,7 +4176,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4150,12 +4195,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4154: checking for vprintf" >&5 +echo "configure:4199: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4202,12 +4247,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4206: checking for _doprnt" >&5 +echo "configure:4251: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4257,12 +4302,12 @@ for ac_func in gettimeofday select socket strdup strstr vsnprintf snprintf usleep strncasecmp strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4261: checking for $ac_func" >&5 +echo "configure:4306: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4312,12 +4357,12 @@ # check getopt echo $ac_n "checking for getopt""... $ac_c" 1>&6 -echo "configure:4316: checking for getopt" >&5 +echo "configure:4361: checking for getopt" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_getopt=yes" else @@ -4374,73 +4419,62 @@ if test "${with_tcl_includes+set}" = set; then withval="$with_tcl_includes" if test ! -d $withval; then - { echo "configure: error: $withval not found." 1>&2; exit 1; } + echo "configure: warning: $withval is not found." 1>&2 fi - tcl_include_dir=$withval + tcl_include_dir="-I$withval" -else - tcl_include_dir=/usr/local/include fi # Check whether --with-tcl-libs or --without-tcl-libs was given. if test "${with_tcl_libs+set}" = set; then withval="$with_tcl_libs" if test ! -d $withval; then - { echo "configure: error: $withval not found." 1>&2; exit 1; } + echo "configure: warning: $withval is not found." 1>&2 fi - tcl_lib_dir=$withval -else - tcl_lib_dir=/usr/local/lib + tcl_libdir="-L$withval" fi # Check whether --with-tk-includes or --without-tk-includes was given. if test "${with_tk_includes+set}" = set; then withval="$with_tk_includes" if test ! -d $withval; then - { echo "configure: error: $withval not found." 1>&2; exit 1; } + echo "configure: warning: $withval is not found." 1>&2 fi - tk_include_dir=$withval -else - tk_include_dir=/usr/local/include + tk_includes="-I$withval" fi # Check whether --with-tk-libs or --without-tk-libs was given. if test "${with_tk_libs+set}" = set; then withval="$with_tk_libs" if test ! -d $withval; then - { echo "configure: error: $withval not found." 1>&2; exit 1; } + echo "configure: warning: $withval is not found." 1>&2 fi - tk_lib_dir=$withval -else - tk_lib_dir=/usr/local/lib + tk_libdir="-L$withval" fi + # Check whether --with-offix-includes or --without-offix-includes was given. if test "${with_offix_includes+set}" = set; then withval="$with_offix_includes" if test ! -d $withval; then - { echo "configure: error: $withval not found." 1>&2; exit 1; } + echo "configure: warning: $withval is not found." 1>&2 fi - offix_include_dir=$withval -else - offix_include_dir=/usr/local/include + offix_include_dir="-I$withval" fi # Check whether --with-offix-libs or --without-offix-libs was given. if test "${with_offix_libs+set}" = set; then withval="$with_offix_libs" if test ! -d $withval; then - { echo "configure: error: $withval not found." 1>&2; exit 1; } + echo "configure: warning: $withval is not found." 1>&2 fi - offix_lib_dir=$withval -else - offix_lib_dir=/usr/local/lib + offix_lib_dir="-L$withval" fi echo $ac_n "checking whether to enable audio""... $ac_c" 1>&6 -echo "configure:4444: checking whether to enable audio" >&5 +echo "configure:4478: checking whether to enable audio" >&5 # Check whether --enable-audio or --disable-audio was given. if test "${enable_audio+set}" = set; then enableval="$enable_audio" @@ -4486,7 +4520,7 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:4490: checking for ALSA CFLAGS" >&5 +echo "configure:4524: 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" @@ -4494,7 +4528,7 @@ echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:4498: checking for ALSA LDFLAGS" >&5 +echo "configure:4532: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -4506,7 +4540,7 @@ min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:4510: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:4544: 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/'` @@ -4516,7 +4550,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -4557,7 +4591,7 @@ ; return 0; } EOF -if { (eval echo configure:4561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -4571,7 +4605,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:4575: checking for snd_cards in -lasound" >&5 +echo "configure:4609: 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 @@ -4579,7 +4613,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4642,7 +4676,7 @@ EXTRADEFS="$EXTRADEFS -DHPUX -DAU_HPUX" SYSEXTRAS="$SYSEXTRAS hpux_d_a.c hpux_a.c" if test -d /opt/audio/include; then - EXTRAINCS="$EXTRAINCS -I/opt/audio/include" + CPPFLAGS="$CPPFLAGS -I/opt/audio/include" fi if test -d /opt/audio/lib; then EXTRALIBS="$EXTRALIBS -L/opt/audio/lib" @@ -4653,7 +4687,7 @@ *-dec-*) EXTRADEFS="$EXTRADEFS -DAU_DEC -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_mme.c" - EXTRAINCS="$EXTRAINCS -I/usr/opt/MME210/include" + CPPFLAGS="$CPPFLAGS -I/usr/opt/MME210/include" EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a" echo "$ac_t""yes dec" 1>&6 ;; @@ -4712,23 +4746,31 @@ -case "$CC" in *gcc*) SHCFLAGS="-fPIC";; esac -case "x$enable_ump" in xyes|xdynamic) CFLAGS="$CFLAGS -DXP_UNIX $SHCFLAGS";; esac +# Check whether --with-enable-dynamic or --without-enable-dynamic was given. +if test "${with_enable_dynamic+set}" = set; then + withval="$with_enable_dynamic" + test "x$enable_dynamic" = xyes && enable_dynamic=dynamic + +fi + -case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_xskin$enable_gtk" in +case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_xskin$enable_gtk$enable_dynamic" in *dynamic*) NEEDDLOPEN=yes;; *) NEEDDLOPEN=no;; esac +case "$CC " in "gcc "*) SHCFLAGS="-fPIC";; esac +case "x$enable_ump" in xyes|xdynamic) EXTRACFLAGS="$EXTRACFLAGS -DXP_UNIX $SHCFLAGS";; esac + if test "$NEEDDLOPEN" = "yes"; then have_dl=no echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6 -echo "configure:4727: checking for LoadLibraryExA" >&5 +echo "configure:4769: checking for LoadLibraryExA" >&5 if eval "test \"`echo '$''{'ac_cv_func_LoadLibraryExA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_LoadLibraryExA=yes" else @@ -4772,12 +4814,12 @@ if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:4776: checking for shl_load" >&5 +echo "configure:4818: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -4825,12 +4867,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4829: checking for dlopen" >&5 +echo "configure:4871: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -4875,12 +4917,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:4879: checking for dld_init" >&5 +echo "configure:4921: checking for dld_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_dld_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dld_init=yes" else @@ -4925,7 +4967,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:4929: checking for dld_init in -ldld" >&5 +echo "configure:4971: 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 @@ -4933,7 +4975,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4967,13 +5009,13 @@ fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:4971: checking dynamic link method" >&5 +echo "configure:5013: 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:4977: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:5019: 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 @@ -5121,17 +5163,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5125: checking for $ac_hdr" >&5 +echo "configure:5167: 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:5135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5158,7 +5200,7 @@ done echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:5162: checking for initscr in -lncurses" >&5 +echo "configure:5204: 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 @@ -5166,7 +5208,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5226,7 +5268,7 @@ ;; xdynamic) dynamic_targets="$dynamic_targets interface_n.\$(so)" - n_so_libs="$SHLDFLAGS -lncurses" + n_so_libs="-lncurses" case "$target" in *-*-freebsd*) n_so_libs="$n_so_libs -lmytinfo" @@ -5256,7 +5298,7 @@ enableval="$enable_slang" case "x$enable_slang" in xyes|xdynamic) KEEPLIBS=$LIBS echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:5260: checking for SLang_init_tty in -lslang" >&5 +echo "configure:5302: 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 @@ -5264,7 +5306,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5326,9 +5368,9 @@ ;; xdynamic) dynamic_targets="$dynamic_targets interface_s.\$(so)" - s_so_libs="$SHLDFLAGS -lslang" + s_so_libs="-lslang" echo $ac_n "checking for initscr in -ltermcap""... $ac_c" 1>&6 -echo "configure:5332: checking for initscr in -ltermcap" >&5 +echo "configure:5374: 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 @@ -5336,7 +5378,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5452,16 +5494,20 @@ case "x$enable_tcltk" in xyes|xdynamic) if test "x$with_x" != xyes; then { echo "configure: error: tcltk: --with-x option must be specified" 1>&2; exit 1; } fi + + KEEPCPPFLAGS=$CPPFLAGS + KEEPLDFLAGS=$LDFLAGS KEEPLIBS=$LIBS - KEEPCFLAGS=$CFLAGS - LDFLAGS="$LDFLAGS -L$tcl_lib_dir -L$tk_lib_dir" - CFLAGS="$CFLAGS -I$tcl_include_dir -I$tk_include_dir" + + CPPFLAGS="$tcl_include_dir $tk_includes $CPPFLAGS" + LDFLAGS="$tcl_libdir $tk_libdir $LDFLAGS" LIBS="$LIBS $lib_dl_opt" + tcl_lib= 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:5465: checking for Tcl_Init in -l$l" >&5 +echo "configure:5511: 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 @@ -5469,7 +5515,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5504,7 +5550,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:5508: checking for Tk_Init in -l$l" >&5 +echo "configure:5554: 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 @@ -5512,7 +5558,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5544,10 +5590,11 @@ fi ;; esac done - LIBS=$KEEPLIBS + LIBS=$KEEPLIBS if test "x$tcl_lib" = x -o "x$tk_lib" = x; then - CFLAGS=$KEEPCFLAGS + CPPFLAGS=$KEEPCPPFLAGS + LDFLAGS=$KEEPLDFLAGS enable_tcltk=no echo "configure: warning: tcl/tk is not enable" 1>&2 else @@ -5572,7 +5619,6 @@ ENABLE_TCLTK_FALSE= fi LIBS=`echo $LIBS | sed "s/-lX11/$tk_lib $tcl_lib -lX11/"` - EXTRAINCS="$EXTRAINCS -I$tcl_include_dir -I$tk_include_dir" EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" case "$target" in *-*-bsdi*) @@ -5582,9 +5628,8 @@ ;; xdynamic) dynamic_targets="$dynamic_targets interface_k.\$(so)" - EXTRAINCS="$EXTRAINCS -I$tcl_include_dir -I$tk_include_dir" - EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" - k_so_libs="-L$tcl_lib_dir -L$tk_lib_dir $tcl_lib $tk_lib $lib_dl_opt" + EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" + 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" @@ -5754,6 +5799,8 @@ dynamic_targets="$dynamic_targets interface_a.\$(so)" if test "$have_xext" = "yes"; then a_so_libs="-lXext -lX11" + else + a_so_libs="-lX11" fi if test "$have_xprelibs" = "yes"; then a_so_libs="-lSM -lICE $a_so_libs" @@ -5883,7 +5930,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:5887: checking for $ac_word" >&5 +echo "configure:5934: 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 @@ -5914,7 +5961,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:5918: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:5965: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -5937,7 +5984,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6003,7 +6050,7 @@ } EOF -if { (eval echo configure:6007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6037,7 +6084,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -6047,7 +6094,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:6051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -6107,7 +6154,8 @@ ;; xdynamic) dynamic_targets="$dynamic_targets interface_g.\$(so)" - g_so_libs="$GTK_LIBS" + g_so_libs="$GTK_LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" ;; *) @@ -6125,17 +6173,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:6129: checking for X11/xpm.h" >&5 +echo "configure:6177: 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:6139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6158,7 +6206,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:6162: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:6210: 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 @@ -6166,7 +6214,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6192,19 +6240,20 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo Xpm | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 { echo "configure: error: UMP Package needs libXpm.a, but could not find it." 1>&2; exit 1; } fi + if test "$have_xext" = "yes"; then + lib_xext_opt=-lXext + fi + if test "$have_xprelibs" = "yes"; then + lib_xprelibs_opt='-lSM -lICE' + fi + lib_xmu_opt=-lXmu + lib_xt_opt=-lXt ;; esac fi @@ -6223,7 +6272,7 @@ ENABLE_PLUGIN_TRUE='#' ENABLE_PLUGIN_FALSE= fi - LIBS="$LIBS -lXpm" + ;; xdynamic) dynamic_targets="$dynamic_targets interface_p.\$(so)" @@ -6237,19 +6286,18 @@ - # Check whether --enable-offix or --disable-offix was given. if test "${enable_offix+set}" = set; then enableval="$enable_offix" if test "$enableval" = "yes"; then - KEEPCFLAGS=$CFLAGS + KEEPCPPFLAGS=$CPPFLAGS KEEPLIBS=$LIBS KEEPLDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS -I$offix_include_dir" - LDFLAGS="$LDFLAGS -L$offix_lib_dir" + CPPFLAGS="$CPPFLAGS $offix_include_dir" + 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:6253: checking for DndInitialize in -lDnd" >&5 +echo "configure:6301: 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 @@ -6257,7 +6305,7 @@ ac_save_LIBS="$LIBS" LIBS="-lDnd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6291,7 +6339,7 @@ else echo "$ac_t""no" 1>&6 LDFLAGS=$KEEPLDFLAGS - CFLAGS=$KEEPCFLAGS + CPPFLAGS=$KEEPCPPFLAGS LIBS=$KEEPLIBS fi @@ -6366,6 +6414,8 @@ + + if test "x$CYGWIN32" = "xyes"; then CYGWIN32_TRUE= CYGWIN32_FALSE='#' @@ -6373,18 +6423,64 @@ CYGWIN32_TRUE='#' CYGWIN32_FALSE= fi +rm -f wordtmp >/dev/null 2>&1 +val='' +for f in $LDFLAGS; do + if $contains "^$f"'$' wordtmp >/dev/null 2>&1; then + : +else + echo $f >>wordtmp; val="$val $f" +fi -CFLAGS=`for f in $CFLAGS $EXTRACFLAGS $EXTRAINCS $X_CFLAGS; do echo $f; done | sort | uniq` -CFLAGS=`echo $CFLAGS` +done +LDFLAGS="$val" +rm -f wordtmp >/dev/null 2>&1 -LDFLAGS=`for f in $LDFLAGS; do echo $f; done | sort | uniq` -LDFLAGS=`echo $LDFLAGS` +rm -f wordtmp >/dev/null 2>&1 +val='' +for f in $SHLDFLAGS; do + if $contains "^$f"'$' wordtmp >/dev/null 2>&1; then + : +else + echo $f >>wordtmp; val="$val $f" +fi + +done +SHLDFLAGS="$val" +rm -f wordtmp >/dev/null 2>&1 + +rm -f wordtmp >/dev/null 2>&1 +val='' +for f in $EXTRACFLAGS $CFLAGS; do + if $contains "^$f"'$' wordtmp >/dev/null 2>&1; then + : +else + echo $f >>wordtmp; val="$val $f" +fi + +done +CFLAGS="$val" +rm -f wordtmp >/dev/null 2>&1 + +rm -f wordtmp >/dev/null 2>&1 +val='' +for f in $CPPFLAGS; do + if $contains "^$f"'$' wordtmp >/dev/null 2>&1; then + : +else + echo $f >>wordtmp; val="$val $f" +fi + +done +CPPFLAGS="$val" +rm -f wordtmp >/dev/null 2>&1 if test "x$with_x" = xyes; then LIBS=`echo $LIBS | sed "s/-lX11/$lib_xm_opt $lib_xaw_opt $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11/"` fi LIBS="$LIBS $lib_dl_opt" +SHLD="$SHLD $SHLDFLAGS" @@ -6630,13 +6726,13 @@ s%@ENABLE_WRD_FALSE@%$ENABLE_WRD_FALSE%g s%@CYGWIN32_TRUE@%$CYGWIN32_TRUE%g s%@CYGWIN32_FALSE@%$CYGWIN32_FALSE%g -s%@SHCFLAGS@%$SHCFLAGS%g s%@SYSEXTRAS@%$SYSEXTRAS%g s%@EXTRALIBS@%$EXTRALIBS%g s%@EXTRADEFS@%$EXTRADEFS%g s%@NETSRCS@%$NETSRCS%g s%@ELFILES@%$ELFILES%g s%@SHLD@%$SHLD%g +s%@SHCFLAGS@%$SHCFLAGS%g s%@dynamic_targets@%$dynamic_targets%g s%@so@%$so%g s%@WISH@%$WISH%g diff -ruN TiMidity++-1.2.0/configure.in TiMidity++-1.2.1/configure.in --- TiMidity++-1.2.0/configure.in Thu Jan 21 01:36:50 1999 +++ TiMidity++-1.2.1/configure.in Mon Jan 25 21:19:14 1999 @@ -24,9 +24,40 @@ dnl modified for automake by Masanao Izumo (1998.11) +dnl variable note: +dnl CFLAGS - Flags for compile. +dnl CPPFLAGS - Flags for cpp +dnl LDFLAGS - Flags for linker +dnl ac_cpp: $CPP $CPPFLAGS +dnl ac_compile: ${CC-cc} -c $CFLAGS $CPPFLAGS +dnl ac_link: ${CC-cc} -o * $CFLAGS $CPPFLAGS $LDFLAGS *.c $LIBS +dnl EXTRACFLAGS - Extra flags to compile. Adds to CFLAGS. +dnl EXTRADEFS - Extra define macros. (AC_SUBST: Adds to CFLAGS) +dnl EXTRALIBS - Extra libraries (AC_SUBST: Adds to LIBS) +dnl SYSEXTRAS - Additional source codes to compile. +dnl lib_*_opt - Optional libraries. Adds to LIBS. +dnl LIBRARY_PATH +dnl - add to -L LDFLAGS +dnl C_INCLUDE_PATH +dnl - add to -I CPPFLAGS +dnl CYGWIN32 - `yes' if cygnus win32 environment. +dnl WISH - wish +dnl LN_S - ln -s +dnl tcltk_dep - make dependencies for tcl/tk interface + +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) + + AC_INIT(timidity/timidity.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 1.2.0, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 1.2.1, no-define) + +dnl To use CONTAINS() macro (See acinclude.m4) +CONTAINS_INIT dnl use config.h AM_CONFIG_HEADER(config.h interface.h) @@ -41,20 +72,10 @@ CFLAGS="$CFLAGS -g" fi ], [ CFLAGS=${CFLAGS:--O2} ]) -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_RANLIB -AC_PROG_LN_S - -LDFLAGS=${LDFLAGS:--L/usr/local/lib} -SHLDFLAGS=${LDFLAGS:--L/usr/local/lib} -CPPFLAGS="$CPPFLAGS -I/usr/local/include" - EXTRACFLAGS= EXTRADEFS= -SYSEXTRAS= EXTRALIBS= -EXTRAINCS= +SYSEXTRAS= dnl X library dependent lib_xm_opt= @@ -72,12 +93,30 @@ dnl check gcc environment for i in `echo $LIBRARY_PATH|sed -e 's,:, ,g'`; do LDFLAGS="$LDFLAGS -L${i}" - SHLDFLAGS="$SHLDFLAGS -L${i}" done for i in `echo $C_INCLUDE_PATH|sed -e 's,:, ,g'`; do - EXTRAINCS="$EXTRAINCS -I${i}" + CPPFLAGS="$CPPFLAGS -I${i}" done +dnl add prefix /usr/local by default +LDFLAGS="$LDFLAGS -L/usr/local/lib" +CPPFLAGS="$CPPFLAGS -I/usr/local/include" +SHLDFLAGS=${SHLDFLAGS:-$LDFLAGS} + +dnl add $prefix if specified. +if test "x$prefix" != xNONE -a "x$prefix" != "x$ac_default_prefix"; then + LDFLAGS="-L$prefix/lib $LDFLAGS" + SHLDFLAGS="-L$prefix/lib $SHLDFLAGS" + CPPFLAGS="-I$prefix/include $CPPFLAGS" +fi + + +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_RANLIB +AC_PROG_LN_S + + dnl Target dependent case "$target" in *-*-hpux*) @@ -94,14 +133,27 @@ test -n "$SHLD" || SHLD="ld -Bforcearchive -Bshareable" so="so" ;; - *-*-freebsd*) - EXTRALIBS="$EXTRALIB -lxpg4" + *-*-freebsd2*) + EXTRALIBS="$EXTRALIBS -lxpg4" test -n "$SHLD" || SHLD="ld -Bshareable" so="so" ;; + *-*-freebsd*) + EXTRACFLAGS=-aout + EXTRALIBS="$EXTRALIBS -lxpg4" + SHLDFLAGS="-L/usr/X11R6/aout $SHLDFLAGS" + test -n "$SHLD" || SHLD="env OBJFORMAT=aout ld -shared" + so="so" + ;; *-*-cygwin32*) EXTRADEFS="-D__WIN32__" - test -n "$SHLD" || SHLD="$CC" + # ?? + case "x${CC} " in + "xbcc32 "*) test -n "$SHLD" || SHLD="tlink32 -Tpd" ;; + "xcl "*) test -n "$SHLD" || SHLD="link -dll" ;; + "xgcc "*) test -n "$SHLD" || SHLD="gcc -mdll" ;; + *) test -n "$SHLD" || SHLD="unknown" ;; + esac so="dll" CYGWIN32=yes ;; @@ -226,49 +278,43 @@ AC_ARG_WITH(tcl-includes, [ --with-tcl-includes=dir Tcl include file path ], [ if test ! -d $withval; then - AC_MSG_ERROR($withval not found.) + AC_MSG_WARN($withval is not found.) fi - tcl_include_dir=$withval - ], - [ tcl_include_dir=/usr/local/include ]) + tcl_include_dir="-I$withval" + ]) AC_ARG_WITH(tcl-libs, [ --with-tcl-libs=dir Tcl include file path ], [ if test ! -d $withval; then - AC_MSG_ERROR($withval not found.) + AC_MSG_WARN($withval is not found.) fi - tcl_lib_dir=$withval ], - [ tcl_lib_dir=/usr/local/lib ]) + tcl_libdir="-L$withval" ]) AC_ARG_WITH(tk-includes, [ --with-tk-includes=dir Tk include file path ], [ if test ! -d $withval; then - AC_MSG_ERROR($withval not found.) + AC_MSG_WARN($withval is not found.) fi - tk_include_dir=$withval ], - [ tk_include_dir=/usr/local/include ]) + tk_includes="-I$withval" ]) AC_ARG_WITH(tk-libs, [ --with-tk-libs=dir Tk include file path ], [ if test ! -d $withval; then - AC_MSG_ERROR($withval not found.) + AC_MSG_WARN($withval is not found.) fi - tk_lib_dir=$withval ], - [ tk_lib_dir=/usr/local/lib ]) + tk_libdir="-L$withval" ]) + dnl offix paths AC_ARG_WITH(offix-includes, [ --with-offix-includes=dir Offix include file path ], [ if test ! -d $withval; then - AC_MSG_ERROR($withval not found.) + AC_MSG_WARN($withval is not found.) fi - offix_include_dir=$withval ], - [ offix_include_dir=/usr/local/include ]) + offix_include_dir="-I$withval" ]) AC_ARG_WITH(offix-libs, [ --with-offix-libs=dir Offix include file path ], [ if test ! -d $withval; then - AC_MSG_ERROR($withval not found.) + AC_MSG_WARN($withval is not found.) fi - offix_lib_dir=$withval ], - [ offix_lib_dir=/usr/local/lib ]) + offix_lib_dir="-L$withval" ]) -dnl Define system dependent flags AC_MSG_CHECKING(whether to enable audio) AC_ARG_ENABLE(audio, @@ -305,7 +351,7 @@ EXTRADEFS="$EXTRADEFS -DHPUX -DAU_HPUX" SYSEXTRAS="$SYSEXTRAS hpux_d_a.c hpux_a.c" if test -d /opt/audio/include; then - EXTRAINCS="$EXTRAINCS -I/opt/audio/include" + CPPFLAGS="$CPPFLAGS -I/opt/audio/include" fi if test -d /opt/audio/lib; then EXTRALIBS="$EXTRALIBS -L/opt/audio/lib" @@ -316,7 +362,7 @@ *-dec-*) EXTRADEFS="$EXTRADEFS -DAU_DEC -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_mme.c" - EXTRAINCS="$EXTRAINCS -I/usr/opt/MME210/include" + CPPFLAGS="$CPPFLAGS -I/usr/opt/MME210/include" EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a" AC_MSG_RESULT(yes dec) ;; @@ -374,17 +420,23 @@ -dnl dynamic link +dnl Dynamic link configuration -dnl check -fpic option for gcc -case "$CC" in *gcc*) SHCFLAGS="-fPIC";; esac -case "x$enable_ump" in xyes|xdynamic) CFLAGS="$CFLAGS -DXP_UNIX $SHCFLAGS";; esac +AC_ARG_WITH(enable-dynamic, + [ --enable-dynamic Enable dynamic link interface ], + [ dnl --enable-dynamic=yes to --enable-dynamic=dynamic + test "x$enable_dynamic" = xyes && enable_dynamic=dynamic + ]) -case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_xskin$enable_gtk" in +case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_xskin$enable_gtk$enable_dynamic" in *dynamic*) NEEDDLOPEN=yes;; *) NEEDDLOPEN=no;; esac +dnl check -fpic option for gcc +case "$CC " in "gcc "*) SHCFLAGS="-fPIC";; esac +case "x$enable_ump" in xyes|xdynamic) EXTRACFLAGS="$EXTRACFLAGS -DXP_UNIX $SHCFLAGS";; esac + if test "$NEEDDLOPEN" = "yes"; then have_dl=no AC_CHECK_FUNC(LoadLibraryExA,have_dl=cygwin) @@ -458,7 +510,7 @@ EXTRALIBS="$EXTRALIBS -lmytinfo" ;; esac ], - [ n_so_libs="$SHLDFLAGS -lncurses" + [ n_so_libs="-lncurses" case "$target" in *-*-freebsd*) n_so_libs="$n_so_libs -lmytinfo" @@ -476,7 +528,7 @@ LIBS=$KEEPLIBS ], [ LIBS="$LIBS -lslang" ], - [ s_so_libs="$SHLDFLAGS -lslang" + [ s_so_libs="-lslang" AC_CHECK_LIB(termcap,initscr,s_so_libs="$s_so_libs -ltermcap") ]) @@ -513,11 +565,16 @@ [ if test "x$with_x" != xyes; then AC_MSG_ERROR(tcltk: --with-x option must be specified) fi + + dnl save flags + KEEPCPPFLAGS=$CPPFLAGS + KEEPLDFLAGS=$LDFLAGS KEEPLIBS=$LIBS - KEEPCFLAGS=$CFLAGS - LDFLAGS="$LDFLAGS -L$tcl_lib_dir -L$tk_lib_dir" - CFLAGS="$CFLAGS -I$tcl_include_dir -I$tk_include_dir" + + CPPFLAGS="$tcl_include_dir $tk_includes $CPPFLAGS" + LDFLAGS="$tcl_libdir $tk_libdir $LDFLAGS" LIBS="$LIBS $lib_dl_opt" + tcl_lib= tk_lib= for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do @@ -527,10 +584,11 @@ for l in tk tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do case "x$tk_lib" in x) AC_CHECK_LIB($l,Tk_Init,tk_lib=-l$l);; esac done - LIBS=$KEEPLIBS + LIBS=$KEEPLIBS if test "x$tcl_lib" = x -o "x$tk_lib" = x; then - CFLAGS=$KEEPCFLAGS + CPPFLAGS=$KEEPCPPFLAGS + LDFLAGS=$KEEPLDFLAGS enable_tcltk=no AC_MSG_WARN(tcl/tk is not enable) else @@ -538,16 +596,14 @@ fi ], [ LIBS=`echo $LIBS | sed "s/-lX11/$tk_lib $tcl_lib -lX11/"` - EXTRAINCS="$EXTRAINCS -I$tcl_include_dir -I$tk_include_dir" EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" case "$target" in *-*-bsdi*) EXTRALIBS="$EXTRALIBS -lipc" ;; esac ], - [ EXTRAINCS="$EXTRAINCS -I$tcl_include_dir -I$tk_include_dir" - EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" - k_so_libs="-L$tcl_lib_dir -L$tk_lib_dir $tcl_lib $tk_lib $lib_dl_opt" + [ EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" + 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" @@ -602,6 +658,8 @@ ], [ if test "$have_xext" = "yes"; then a_so_libs="-lXext -lX11" + else + a_so_libs="-lX11" fi if test "$have_xprelibs" = "yes"; then a_so_libs="-lSM -lICE $a_so_libs" @@ -635,7 +693,8 @@ [ AM_PATH_GTK(1.1.3,,enable_gtk=no) ], [ LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" ], - g_so_libs="$GTK_LIBS") + [ g_so_libs="$GTK_LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" ]) dnl UMP configuration @@ -645,10 +704,16 @@ AC_MSG_ERROR(UMP Package is not exists. Can't configure it.) fi AC_CHECK_HEADER(X11/xpm.h,,AC_MSG_ERROR([UMP Package needs xpm.h[,] but could not find it.])) - AC_CHECK_LIB(Xpm,XpmCreatePixmapFromData,,AC_MSG_ERROR([UMP Package needs libXpm.a[,] but could not find it.])) - ], - [ LIBS="$LIBS -lXpm" ]) - + AC_CHECK_LIB(Xpm,XpmCreatePixmapFromData,:,AC_MSG_ERROR([UMP Package needs libXpm.a[,] but could not find it.])) + if test "$have_xext" = "yes"; then + lib_xext_opt=-lXext + fi + if test "$have_xprelibs" = "yes"; then + lib_xprelibs_opt='-lSM -lICE' + fi + lib_xmu_opt=-lXmu + lib_xt_opt=-lXt + ]) dnl Offix support @@ -656,11 +721,11 @@ AC_ARG_ENABLE(offix, [ --enable-offix Enable offix support (default is no)], [ if test "$enableval" = "yes"; then - KEEPCFLAGS=$CFLAGS + KEEPCPPFLAGS=$CPPFLAGS KEEPLIBS=$LIBS KEEPLDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS -I$offix_include_dir" - LDFLAGS="$LDFLAGS -L$offix_lib_dir" + CPPFLAGS="$CPPFLAGS $offix_include_dir" + LDFLAGS="$LDFLAGS $offix_lib_dir" LIBS="$LIBS $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11" AC_CHECK_LIB(Dnd,DndInitialize,[ LIBS=$KEEPLIBS @@ -668,7 +733,7 @@ EXTRADEFS="$EXTRADEFS -DOFFIX" ], [ LDFLAGS=$KEEPLDFLAGS - CFLAGS=$KEEPCFLAGS + CPPFLAGS=$KEEPCPPFLAGS LIBS=$KEEPLIBS ]) fi @@ -707,24 +772,30 @@ -AM_CONDITIONAL(CYGWIN32, test "x$CYGWIN32" = "xyes") +dnl Move -I* in CFLAGS to CPPFLAGS. +dnl It comes from -SET_SORT_UNIQ_WORD(CFLAGS,$CFLAGS $EXTRACFLAGS $EXTRAINCS $X_CFLAGS) -SET_SORT_UNIQ_WORD(LDFLAGS,$LDFLAGS) + +AM_CONDITIONAL(CYGWIN32, test "x$CYGWIN32" = "xyes") +SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS) +SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS) +SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS) +SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS) if test "x$with_x" = xyes; then dnl Order of X-library is: -lXm -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 LIBS=`echo $LIBS | sed "s/-lX11/$lib_xm_opt $lib_xaw_opt $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11/"` fi LIBS="$LIBS $lib_dl_opt" +SHLD="$SHLD $SHLDFLAGS" -AC_SUBST(SHCFLAGS) AC_SUBST(SYSEXTRAS) AC_SUBST(EXTRALIBS) AC_SUBST(EXTRADEFS) AC_SUBST(NETSRCS) AC_SUBST(ELFILES) AC_SUBST(SHLD) +AC_SUBST(SHCFLAGS) AC_SUBST(dynamic_targets) AC_SUBST(so) AC_SUBST(LN_S) diff -ruN TiMidity++-1.2.0/interface/Makefile.in TiMidity++-1.2.1/interface/Makefile.in --- TiMidity++-1.2.0/interface/Makefile.in Thu Jan 21 01:59:24 1999 +++ TiMidity++-1.2.1/interface/Makefile.in Mon Jan 25 21:30:27 1999 @@ -417,65 +417,11 @@ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done -VTPrsTbl.o: VTPrsTbl.c VTparse.h dumb_c.o: dumb_c.c ../config.h ../timidity/timidity.h \ ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ ../timidity/output.h ../timidity/controls.h \ ../timidity/instrum.h ../timidity/playmidi.h \ ../timidity/readmidi.h -dynamic_c.o: dynamic_c.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/output.h ../timidity/controls.h \ - ../timidity/dlutils.h -emacs_c.o: emacs_c.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/output.h ../timidity/controls.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/miditrace.h -motif_c.o: motif_c.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h motif.h ../timidity/miditrace.h -motif_i.o: motif_i.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/output.h ../timidity/controls.h motif.h \ - motif_bitmaps/back.xbm motif_bitmaps/next.xbm \ - motif_bitmaps/prev.xbm motif_bitmaps/restart.xbm \ - motif_bitmaps/fwd.xbm motif_bitmaps/pause.xbm \ - motif_bitmaps/quit.xbm motif_bitmaps/timidity.xbm -motif_p.o: motif_p.c ../config.h ../timidity/timidity.h \ - ../timidity/controls.h motif.h -ncurs_c.o: ncurs_c.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h ../utils/timer.h \ - ../utils/bitset.h ../libarc/arc.h ../utils/memb.h \ - ../timidity/mid-j.defs -slang_c.o: slang_c.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h ../utils/timer.h -soundspec.o: soundspec.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/output.h ../timidity/controls.h soundspec.h \ - ../utils/fft.h ../timidity/miditrace.h -tk_c.o: tk_c.c ../config.h ../timidity/timidity.h ../timidity/common.h \ - ../libarc/url.h ../utils/mblock.h ../timidity/instrum.h \ - ../timidity/playmidi.h ../timidity/readmidi.h \ - ../timidity/output.h ../timidity/controls.h \ - ../timidity/miditrace.h -vt100.o: vt100.c ../config.h ../timidity/timidity.h vt100.h -vt100_c.o: vt100_c.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h vt100.h \ - ../utils/timer.h ../utils/bitset.h wrdt_dumb.o: wrdt_dumb.c ../config.h ../timidity/timidity.h \ ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ ../timidity/instrum.h ../timidity/playmidi.h \ @@ -484,47 +430,6 @@ ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ ../timidity/instrum.h ../timidity/playmidi.h \ ../timidity/readmidi.h ../timidity/controls.h ../timidity/wrd.h -wrdt_x.o: wrdt_x.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/controls.h ../timidity/wrd.h \ - x_wrdwindow.h x_mag.h -x_mag.o: x_mag.c ../config.h ../timidity/timidity.h ../timidity/common.h \ - ../libarc/url.h ../utils/mblock.h x_mag.h \ - ../timidity/controls.h ../timidity/wrd.h -x_wrdwindow.o: x_wrdwindow.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h x_mag.h \ - x_wrdwindow.h VTparse.h ../timidity/wrd.h \ - ../timidity/controls.h -xaw_c.o: xaw_c.c ../config.h ../timidity/timidity.h ../timidity/common.h \ - ../libarc/url.h ../utils/mblock.h ../timidity/instrum.h \ - ../timidity/playmidi.h ../timidity/readmidi.h \ - ../timidity/output.h ../timidity/controls.h \ - ../timidity/miditrace.h ../utils/timer.h xaw.h -xaw_i.o: xaw_i.c ../config.h xaw.h check.xbm ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/controls.h -xskin_c.o: xskin_c.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h xskin.h -xskin_i.o: xskin_i.c xskin.h ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/output.h ../timidity/controls.h \ - ../timidity/miditrace.h -xskin_loadBMP.o: xskin_loadBMP.c ../config.h ../timidity/timidity.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/controls.h ../timidity/output.h ../libarc/arc.h \ - ../utils/memb.h -xskin_spectrum.o: xskin_spectrum.c xskin.h ../config.h \ - ../timidity/timidity.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/output.h ../timidity/controls.h \ - ../timidity/miditrace.h info: info-recursive dvi: dvi-recursive diff -ruN TiMidity++-1.2.0/interface/gtk_c.c TiMidity++-1.2.1/interface/gtk_c.c --- TiMidity++-1.2.0/interface/gtk_c.c Wed Jan 20 18:17:27 1999 +++ TiMidity++-1.2.1/interface/gtk_c.c Mon Jan 25 20:26:44 1999 @@ -541,3 +541,11 @@ } } } + +/* + * interface__loader(); + */ +ControlMode *interface_g_loader(void) +{ + return &ctl; +} diff -ruN TiMidity++-1.2.0/interface/gtk_i.c TiMidity++-1.2.1/interface/gtk_i.c --- TiMidity++-1.2.0/interface/gtk_i.c Wed Jan 20 16:09:17 1999 +++ TiMidity++-1.2.1/interface/gtk_i.c Fri Jan 22 20:16:00 1999 @@ -125,7 +125,7 @@ filer_cb(GtkWidget *widget, gpointer data) { gchar *filenames[2]; -#ifdef HAVE_GLOB_H +#if defined(HAVE_GLOB_H) && !defined(SOLARIS) int i; gchar *patt; glob_t pglob; diff -ruN TiMidity++-1.2.0/interface/pixmaps/Makefile.am TiMidity++-1.2.1/interface/pixmaps/Makefile.am --- TiMidity++-1.2.0/interface/pixmaps/Makefile.am Thu Dec 10 18:05:25 1998 +++ TiMidity++-1.2.1/interface/pixmaps/Makefile.am Thu Jan 21 03:52:32 1999 @@ -28,6 +28,11 @@ quit.xpm \ rew.xpm \ stop.xpm \ - open.xpm + open.xpm \ + fast.xpm \ + slow.xpm \ + restart.xpm \ + keyup.xpm \ + keydown.xpm -EXTRA_DIST = $(PIXMAPS) \ No newline at end of file +EXTRA_DIST = $(PIXMAPS) diff -ruN TiMidity++-1.2.0/interface/pixmaps/Makefile.in TiMidity++-1.2.1/interface/pixmaps/Makefile.in --- TiMidity++-1.2.0/interface/pixmaps/Makefile.in Thu Jan 21 01:59:30 1999 +++ TiMidity++-1.2.1/interface/pixmaps/Makefile.in Mon Jan 25 21:30:35 1999 @@ -118,7 +118,12 @@ quit.xpm \ rew.xpm \ stop.xpm \ - open.xpm + open.xpm \ + fast.xpm \ + slow.xpm \ + restart.xpm \ + keyup.xpm \ + keydown.xpm EXTRA_DIST = $(PIXMAPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -ruN TiMidity++-1.2.0/interface/pixmaps/fast.xpm TiMidity++-1.2.1/interface/pixmaps/fast.xpm --- TiMidity++-1.2.0/interface/pixmaps/fast.xpm Thu Jan 1 09:00:00 1970 +++ TiMidity++-1.2.1/interface/pixmaps/fast.xpm Thu Jan 21 03:51:56 1999 @@ -0,0 +1,21 @@ +/* XPM */ +static char * fast_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" ", +" ", +" .. ", +" .... .. ", +" ...... .. ", +" .......... ", +" ..... ..... ", +". . .. ", +" . ...", +" ", +" ", +" ", +" ", +" "}; diff -ruN TiMidity++-1.2.0/interface/pixmaps/keydown.xpm TiMidity++-1.2.1/interface/pixmaps/keydown.xpm --- TiMidity++-1.2.0/interface/pixmaps/keydown.xpm Thu Jan 1 09:00:00 1970 +++ TiMidity++-1.2.1/interface/pixmaps/keydown.xpm Thu Jan 21 03:51:56 1999 @@ -0,0 +1,21 @@ +/* XPM */ +static char * keydown_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" . ", +" .. ", +" . . ", +" . . ..... ", +" . . ..... ", +" .. ... ", +" . ... ", +" . . ", +" .... . ", +" ..... ", +" ... ", +" ", +" ", +" "}; diff -ruN TiMidity++-1.2.0/interface/pixmaps/keyup.xpm TiMidity++-1.2.1/interface/pixmaps/keyup.xpm --- TiMidity++-1.2.0/interface/pixmaps/keyup.xpm Thu Jan 1 09:00:00 1970 +++ TiMidity++-1.2.1/interface/pixmaps/keyup.xpm Thu Jan 21 03:51:56 1999 @@ -0,0 +1,21 @@ +/* XPM */ +static char * keyup_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" . ", +" .. ", +" . . ", +" . . . ", +" . . . ", +" .. ... ", +" . ... ", +" . ..... ", +" .... ..... ", +" ..... ", +" ... ", +" ", +" ", +" "}; diff -ruN TiMidity++-1.2.0/interface/pixmaps/restart.xpm TiMidity++-1.2.1/interface/pixmaps/restart.xpm --- TiMidity++-1.2.0/interface/pixmaps/restart.xpm Thu Jan 1 09:00:00 1970 +++ TiMidity++-1.2.1/interface/pixmaps/restart.xpm Thu Jan 21 03:51:56 1999 @@ -0,0 +1,21 @@ +/* XPM */ +static char * restart_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" ", +" ", +" ", +" .. ", +" .. .. ", +" .. .... ", +" ........ ", +" .. .... ", +" .. .. ", +" .. ", +" ", +" ", +" ", +" "}; diff -ruN TiMidity++-1.2.0/interface/pixmaps/slow.xpm TiMidity++-1.2.1/interface/pixmaps/slow.xpm --- TiMidity++-1.2.0/interface/pixmaps/slow.xpm Thu Jan 1 09:00:00 1970 +++ TiMidity++-1.2.1/interface/pixmaps/slow.xpm Thu Jan 21 03:51:56 1999 @@ -0,0 +1,21 @@ +/* XPM */ +static char * slow_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" ", +" ", +" ", +" .... ", +" ...... ", +" ....... . ", +" .......... ", +" ..... . ", +" . . ... ", +" ", +" ", +" ", +" ", +" "}; diff -ruN TiMidity++-1.2.0/libarc/Makefile.in TiMidity++-1.2.1/libarc/Makefile.in --- TiMidity++-1.2.0/libarc/Makefile.in Thu Jan 21 01:59:21 1999 +++ TiMidity++-1.2.1/libarc/Makefile.in Mon Jan 25 21:30:22 1999 @@ -281,8 +281,6 @@ ../utils/memb.h ../utils/mblock.h url.h arc_mime.o: arc_mime.c ../config.h ../timidity/timidity.h \ ../utils/mblock.h zip.h arc.h ../utils/memb.h url.h -arc_newsgroup.o: arc_newsgroup.c ../config.h ../timidity/timidity.h \ - arc.h ../utils/memb.h ../utils/mblock.h url.h arc_tar.o: arc_tar.c ../config.h ../timidity/timidity.h \ ../utils/mblock.h zip.h arc.h ../utils/memb.h url.h arc_zip.o: arc_zip.c ../config.h ../timidity/timidity.h arc.h \ @@ -303,19 +301,11 @@ url_dir.o: url_dir.c ../config.h ../timidity/timidity.h url.h \ ../utils/strtab.h ../utils/mblock.h url_file.o: url_file.c ../config.h ../timidity/timidity.h url.h -url_ftp.o: url_ftp.c ../config.h ../timidity/timidity.h url.h \ - ../utils/net.h url_hqxdecode.o: url_hqxdecode.c ../config.h ../timidity/timidity.h \ url.h -url_http.o: url_http.c ../config.h ../timidity/timidity.h url.h \ - ../utils/net.h url_inflate.o: url_inflate.c ../config.h ../timidity/timidity.h url.h \ ../utils/mblock.h zip.h url_mem.o: url_mem.c ../config.h ../timidity/timidity.h url.h -url_news.o: url_news.c ../config.h ../timidity/timidity.h url.h \ - ../utils/net.h -url_newsgroup.o: url_newsgroup.c ../config.h ../timidity/timidity.h \ - url.h ../utils/net.h url_pipe.o: url_pipe.c ../config.h ../timidity/timidity.h url.h url_qsdecode.o: url_qsdecode.c ../config.h ../timidity/timidity.h url.h url_uudecode.o: url_uudecode.c ../config.h ../timidity/timidity.h url.h diff -ruN TiMidity++-1.2.0/timidity/Makefile.in TiMidity++-1.2.1/timidity/Makefile.in --- TiMidity++-1.2.0/timidity/Makefile.in Thu Jan 21 01:59:31 1999 +++ TiMidity++-1.2.1/timidity/Makefile.in Mon Jan 25 21:30:37 1999 @@ -350,7 +350,6 @@ ../utils/mblock.h output.h controls.h ../libarc/arc.h \ ../utils/memb.h ../utils/nkflib.h wrd.h controls.o: controls.c ../config.h ../interface.h timidity.h controls.h -dl_dlopen.o: dl_dlopen.c ../config.h timidity.h dlutils.h filter.o: filter.c ../config.h timidity.h common.h ../libarc/url.h \ ../utils/mblock.h controls.h instrum.h filter.h instrum.o: instrum.c ../config.h timidity.h common.h ../libarc/url.h \ @@ -375,8 +374,7 @@ playmidi.o: playmidi.c ../config.h timidity.h common.h ../libarc/url.h \ ../utils/mblock.h instrum.h playmidi.h readmidi.h output.h \ mix.h controls.h miditrace.h recache.h ../libarc/arc.h \ - ../utils/memb.h reverb.h wrd.h ../interface/soundspec.h \ - tables.h + ../utils/memb.h reverb.h wrd.h tables.h raw_a.o: raw_a.c ../config.h timidity.h output.h controls.h rcp.o: rcp.c ../config.h timidity.h common.h ../libarc/url.h \ ../utils/mblock.h instrum.h playmidi.h readmidi.h controls.h @@ -406,8 +404,8 @@ timidity.o: timidity.c ../config.h ../interface.h timidity.h common.h \ ../libarc/url.h ../utils/mblock.h instrum.h playmidi.h \ readmidi.h output.h controls.h tables.h miditrace.h reverb.h \ - ../interface/soundspec.h recache.h ../libarc/arc.h \ - ../utils/memb.h ../utils/strtab.h wrd.h mid.defs dlutils.h + recache.h ../libarc/arc.h ../utils/memb.h ../utils/strtab.h \ + wrd.h mid.defs wave_a.o: wave_a.c ../config.h timidity.h output.h controls.h wrd_read.o: wrd_read.c ../config.h timidity.h common.h ../libarc/url.h \ ../utils/mblock.h instrum.h playmidi.h readmidi.h controls.h \ diff -ruN TiMidity++-1.2.0/timidity/dl_dlopen.c TiMidity++-1.2.1/timidity/dl_dlopen.c --- TiMidity++-1.2.0/timidity/dl_dlopen.c Mon Nov 2 12:29:10 1998 +++ TiMidity++-1.2.1/timidity/dl_dlopen.c Mon Jan 25 20:28:52 1999 @@ -53,6 +53,6 @@ RETVAL = dlsym(libhandle, symbolname); if (RETVAL == NULL) - fprintf(stderr, "%s", dlerror()); + fprintf(stderr, "%s\n", dlerror()); return RETVAL; } diff -ruN TiMidity++-1.2.0/timidity/timidity.c TiMidity++-1.2.1/timidity/timidity.c --- TiMidity++-1.2.0/timidity/timidity.c Wed Jan 20 18:34:45 1999 +++ TiMidity++-1.2.1/timidity/timidity.c Mon Jan 25 20:29:00 1999 @@ -2792,22 +2792,6 @@ if(strncmp(program_name,"timidity",8) == 0); else if(strncmp(program_name,"kmidi",5) == 0) set_ctl("q"); else if(strncmp(program_name,"tkmidi",6) == 0) set_ctl("k"); - else if(strncmp(program_name,"xmmidi",6) == 0) set_ctl("m"); - else if(strncmp(program_name,"xawmidi",7) == 0) set_ctl("a"); - else if(strncmp(program_name,"xskinmidi",9) == 0) set_ctl("i"); - - if(argc == 1 && !strchr(INTERACTIVE_INTERFACE_IDS, ctl->id_character)) - { - interesting_message(); - return 0; - } - - if((program_name=strrchr(argv[0], PATH_SEP))) program_name++; - else program_name=argv[0]; - - if(strncmp(program_name,"timidity",8) == 0); - else if(strncmp(program_name,"kmidi",5) == 0) set_ctl("q"); - else if(strncmp(program_name,"tkmidi",6) == 0) set_ctl("k"); else if(strncmp(program_name,"gtkmidi",6) == 0) set_ctl("g"); else if(strncmp(program_name,"xmmidi",6) == 0) set_ctl("m"); else if(strncmp(program_name,"xawmidi",7) == 0) set_ctl("a"); diff -ruN TiMidity++-1.2.0/utils/Makefile.in TiMidity++-1.2.1/utils/Makefile.in --- TiMidity++-1.2.0/utils/Makefile.in Thu Jan 21 01:59:18 1999 +++ TiMidity++-1.2.1/utils/Makefile.in Mon Jan 25 21:30:20 1999 @@ -267,12 +267,9 @@ done bitset.o: bitset.c ../config.h ../timidity/timidity.h \ ../timidity/common.h ../libarc/url.h mblock.h bitset.h -fft.o: fft.c ../config.h ../timidity/timidity.h ../timidity/common.h \ - ../libarc/url.h mblock.h fft.h mblock.o: mblock.c ../config.h ../timidity/timidity.h mblock.h memb.o: memb.c ../config.h ../timidity/timidity.h memb.h mblock.h \ ../libarc/url.h -net.o: net.c ../config.h ../timidity/timidity.h net.h nkflib.o: nkflib.c ../config.h ../timidity/timidity.h \ ../timidity/common.h ../libarc/url.h mblock.h nkflib.h strtab.o: strtab.c ../config.h ../timidity/timidity.h mblock.h strtab.h