diff -ruN TiMidity++-1.0.1/ChangeLog TiMidity++-1.1.0/ChangeLog --- TiMidity++-1.0.1/ChangeLog Thu Jan 14 17:54:35 1999 +++ TiMidity++-1.1.0/ChangeLog Mon Jan 18 06:36:48 1999 @@ -1,4 +1,41 @@ +-- 1.1.0 +Sun Jan 18 1999 +Summary: + * Fixed bugs of xaw interface with no trace mode. + * Added configuration for UMP package. + * Modified configure and Makefiles. + * Added trace mode to xaw interface. + * Supported OffiX configuration. + * Some bugs are fixed. + +Date: Mon Jan 18 1999 +From: Masanao Izumo +Files: interface/xaw_i.c + Fixed bugs of xaw interface with no trace mode. +Files: configure* */Makefile* + Added configuration for UMP package. + Modified configure and Makefiles. + +Date: Sat, 16 Jan 1999 02:18:01 +0900 (JST) +From: Yoshishige Arai +Files: interface/{xaw.h,xaw_c.c,xaw_i.c} + Added trace mode to xaw interface. + +Date: Fri, 15 Jan 1999 14:26:17 +0900 +From: takawata@shidahara1.planet.sci.kobe-u.ac.jp +Files: configure.in interface/xaw.h interface/xskin_loadBMP.c + Supported OffiX configuration. The new configure options are: + --enable-offix + Turn on OffiX interface for XAW. + --with-offix-includes=[dir] + Specify include directry for Offix library. + --with-offix-libs=[dir] + Specify library for Offix. + Fixed tkl/tk configure bug. + Included config.h in xskin_loadBMP.c. + -- 1.0.1 +Thu Jan 14 1999 Summary: * Define function of vsnprintf() and snprintf() if it is not exists. * Fixed message transfer probrem with '\n' for some interface. diff -ruN TiMidity++-1.0.1/Makefile.am TiMidity++-1.1.0/Makefile.am --- TiMidity++-1.0.1/Makefile.am Thu Jan 14 12:10:34 1999 +++ TiMidity++-1.1.0/Makefile.am Sun Jan 17 23:42:13 1999 @@ -18,6 +18,8 @@ # # This Makefile is known to work with GNU make. +include $(top_builddir)/common.makefile + SUBDIRS = \ utils \ libarc \ diff -ruN TiMidity++-1.0.1/Makefile.in TiMidity++-1.1.0/Makefile.in --- TiMidity++-1.0.1/Makefile.in Thu Jan 14 17:56:46 1999 +++ TiMidity++-1.1.0/Makefile.in Mon Jan 18 06:44:41 1999 @@ -88,7 +88,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -101,11 +101,10 @@ SHCFLAGS = @SHCFLAGS@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ SUBDIRS = \ utils \ @@ -369,6 +368,8 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean + +include $(top_builddir)/common.makefile dynamics: cd interface; $(MAKE) $@ diff -ruN TiMidity++-1.0.1/NEWS TiMidity++-1.1.0/NEWS --- TiMidity++-1.0.1/NEWS Thu Jan 14 12:15:10 1999 +++ TiMidity++-1.1.0/NEWS Mon Jan 18 06:44:27 1999 @@ -1,3 +1,7 @@ +* 1/18, 1999 + Support OffiX file drag & drop interface for xaw. + Support UMP configuration. + * 1/14, 1999 Modfied for OffiX file drag & drop interface for xaw. If you want build this, define OFFIX in interface/xaw.h and link libDnd. diff -ruN TiMidity++-1.0.1/acinclude.m4 TiMidity++-1.1.0/acinclude.m4 --- TiMidity++-1.0.1/acinclude.m4 Thu Jan 14 11:03:00 1999 +++ TiMidity++-1.1.0/acinclude.m4 Mon Jan 18 03:31:46 1999 @@ -7,11 +7,11 @@ case "x$enable_$1" in xyes) AM_CONDITIONAL(ENABLE_$2, true) - SYSTEM="$SYSTEM -DIA_$2" + EXTRADEFS="$EXTRADEFS -DIA_$2" $6 ;; xdynamic) - dynamic_targets="$dynamic_targets interface_$3.\$(sharedLibExtension)" + dynamic_targets="$dynamic_targets interface_$3.\$(so)" $7 ;; *) @@ -180,7 +180,7 @@ #else int mode = RTLD_LAZY ; #endif - handle = dlopen("./dyna.$sharedLibExtension", mode) ; + handle = dlopen("./dyna.$so", mode) ; if (handle == NULL) { printf ("1\n") ; fflush (stdout) ; @@ -206,7 +206,7 @@ : Call the object file tmp-dyna.o in case dlext=o. if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 && mv dyna.o tmp-dyna.o > /dev/null 2>&1 && - $SHLD $SHLDFLAGS -o dyna.$sharedLibExtension tmp-dyna.o > /dev/null 2>&1 && + $SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 && ${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.$ac_ext $LIBS > /dev/null 2>&1; then xxx=`./fred` case $xxx in @@ -222,7 +222,7 @@ else AC_MSG_WARN(I can't compile and run the test program.) fi -rm -f dyna.c dyna.o dyna.$sharedLibExtension tmp-dyna.o fred.c fred.o fred +rm -f dyna.c dyna.o dyna.$so tmp-dyna.o fred.c fred.o fred ]) case "x$timidity_cv_func_dlsym_underscore" in xyes) [$1] @@ -232,4 +232,11 @@ AC_MSG_RESULT(no) ;; esac +]) + + +dnl SET_UNIQ_SORT_WORD(shell-variable,words...) +AC_DEFUN(SET_UNIQ_SORT_WORD, +[$1=`for f in $2; do echo $f; done | sort | uniq` +$1=`echo $$1` ]) diff -ruN TiMidity++-1.0.1/aclocal.m4 TiMidity++-1.1.0/aclocal.m4 --- TiMidity++-1.0.1/aclocal.m4 Thu Jan 14 12:38:33 1999 +++ TiMidity++-1.1.0/aclocal.m4 Mon Jan 18 06:31:04 1999 @@ -19,11 +19,11 @@ case "x$enable_$1" in xyes) AM_CONDITIONAL(ENABLE_$2, true) - SYSTEM="$SYSTEM -DIA_$2" + EXTRADEFS="$EXTRADEFS -DIA_$2" $6 ;; xdynamic) - dynamic_targets="$dynamic_targets interface_$3.\$(sharedLibExtension)" + dynamic_targets="$dynamic_targets interface_$3.\$(so)" $7 ;; *) @@ -192,7 +192,7 @@ #else int mode = RTLD_LAZY ; #endif - handle = dlopen("./dyna.$sharedLibExtension", mode) ; + handle = dlopen("./dyna.$so", mode) ; if (handle == NULL) { printf ("1\n") ; fflush (stdout) ; @@ -218,7 +218,7 @@ : Call the object file tmp-dyna.o in case dlext=o. if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 && mv dyna.o tmp-dyna.o > /dev/null 2>&1 && - $SHLD $SHLDFLAGS -o dyna.$sharedLibExtension tmp-dyna.o > /dev/null 2>&1 && + $SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 && ${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.$ac_ext $LIBS > /dev/null 2>&1; then xxx=`./fred` case $xxx in @@ -234,7 +234,7 @@ else AC_MSG_WARN(I can't compile and run the test program.) fi -rm -f dyna.c dyna.o dyna.$sharedLibExtension tmp-dyna.o fred.c fred.o fred +rm -f dyna.c dyna.o dyna.$so tmp-dyna.o fred.c fred.o fred ]) case "x$timidity_cv_func_dlsym_underscore" in xyes) [$1] @@ -244,6 +244,13 @@ AC_MSG_RESULT(no) ;; esac +]) + + +dnl SET_UNIQ_SORT_WORD(shell-variable,words...) +AC_DEFUN(SET_UNIQ_SORT_WORD, +[$1=`for f in $2; do echo $f; done | sort | uniq` +$1=`echo $$1` ]) # Define a conditional. diff -ruN TiMidity++-1.0.1/common.makefile.in TiMidity++-1.1.0/common.makefile.in --- TiMidity++-1.0.1/common.makefile.in Mon Dec 14 14:46:41 1998 +++ TiMidity++-1.1.0/common.makefile.in Mon Jan 18 03:28:27 1999 @@ -53,13 +53,6 @@ ########### Install. #INSTALL = @INSTALL@ -# Where to install the executable -#BIN_DIR = $(prefix)/bin - -# Where to install the manual pages -#MAN_DIR = $(prefix)/man/man1 -JMAN_DIR = $(prefix)/man/ja_JP.EUC/man1 - # Where to install the patches, config files, and MIDI files. # If you change this, it's a good idea to recompile the binary, # or you'll need to invoke timidity with the -L option. @@ -70,25 +63,7 @@ TCL_DIR = $(TIMID_DIR) #TCL_DIR = $(pkgdatadir) +CFLAGS += $(DEBUGFLAGS) +DEFS += $(EXTRADEFS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" -########### Audio device selection - -#VERSION = @VERSION@ - -SYSTEM = @SYSTEM@ -#SYSEXTRAS = @SYSEXTRAS@ -#EXTRALIBS = @EXTRALIBS@ -#EXTRAINCS = @EXTRAINCS@ - -CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \ - $(SYSTEM) @DEFS@ - -#CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \ -# $(SYSTEM) $(EXTRAINCS) - - -#DEFS = @DEFS@ -#.c.o: -# $(CC) $(CFLAGS) $(DEFS) -c $< - -.SUFFIXES: .c .h .ptcl .tcl .o .1 .txt .ps +.SUFFIXES: .c .h .ptcl .tcl .o .1 .txt .ps .@so@ diff -ruN TiMidity++-1.0.1/config.h.in TiMidity++-1.1.0/config.h.in --- TiMidity++-1.0.1/config.h.in Wed Jan 6 09:00:29 1999 +++ TiMidity++-1.1.0/config.h.in Sun Jan 17 04:52:09 1999 @@ -143,6 +143,9 @@ /* 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.0.1/configure TiMidity++-1.1.0/configure --- TiMidity++-1.0.1/configure Thu Jan 14 12:38:35 1999 +++ TiMidity++-1.1.0/configure Mon Jan 18 06:31:33 1999 @@ -24,6 +24,10 @@ ac_help="$ac_help --with-tk-libs=dir Tk include file path " ac_help="$ac_help + --with-offix-includes=dir Offix include file path " +ac_help="$ac_help + --with-offix-libs=dir Offix include file path " +ac_help="$ac_help --enable-audio Enable audio (default if you use supported platform) " ac_help="$ac_help --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)" @@ -56,11 +60,15 @@ ac_help="$ac_help --disable-gtktest Do not try to compile and run a test GTK program" ac_help="$ac_help + --enable-ump UMP configuration (default is no)" +ac_help="$ac_help + --enable-offix Enable offix support (default is no)" +ac_help="$ac_help --enable-network Enable network support (default is no)" ac_help="$ac_help --enable-spectrogram Enable Sound Spectrogram Viewer (default is no)" ac_help="$ac_help - --enable-wrd Enable WRD interface (default is no)" + --enable-wrd Enable WRD interface for X (default is no)" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -615,7 +623,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:619: checking host system type" >&5 +echo "configure:627: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -636,7 +644,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:640: checking target system type" >&5 +echo "configure:648: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -654,7 +662,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:658: checking build system type" >&5 +echo "configure:666: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -687,7 +695,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:691: checking for a BSD compatible install" >&5 +echo "configure:699: 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 @@ -740,7 +748,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:744: checking whether build environment is sane" >&5 +echo "configure:752: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -797,7 +805,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:801: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:809: 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 @@ -826,7 +834,7 @@ PACKAGE=TiMidity++ -VERSION=1.0.1 +VERSION=1.1.0 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; } @@ -836,7 +844,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:840: checking for working aclocal" >&5 +echo "configure:848: 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. @@ -849,7 +857,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:853: checking for working autoconf" >&5 +echo "configure:861: 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. @@ -862,7 +870,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:866: checking for working automake" >&5 +echo "configure:874: 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. @@ -875,7 +883,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:879: checking for working autoheader" >&5 +echo "configure:887: 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. @@ -888,7 +896,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:892: checking for working makeinfo" >&5 +echo "configure:900: 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. @@ -912,7 +920,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:916: checking for $ac_word" >&5 +echo "configure:924: 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 @@ -943,7 +951,7 @@ if test $EMACS != "no"; then echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:947: checking where .elc files should go" >&5 +echo "configure:955: 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 @@ -980,7 +988,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:984: checking for $ac_word" >&5 +echo "configure:992: 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 @@ -1009,7 +1017,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:1013: checking for $ac_word" >&5 +echo "configure:1021: 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 @@ -1057,7 +1065,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1061: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1069: 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. @@ -1067,11 +1075,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:1083: \"$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 @@ -1091,12 +1099,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:1095: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1103: 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:1100: checking whether we are using GNU C" >&5 +echo "configure:1108: 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 @@ -1105,7 +1113,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1109: \"$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:1117: \"$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 @@ -1120,7 +1128,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1124: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1132: 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 @@ -1158,7 +1166,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:1162: checking for a BSD compatible install" >&5 +echo "configure:1170: 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 @@ -1210,7 +1218,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:1214: checking for $ac_word" >&5 +echo "configure:1222: 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 @@ -1237,7 +1245,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1241: checking whether ln -s works" >&5 +echo "configure:1249: 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 @@ -1262,24 +1270,259 @@ SHLDFLAGS=${LDFLAGS:--L/usr/local/lib} CFLAGS="$CFLAGS -I/usr/local/include" -SYSTEM= +EXTRACFLAGS= +EXTRADEFS= SYSEXTRAS= EXTRALIBS= -EXTRAINCS=${EXTRAINCS:--I/usr/local/include} +EXTRAINCS= + +lib_xm_opt= +lib_xaw_opt= +lib_xmu_opt= +lib_xt_opt= +lib_xprelibs_opt= +lib_xext_opt= + -case "$target/$CC" in - *-sgi-irix*/cc) - EXTRACFLAGS="-signed" - ;; -esac case "$target" in + *-*-hpux*) + SHLD="ld -b" + so="sl" + ;; + *-sgi-irix*) + case ".$CC" in .cc*) EXTRACFLAGS="-signed";; esac + SHLD="cc -shared -all" + so="so" + ;; + *-*-netbsd*) + SHLD="ld -Bforcearchive -Bshareable" + so="so" + ;; *-*-freebsd*) EXTRALIBS="$EXTRALIB -lxpg4" - ;; + ;; + *-*-cygwin32*) + EXTRADEFS="-D__WIN32__" + SHLD="$CC" + so="dll" + CYGWIN32=yes + ;; + *-dec-*) + EXTRADEFS="-DDEC" + SHLD="ld -Bdynamic -G" + so="so" + ;; + *-*-solaris*) + EXTRADEFS="-DSOLARIS" + SHLD="ld -Bdynamic -G" + so="so" + ;; + *) + SHLD="ld -Bdynamic -G" + so="so" + ;; esac -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1283: checking how to run the C preprocessor" >&5 +echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 +echo "configure:1328: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + +echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +echo "configure:1375: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + +for ac_func in gethostbyname +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1424: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +echo "configure:1474: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lnsl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + +fi +done + + +if test "x$with_x" = xyes; then + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:1526: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1294,13 +1537,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:1304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1311,13 +1554,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:1321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1344,7 +1587,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:1348: checking for X" >&5 +echo "configure:1591: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1406,12 +1649,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:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1480,14 +1723,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:1734: \"$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. @@ -1593,17 +1836,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:1597: checking whether -R must be followed by a space" >&5 +echo "configure:1840: 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:1850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -1619,14 +1862,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:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -1658,7 +1901,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:1662: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1905: 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 @@ -1666,7 +1909,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:1924: \"$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 @@ -1699,7 +1942,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:1703: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1946: 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 @@ -1707,7 +1950,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:1965: \"$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 @@ -1747,12 +1990,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:1751: checking for gethostbyname" >&5 +echo "configure:1994: 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:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1796,7 +2039,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1800: checking for gethostbyname in -lnsl" >&5 +echo "configure:2043: 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 @@ -1804,7 +2047,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: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 @@ -1845,12 +2088,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:1849: checking for connect" >&5 +echo "configure:2092: 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:2120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1894,7 +2137,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1898: checking for connect in -lsocket" >&5 +echo "configure:2141: 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 @@ -1902,7 +2145,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:2160: \"$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 @@ -1937,12 +2180,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:1941: checking for remove" >&5 +echo "configure:2184: 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:2212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -1986,7 +2229,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1990: checking for remove in -lposix" >&5 +echo "configure:2233: 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 @@ -1994,7 +2237,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:2252: \"$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 @@ -2029,12 +2272,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2033: checking for shmat" >&5 +echo "configure:2276: 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:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2078,7 +2321,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2082: checking for shmat in -lipc" >&5 +echo "configure:2325: 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 @@ -2086,7 +2329,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:2344: \"$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 @@ -2130,7 +2373,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:2134: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2377: 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 @@ -2138,7 +2381,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:2396: \"$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 @@ -2173,214 +2416,19 @@ fi -if test "x$x_libraries" != x; then - LDFLAGS="-L${x_libraries} $LDFLAGS" -fi -if test "x$x_includes" != x; then - EXTRAINCS="$EXTRAINCS -I$x_includes" -fi -CPPFLAGS="$EXTRAINCS" -if test "x$x_includes" != x; then - CFLAGS="$EXTRACFLAGS $CFLAGS -I$x_includes" -fi -echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:2188: checking for sqrt in -lm" >&5 -ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lm $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - -echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2235: checking for socket in -lsocket" >&5 -ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - -for ac_func in gethostbyname -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2284: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:2312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2334: checking for gethostbyname in -lnsl" >&5 -ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/^a-zA-Z0-9_/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - -fi -done + if test "x$x_libraries" != x; then + ldflags_x_opt="-L$x_libraries" + LDFLAGS="$LDFLAGS $ldflags_x_opt" + else + ldflags_x_opt= + fi + if test "x$x_includes" != x; then + CPPFLAGS="$CPPFLAGS -I$x_includes" + CFLAGS="$CFLAGS -I$x_includes" + fi -echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2384: checking for XOpenDisplay in -lX11" >&5 + echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 +echo "configure:2432: 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 @@ -2388,7 +2436,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:2451: \"$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 @@ -2426,13 +2474,13 @@ echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 -echo "configure:2431: checking X11 version 6" >&5 -if eval "test \"`echo '$''{'timidity_cv_x11_version_6'+set}'`\" = set"; then + echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 +echo "configure:2479: 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() { @@ -2442,7 +2490,7 @@ ; return 0; } EOF -if { (eval echo configure:2446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* timidity_cv_x11_version_6=yes else @@ -2454,15 +2502,15 @@ rm -f conftest* fi -if test "$timidity_cv_x11_version_6" = "yes"; then - echo "$ac_t""6 or newer" 1>&6 - else - echo "$ac_t""before 6" 1>&6 -fi + if test "$timidity_cv_x11_version_6" = "yes"; then + echo "$ac_t""6 or newer" 1>&6 + else + echo "$ac_t""before 6" 1>&6 + fi -KEEPLIBS=$LIBS -echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6 -echo "configure:2466: checking for XShapeCombineMask in -lXext" >&5 + KEEPLIBS=$LIBS + echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6 +echo "configure:2514: 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 @@ -2470,7 +2518,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:2533: \"$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 @@ -2502,8 +2550,8 @@ have_xext=no fi -echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2507: checking for IceConnectionNumber in -lICE" >&5 + echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 +echo "configure:2555: 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 @@ -2511,7 +2559,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:2574: \"$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 @@ -2549,8 +2597,8 @@ echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6 -echo "configure:2554: checking for SmcOpenConnection in -lSM" >&5 + echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6 +echo "configure:2602: 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 @@ -2558,7 +2606,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:2621: \"$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 @@ -2590,8 +2638,8 @@ have_xprelibs=no fi -echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2595: checking for XtVaAppInitialize in -lXt" >&5 + echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6 +echo "configure:2643: 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 @@ -2599,7 +2647,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:2662: \"$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 @@ -2631,8 +2679,8 @@ have_xt=no fi -echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6 -echo "configure:2636: checking for XmuInternAtom in -lXmu" >&5 + echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6 +echo "configure:2684: 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 @@ -2640,7 +2688,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:2703: \"$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 @@ -2671,8 +2719,8 @@ echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 -echo "configure:2676: checking for XawInitializeWidgetSet in -lXaw3d" >&5 + echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 +echo "configure:2724: 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 @@ -2680,7 +2728,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:2743: \"$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 @@ -2710,7 +2758,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 -echo "configure:2714: checking for XawInitializeWidgetSet in -lXaw" >&5 +echo "configure:2762: 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 @@ -2718,7 +2766,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:2781: \"$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 @@ -2752,8 +2800,8 @@ fi -echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 -echo "configure:2757: checking for XmCreateForm in -lXm" >&5 + echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 +echo "configure:2805: 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 @@ -2761,7 +2809,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:2824: \"$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 @@ -2793,19 +2841,21 @@ have_xm=no fi -LIBS=$KEEPLIBS + LIBS=$KEEPLIBS +fi + ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h 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:2804: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2854: 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> @@ -2813,7 +2863,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2838,7 +2888,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:2842: checking for opendir in -ldir" >&5 +echo "configure:2892: 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 @@ -2846,7 +2896,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:2911: \"$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 @@ -2879,7 +2929,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2883: checking for opendir in -lx" >&5 +echo "configure:2933: 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 @@ -2887,7 +2937,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:2952: \"$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 @@ -2921,12 +2971,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2925: checking for ANSI C header files" >&5 +echo "configure:2975: 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 @@ -2934,7 +2984,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2951,7 +3001,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 @@ -2969,7 +3019,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 @@ -2990,7 +3040,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3001,7 +3051,7 @@ exit (0); } EOF -if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -3025,12 +3075,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3029: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3079: 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 @@ -3046,7 +3096,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3070,17 +3120,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3074: checking for $ac_hdr" >&5 +echo "configure:3124: 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:3084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3108,17 +3158,17 @@ ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:3112: checking for string.h" >&5 +echo "configure:3162: 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:3122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3137,17 +3187,17 @@ : else echo "$ac_t""no" 1>&6 - SYSTEM="$SYSTEM -DNO_STRING_H " + EXTRADEFS="$EXTRADEFS -DNO_STRING_H " fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3146: checking for working const" >&5 +echo "configure:3196: 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:3250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3217,14 +3267,14 @@ fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3221: checking whether char is unsigned" >&5 +echo "configure:3271: 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:3310: \"$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 @@ -3280,14 +3330,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3284: checking whether byte ordering is bigendian" >&5 +echo "configure:3334: 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 @@ -3298,11 +3348,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3302: \"$ac_compile\") 1>&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* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -3313,7 +3363,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3333,7 +3383,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:3400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3370,21 +3420,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3374: checking for inline" >&5 +echo "configure:3424: 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:3438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3410,12 +3460,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3414: checking for off_t" >&5 +echo "configure:3464: 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 @@ -3443,12 +3493,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3447: checking for pid_t" >&5 +echo "configure:3497: 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 @@ -3476,12 +3526,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3480: checking for size_t" >&5 +echo "configure:3530: 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 @@ -3509,12 +3559,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3513: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3563: 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 @@ -3523,7 +3573,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3545,31 +3595,42 @@ echo $ac_n "checking volatile declaration""... $ac_c" 1>&6 -echo "configure:3549: checking volatile declaration" >&5 -cat > conftest.$ac_ext <&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:3611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - echo "$ac_t""yes" 1>&6 + timidity_cv_type_volatile=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - EXTRACFLAGS="$EXTRACFLAGS -DNO_VOLATILE" - echo "$ac_t""no" 1>&6 + timidity_cv_type_volatile=no fi rm -f conftest* +fi + +echo "$ac_t""$timidity_cv_type_volatile" 1>&6 +if test $timidity_cv_type_volatile = no; then + EXTRADEFS="$EXTRADEFS -DNO_VOLATILE" +fi echo $ac_n "checking union semun declaration""... $ac_c" 1>&6 -echo "configure:3571: checking union semun declaration" >&5 -cat > conftest.$ac_ext <&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 @@ -3578,27 +3639,32 @@ union semun x ; return 0; } EOF -if { (eval echo configure:3582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - echo "$ac_t""yes" 1>&6 - EXTRACFLAGS="$EXTRACFLAGS -DHAVE_UNION_SEMUN" + timidity_cv_type_union_semun=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - echo "$ac_t""no" 1>&6 + timidity_cv_type_union_semun=no fi rm -f conftest* +fi + +echo "$ac_t""$timidity_cv_type_union_semun" 1>&6 +if test $timidity_cv_type_union_semun = yes; then + EXTRADEFS="$EXTRADEFS -DHAVE_UNION_SEMUN" +fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:3596: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:3662: 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 @@ -3616,7 +3682,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -3638,7 +3704,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3642: checking for 8-bit clean memcmp" >&5 +echo "configure:3708: 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 @@ -3646,7 +3712,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:3726: \"$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 @@ -3677,17 +3743,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3681: checking for $ac_hdr" >&5 +echo "configure:3747: 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:3691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3716,12 +3782,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3720: checking for $ac_func" >&5 +echo "configure:3786: 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:3814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3769,7 +3835,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3773: checking for working mmap" >&5 +echo "configure:3839: 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 @@ -3777,7 +3843,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:3987: \"$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 @@ -3940,7 +4006,7 @@ fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:3944: checking whether setvbuf arguments are reversed" >&5 +echo "configure:4010: 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 @@ -3948,7 +4014,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. */ @@ -3962,7 +4028,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:3966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4032: \"$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 @@ -3986,12 +4052,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3990: checking return type of signal handlers" >&5 +echo "configure:4056: 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 @@ -4008,7 +4074,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4027,12 +4093,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4031: checking for vprintf" >&5 +echo "configure:4097: 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:4125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4079,12 +4145,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4083: checking for _doprnt" >&5 +echo "configure:4149: 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:4177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4134,12 +4200,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:4138: checking for $ac_func" >&5 +echo "configure:4204: 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:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4189,12 +4255,12 @@ # check getopt echo $ac_n "checking for getopt""... $ac_c" 1>&6 -echo "configure:4193: checking for getopt" >&5 +echo "configure:4259: 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:4287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_getopt=yes" else @@ -4251,8 +4317,7 @@ if test "${with_tcl_includes+set}" = set; then withval="$with_tcl_includes" if test ! -d $withval; then - echo "$withval not found." - exit + { echo "configure: error: $withval not found." 1>&2; exit 1; } fi tcl_include_dir=$withval else @@ -4263,8 +4328,7 @@ if test "${with_tcl_libs+set}" = set; then withval="$with_tcl_libs" if test ! -d $withval; then - echo "$withval not found." - exit + { echo "configure: error: $withval not found." 1>&2; exit 1; } fi tcl_lib_dir=$withval else @@ -4275,8 +4339,7 @@ if test "${with_tk_includes+set}" = set; then withval="$with_tk_includes" if test ! -d $withval; then - echo "$withval not found." - exit + { echo "configure: error: $withval not found." 1>&2; exit 1; } fi tk_include_dir=$withval else @@ -4287,19 +4350,39 @@ if test "${with_tk_libs+set}" = set; then withval="$with_tk_libs" if test ! -d $withval; then - echo "$withval not found." - exit + { echo "configure: error: $withval not found." 1>&2; exit 1; } fi tk_lib_dir=$withval else tk_lib_dir=/usr/local/lib 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; } + fi + offix_include_dir=$withval +else + offix_include_dir=/usr/local/include +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; } + fi + offix_lib_dir=$withval +else + offix_lib_dir=/usr/local/lib +fi echo $ac_n "checking whether to enable audio""... $ac_c" 1>&6 -echo "configure:4303: checking whether to enable audio" >&5 +echo "configure:4386: 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" @@ -4312,7 +4395,7 @@ if test "$enable_audio" = "yes"; then case "$target" in *-*-linux*|*-*-freebsd*) - SYSTEM="$SYSTEM -DAU_LINUX" + EXTRADEFS="$EXTRADEFS -DAU_LINUX" SYSEXTRAS="$SYSEXTRAS linux_a.c" echo "$ac_t""yes linux" 1>&6 KEEPCFLAGS=$CFLAGS @@ -4345,7 +4428,7 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:4349: checking for ALSA CFLAGS" >&5 +echo "configure:4432: 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" @@ -4353,7 +4436,7 @@ echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:4357: checking for ALSA LDFLAGS" >&5 +echo "configure:4440: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -4365,7 +4448,7 @@ min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:4369: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:4452: 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/'` @@ -4375,7 +4458,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -4416,7 +4499,7 @@ ; return 0; } EOF -if { (eval echo configure:4420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -4430,7 +4513,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:4434: checking for snd_cards in -lasound" >&5 +echo "configure:4517: 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 @@ -4438,7 +4521,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:4536: \"$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 @@ -4486,19 +4569,19 @@ LIBS=$KEEPLIBS LDFLAGS=$KEEPLDFLAGS if test "x$have_alsa" = "xyes"; then - SYSTEM="$SYSTEM -DAU_ALSA" + EXTRADEFS="$EXTRADEFS -DAU_ALSA" SYSEXTRAS="$SYSEXTRAS alsa_a.c" CFLAGS="$CFLAGS $ALSA_CFLAGS" LIBS="$LIBS $ALSA_LIBS" fi ;; *-*-bsdi2.?|*-*-bsdi3.?) - SYSTEM="$SYSTEM -DAU_BSDI -DDEFAULT_RATE=22500" + EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500" SYSEXTRAS="$SYSEXTRAS bsd20_a.c" echo "$ac_t""yes bsdi" 1>&6 ;; *-*-hpux*) - SYSTEM="$SYSTEM -DHPUX -DAU_HPUX" + 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" @@ -4510,26 +4593,26 @@ echo "$ac_t""yes hpux" 1>&6 ;; *-dec-*) - SYSTEM="$SYSTEM -DDEC -DAU_DEC -DAU_AUDRIV" + EXTRADEFS="$EXTRADEFS -DAU_DEC -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_mme.c" EXTRAINCS="$EXTRAINCS -I/usr/opt/MME210/include" EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a" echo "$ac_t""yes dec" 1>&6 ;; *-sgi-irix5*) - SYSTEM="$SYSTEM -DAU_AUDRIV -DSGI_OLDAL" + EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_OLDAL" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c" EXTRALIBS="$EXTRALIBS -laudio" echo "$ac_t""yes irix5" 1>&6 ;; *-sgi-irix6*) - SYSTEM="$SYSTEM -DAU_AUDRIV -DSGI_NEWAL" + EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c" EXTRALIBS="$EXTRASLIBS -laudio" echo "$ac_t""yes irix6" 1>&6 ;; *-*-sunos4*) - SYSTEM="$SYSTEM -DAU_AUDRIV" + EXTRADEFS="$EXTRADEFS -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_sun.c" echo "$ac_t""yes sunos4" 1>&6 if test -f /usr/demo/SOUND/libaudio.a; then @@ -4539,7 +4622,7 @@ fi ;; *-*-solaris*) - SYSTEM="$SYSTEM -DAU_AUDRIV -DSOLARIS" + EXTRADEFS="$EXTRADEFS -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_sun.c" echo "$ac_t""yes solaris" 1>&6 if test -f /usr/demo/SOUND/lib/libaudio.a; then @@ -4549,17 +4632,17 @@ fi ;; *-*-netbsd*) - SYSTEM="$SYSTEM -DAU_AUDRIV" + EXTRADEFS="$EXTRADEFS -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_sun.c" echo "$ac_t""yes netbsd" 1>&6 ;; *-*-cygwin32*) - SYSTEM="$SYSTEM -DAU_WIN32" + EXTRADEFS="$EXTRADEFS -DAU_WIN32" SYSEXTRAS="$SYSEXTRAS win_a.c" echo "$ac_t""yes cygwin32" 1>&6 ;; *) - SYSTEM="$SYSTEM -DAU_NONE -DAU_AUDRIV" + EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c" echo "$ac_t""no" 1>&6 ;; @@ -4568,8 +4651,20 @@ echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for LoadLibraryExA in -lc""... $ac_c" 1>&6 -echo "configure:4573: checking for LoadLibraryExA in -lc" >&5 + + + +case "$CC" in *gcc*) SHCFLAGS="-fPIC";; esac +case "x$enable_ump" in xyes|xdynamic) CFLAGS="$CFLAGS -DXP_UNIX $SHCFLAGS";; esac + +case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_xskin$enable_gtk" in +*dynamic*) NEEDDLOPEN=yes;; +*) NEEDDLOPEN=no;; +esac + +if test "$NEEDDLOPEN" = "yes"; then + echo $ac_n "checking for LoadLibraryExA in -lc""... $ac_c" 1>&6 +echo "configure:4668: checking for LoadLibraryExA in -lc" >&5 ac_lib_var=`echo c'_'LoadLibraryExA | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4577,7 +4672,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4687: \"$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 @@ -4609,9 +4704,9 @@ have_dl=no fi -if test "$have_dl" = "no"; then - echo $ac_n "checking for shl_load in -lc""... $ac_c" 1>&6 -echo "configure:4615: checking for shl_load in -lc" >&5 + if test "$have_dl" = "no"; then + echo $ac_n "checking for shl_load in -lc""... $ac_c" 1>&6 +echo "configure:4710: checking for shl_load in -lc" >&5 ac_lib_var=`echo c'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4619,7 +4714,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4729: \"$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 @@ -4651,10 +4746,10 @@ have_dl=no fi -fi -if test "$have_dl" = "no"; then - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4658: checking for dlopen in -ldl" >&5 + fi + if test "$have_dl" = "no"; then + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "configure:4753: 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 @@ -4662,7 +4757,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:4772: \"$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 @@ -4694,10 +4789,10 @@ have_dl=no fi -fi -if test "$have_dl" = "no"; then - echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:4701: checking for dlopen in -lc" >&5 + fi + if test "$have_dl" = "no"; then + echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 +echo "configure:4796: checking for dlopen in -lc" >&5 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4705,7 +4800,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4815: \"$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 @@ -4737,10 +4832,10 @@ have_dl=no fi -fi -if test "$have_dl" = "no"; then - echo $ac_n "checking for dld_init in -lc""... $ac_c" 1>&6 -echo "configure:4744: checking for dld_init in -lc" >&5 + fi + if test "$have_dl" = "no"; then + echo $ac_n "checking for dld_init in -lc""... $ac_c" 1>&6 +echo "configure:4839: checking for dld_init in -lc" >&5 ac_lib_var=`echo c'_'dld_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4748,7 +4843,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4858: \"$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 @@ -4780,67 +4875,13 @@ have_dl=no fi -fi - -echo $ac_n "checking dynamic loader""... $ac_c" 1>&6 -echo "configure:4787: checking dynamic loader" >&5 - -case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_skin" in -*dynamic*) SHARED=yes;; -*) SHARED=no;; -esac + fi -if test "$SHARED" = "yes"; then case "$have_dl" in dlopen) SYSEXTRAS="$SYSEXTRAS dl_dlopen.c" - sharedLibExtension="so" - echo "$ac_t""yes dlopen" 1>&6 - ;; - dld) - SYSEXTRAS="$SYSEXTRAS dl_dld.c" - sharedLibExtension="so" - echo "$ac_t""yes dld" 1>&6 - ;; - hpux) - SYSEXTRAS="$SYSEXTRAS dl_hpux.c" - sharedLibExtension="sl" - LDFLAGS="-Wl,-E $LDFLAGS" - echo "$ac_t""yes hpux" 1>&6 - ;; - cygwin) - SYSEXTRAS="$SYSEXTRAS dl_cygwin32.c" - sharedLibExtension="dll" - echo "$ac_t""yes cygwin32" 1>&6 - ;; - *) - SHARED="no" - echo "$ac_t""no or method unknown" 1>&6 - ;; - esac - - case "$target" in - *-*-hpux*) - SHLD="ld -b" - ;; - *-sgi-irix*) - SHLD="cc -shared -all" - ;; - *-*-netbsd*) - SHLD="ld -Bforcearchive -Bshareable" - ;; - *) - SHLD="ld -Bdynamic -G" - #SHLD="ld -Bshareable" - ;; - esac - case "$CC" in *gcc*) SHCFLAGS="-fpic";; esac - SHARED_LIB_PATH="\$(TIMID_DIR)" - EXTRALIBS="$EXTRALIBS $dl_extra_lib" - SYSTEM="$SYSTEM -DIA_DYNAMIC -DSHARED_LIB_EXT=\\\".$sharedLibExtension\\\"" - SYSTEM="$SYSTEM -DSHARED_LIB_PATH=\\\"$SHARED_LIB_PATH\\\"" - case "$have_dl" in dlopen) echo $ac_n "checking whether your dlsym() needs a leading underscore""... $ac_c" 1>&6 -echo "configure:4844: checking whether your dlsym() needs a leading underscore" >&5 + echo $ac_n "checking whether your dlsym() needs a leading underscore""... $ac_c" 1>&6 +echo "configure:4885: 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 @@ -4874,7 +4915,7 @@ #else int mode = RTLD_LAZY ; #endif - handle = dlopen("./dyna.$sharedLibExtension", mode) ; + handle = dlopen("./dyna.$so", mode) ; if (handle == NULL) { printf ("1\n") ; fflush (stdout) ; @@ -4900,7 +4941,7 @@ : Call the object file tmp-dyna.o in case dlext=o. if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 && mv dyna.o tmp-dyna.o > /dev/null 2>&1 && - $SHLD $SHLDFLAGS -o dyna.$sharedLibExtension tmp-dyna.o > /dev/null 2>&1 && + $SHLD $SHLDFLAGS -o dyna.$so tmp-dyna.o > /dev/null 2>&1 && ${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.$ac_ext $LIBS > /dev/null 2>&1; then xxx=`./fred` case $xxx in @@ -4916,31 +4957,51 @@ else echo "configure: warning: I can't compile and run the test program." 1>&2 fi -rm -f dyna.c dyna.o dyna.$sharedLibExtension tmp-dyna.o fred.c fred.o fred +rm -f dyna.c dyna.o dyna.$so tmp-dyna.o fred.c fred.o fred fi case "x$timidity_cv_func_dlsym_underscore" in -xyes) SYSTEM="$SYSTEM -DDLSYM_NEEDS_UNDERSCORE" +xyes) EXTRADEFS="$EXTRADEFS -DDLSYM_NEEDS_UNDERSCORE" echo "$ac_t""yes" 1>&6 ;; xno) echo "$ac_t""no" 1>&6 ;; esac -;; esac -else - echo "$ac_t""not need" 1>&6 + + ;; + dld) + SYSEXTRAS="$SYSEXTRAS dl_dld.c" + ;; + hpux) + SYSEXTRAS="$SYSEXTRAS dl_hpux.c" + LDFLAGS="-Wl,-E $LDFLAGS" + ;; + cygwin) + SYSEXTRAS="$SYSEXTRAS dl_cygwin32.c" + ;; + *) + NEEDDLOPEN="no" + echo "configure: warning: no method to open a shared object" 1>&2 + ;; + esac fi +if test "$NEEDDLOPEN" = "yes"; then + SHARED_LIB_PATH="\$(TIMID_DIR)" + EXTRALIBS="$EXTRALIBS $dl_extra_lib" + EXTRADEFS="$EXTRADEFS -DIA_DYNAMIC -DSHARED_LIB_EXT=\\\".$so\\\"" + EXTRADEFS="$EXTRADEFS -DSHARED_LIB_PATH=\\\"$SHARED_LIB_PATH\\\"" +fi -if test "$SHARED" = "yes"; then - ENABLE_SHARED_TRUE= - ENABLE_SHARED_FALSE='#' +if test "$NEEDDLOPEN" = "yes"; then + NEEDDLOPEN_TRUE= + NEEDDLOPEN_FALSE='#' else - ENABLE_SHARED_TRUE='#' - ENABLE_SHARED_FALSE= + NEEDDLOPEN_TRUE='#' + NEEDDLOPEN_FALSE= fi @@ -4948,8 +5009,6 @@ - - if false; then ENABLE_NCURSES_TRUE= ENABLE_NCURSES_FALSE='#' @@ -4964,17 +5023,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4968: checking for $ac_hdr" >&5 +echo "configure:5027: 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:4978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5002,7 +5061,7 @@ KEEPLIBS=$LIBS echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:5006: checking for initscr in -lncurses" >&5 +echo "configure:5065: 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 @@ -5010,7 +5069,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:5084: \"$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 @@ -5064,7 +5123,7 @@ ENABLE_NCURSES_TRUE='#' ENABLE_NCURSES_FALSE= fi - SYSTEM="$SYSTEM -DIA_NCURSES" + EXTRADEFS="$EXTRADEFS -DIA_NCURSES" LIBS="$LIBS -lncurses" case "$target" in *-*-freebsd*) @@ -5073,7 +5132,7 @@ esac ;; xdynamic) - dynamic_targets="$dynamic_targets interface_n.\$(sharedLibExtension)" + dynamic_targets="$dynamic_targets interface_n.\$(so)" n_so_libs="$SHLDFLAGS -lncurses" case "$target" in *-*-freebsd*) @@ -5104,7 +5163,7 @@ enableval="$enable_slang" KEEPLIBS=$LIBS echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:5108: checking for SLang_init_tty in -lslang" >&5 +echo "configure:5167: 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 @@ -5112,7 +5171,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:5186: \"$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 @@ -5166,14 +5225,14 @@ ENABLE_SLANG_TRUE='#' ENABLE_SLANG_FALSE= fi - SYSTEM="$SYSTEM -DIA_SLANG" + EXTRADEFS="$EXTRADEFS -DIA_SLANG" LIBS="$LIBS -lslang" ;; xdynamic) - dynamic_targets="$dynamic_targets interface_s.\$(sharedLibExtension)" + dynamic_targets="$dynamic_targets interface_s.\$(so)" s_so_libs="$SHLDFLAGS -lslang" echo $ac_n "checking for initscr in -ltermcap""... $ac_c" 1>&6 -echo "configure:5177: checking for initscr in -ltermcap" >&5 +echo "configure:5236: 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 @@ -5181,7 +5240,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:5255: \"$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 @@ -5236,7 +5295,8 @@ if test "${enable_motif+set}" = set; then enableval="$enable_motif" if test "$have_xm" != "yes"; then - enable_xm=no + echo "configure: warning: Motif library is not found." 1>&2 + enable_motif=no fi fi @@ -5251,30 +5311,23 @@ ENABLE_MOTIF_TRUE='#' ENABLE_MOTIF_FALSE= fi - SYSTEM="$SYSTEM -DIA_MOTIF" - if test "$have_xm" = "yes"; then - if test "$have_xprelibs" = "yes"; then - LIBS="-lXm -lXt -lSM -lICE $LIBS" - else - LIBS="-lXm -lXt $LIBS" - fi - enable_motif=yes - else - enable_motif=no - fi + EXTRADEFS="$EXTRADEFS -DIA_MOTIF" + lib_xm_opt=-lXm + lib_xt_opt=-lXt + if test "$have_xprelibs" = "yes"; then + lib_xprelibs_opt='-lSM -lICE' + fi + ;; xdynamic) - dynamic_targets="$dynamic_targets interface_m.\$(sharedLibExtension)" + dynamic_targets="$dynamic_targets interface_m.\$(so)" if test x$have_xprelibs = xyes; then m_so_libs="-lSM -lICE -lX11" else m_so_libs="-lX11" fi - m_so_libs="-lXm -lXt $m_so_libs" - case "x$x_libraries" in - x) ;; - *) m_so_libs="-L$x_libraries $m_so_libs";; - esac + m_so_libs="$ldflags_x_opt -lXm -lXt $m_so_libs" + ;; *) @@ -5305,7 +5358,7 @@ tk_lib= for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do case "x$tcl_lib" in x) echo $ac_n "checking for Tcl_Init in -l$l""... $ac_c" 1>&6 -echo "configure:5309: checking for Tcl_Init in -l$l" >&5 +echo "configure:5362: 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 @@ -5313,7 +5366,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:5381: \"$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 @@ -5345,9 +5398,10 @@ fi ;; esac done + 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:5351: checking for Tk_Init in -l$l" >&5 +echo "configure:5405: 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 @@ -5355,7 +5409,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:5424: \"$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 @@ -5407,10 +5461,10 @@ ENABLE_TCLTK_TRUE='#' ENABLE_TCLTK_FALSE= fi - SYSTEM="$SYSTEM -DIA_TCLTK" + EXTRADEFS="$EXTRADEFS -DIA_TCLTK" LIBS=`echo $LIBS | sed "s/-lX11/$tk_lib $tcl_lib -lX11/"` EXTRAINCS="$EXTRAINCS -I$tcl_include_dir -I$tk_include_dir" - SYSTEM="$SYSTEM -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" + EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" case "$target" in *-*-bsdi*) EXTRALIBS="$EXTRALIBS -lipc" @@ -5418,9 +5472,9 @@ esac ;; xdynamic) - dynamic_targets="$dynamic_targets interface_k.\$(sharedLibExtension)" + dynamic_targets="$dynamic_targets interface_k.\$(so)" EXTRAINCS="$EXTRAINCS -I$tcl_include_dir -I$tk_include_dir" - SYSTEM="$SYSTEM -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" + EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" k_so_libs="-L$tcl_lib_dir -L$tk_lib_dir $tcl_lib $tk_lib" case "$target" in *-*-bsdi*) @@ -5473,11 +5527,11 @@ ENABLE_EMACS_TRUE='#' ENABLE_EMACS_FALSE= fi - SYSTEM="$SYSTEM -DIA_EMACS" + EXTRADEFS="$EXTRADEFS -DIA_EMACS" ELFILES="$ELFILES timidity.el" ;; xdynamic) - dynamic_targets="$dynamic_targets interface_e.\$(sharedLibExtension)" + dynamic_targets="$dynamic_targets interface_e.\$(so)" ELFILES="$ELFILES timidity.el" ;; *) @@ -5490,7 +5544,6 @@ - if false; then ENABLE_VT100_TRUE= ENABLE_VT100_FALSE='#' @@ -5515,11 +5568,11 @@ ENABLE_VT100_TRUE='#' ENABLE_VT100_FALSE= fi - SYSTEM="$SYSTEM -DIA_VT100" + EXTRADEFS="$EXTRADEFS -DIA_VT100" ;; xdynamic) - dynamic_targets="$dynamic_targets interface_T.\$(sharedLibExtension)" + dynamic_targets="$dynamic_targets interface_T.\$(so)" ;; *) @@ -5532,7 +5585,6 @@ - if false; then ENABLE_XAW_TRUE= ENABLE_XAW_FALSE='#' @@ -5543,7 +5595,8 @@ # Check whether --enable-xaw or --disable-xaw was given. if test "${enable_xaw+set}" = set; then enableval="$enable_xaw" - if test "$have_xaw" = "no"; then + if test "x$have_xaw" != "xyes" -a "x$have_xaw" != "x3d"; then + echo "configure: warning: X Athena Widget library is not found." 1>&2 enable_xaw=no fi fi @@ -5559,28 +5612,25 @@ ENABLE_XAW_TRUE='#' ENABLE_XAW_FALSE= fi - SYSTEM="$SYSTEM -DIA_XAW" - if test "$enable_motif" = "yes"; then - LIBS=`echo $LIBS | sed -e 's/-lXm/-lXm -lXaw -lXmu/'` - if test "$have_xext" = "yes"; then - LIBS=`echo $LIBS | sed -e 's/-lICE/-lICE -lXext/'` - fi - else - if test "$have_xext" = "yes"; then - LIBS="-lXext $LIBS" - fi - if test "$have_xprelibs" = "yes"; then - LIBS="-lSM -lICE $LIBS" - fi - LIBS="-lXaw -lXmu -lXt $LIBS" + EXTRADEFS="$EXTRADEFS -DIA_XAW" + 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 if test "$have_xaw" = "3d"; then - SYSTEM="$SYSTEM -DXAW3D" - LIBS=`echo $LIBS | sed -e 's/-lXaw/-lXaw3d/'` - fi + EXTRADEFS="$EXTRADEFS -DXAW3D" + lib_xaw_opt=-lXaw3d + else + lib_xaw_opt=-lXaw + fi + ;; xdynamic) - dynamic_targets="$dynamic_targets interface_a.\$(sharedLibExtension)" + dynamic_targets="$dynamic_targets interface_a.\$(so)" if test "$have_xext" = "yes"; then a_so_libs="-lXext -lX11" fi @@ -5590,13 +5640,11 @@ if test "$have_xaw" = "yes"; then a_so_libs="-lXaw -lXmu -lXt $a_so_libs" elif test "$have_xaw" = "3d"; then - SYSTEM="$SYSTEM -DXAW3D" + EXTRADEFS="$EXTRADEFS -DXAW3D" a_so_libs="-lXaw3d -lXmu -lXt $a_so_libs" fi - case "x$x_libraries" in - x) ;; - *) a_so_libs="-L$x_libraries $a_so_libs";; - esac + a_so_libs="$ldflags_x_opt $a_so_libs" + ;; *) @@ -5627,7 +5675,9 @@ # Check whether --enable-xskin or --disable-xskin was given. if test "${enable_xskin+set}" = set; then enableval="$enable_xskin" - : + if test "x$with_x" != xyes; then + echo "configure: warning: --with-x option is not specified" 1>&2 + fi fi case "x$enable_xskin" in @@ -5641,21 +5691,12 @@ ENABLE_XSKIN_TRUE='#' ENABLE_XSKIN_FALSE= fi - SYSTEM="$SYSTEM -DIA_XSKIN" + EXTRADEFS="$EXTRADEFS -DIA_XSKIN" ;; xdynamic) - dynamic_targets="$dynamic_targets interface_i.\$(sharedLibExtension)" - if test "$have_xprelibs" = "yes"; then - i_so_libs="-lSM -lICE -lX11" - else - i_so_libs="-lX11" - fi - i_so_libs="-lXt $i_so_libs" - case "x$x_libraries" in - x) ;; - *) i_so_libs="-L$x_libraries $i_so_libs";; - esac + dynamic_targets="$dynamic_targets interface_i.\$(so)" + ;; *) @@ -5718,7 +5759,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:5722: checking for $ac_word" >&5 +echo "configure:5763: 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 @@ -5749,7 +5790,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:5753: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:5794: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -5772,7 +5813,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5838,7 +5879,7 @@ } EOF -if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -5872,7 +5913,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -5882,7 +5923,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:5886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5927: \"$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" @@ -5933,12 +5974,12 @@ ENABLE_GTK_TRUE='#' ENABLE_GTK_FALSE= fi - SYSTEM="$SYSTEM -DIA_GTK" + EXTRADEFS="$EXTRADEFS -DIA_GTK" LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" ;; xdynamic) - dynamic_targets="$dynamic_targets interface_g.\$(sharedLibExtension)" + dynamic_targets="$dynamic_targets interface_g.\$(so)" g_so_libs="$GTK_LIBS" ;; *) @@ -5949,11 +5990,190 @@ +# Check whether --enable-ump or --disable-ump was given. +if test "${enable_ump+set}" = set; then + enableval="$enable_ump" + if test ! -d ump; then + { echo "configure: error: UMP Package is not exists. Can't configure it." 1>&2; exit 1; } + fi + ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 +echo "configure:6002: 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:6012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +{ echo "configure: error: UMP Package needs xpm.h, but could not find it." 1>&2; exit 1; } +fi + + echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 +echo "configure:6035: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lXpm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo 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 + + +fi + +case "x$enable_ump" in +xyes) + + +if true; then + ENABLE_PLUGIN_TRUE= + ENABLE_PLUGIN_FALSE='#' +else + ENABLE_PLUGIN_TRUE='#' + ENABLE_PLUGIN_FALSE= +fi + EXTRADEFS="$EXTRADEFS -DIA_PLUGIN" + LIBS="$LIBS -lXpm" + ;; +xdynamic) + dynamic_targets="$dynamic_targets interface_p.\$(so)" + + ;; +*) + + ;; +esac + + + + + +# 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 + KEEPLIBS=$KEEPLIBS + KEEPLDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS -I$offix_include_dir" + LDFLAGS="$LDFLAGS -L$offix_lib_dir" + echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6 +echo "configure:6122: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lDnd $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + LIBS="$LIBS -lDnd" + EXTRADEFS="$EXTRADEFS -DOFFIX" + +else + echo "$ac_t""no" 1>&6 + LDFLAGS=$KEEPLDFLAGS + CFLAGS=$KEEPCFLAGS + +fi + + fi + + +fi + + # Check whether --enable-network or --disable-network was given. if test "${enable_network+set}" = set; then enableval="$enable_network" if test "$enableval" = "yes"; then - SYSTEM="$SYSTEM -DSUPPORT_SOCKET" + EXTRADEFS="$EXTRADEFS -DSUPPORT_SOCKET" fi fi @@ -5973,7 +6193,7 @@ if test "$no_x" = "yes"; then echo "Sound Spectrogram Viewer needs X Window System" elif test "$enableval" = "yes"; then - SYSTEM="$SYSTEM -DSUPPORT_SOUNDSPEC" + EXTRADEFS="$EXTRADEFS -DSUPPORT_SOUNDSPEC" fi fi @@ -5990,8 +6210,12 @@ # Check whether --enable-wrd or --disable-wrd was given. if test "${enable_wrd+set}" = set; then enableval="$enable_wrd" - if test "$enableval" = "yes"; then - SYSTEM="$SYSTEM -DWRDT_X" + if test "x$enableval" = "xyes"; then + if test "x$with_x" = xyes; then + EXTRADEFS="$EXTRADEFS -DWRDT_X" + else + echo "configure: warning: --with-x option is not specified" 1>&2 + fi fi fi @@ -6005,11 +6229,8 @@ ENABLE_WRD_FALSE= fi -case "$target" in - *-*-cygwin32) - CYGWIN32=yes - ;; -esac + + if test "x$CYGWIN32" = "xyes"; then @@ -6020,7 +6241,17 @@ CYGWIN32_FALSE= fi +CFLAGS=`for f in $CFLAGS $EXTRACFLAGS $EXTRAINCS $X_CFLAGS $ALSA_CFLAGS; do echo $f; done | sort | uniq` +CFLAGS=`echo $CFLAGS` + +LDFLAGS=`for f in $LDFLAGS; do echo $f; done | sort | uniq` +LDFLAGS=`echo $LDFLAGS` +LIBS="$LIBS $ALSA_LIBS" + +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 @@ -6217,8 +6448,8 @@ s%@NEED_GETOPT_FALSE@%$NEED_GETOPT_FALSE%g s%@ALSA_CFLAGS@%$ALSA_CFLAGS%g s%@ALSA_LIBS@%$ALSA_LIBS%g -s%@ENABLE_SHARED_TRUE@%$ENABLE_SHARED_TRUE%g -s%@ENABLE_SHARED_FALSE@%$ENABLE_SHARED_FALSE%g +s%@NEEDDLOPEN_TRUE@%$NEEDDLOPEN_TRUE%g +s%@NEEDDLOPEN_FALSE@%$NEEDDLOPEN_FALSE%g s%@ENABLE_NCURSES_TRUE@%$ENABLE_NCURSES_TRUE%g s%@ENABLE_NCURSES_FALSE@%$ENABLE_NCURSES_FALSE%g s%@n_so_libs@%$n_so_libs%g @@ -6253,6 +6484,9 @@ s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GTK_LIBS@%$GTK_LIBS%g s%@g_so_libs@%$g_so_libs%g +s%@ENABLE_PLUGIN_TRUE@%$ENABLE_PLUGIN_TRUE%g +s%@ENABLE_PLUGIN_FALSE@%$ENABLE_PLUGIN_FALSE%g +s%@p_so_libs@%$p_so_libs%g s%@ENABLE_NETWORK_TRUE@%$ENABLE_NETWORK_TRUE%g s%@ENABLE_NETWORK_FALSE@%$ENABLE_NETWORK_FALSE%g s%@ENABLE_SOUND_SPEC_TRUE@%$ENABLE_SOUND_SPEC_TRUE%g @@ -6261,16 +6495,15 @@ s%@ENABLE_WRD_FALSE@%$ENABLE_WRD_FALSE%g s%@CYGWIN32_TRUE@%$CYGWIN32_TRUE%g s%@CYGWIN32_FALSE@%$CYGWIN32_FALSE%g -s%@SYSTEM@%$SYSTEM%g s%@SHCFLAGS@%$SHCFLAGS%g s%@SYSEXTRAS@%$SYSEXTRAS%g s%@EXTRALIBS@%$EXTRALIBS%g -s%@EXTRAINCS@%$EXTRAINCS%g +s%@EXTRADEFS@%$EXTRADEFS%g s%@NETSRCS@%$NETSRCS%g s%@ELFILES@%$ELFILES%g s%@SHLD@%$SHLD%g s%@dynamic_targets@%$dynamic_targets%g -s%@sharedLibExtension@%$sharedLibExtension%g +s%@so@%$so%g CEOF EOF diff -ruN TiMidity++-1.0.1/configure.in TiMidity++-1.1.0/configure.in --- TiMidity++-1.0.1/configure.in Thu Jan 14 12:27:25 1999 +++ TiMidity++-1.1.0/configure.in Mon Jan 18 06:30:06 1999 @@ -23,9 +23,10 @@ dnl modified for automake by Isaku Yamahata dnl modified for automake by Masanao Izumo (1998.11) + AC_INIT(timidity/timidity.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 1.0.1, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 1.1.0, no-define) dnl use config.h AM_CONFIG_HEADER(config.h) @@ -49,72 +50,117 @@ SHLDFLAGS=${LDFLAGS:--L/usr/local/lib} CFLAGS="$CFLAGS -I/usr/local/include" -SYSTEM= +EXTRACFLAGS= +EXTRADEFS= SYSEXTRAS= EXTRALIBS= -EXTRAINCS=${EXTRAINCS:--I/usr/local/include} +EXTRAINCS= + +dnl X library dependent +lib_xm_opt= +lib_xaw_opt= +lib_xmu_opt= +lib_xt_opt= +lib_xprelibs_opt= +lib_xext_opt= dnl IRIX cc needs -signed option -case "$target/$CC" in - *-sgi-irix*/cc) - EXTRACFLAGS="-signed" - ;; -esac + +dnl Target dependent case "$target" in + *-*-hpux*) + SHLD="ld -b" + so="sl" + ;; + *-sgi-irix*) + case ".$CC" in .cc*) EXTRACFLAGS="-signed";; esac + SHLD="cc -shared -all" + so="so" + ;; + *-*-netbsd*) + SHLD="ld -Bforcearchive -Bshareable" + so="so" + ;; *-*-freebsd*) EXTRALIBS="$EXTRALIB -lxpg4" - ;; + ;; + *-*-cygwin32*) + EXTRADEFS="-D__WIN32__" + SHLD="$CC" + so="dll" + CYGWIN32=yes + ;; + *-dec-*) + EXTRADEFS="-DDEC" + SHLD="ld -Bdynamic -G" + so="so" + ;; + *-*-solaris*) + EXTRADEFS="-DSOLARIS" + SHLD="ld -Bdynamic -G" + so="so" + ;; + *) + SHLD="ld -Bdynamic -G" + so="so" + ;; esac -dnl Checks for header files. -AC_PATH_XTRA -if test "x$x_libraries" != x; then - LDFLAGS="-L${x_libraries} $LDFLAGS" -fi -if test "x$x_includes" != x; then - EXTRAINCS="$EXTRAINCS -I$x_includes" -fi -CPPFLAGS="$EXTRAINCS" -if test "x$x_includes" != x; then - CFLAGS="$EXTRACFLAGS $CFLAGS -I$x_includes" -fi AC_CHECK_LIB(m,sqrt) AC_CHECK_LIB(socket,socket) AC_CHECK_FUNCS(gethostbyname,,[ AC_CHECK_LIB(nsl,gethostbyname) ]) -AC_CHECK_LIB(X11,XOpenDisplay) -AC_MSG_CHECKING(X11 version 6) -AC_CACHE_VAL(timidity_cv_x11_version_6, -AC_TRY_LINK([#include ], + +dnl Start of X configure +if test "x$with_x" = xyes; then + AC_PATH_XTRA + if test "x$x_libraries" != x; then + ldflags_x_opt="-L$x_libraries" + LDFLAGS="$LDFLAGS $ldflags_x_opt" + else + ldflags_x_opt= + fi + if test "x$x_includes" != x; then + CPPFLAGS="$CPPFLAGS -I$x_includes" + CFLAGS="$CFLAGS -I$x_includes" + fi + + AC_CHECK_LIB(X11,XOpenDisplay) + AC_MSG_CHECKING(X11 version 6) + AC_CACHE_VAL(timidity_cv_x11_version_6, + AC_TRY_LINK([#include ], [#if XlibSpecificationRelease < 6 fail; #endif ], timidity_cv_x11_version_6=yes, timidity_cv_x11_version_6=no)) -if test "$timidity_cv_x11_version_6" = "yes"; then - AC_MSG_RESULT(6 or newer) - dnl AC_DEFINE(HAVE_X11R6) -else - AC_MSG_RESULT(before 6) + if test "$timidity_cv_x11_version_6" = "yes"; then + AC_MSG_RESULT(6 or newer) + dnl AC_DEFINE(HAVE_X11R6) + else + AC_MSG_RESULT(before 6) + fi + + dnl checking order required + KEEPLIBS=$LIBS + AC_CHECK_LIB(Xext,XShapeCombineMask,have_xext=yes; LIBS="-lXext $LIBS", + have_xext=no) + AC_CHECK_LIB(ICE,IceConnectionNumber) + AC_CHECK_LIB(SM,SmcOpenConnection,have_xprelibs=yes; LIBS="-lSM $LIBS", + have_xprelibs=no) + AC_CHECK_LIB(Xt,XtVaAppInitialize,have_xt=yes; LIBS="-lXt $LIBS",have_xt=no) + AC_CHECK_LIB(Xmu,XmuInternAtom,LIBS="-lXmu $LIBS") + AC_CHECK_LIB(Xaw3d,XawInitializeWidgetSet,have_xaw=3d, + [ AC_CHECK_LIB(Xaw,XawInitializeWidgetSet,have_xaw=yes,have_xaw=no) ]) + AC_CHECK_LIB(Xm,XmCreateForm,have_xm=yes,have_xm=no) + LIBS=$KEEPLIBS fi +dnl End of X configure -dnl checking order required -KEEPLIBS=$LIBS -AC_CHECK_LIB(Xext,XShapeCombineMask,have_xext=yes; LIBS="-lXext $LIBS", - have_xext=no) -AC_CHECK_LIB(ICE,IceConnectionNumber) -AC_CHECK_LIB(SM,SmcOpenConnection,have_xprelibs=yes; LIBS="-lSM $LIBS", - have_xprelibs=no) -AC_CHECK_LIB(Xt,XtVaAppInitialize,have_xt=yes; LIBS="-lXt $LIBS",have_xt=no) -AC_CHECK_LIB(Xmu,XmuInternAtom,LIBS="-lXmu $LIBS") -AC_CHECK_LIB(Xaw3d,XawInitializeWidgetSet,have_xaw=3d, - [ AC_CHECK_LIB(Xaw,XawInitializeWidgetSet,have_xaw=yes,have_xaw=no) ]) -AC_CHECK_LIB(Xm,XmCreateForm,have_xm=yes,have_xm=no) -LIBS=$KEEPLIBS AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h unistd.h dlfcn.h glob.h) -AC_CHECK_HEADER(string.h,, [ SYSTEM="$SYSTEM -DNO_STRING_H " ]) +AC_CHECK_HEADER(string.h,, [ EXTRADEFS="$EXTRADEFS -DNO_STRING_H " ]) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -126,21 +172,23 @@ AC_TYPE_SIZE_T AC_HEADER_TIME -AC_MSG_CHECKING(volatile declaration) -AC_TRY_COMPILE(,volatile int x, - [ AC_MSG_RESULT(yes) ], - [ EXTRACFLAGS="$EXTRACFLAGS -DNO_VOLATILE" - AC_MSG_RESULT(no) ]) +AC_CACHE_CHECK(volatile declaration,timidity_cv_type_volatile, + AC_TRY_COMPILE(,volatile int x, + timidity_cv_type_volatile=yes,timidity_cv_type_volatile=no)) +if test $timidity_cv_type_volatile = no; then + EXTRADEFS="$EXTRADEFS -DNO_VOLATILE" +fi -AC_MSG_CHECKING(union semun declaration) -AC_TRY_COMPILE( +AC_CACHE_CHECK(union semun declaration,timidity_cv_type_union_semun, + AC_TRY_COMPILE( [#include #include #include ], -union semun x, - [ AC_MSG_RESULT(yes) - EXTRACFLAGS="$EXTRACFLAGS -DHAVE_UNION_SEMUN" ], - [ AC_MSG_RESULT(no) ]) + union semun x, + timidity_cv_type_union_semun=yes,timidity_cv_type_union_semun=no)) +if test $timidity_cv_type_union_semun = yes; then + EXTRADEFS="$EXTRADEFS -DHAVE_UNION_SEMUN" +fi dnl Checks for library functions. AC_PROG_GCC_TRADITIONAL @@ -159,39 +207,49 @@ AC_ARG_WITH(tcl-includes, [ --with-tcl-includes=dir Tcl include file path ], [ if test ! -d $withval; then - echo "$withval not found." - exit + AC_MSG_ERROR($withval not found.) fi tcl_include_dir=$withval ], [ tcl_include_dir=/usr/local/include ]) AC_ARG_WITH(tcl-libs, [ --with-tcl-libs=dir Tcl include file path ], [ if test ! -d $withval; then - echo "$withval not found." - exit + AC_MSG_ERROR($withval not found.) fi tcl_lib_dir=$withval ], [ tcl_lib_dir=/usr/local/lib ]) AC_ARG_WITH(tk-includes, [ --with-tk-includes=dir Tk include file path ], [ if test ! -d $withval; then - echo "$withval not found." - exit + AC_MSG_ERROR($withval not found.) fi tk_include_dir=$withval ], [ tk_include_dir=/usr/local/include ]) AC_ARG_WITH(tk-libs, [ --with-tk-libs=dir Tk include file path ], [ if test ! -d $withval; then - echo "$withval not found." - exit + AC_MSG_ERROR($withval not found.) fi tk_lib_dir=$withval ], [ tk_lib_dir=/usr/local/lib ]) +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.) + fi + offix_include_dir=$withval ], + [ offix_include_dir=/usr/local/include ]) +AC_ARG_WITH(offix-libs, + [ --with-offix-libs=dir Offix include file path ], + [ if test ! -d $withval; then + AC_MSG_ERROR($withval not found.) + fi + offix_lib_dir=$withval ], + [ offix_lib_dir=/usr/local/lib ]) dnl Define system dependent flags - AC_MSG_CHECKING(whether to enable audio) AC_ARG_ENABLE(audio, [ --enable-audio Enable audio (default if you use supported platform) ], @@ -201,7 +259,7 @@ if test "$enable_audio" = "yes"; then case "$target" in *-*-linux*|*-*-freebsd*) - SYSTEM="$SYSTEM -DAU_LINUX" + EXTRADEFS="$EXTRADEFS -DAU_LINUX" SYSEXTRAS="$SYSEXTRAS linux_a.c" AC_MSG_RESULT(yes linux) KEEPCFLAGS=$CFLAGS @@ -212,19 +270,19 @@ LIBS=$KEEPLIBS LDFLAGS=$KEEPLDFLAGS if test "x$have_alsa" = "xyes"; then - SYSTEM="$SYSTEM -DAU_ALSA" + EXTRADEFS="$EXTRADEFS -DAU_ALSA" SYSEXTRAS="$SYSEXTRAS alsa_a.c" CFLAGS="$CFLAGS $ALSA_CFLAGS" LIBS="$LIBS $ALSA_LIBS" fi ;; *-*-bsdi2.?|*-*-bsdi3.?) - SYSTEM="$SYSTEM -DAU_BSDI -DDEFAULT_RATE=22500" + EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500" SYSEXTRAS="$SYSEXTRAS bsd20_a.c" AC_MSG_RESULT(yes bsdi) ;; *-*-hpux*) - SYSTEM="$SYSTEM -DHPUX -DAU_HPUX" + 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" @@ -236,26 +294,26 @@ AC_MSG_RESULT(yes hpux) ;; *-dec-*) - SYSTEM="$SYSTEM -DDEC -DAU_DEC -DAU_AUDRIV" + EXTRADEFS="$EXTRADEFS -DAU_DEC -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_mme.c" EXTRAINCS="$EXTRAINCS -I/usr/opt/MME210/include" EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a" AC_MSG_RESULT(yes dec) ;; *-sgi-irix5*) - SYSTEM="$SYSTEM -DAU_AUDRIV -DSGI_OLDAL" + EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_OLDAL" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c" EXTRALIBS="$EXTRALIBS -laudio" AC_MSG_RESULT(yes irix5) ;; *-sgi-irix6*) - SYSTEM="$SYSTEM -DAU_AUDRIV -DSGI_NEWAL" + EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c" EXTRALIBS="$EXTRASLIBS -laudio" AC_MSG_RESULT(yes irix6) ;; *-*-sunos4*) - SYSTEM="$SYSTEM -DAU_AUDRIV" + EXTRADEFS="$EXTRADEFS -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_sun.c" AC_MSG_RESULT(yes sunos4) if test -f /usr/demo/SOUND/libaudio.a; then @@ -265,7 +323,7 @@ fi ;; *-*-solaris*) - SYSTEM="$SYSTEM -DAU_AUDRIV -DSOLARIS" + EXTRADEFS="$EXTRADEFS -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_sun.c" AC_MSG_RESULT(yes solaris) if test -f /usr/demo/SOUND/lib/libaudio.a; then @@ -275,17 +333,17 @@ fi ;; *-*-netbsd*) - SYSTEM="$SYSTEM -DAU_AUDRIV" + EXTRADEFS="$EXTRADEFS -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_sun.c" AC_MSG_RESULT(yes netbsd) ;; *-*-cygwin32*) - SYSTEM="$SYSTEM -DAU_WIN32" + EXTRADEFS="$EXTRADEFS -DAU_WIN32" SYSEXTRAS="$SYSEXTRAS win_a.c" AC_MSG_RESULT(yes cygwin32) ;; *) - SYSTEM="$SYSTEM -DAU_NONE -DAU_AUDRIV" + EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c" AC_MSG_RESULT(no) ;; @@ -294,90 +352,68 @@ AC_MSG_RESULT(no) fi -dnl dynamic loader -AC_CHECK_LIB(c,LoadLibraryExA,[have_dl=cygwin;dl_extra_lib=''],have_dl=no) -if test "$have_dl" = "no"; then - AC_CHECK_LIB(c,shl_load,[have_dl=hpux;dl_extra_lib=''],have_dl=no) -fi -if test "$have_dl" = "no"; then - AC_CHECK_LIB(dl,dlopen,[have_dl=dlopen;LIBS="$LIBS -ldl";dl_extra_lib=-ldl],have_dl=no) -fi -if test "$have_dl" = "no"; then - AC_CHECK_LIB(c,dlopen,[have_dl=dlopen;dl_extra_lib=''],have_dl=no) -fi -if test "$have_dl" = "no"; then - AC_CHECK_LIB(c,dld_init,[have_dl=dld;dl_extra_lib=''],have_dl=no) -fi -AC_MSG_CHECKING(dynamic loader) -case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_skin" in -*dynamic*) SHARED=yes;; -*) SHARED=no;; +dnl dynamic link + +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 + +case "$enable_ncurses$enable_slang$enable_motif$enable_tcltk$enable_emacs$enable_vt100$enable_xaw$enable_xskin$enable_gtk" in +*dynamic*) NEEDDLOPEN=yes;; +*) NEEDDLOPEN=no;; esac -if test "$SHARED" = "yes"; then +if test "$NEEDDLOPEN" = "yes"; then + AC_CHECK_LIB(c,LoadLibraryExA,[have_dl=cygwin;dl_extra_lib=''],have_dl=no) + if test "$have_dl" = "no"; then + AC_CHECK_LIB(c,shl_load,[have_dl=hpux;dl_extra_lib=''],have_dl=no) + fi + if test "$have_dl" = "no"; then + AC_CHECK_LIB(dl,dlopen,[have_dl=dlopen;LIBS="$LIBS -ldl";dl_extra_lib=-ldl],have_dl=no) + fi + if test "$have_dl" = "no"; then + AC_CHECK_LIB(c,dlopen,[have_dl=dlopen;dl_extra_lib=''],have_dl=no) + fi + if test "$have_dl" = "no"; then + AC_CHECK_LIB(c,dld_init,[have_dl=dld;dl_extra_lib=''],have_dl=no) + fi + case "$have_dl" in dlopen) SYSEXTRAS="$SYSEXTRAS dl_dlopen.c" - sharedLibExtension="so" - AC_MSG_RESULT(yes dlopen) + CHECK_DLSYM_UNDERSCORE(EXTRADEFS="$EXTRADEFS -DDLSYM_NEEDS_UNDERSCORE") ;; dld) SYSEXTRAS="$SYSEXTRAS dl_dld.c" - sharedLibExtension="so" - AC_MSG_RESULT(yes dld) ;; hpux) SYSEXTRAS="$SYSEXTRAS dl_hpux.c" - sharedLibExtension="sl" LDFLAGS="-Wl,-E $LDFLAGS" - AC_MSG_RESULT(yes hpux) ;; cygwin) SYSEXTRAS="$SYSEXTRAS dl_cygwin32.c" - sharedLibExtension="dll" - AC_MSG_RESULT(yes cygwin32) ;; *) - SHARED="no" - AC_MSG_RESULT(no or method unknown) + NEEDDLOPEN="no" + AC_MSG_WARN(no method to open a shared object) ;; esac +fi - case "$target" in - *-*-hpux*) - SHLD="ld -b" - ;; - *-sgi-irix*) - SHLD="cc -shared -all" - ;; - *-*-netbsd*) - SHLD="ld -Bforcearchive -Bshareable" - ;; - *) - SHLD="ld -Bdynamic -G" - #SHLD="ld -Bshareable" - ;; - esac - case "$CC" in *gcc*) SHCFLAGS="-fpic";; esac +if test "$NEEDDLOPEN" = "yes"; then SHARED_LIB_PATH="\$(TIMID_DIR)" EXTRALIBS="$EXTRALIBS $dl_extra_lib" - SYSTEM="$SYSTEM -DIA_DYNAMIC -DSHARED_LIB_EXT=\\\".$sharedLibExtension\\\"" - SYSTEM="$SYSTEM -DSHARED_LIB_PATH=\\\"$SHARED_LIB_PATH\\\"" - case "$have_dl" in dlopen) CHECK_DLSYM_UNDERSCORE(SYSTEM="$SYSTEM -DDLSYM_NEEDS_UNDERSCORE");; esac -else - AC_MSG_RESULT(not need) + EXTRADEFS="$EXTRADEFS -DIA_DYNAMIC -DSHARED_LIB_EXT=\\\".$so\\\"" + EXTRADEFS="$EXTRADEFS -DSHARED_LIB_PATH=\\\"$SHARED_LIB_PATH\\\"" fi +AM_CONDITIONAL(NEEDDLOPEN, test "$NEEDDLOPEN" = "yes") -AM_CONDITIONAL(ENABLE_SHARED, test "$SHARED" = "yes") dnl Select interfaces - - - dnl ncurses AM_CONDITIONAL(ENABLE_NCURSES, false) CONFIG_INTERFACE(ncurses,NCURSES,n, @@ -422,28 +458,22 @@ CONFIG_INTERFACE(motif,MOTIF,m, [ --enable-motif Enable motif interface (default is no)], [ if test "$have_xm" != "yes"; then - enable_xm=no - fi ], - [ if test "$have_xm" = "yes"; then - if test "$have_xprelibs" = "yes"; then - LIBS="-lXm -lXt -lSM -lICE $LIBS" - else - LIBS="-lXm -lXt $LIBS" - fi - enable_motif=yes - else + AC_MSG_WARN(Motif library is not found.) enable_motif=no fi ], + [ lib_xm_opt=-lXm + lib_xt_opt=-lXt + if test "$have_xprelibs" = "yes"; then + lib_xprelibs_opt='-lSM -lICE' + fi + ], [ if test x$have_xprelibs = xyes; then m_so_libs="-lSM -lICE -lX11" else m_so_libs="-lX11" fi - m_so_libs="-lXm -lXt $m_so_libs" - case "x$x_libraries" in - x) ;; - *) m_so_libs="-L$x_libraries $m_so_libs";; - esac ]) + m_so_libs="$ldflags_x_opt -lXm -lXt $m_so_libs" + ]) @@ -460,6 +490,7 @@ for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do case "x$tcl_lib" in x) AC_CHECK_LIB($l,Tcl_Init,tcl_lib=-l$l);; esac done + 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) AC_CHECK_LIB($l,Tk_Init,tk_lib=-l$l);; esac done @@ -472,14 +503,14 @@ ], [ LIBS=`echo $LIBS | sed "s/-lX11/$tk_lib $tcl_lib -lX11/"` EXTRAINCS="$EXTRAINCS -I$tcl_include_dir -I$tk_include_dir" - SYSTEM="$SYSTEM -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" + 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" - SYSTEM="$SYSTEM -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" + EXTRADEFS="$EXTRADEFS -DTKPROGPATH=\\\"\$(TCL_DIR)/tkmidity.tcl\\\"" k_so_libs="-L$tcl_lib_dir -L$tk_lib_dir $tcl_lib $tk_lib" case "$target" in *-*-bsdi*) @@ -500,39 +531,36 @@ [ ELFILES="$ELFILES timidity.el" ]) - dnl VT100 AM_CONDITIONAL(ENABLE_VT100, false) CONFIG_INTERFACE(vt100,VT100,T, [ --enable-vt100 Enable VT100 interface (default is no)]) - dnl X Athena Widget AM_CONDITIONAL(ENABLE_XAW, false) CONFIG_INTERFACE(xaw,XAW,a, [ --enable-xaw Enable athena interface (default is no)], - [ if test "$have_xaw" = "no"; then + [ if test "x$have_xaw" != "xyes" -a "x$have_xaw" != "x3d"; then + AC_MSG_WARN(X Athena Widget library is not found.) enable_xaw=no fi ], - [ if test "$enable_motif" = "yes"; then - LIBS=`echo $LIBS | sed -e 's/-lXm/-lXm -lXaw -lXmu/'` - if test "$have_xext" = "yes"; then - LIBS=`echo $LIBS | sed -e 's/-lICE/-lICE -lXext/'` - fi - else - if test "$have_xext" = "yes"; then - LIBS="-lXext $LIBS" - fi - if test "$have_xprelibs" = "yes"; then - LIBS="-lSM -lICE $LIBS" - fi - LIBS="-lXaw -lXmu -lXt $LIBS" + [ dnl Add -lXext -lSM -lICE -lXmu -lXt {-lXaw|-lXaw3d} + 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 if test "$have_xaw" = "3d"; then - SYSTEM="$SYSTEM -DXAW3D" - LIBS=`echo $LIBS | sed -e 's/-lXaw/-lXaw3d/'` - fi ], + EXTRADEFS="$EXTRADEFS -DXAW3D" + lib_xaw_opt=-lXaw3d + else + lib_xaw_opt=-lXaw + fi + ], [ if test "$have_xext" = "yes"; then a_so_libs="-lXext -lX11" fi @@ -542,13 +570,11 @@ if test "$have_xaw" = "yes"; then a_so_libs="-lXaw -lXmu -lXt $a_so_libs" elif test "$have_xaw" = "3d"; then - SYSTEM="$SYSTEM -DXAW3D" + EXTRADEFS="$EXTRADEFS -DXAW3D" a_so_libs="-lXaw3d -lXmu -lXt $a_so_libs" fi - case "x$x_libraries" in - x) ;; - *) a_so_libs="-L$x_libraries $a_so_libs";; - esac ]) + a_so_libs="$ldflags_x_opt $a_so_libs" + ]) AM_CONDITIONAL(ENABLE_DYNAMIC_XAW, test "x$enable_xaw" = "xdynamic") @@ -556,18 +582,9 @@ AM_CONDITIONAL(ENABLE_XSKIN, false) CONFIG_INTERFACE(xskin,XSKIN,i, [ --enable-xskin Enable X skin interface (default is no)], - , - , - [ if test "$have_xprelibs" = "yes"; then - i_so_libs="-lSM -lICE -lX11" - else - i_so_libs="-lX11" - fi - i_so_libs="-lXt $i_so_libs" - case "x$x_libraries" in - x) ;; - *) i_so_libs="-L$x_libraries $i_so_libs";; - esac ]) + [ if test "x$with_x" != xyes; then + AC_MSG_WARN(--with-x option is not specified) + fi]) dnl GTK+ @@ -580,11 +597,45 @@ g_so_libs="$GTK_LIBS") +dnl UMP configuration +CONFIG_INTERFACE(ump, PLUGIN, p, + [ --enable-ump UMP configuration (default is no)], + [ if test ! -d ump; then + 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" ]) + + + +dnl Offix support +dnl this rely on CFLAGS and LIBS +AC_ARG_ENABLE(offix, + [ --enable-offix Enable offix support (default is no)], + [ if test "$enableval" = "yes"; then + KEEPCFLAGS=$CFLAGS + KEEPLIBS=$KEEPLIBS + KEEPLDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS -I$offix_include_dir" + LDFLAGS="$LDFLAGS -L$offix_lib_dir" + AC_CHECK_LIB(Dnd,DndInitialize,[ + LIBS="$LIBS -lDnd" + EXTRADEFS="$EXTRADEFS -DOFFIX" + ], + [ LDFLAGS=$KEEPLDFLAGS + CFLAGS=$KEEPCFLAGS + ]) + fi + ] +) + dnl Network selection AC_ARG_ENABLE(network, [ --enable-network Enable network support (default is no)], [ if test "$enableval" = "yes"; then - SYSTEM="$SYSTEM -DSUPPORT_SOCKET" + EXTRADEFS="$EXTRADEFS -DSUPPORT_SOCKET" fi ]) AM_CONDITIONAL(ENABLE_NETWORK, test "x$enable_network" = "xyes") @@ -594,37 +645,44 @@ [ if test "$no_x" = "yes"; then echo "Sound Spectrogram Viewer needs X Window System" elif test "$enableval" = "yes"; then - SYSTEM="$SYSTEM -DSUPPORT_SOUNDSPEC" + EXTRADEFS="$EXTRADEFS -DSUPPORT_SOUNDSPEC" fi ]) AM_CONDITIONAL(ENABLE_SOUND_SPEC, test "x$enable_spectrogram" = "xyes") dnl WRD interface AC_ARG_ENABLE(wrd, - [ --enable-wrd Enable WRD interface (default is no)], - [ if test "$enableval" = "yes"; then - SYSTEM="$SYSTEM -DWRDT_X" + [ --enable-wrd Enable WRD interface for X (default is no)], + [ if test "x$enableval" = "xyes"; then + if test "x$with_x" = xyes; then + EXTRADEFS="$EXTRADEFS -DWRDT_X" + else + AC_MSG_WARN(--with-x option is not specified) + fi fi ]) AM_CONDITIONAL(ENABLE_WRD, test "x$enable_wrd" = "xyes") -dnl for Microsoft Windows -case "$target" in - *-*-cygwin32) - CYGWIN32=yes - ;; -esac + + AM_CONDITIONAL(CYGWIN32, test "x$CYGWIN32" = "xyes") +SET_UNIQ_SORT_WORD(CFLAGS,$CFLAGS $EXTRACFLAGS $EXTRAINCS $X_CFLAGS $ALSA_CFLAGS) +SET_UNIQ_SORT_WORD(LDFLAGS,$LDFLAGS) +LIBS="$LIBS $ALSA_LIBS" + +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 -AC_SUBST(SYSTEM) AC_SUBST(SHCFLAGS) AC_SUBST(SYSEXTRAS) AC_SUBST(EXTRALIBS) -AC_SUBST(EXTRAINCS) +AC_SUBST(EXTRADEFS) AC_SUBST(NETSRCS) AC_SUBST(ELFILES) AC_SUBST(SHLD) AC_SUBST(dynamic_targets) -AC_SUBST(sharedLibExtension) +AC_SUBST(so) AC_SUBST(LN_S) AC_OUTPUT([ diff -ruN TiMidity++-1.0.1/doc/C/Makefile.in TiMidity++-1.1.0/doc/C/Makefile.in --- TiMidity++-1.0.1/doc/C/Makefile.in Thu Jan 14 17:57:06 1999 +++ TiMidity++-1.1.0/doc/C/Makefile.in Mon Jan 18 06:45:03 1999 @@ -86,7 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -99,11 +99,10 @@ SHCFLAGS = @SHCFLAGS@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ EXTRA_DIST = \ timidity.1 \ diff -ruN TiMidity++-1.0.1/doc/Makefile.in TiMidity++-1.1.0/doc/Makefile.in --- TiMidity++-1.0.1/doc/Makefile.in Thu Jan 14 17:57:05 1999 +++ TiMidity++-1.1.0/doc/Makefile.in Mon Jan 18 06:45:02 1999 @@ -86,7 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -99,11 +99,10 @@ SHCFLAGS = @SHCFLAGS@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ SUBDIRS = C ja_JP.ujis lang_target = C diff -ruN TiMidity++-1.0.1/doc/ja_JP.ujis/Makefile.in TiMidity++-1.1.0/doc/ja_JP.ujis/Makefile.in --- TiMidity++-1.0.1/doc/ja_JP.ujis/Makefile.in Thu Jan 14 17:57:08 1999 +++ TiMidity++-1.1.0/doc/ja_JP.ujis/Makefile.in Mon Jan 18 06:45:05 1999 @@ -86,7 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -99,11 +99,10 @@ SHCFLAGS = @SHCFLAGS@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ EXTRA_DIST = \ timidity.1 \ diff -ruN TiMidity++-1.0.1/interface/Makefile.am TiMidity++-1.1.0/interface/Makefile.am --- TiMidity++-1.0.1/interface/Makefile.am Wed Jan 6 18:11:22 1999 +++ TiMidity++-1.1.0/interface/Makefile.am Mon Jan 18 06:25:27 1999 @@ -136,7 +136,7 @@ x_mag.o endif -if ENABLE_SHARED +if NEEDDLOPEN DYNAMIC_OBJS = dynamic_c.o endif @@ -180,6 +180,8 @@ sed -e s@%TCL_DIR%@$(TCL_DIR)@g -e s@%TIMID_DIR%@$(TIMID_DIR)@g $< > $@ clean: rm -f tkmidity.tcl + rm -f *.o + rm -f *.$(so) tclIndex: $(TCLF) echo 'auto_mkindex . *.tcl; exit' | wish @@ -221,12 +223,8 @@ ## ## For dynamic interfaces ## -SUFFIXES = .$(so) -if ENABLE_SHARED -SHLD = @SHLD@ -SHCFLAGS = @SHCFLAGS@ -so = @sharedLibExtension@ +if NEEDDLOPEN dynamic_targets = @dynamic_targets@ install_dynamics = install.dynamics n_so_libs = @n_so_libs@ @@ -237,6 +235,7 @@ T_so_libs = @T_so_libs@ a_so_libs = @a_so_libs@ i_so_libs = @i_so_libs@ +g_so_libs = @g_so_libs@ all-am: $(dynamic_targets) @@ -273,8 +272,8 @@ interface_T.$(so): vt100_c.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(SHLD) -o $@ vt100_c.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs) -interface_a.$(so): xaw_c.$(so) xaw_i.$(so) - $(SHLD) -o $@ xaw_c.$(so) xaw_i.$(so) $(a_so_libs) +interface_a.$(so): xaw_c.$(so) xaw_i.$(so) timer.$(so) + $(SHLD) -o $@ xaw_c.$(so) xaw_i.$(so) timer.$(so) $(a_so_libs) interface_i.$(so): xskin_c.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(SHLD) -o $@ xskin_c.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs) diff -ruN TiMidity++-1.0.1/interface/Makefile.in TiMidity++-1.1.0/interface/Makefile.in --- TiMidity++-1.0.1/interface/Makefile.in Thu Jan 14 17:56:54 1999 +++ TiMidity++-1.1.0/interface/Makefile.in Mon Jan 18 06:44:49 1999 @@ -85,7 +85,7 @@ ALSA_LIBS = @ALSA_LIBS@ CC = @CC@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -95,11 +95,12 @@ NETSRCS = @NETSRCS@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SHCFLAGS = @SHCFLAGS@ +SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ SUBDIRS = motif_bitmaps bitmaps pixmaps @@ -199,7 +200,7 @@ @ENABLE_WRD_TRUE@ VTPrsTbl.o \ @ENABLE_WRD_TRUE@ x_mag.o -@ENABLE_SHARED_TRUE@DYNAMIC_OBJS = dynamic_c.o +@NEEDDLOPEN_TRUE@DYNAMIC_OBJS = dynamic_c.o @ENABLE_SOUND_SPEC_TRUE@SOUND_SPEC_OBJS = \ @ENABLE_SOUND_SPEC_TRUE@ soundspec.o @@ -241,21 +242,17 @@ @ENABLE_EMACS_TRUE@ELFILES = @ELFILES@ @ENABLE_EMACS_TRUE@install_el = install.el -SUFFIXES = .$(so) - -@ENABLE_SHARED_TRUE@SHLD = @SHLD@ -@ENABLE_SHARED_TRUE@SHCFLAGS = @SHCFLAGS@ -@ENABLE_SHARED_TRUE@so = @sharedLibExtension@ -@ENABLE_SHARED_TRUE@dynamic_targets = @dynamic_targets@ -@ENABLE_SHARED_TRUE@install_dynamics = install.dynamics -@ENABLE_SHARED_TRUE@n_so_libs = @n_so_libs@ -@ENABLE_SHARED_TRUE@s_so_libs = @s_so_libs@ -@ENABLE_SHARED_TRUE@m_so_libs = @m_so_libs@ -@ENABLE_SHARED_TRUE@k_so_libs = @k_so_libs@ -@ENABLE_SHARED_TRUE@e_so_libs = @e_so_libs@ -@ENABLE_SHARED_TRUE@T_so_libs = @T_so_libs@ -@ENABLE_SHARED_TRUE@a_so_libs = @a_so_libs@ -@ENABLE_SHARED_TRUE@i_so_libs = @i_so_libs@ +@NEEDDLOPEN_TRUE@dynamic_targets = @dynamic_targets@ +@NEEDDLOPEN_TRUE@install_dynamics = install.dynamics +@NEEDDLOPEN_TRUE@n_so_libs = @n_so_libs@ +@NEEDDLOPEN_TRUE@s_so_libs = @s_so_libs@ +@NEEDDLOPEN_TRUE@m_so_libs = @m_so_libs@ +@NEEDDLOPEN_TRUE@k_so_libs = @k_so_libs@ +@NEEDDLOPEN_TRUE@e_so_libs = @e_so_libs@ +@NEEDDLOPEN_TRUE@T_so_libs = @T_so_libs@ +@NEEDDLOPEN_TRUE@a_so_libs = @a_so_libs@ +@NEEDDLOPEN_TRUE@i_so_libs = @i_so_libs@ +@NEEDDLOPEN_TRUE@g_so_libs = @g_so_libs@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -270,40 +267,40 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ +@ENABLE_XAW_FALSE@libinterface_a_DEPENDENCIES = @ENABLE_VT100_TRUE@libinterface_a_DEPENDENCIES = @ENABLE_SOUND_SPEC_FALSE@libinterface_a_DEPENDENCIES = @ENABLE_MOTIF_TRUE@libinterface_a_DEPENDENCIES = -@ENABLE_SHARED_FALSE@libinterface_a_DEPENDENCIES = +@ENABLE_SLANG_FALSE@libinterface_a_DEPENDENCIES = +gtk_c.olibinterface_a_DEPENDENCIES = gtk_i.o +@ENABLE_TCLTK_TRUE@libinterface_a_DEPENDENCIES = tk_c.o +@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = +@ENABLE_NCURSES_TRUE@libinterface_a_DEPENDENCIES = ncurs_c.o xskin_loadBMP.olibinterface_a_DEPENDENCIES = xskin_spectrum.o +@ENABLE_VT100_FALSE@libinterface_a_DEPENDENCIES = +@ENABLE_GTK_TRUE@libinterface_a_DEPENDENCIES = motif_p.olibinterface_a_DEPENDENCIES = +xskin_c.olibinterface_a_DEPENDENCIES = xskin_i.o +@ENABLE_EMACS_TRUE@libinterface_a_DEPENDENCIES = emacs_c.o +@ENABLE_MOTIF_FALSE@libinterface_a_DEPENDENCIES = xaw_c.olibinterface_a_DEPENDENCIES = xaw_i.o soundspec.olibinterface_a_DEPENDENCIES = @ENABLE_XSKIN_TRUE@libinterface_a_DEPENDENCIES = +@ENABLE_WRD_TRUE@libinterface_a_DEPENDENCIES = +@ENABLE_TCLTK_FALSE@libinterface_a_DEPENDENCIES = gtk_p.olibinterface_a_DEPENDENCIES = @ENABLE_NCURSES_FALSE@libinterface_a_DEPENDENCIES = @ENABLE_XAW_TRUE@libinterface_a_DEPENDENCIES = wrdt_x.olibinterface_a_DEPENDENCIES = x_wrdwindow.o +@ENABLE_GTK_FALSE@libinterface_a_DEPENDENCIES = @ENABLE_SOUND_SPEC_TRUE@libinterface_a_DEPENDENCIES = vt100.olibinterface_a_DEPENDENCIES = vt100_c.o @ENABLE_EMACS_FALSE@libinterface_a_DEPENDENCIES = -@ENABLE_SHARED_TRUE@libinterface_a_DEPENDENCIES = dynamic_c.o -@ENABLE_WRD_FALSE@libinterface_a_DEPENDENCIES = -motif_c.olibinterface_a_DEPENDENCIES = motif_i.o -@ENABLE_XAW_FALSE@libinterface_a_DEPENDENCIES = -@ENABLE_SLANG_FALSE@libinterface_a_DEPENDENCIES = -gtk_c.olibinterface_a_DEPENDENCIES = gtk_i.o -@ENABLE_TCLTK_TRUE@libinterface_a_DEPENDENCIES = tk_c.o -@ENABLE_NCURSES_TRUE@libinterface_a_DEPENDENCIES = ncurs_c.o -@ENABLE_GTK_TRUE@libinterface_a_DEPENDENCIES = -@ENABLE_VT100_FALSE@libinterface_a_DEPENDENCIES = -xskin_c.olibinterface_a_DEPENDENCIES = xskin_i.o -@ENABLE_EMACS_TRUE@libinterface_a_DEPENDENCIES = emacs_c.o -@ENABLE_MOTIF_FALSE@libinterface_a_DEPENDENCIES = -@ENABLE_TCLTK_FALSE@libinterface_a_DEPENDENCIES = -@ENABLE_WRD_TRUE@libinterface_a_DEPENDENCIES = -@ENABLE_GTK_FALSE@libinterface_a_DEPENDENCIES = @ENABLE_SLANG_TRUE@libinterface_a_DEPENDENCIES = slang_c.o +@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = dynamic_c.o @ENABLE_XSKIN_FALSE@libinterface_a_DEPENDENCIES = +@ENABLE_WRD_FALSE@libinterface_a_DEPENDENCIES = +motif_c.olibinterface_a_DEPENDENCIES = motif_i.o VTPrsTbl.olibinterface_a_DEPENDENCIES = x_mag.o libinterface_a_OBJECTS = dumb_c.o wrdt_dumb.o wrdt_tty.o AR = ar @@ -323,7 +320,7 @@ all: all-recursive all-am .SUFFIXES: -.SUFFIXES: .$(so) .S .c .o .s +.SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps interface/Makefile @@ -453,6 +450,10 @@ ../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 \ @@ -526,9 +527,10 @@ ../libarc/url.h ../utils/mblock.h ../timidity/instrum.h \ ../timidity/playmidi.h ../timidity/readmidi.h \ ../timidity/output.h ../timidity/controls.h \ - ../timidity/miditrace.h xaw.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 \ @@ -540,7 +542,7 @@ ../timidity/instrum.h ../timidity/playmidi.h \ ../timidity/output.h ../timidity/controls.h \ ../timidity/miditrace.h -xskin_loadBMP.o: xskin_loadBMP.c ../timidity/timidity.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 \ @@ -638,6 +640,8 @@ sed -e s@%TCL_DIR%@$(TCL_DIR)@g -e s@%TIMID_DIR%@$(TIMID_DIR)@g $< > $@ clean: rm -f tkmidity.tcl + rm -f *.o + rm -f *.$(so) tclIndex: $(TCLF) echo 'auto_mkindex . *.tcl; exit' | wish @@ -655,52 +659,52 @@ test -d $(DESTDIR)$(TIMID_DIR) || mkdir -p $(DESTDIR)$(TIMID_DIR) for f in $(ELFILES) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(TIMID_DIR);; esac; done -@ENABLE_SHARED_TRUE@all-am: $(dynamic_targets) +@NEEDDLOPEN_TRUE@all-am: $(dynamic_targets) -@ENABLE_SHARED_TRUE@install.dynamics: $(dynamic_targets) -@ENABLE_SHARED_TRUE@ for f in $(dynamic_targets) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(TIMID_DIR);; esac; done +@NEEDDLOPEN_TRUE@install.dynamics: $(dynamic_targets) +@NEEDDLOPEN_TRUE@ for f in $(dynamic_targets) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(TIMID_DIR);; esac; done -@ENABLE_SHARED_TRUE@.c.$(so): -@ENABLE_SHARED_TRUE@ $(COMPILE) $(SHCFLAGS) -c $< -o $@ +@NEEDDLOPEN_TRUE@.c.$(so): +@NEEDDLOPEN_TRUE@ $(COMPILE) $(SHCFLAGS) -c $< -o $@ -@ENABLE_SHARED_TRUE@bitset.$(so): $(top_srcdir)/utils/bitset.c -@ENABLE_SHARED_TRUE@ $(COMPILE) $(SHCFLAGS) -o $@ -c $< +@NEEDDLOPEN_TRUE@bitset.$(so): $(top_srcdir)/utils/bitset.c +@NEEDDLOPEN_TRUE@ $(COMPILE) $(SHCFLAGS) -o $@ -c $< -@ENABLE_SHARED_TRUE@timer.$(so): $(top_srcdir)/utils/timer.c -@ENABLE_SHARED_TRUE@ $(COMPILE) $(SHCFLAGS) -o $@ -c $< +@NEEDDLOPEN_TRUE@timer.$(so): $(top_srcdir)/utils/timer.c +@NEEDDLOPEN_TRUE@ $(COMPILE) $(SHCFLAGS) -o $@ -c $< -@ENABLE_SHARED_TRUE@url_buff.$(so): $(top_srcdir)/libarc/url_buff.c -@ENABLE_SHARED_TRUE@ $(COMPILE) $(SHCFLAGS) -o $@ -c $< +@NEEDDLOPEN_TRUE@url_buff.$(so): $(top_srcdir)/libarc/url_buff.c +@NEEDDLOPEN_TRUE@ $(COMPILE) $(SHCFLAGS) -o $@ -c $< -@ENABLE_SHARED_TRUE@interface_n.$(so): ncurs_c.$(so) bitset.$(so) timer.$(so) -@ENABLE_SHARED_TRUE@ $(SHLD) -o $@ ncurs_c.$(so) bitset.$(so) timer.$(so) $(n_so_libs) +@NEEDDLOPEN_TRUE@interface_n.$(so): ncurs_c.$(so) bitset.$(so) timer.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ ncurs_c.$(so) bitset.$(so) timer.$(so) $(n_so_libs) -@ENABLE_SHARED_TRUE@interface_s.$(so): slang_c.$(so) timer.$(so) -@ENABLE_SHARED_TRUE@ $(SHLD) -o $@ slang_c.$(so) timer.$(so) $(s_so_libs) +@NEEDDLOPEN_TRUE@interface_s.$(so): slang_c.$(so) timer.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ slang_c.$(so) timer.$(so) $(s_so_libs) -@ENABLE_SHARED_TRUE@interface_m.$(so): motif_c.$(so) motif_i.$(so) motif_p.$(so) -@ENABLE_SHARED_TRUE@ $(SHLD) -o $@ motif_c.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs) +@NEEDDLOPEN_TRUE@interface_m.$(so): motif_c.$(so) motif_i.$(so) motif_p.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ motif_c.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs) -@ENABLE_SHARED_TRUE@interface_k.$(so): tk_c.$(so) -@ENABLE_SHARED_TRUE@ $(SHLD) -o $@ tk_c.$(so) $(k_so_libs) +@NEEDDLOPEN_TRUE@interface_k.$(so): tk_c.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ tk_c.$(so) $(k_so_libs) -@ENABLE_SHARED_TRUE@interface_e.$(so): emacs_c.$(so) -@ENABLE_SHARED_TRUE@ $(SHLD) -o $@ emacs_c.$(so) $(e_so_libs) +@NEEDDLOPEN_TRUE@interface_e.$(so): emacs_c.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ emacs_c.$(so) $(e_so_libs) -@ENABLE_SHARED_TRUE@interface_T.$(so): vt100_c.$(so) vt100.$(so) bitset.$(so) timer.$(so) -@ENABLE_SHARED_TRUE@ $(SHLD) -o $@ vt100_c.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs) +@NEEDDLOPEN_TRUE@interface_T.$(so): vt100_c.$(so) vt100.$(so) bitset.$(so) timer.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ vt100_c.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs) -@ENABLE_SHARED_TRUE@interface_a.$(so): xaw_c.$(so) xaw_i.$(so) -@ENABLE_SHARED_TRUE@ $(SHLD) -o $@ xaw_c.$(so) xaw_i.$(so) $(a_so_libs) +@NEEDDLOPEN_TRUE@interface_a.$(so): xaw_c.$(so) xaw_i.$(so) timer.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ xaw_c.$(so) xaw_i.$(so) timer.$(so) $(a_so_libs) -@ENABLE_SHARED_TRUE@interface_i.$(so): xskin_c.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) -@ENABLE_SHARED_TRUE@ $(SHLD) -o $@ xskin_c.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs) +@NEEDDLOPEN_TRUE@interface_i.$(so): xskin_c.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ xskin_c.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs) -@ENABLE_SHARED_TRUE@interface_g.$(so): gtk_c.$(so) gtk_i.$(so) gtk_p.$(so) -@ENABLE_SHARED_TRUE@ $(SHLD) -o $@ gtk_c.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs) +@NEEDDLOPEN_TRUE@interface_g.$(so): gtk_c.$(so) gtk_i.$(so) gtk_p.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ gtk_c.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs) -@ENABLE_SHARED_TRUE@clean-compile: -@ENABLE_SHARED_TRUE@ -rm -f *.$(so) +@NEEDDLOPEN_TRUE@clean-compile: +@NEEDDLOPEN_TRUE@ -rm -f *.$(so) install-exec-local: $(install_tk) $(install_xaw) $(install_el) $(install_dynamics) ########## End of Makefile diff -ruN TiMidity++-1.0.1/interface/bitmaps/Makefile.in TiMidity++-1.1.0/interface/bitmaps/Makefile.in --- TiMidity++-1.0.1/interface/bitmaps/Makefile.in Thu Jan 14 17:56:57 1999 +++ TiMidity++-1.1.0/interface/bitmaps/Makefile.in Mon Jan 18 06:44:54 1999 @@ -86,7 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -99,11 +99,10 @@ SHCFLAGS = @SHCFLAGS@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ BITMAPS = \ back.xbm \ diff -ruN TiMidity++-1.0.1/interface/motif_bitmaps/Makefile.in TiMidity++-1.1.0/interface/motif_bitmaps/Makefile.in --- TiMidity++-1.0.1/interface/motif_bitmaps/Makefile.in Thu Jan 14 17:56:56 1999 +++ TiMidity++-1.1.0/interface/motif_bitmaps/Makefile.in Mon Jan 18 06:44:52 1999 @@ -86,7 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -99,11 +99,10 @@ SHCFLAGS = @SHCFLAGS@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ BITMAPS = \ back.xbm \ diff -ruN TiMidity++-1.0.1/interface/pixmaps/Makefile.in TiMidity++-1.1.0/interface/pixmaps/Makefile.in --- TiMidity++-1.0.1/interface/pixmaps/Makefile.in Thu Jan 14 17:56:59 1999 +++ TiMidity++-1.1.0/interface/pixmaps/Makefile.in Mon Jan 18 06:44:56 1999 @@ -86,7 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -99,11 +99,10 @@ SHCFLAGS = @SHCFLAGS@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ PIXMAPS = \ ff.xpm \ diff -ruN TiMidity++-1.0.1/interface/xaw.h TiMidity++-1.1.0/interface/xaw.h --- TiMidity++-1.0.1/interface/xaw.h Thu Jan 14 11:18:09 1999 +++ TiMidity++-1.1.0/interface/xaw.h Sat Jan 16 22:24:02 1999 @@ -43,9 +43,6 @@ /* Define to use short cut keys */ #define ENABLE_KEY_TRANSLATION -/** Define to use OffiX file manager. */ -/* #define OFFIX */ - /*** Initial dot file name at home directory ***/ #define INITIAL_CONFIG ".xtimidity" @@ -54,6 +51,7 @@ * CONSTANTS FOR XAW MENUS */ #define MAXVOLUME MAX_AMPLIFICATION +#define MAX_XAW_MIDI_CHANNELS 16 #define APP_CLASS "TiMidity" diff -ruN TiMidity++-1.0.1/interface/xaw_c.c TiMidity++-1.1.0/interface/xaw_c.c --- TiMidity++-1.0.1/interface/xaw_c.c Thu Jan 14 17:26:14 1999 +++ TiMidity++-1.1.0/interface/xaw_c.c Mon Jan 18 04:17:09 1999 @@ -47,6 +47,7 @@ #include "output.h" #include "controls.h" #include "miditrace.h" +#include "timer.h" #include "xaw.h" static void ctl_current_time(int secs, int v); static void ctl_lyric(int lyricid); @@ -69,6 +70,20 @@ static void a_pipe_error(char *); #endif +static void ctl_event(CtlEvent *e); +static void ctl_refresh(void); +static void ctl_total_time(int tt); +static void ctl_note(int status, int ch, int note, int velocity); +static void ctl_program(int ch, int val); +static void ctl_volume(int ch, int val); +static void ctl_expression(int ch, int val); +static void ctl_panning(int ch, int val); +static void ctl_sustain(int ch, int val); +static void ctl_pitch_bend(int ch, int val); +static void ctl_reset(void); +static void update_indicator(void); + +static double indicator_last_update = 0; static int exitflag=0,randomflag=0,repeatflag=0,selectflag=0,amp_diff=0; static int xaw_ready=0; static int number_of_files; @@ -81,6 +96,7 @@ /* export the interface functions */ #define ctl xaw_control_mode +#define INDICATOR_UPDATE_TIME 0.6 ControlMode ctl= { @@ -157,12 +173,17 @@ static void ctl_current_time(int sec, int v) { - static int previous_sec=-1; + static int previous_sec=-1,last_voices=-1; + if (sec!=previous_sec) { previous_sec=sec; - snprintf(local_buf,sizeof(local_buf),"T %02d:%02d%s",sec / 60,sec % 60,tt_str); + snprintf(local_buf,sizeof(local_buf),"T %02d:%02d%s",sec / 60,sec % 60,tt_str); a_pipe_write(local_buf); } + if(!ctl.trace_playing||midi_trace.flush_flag) + return; + if(last_voices!=voices) + last_voices=voices; } static void ctl_total_time(int tt) @@ -184,6 +205,58 @@ a_pipe_write(local_buf); } +static void ctl_volume(int ch, int val) +{ + if (!ctl.trace_playing) + return; + if(ch >= MAX_XAW_MIDI_CHANNELS) + return; + sprintf(local_buf, "PV%c%d", ch+'A', val); + a_pipe_write(local_buf); +} + +static void ctl_expression(int ch, int val) +{ + if (!ctl.trace_playing) + return; + if(ch >= MAX_XAW_MIDI_CHANNELS) + return; + sprintf(local_buf, "PE%c%d", ch+'A', val); + a_pipe_write(local_buf); +} + +static void ctl_panning(int ch, int val) +{ + if (!ctl.trace_playing) + return; + if(ch >= MAX_XAW_MIDI_CHANNELS) + return; + sprintf(local_buf, "PA%c%d", ch+'A', val); + a_pipe_write(local_buf); +} + +static void ctl_sustain(int ch, int val) +{ + if (!ctl.trace_playing) + return; + if(ch >= MAX_XAW_MIDI_CHANNELS) + return; + sprintf(local_buf, "PS%c%d", ch+'A', val); + a_pipe_write(local_buf); +} + +static void ctl_pitch_bend(int ch, int val) +{ + /* + if (!ctl.trace_playing) + return; + if(ch >= MAX_XAW_MIDI_CHANNELS) + return; + sprintf(local_buf, "PB%c%d", ch+'A', val); + a_pipe_write(local_buf); + */ +} + static void ctl_lyric(int lyricid) { char *lyric; @@ -231,6 +304,9 @@ static int ctl_open(int using_stdin, int using_stdout) { ctl.opened=1; + if(ctl.trace_playing) + set_trace_loop_hook(update_indicator); + /* The child process won't come back from this call */ a_pipe_open(); @@ -558,6 +634,50 @@ write(pipe_out_fd, "\n", 1); } +static void +ctl_note(int status, int ch, int note, int velocity) +{ + char c; + + if(ch >= MAX_XAW_MIDI_CHANNELS) + return; + if (!ctl.trace_playing || midi_trace.flush_flag) + return; + +#define TRACE_HEIGHT 200 + c = '.'; + switch(status) { + case VOICE_ON: + c = '*'; + break; + case VOICE_SUSTAINED: + c = '*'; + break; + case VOICE_FREE: + case VOICE_DIE: + case VOICE_OFF: + default: + break; + } + snprintf(local_buf,sizeof(local_buf),"Y%c%c%03d%d",ch+'A',c,(unsigned char)note,velocity); + a_pipe_write(local_buf); +} + +static void ctl_program(int ch, int val) +{ + if(ch >= MAX_XAW_MIDI_CHANNELS) + return; + if (!ctl.trace_playing) + return; + + if(channel[ch].special_sample) + val = channel[ch].special_sample; + else + val += progbase; + sprintf(local_buf, "PP%c%d", ch+'A', val); + a_pipe_write(local_buf); +} + static void ctl_event(CtlEvent *e) { switch(e->type) @@ -570,13 +690,94 @@ case CTLE_PLAY_START: ctl_total_time((int)e->v1); break; + case CTLE_PLAY_END: + break; + case CTLE_TEMPO: + break; + case CTLE_METRONOME: + break; + case CTLE_NOTE: + ctl_note((int)e->v1, (int)e->v2, (int)e->v3, (int)e->v4); + break; + case CTLE_PROGRAM: + ctl_program((int)e->v1, (int)e->v2); + break; + case CTLE_VOLUME: + ctl_volume((int)e->v1, (int)e->v2); + break; + case CTLE_EXPRESSION: + ctl_expression((int)e->v1, (int)e->v2); + break; + case CTLE_PANNING: + ctl_panning((int)e->v1, (int)e->v2); + break; + case CTLE_SUSTAIN: + ctl_sustain((int)e->v1, (int)e->v2); + break; + case CTLE_PITCH_BEND: + ctl_pitch_bend((int)e->v1, (int)e->v2); + break; + case CTLE_MOD_WHEEL: + ctl_pitch_bend((int)e->v1, e->v2 ? -1 : 0x2000); + break; + case CTLE_CHORUS_EFFECT: + break; + case CTLE_REVERB_EFFECT: + break; case CTLE_LYRIC: ctl_lyric((int)e->v1); break; case CTLE_MASTER_VOLUME: ctl_master_volume((int)e->v1); break; + case CTLE_REFRESH: + ctl_refresh(); + break; + case CTLE_RESET: + ctl_reset(); + break; + } +} + +static void ctl_refresh(void) +{ +} + +static void ctl_reset(void) +{ + int i; + if (!ctl.trace_playing) + return; + + play_mode->purge_output(); + + for (i=0; i 0) + ctl_pitch_bend(i, -1); + else + ctl_pitch_bend(i, channel[i].pitchbend); + } + sprintf(local_buf, "R"); + a_pipe_write(local_buf); +} + +static void update_indicator(void) +{ + double t; + + t = get_current_calender_time(); + if(indicator_last_update + INDICATOR_UPDATE_TIME > t) return; + sprintf(local_buf, "U"); + a_pipe_write(local_buf); } /* diff -ruN TiMidity++-1.0.1/interface/xaw_i.c TiMidity++-1.1.0/interface/xaw_i.c --- TiMidity++-1.0.1/interface/xaw_i.c Thu Jan 14 17:47:03 1999 +++ TiMidity++-1.1.0/interface/xaw_i.c Mon Jan 18 06:17:26 1999 @@ -68,6 +68,8 @@ #include "check.xbm" #include "timidity.h" #include "common.h" +#include "instrum.h" +#include "playmidi.h" #include "controls.h" #if HAVE_STRSTR #define strstr(s,c) index(s,c) @@ -75,6 +77,18 @@ #ifndef HAVE_STRNCASECMP int strncasecmp(char *s1, char *s2, unsigned int len); #endif +#define TRACE_WIDTH 380 +#define TRACE_HEIGHT 180 +#define POS_HEIGHT 12 +#define PRG_HEIGHT 16 +#define TRACE_XOFS 30 +#define TRACE_YOFS 10 +#define BAR_INTERVAL 2 +#define BAR_SPACE 20 +#define BAR_WIDTH (BAR_SPACE-BAR_INTERVAL) +#define BAR_HEIGHT 140 +#define BAR_SCALE 1 +#define TRACE_BASELINE BAR_HEIGHT+10 typedef struct { int id; @@ -90,15 +104,16 @@ } DirPath; void a_print_text(Widget,char *); +static void draw1Chan(int,int,char); +static void drawProg(int,Boolean), drawPan(int,int,Boolean); static void quitCB(),playCB(),pauseCB(),stopCB(),prevCB(),nextCB(), forwardCB(),backCB(),repeatCB(),randomCB(),menuCB(),sndspecCB(), volsetCB(),volupdownCB(),volupdownAction(),toggleMark(),filemenuCB(), popupLoad(),popdownLoad(),a_readconfig(),a_saveconfig(), saveconfigAction(),setDirAction(),setDirList(); -static char *expandDir(); -static void completeDir(); +static void drawBar(),drawTraceAll(),completeDir(),ctl_channel_note(); +static char *expandDir(),*strmatch(); static int configcmp(); -static char *strmatch(); #ifdef ENABLE_KEY_TRANSLATION static void pauseAction(),soundkeyAction(),speedAction(),voiceAction(); #endif @@ -106,15 +121,20 @@ extern void a_pipe_write(char *); extern int a_pipe_read(char *,int); extern int a_pipe_nread(char *buf, int n); +void initTraceWindow(Boolean); static Widget title_mb,title_sm,time_l, popup_load, popup_load_f, load_d; static Widget load_vport, load_flist, cwd_l, load_info; #ifdef MSGWINDOW static Widget lyric_t; -static Widget lyriclist[1]; -static Dimension lyric_height; -static Dimension base_height; -#endif +static Widget trace; +static Widget lyriclist[1], tracelist[1]; +static Dimension lyric_height, base_height; +#endif +static GC gct; +static XColor bgcolor,defcolor,fgpan,fgstr,fgtmp; +static XFontStruct *StatusFont; +static long barcol[MAX_XAW_MIDI_CHANNELS]; static Widget toplevel, base_f, file_mb, file_sm, bsb, logo_label; static Widget quit_b,play_b,pause_b,stop_b,prev_b,next_b,fwd_b,back_b; @@ -130,9 +150,32 @@ Boolean autostart; Boolean hidetext; Boolean shuffle; + Boolean disptrace; } Config; -Config Cfg = { FALSE, FALSE, TRUE, FALSE, FALSE }; +#define FLAG_NOTE_OFF 1 +#define FLAG_NOTE_ON 2 +#define FLAG_BANK 1 +#define FLAG_PROG 2 +#define FLAG_PROG_ON 4 +#define FLAG_PAN 8 +#define FLAG_SUST 16 +typedef struct { + int reset_panel; + int multi_part; + char v_flags[MAX_XAW_MIDI_CHANNELS]; + int16 cnote[MAX_XAW_MIDI_CHANNELS]; + int16 cvel[MAX_XAW_MIDI_CHANNELS]; + int16 ctotal[MAX_XAW_MIDI_CHANNELS]; + char c_flags[MAX_XAW_MIDI_CHANNELS]; + Channel channel[MAX_XAW_MIDI_CHANNELS]; +} PanelInfo; + +/* Default configuration to execute Xaw interface */ +/* confirmexit repeat autostart hidetext shuffle disptrace */ +Config Cfg = { False, False, True, False, False, True }; +static PanelInfo *Panel; + #define MAXBITMAP 8 static char *bmfname[] = { "back.xbm","fwrd.xbm","next.xbm","pause.xbm","play.xbm","prev.xbm", @@ -177,8 +220,9 @@ x_hot,y_hot, root_height, root_width; static Pixmap bm_Pixmap[MAXBITMAP]; static int max_files; -static char basepath[PATH_MAX]; +char basepath[PATH_MAX]; String *dirlist = NULL; +Dimension trace_width = TRACE_WIDTH, trace_height = TRACE_HEIGHT; /*static struct _app_resources { String bitmap_dir; @@ -205,9 +249,11 @@ #define ID_HIDETXT 103 {ID_HIDETXT, "(Un)Hide Messages", True, False}, #endif +#define ID_HIDETRACE 104 + {ID_HIDETRACE, "(Un)Hide Trace", True, False}, #define ID_DUMMY -1 {ID_DUMMY, "line", False, False}, -#define ID_QUIT 104 +#define ID_QUIT 105 {ID_QUIT, "quit", True, False}, }; @@ -256,8 +302,6 @@ static void sndspecCB(Widget w,XtPointer data,XtPointer dummy) { #ifdef SUPPORT_SOUNDSPEC a_pipe_write("g"); -#else - ; #endif } @@ -314,30 +358,35 @@ offPlayButton(); offPauseButton(); a_pipe_write("S"); + initTraceWindow(True); } /*ARGSUSED*/ static void nextCB(Widget w,XtPointer data,XtPointer dummy) { onPlayOffPause(); a_pipe_write("N"); + initTraceWindow(True); } /*ARGSUSED*/ static void prevCB(Widget w,XtPointer data,XtPointer dummy) { onPlayOffPause(); a_pipe_write("B"); + initTraceWindow(True); } /*ARGSUSED*/ static void forwardCB(Widget w,XtPointer data,XtPointer dummy) { if (onPlayOffPause()) a_pipe_write("P"); a_pipe_write("f"); + initTraceWindow(True); } /*ARGSUSED*/ static void backCB(Widget w,XtPointer data,XtPointer dummy) { if (onPlayOffPause()) a_pipe_write("P"); a_pipe_write("b"); + initTraceWindow(True); } /*ARGSUSED*/ @@ -499,9 +548,9 @@ static void filemenuCB(Widget w,XtPointer id_data, XtPointer data) { int *id = (int *)id_data; #ifdef MSGWINDOW - Dimension w1,h1; - Dimension w2,h2; + Dimension w1,h1,w2,h2; #endif + Dimension tmp; switch (*id) { case ID_LOAD: @@ -510,15 +559,45 @@ case ID_AUTOSTART: toggleMark(w,*id); break; + case ID_HIDETRACE: + if(ctl->trace_playing) { + XtVaGetValues(toplevel,XtNheight,&h1,NULL); + XtVaGetValues(toplevel,XtNwidth,&w1,NULL); + if (XtIsManaged(trace)) { + tmp = trace_height + (XtIsManaged(lyric_t) ? 0:lyric_height); + XtUnmanageChildren(tracelist, XtNumber(tracelist)); + XtVaSetValues(trace,XtNfromVert, + (XtIsManaged(lyric_t) ? lyric_t:v_box),NULL); + XtMakeResizeRequest(toplevel,w1,base_height-tmp,&w2,&h2); + } else { + XtManageChildren(tracelist, XtNumber(tracelist)); + XtVaSetValues(trace,XtNfromVert, + (XtIsManaged(lyric_t) ? lyric_t:v_box),NULL); + XtMakeResizeRequest(toplevel,w1,h1+trace_height,&w2,&h2); + XtVaSetValues(trace,XtNheight,&trace_height,NULL); + } + toggleMark(w,*id); + } + break; #ifdef MSGWINDOW case ID_HIDETXT: XtVaGetValues(toplevel,XtNheight,&h1,NULL); XtVaGetValues(toplevel,XtNwidth,&w1,NULL); if (XtIsManaged(lyric_t)) { + if(ctl->trace_playing) { + tmp = lyric_height + (XtIsManaged(trace) ? 0:trace_height); + } else { + tmp = lyric_height; + } XtUnmanageChildren(lyriclist, XtNumber(lyriclist)); - XtMakeResizeRequest(toplevel,w1,base_height-lyric_height,&w2,&h2); + if(ctl->trace_playing && XtIsManaged(trace)) + XtVaSetValues(trace,XtNfromVert,v_box,NULL); + XtMakeResizeRequest(toplevel,w1,base_height-tmp,&w2,&h2); } else { XtManageChildren(lyriclist, XtNumber(lyriclist)); + if(ctl->trace_playing && XtIsManaged(trace)) { + XtVaSetValues(trace,XtNfromVert,lyric_t,NULL); + } XtMakeResizeRequest(toplevel,w1,h1+lyric_height,&w2,&h2); XtVaSetValues(lyric_t,XtNheight,&lyric_height,NULL); } @@ -562,56 +641,135 @@ } #endif /* MSGWINDOW */ +#define DELTA_VEL 32 + +static void +ctl_channel_note(int ch, int note, int velocity) { + if (velocity == 0) { + if (note == Panel->cnote[ch]) + Panel->v_flags[ch] = FLAG_NOTE_OFF; + Panel->cvel[ch] = 0; + } else if (velocity > Panel->cvel[ch]) { + Panel->cvel[ch] = velocity; + Panel->cnote[ch] = note; + Panel->ctotal[ch] = velocity * Panel->channel[ch].volume * + Panel->channel[ch].expression / (127*127); + Panel->v_flags[ch] = FLAG_NOTE_ON; + } +} + /*ARGSUSED*/ static void handle_input(XtPointer data,int *source,XtInputId *id) { - char s[16]; - int i = 0, n; + char s[16], c; + int i=0, n, ch, note; float thumb; a_pipe_read(local_buf,sizeof(local_buf)); switch (local_buf[0]) { - case 'T' : XtVaSetValues(time_l,XtNlabel,local_buf+2,NULL);break; - case 'E' : - XtVaSetValues(title_mb,XtNlabel,(char *)strrchr(local_buf+2,' ')+1,NULL); - if (arrangetitle) { - snprintf(window_title, sizeof(window_title), "%s : %s", APP_CLASS, local_buf+2); - XtVaSetValues(toplevel,XtNtitle,window_title,NULL); - } - break; - case 'O' : offPlayButton();break; + case 'T' : XtVaSetValues(time_l,XtNlabel,local_buf+2,NULL); break; + case 'E' : + XtVaSetValues(title_mb,XtNlabel,(char *)strrchr(local_buf+2,' ')+1,NULL); + if (arrangetitle) { + snprintf(window_title, sizeof(window_title), "%s : %s", APP_CLASS, local_buf+2); + XtVaSetValues(toplevel,XtNtitle,window_title,NULL); + } + break; + case 'O' : offPlayButton();break; #ifdef MSGWINDOW - case 'L' : - if (XtIsManaged(lyric_t)) a_print_msg(lyric_t); + case 'L' : + if (XtIsManaged(lyric_t)) a_print_msg(lyric_t); + break; +#endif + case 'Q' : exit(0); + case 'V': + i=atoi(local_buf+2); + thumb = (float)i / (float)MAXVOLUME; + sprintf(s, "Volume %3d", i); + XtVaSetValues(vol_l, XtNlabel, s, NULL); + if (sizeof(thumb) > sizeof(XtArgVal)) { + XtVaSetValues(vol_bar, XtNtopOfThumb, &thumb, NULL); + } else { + XtArgVal *l_thumb = (XtArgVal *) &thumb; + XtVaSetValues(vol_bar, XtNtopOfThumb,*l_thumb, NULL); + } + break; + case 'v': + case 'g': + case '\0' : + break; + case 'X': + n=max_files; + max_files+=atoi(local_buf+2); + for (i=n;ic_flags[ch] |= FLAG_PROG_ON; + } else { + Panel->c_flags[ch] &= ~FLAG_PROG_ON; n= 0; + } + ctl_channel_note(ch, note, n); + draw1Chan(ch,Panel->ctotal[ch],c); + break; + case 'P': + c= *(local_buf+1); + ch= *(local_buf+2)-'A'; + n= atoi(local_buf+3); + switch(c) { + case 'A': /* panning */ + Panel->channel[ch].panning = n; + Panel->c_flags[ch] |= FLAG_PAN; + drawPan(ch,n,True); break; -#endif - case 'Q' : exit(0); - case 'V': - i=atoi(local_buf+2); - thumb = (float)i / (float)MAXVOLUME; - sprintf(s, "Volume %3d", i); - XtVaSetValues(vol_l, XtNlabel, s, NULL); - if (sizeof(thumb) > sizeof(XtArgVal)) { - XtVaSetValues(vol_bar, XtNtopOfThumb, &thumb, NULL); - } else { - XtArgVal *l_thumb = (XtArgVal *) &thumb; - XtVaSetValues(vol_bar, XtNtopOfThumb,*l_thumb, NULL); - } + case 'B': /* pitch_bend */ + /*Panel->channel[ch].pitch_bend = n; + Panel->c_flags[ch] |= FLAG_BENDT;*/ break; - case 'v': - case 'g': - case '\0' : + case 'S': /* sustain */ + Panel->channel[ch].sustain = n; + Panel->c_flags[ch] |= FLAG_SUST; break; - case 'X': - n=max_files; - max_files+=atoi(local_buf+2); - for (i=n;ichannel[ch].program = n; + Panel->c_flags[ch] |= FLAG_PROG; + drawProg(ch,True); + break; + case 'E': /* expression */ + Panel->channel[ch].expression = n; + ctl_channel_note(ch, Panel->cnote[ch], Panel->cvel[ch]); break; - default : - fprintf(stderr,"Unkown message '%s' from CONTROL" NLS,local_buf); + case 'V': /* volume */ + Panel->channel[ch].volume = n; + ctl_channel_note(ch, Panel->cnote[ch], Panel->cvel[ch]); + break; + } + break; + case 'R': + drawTraceAll(); break; + case 'U': /* update timer */ + for(i=0; iv_flags[i]) { + if (Panel->v_flags[i] == FLAG_NOTE_OFF) { + Panel->ctotal[i] -= DELTA_VEL; + if (Panel->ctotal[i] <= 0) { + Panel->ctotal[i] = 0; + Panel->v_flags[i] = 0; + } + } else { + Panel->v_flags[i] = 0; + } + } + break; + default : + fprintf(stderr,"Unkown message '%s' from CONTROL" NLS,local_buf); } } @@ -780,6 +938,113 @@ } } +static void drawBar(int ch,int len) { + if (!ctl->trace_playing) return; + XSetForeground(disp, gct, barcol[ch]); + XFillRectangle(XtDisplay(trace),XtWindow(trace),gct, + TRACE_XOFS+ch*BAR_SPACE,TRACE_BASELINE-len*BAR_SCALE, + BAR_WIDTH,len*BAR_SCALE); + XSetForeground(disp, gct, bgcolor.pixel); + XFillRectangle(XtDisplay(trace),XtWindow(trace),gct, + TRACE_XOFS+ch*BAR_SPACE,0, + BAR_WIDTH+1,TRACE_BASELINE-len*BAR_SCALE); +} + +static void drawProg(int ch,Boolean do_clean) { + char s[3]; + + if(do_clean) { + XSetForeground(disp, gct, bgcolor.pixel); + XFillRectangle(XtDisplay(trace),XtWindow(trace),gct, + TRACE_XOFS+ch*BAR_SPACE,TRACE_BASELINE+POS_HEIGHT, + BAR_SPACE,PRG_HEIGHT); + XSetForeground(disp, gct, fgstr.pixel); + } + sprintf(s, "%02X", Panel->channel[ch].program); + /* 14 means suspected Text Height, though it's not so exact.. */ + XDrawString(XtDisplay(trace), XtWindow(trace), gct, + TRACE_XOFS+ch*BAR_SPACE+2,TRACE_BASELINE+POS_HEIGHT+14,s,2); +} + +static void drawPan(int ch,int val,Boolean setcolor) { + int ap,bp; + int x; + static XPoint pp[3]; + + if (val < 0) return; + x= TRACE_XOFS+ BAR_SPACE * ch+ 1; + ap= BAR_WIDTH * val/127; + bp= BAR_WIDTH -ap -1; + pp[0].x= ap+ x; pp[0].y= 6 +TRACE_BASELINE; + pp[1].x= bp+ x; pp[1].y= 2 +TRACE_BASELINE; + pp[2].x= bp+ x; pp[2].y= 10 +TRACE_BASELINE; + if (setcolor) { + XSetForeground(disp, gct, bgcolor.pixel); + XFillRectangle(XtDisplay(trace),XtWindow(trace),gct, + x-2,TRACE_BASELINE+1,BAR_SPACE-1,12); + XSetForeground(disp, gct, fgpan.pixel); + } + XFillPolygon(XtDisplay(trace),XtWindow(trace),gct,pp,3, + (int)Nonconvex,(int)CoordModeOrigin); +} + +static void draw1Chan(int ch,int val,char cmd) { + if (!ctl->trace_playing) return; + if (cmd == '*') { + drawBar(ch, val); + } else { + XSetForeground(disp, gct, bgcolor.pixel); + XFillRectangle(XtDisplay(trace),XtWindow(trace),gct, + TRACE_XOFS+ch*BAR_SPACE,TRACE_YOFS,BAR_WIDTH+1,BAR_HEIGHT); + } +} + +static void drawTraceAll(void) { + int i; + Dimension w, h; + + XtVaGetValues(trace,XtNheight,&h,NULL); + XtVaGetValues(trace,XtNwidth,&w,NULL); + if (!ctl->trace_playing) return; + XSetForeground(disp, gct, bgcolor.pixel); + XFillRectangle(XtDisplay(trace),XtWindow(trace),gct,0,0,w,h); + for(i=0; ictotal[i] != 0 && Panel->c_flags[i] & FLAG_PROG_ON) + draw1Chan(i,Panel->ctotal[i],'*'); + XSetForeground(disp, gct, fgpan.pixel); + for(i=0; ic_flags[i] & FLAG_PAN) + drawPan(i,Panel->channel[i].panning,False); + } + XSetForeground(disp, gct, fgstr.pixel); + for(i=0; itrace_playing) return; + for(i=0; ichannel[i].program= 0; + Panel->channel[i].sustain= 0; + Panel->channel[i].expression= 0; + Panel->channel[i].panning= -1; + Panel->ctotal[i] = 0; + Panel->cvel[i] = 0; + Panel->v_flags[i] = 0; + Panel->c_flags[i] = 0; + } + if (draw) + drawTraceAll(); +} + /*ARGSUSED*/ static void completeDir(Widget w,XEvent *e, XtPointer data) { @@ -824,7 +1089,6 @@ if (match) { sprintf(fullpath, "%s/%s", full.dirname, matchstr); XtVaSetValues(load_d,XtNvalue,fullpath,NULL); - XawTextSetInsertionPoint(w,strlen(fullpath)); } url_close(dirp); reuse_mblock(&pool); @@ -865,6 +1129,8 @@ #endif case S_ShufflePlay: Cfg->shuffle = (Boolean)k; break; + case S_DispTrace: + Cfg->disptrace = (Boolean)k; break; } } @@ -892,6 +1158,7 @@ fprintf(fp,"set %s %d\n",cfg_items[S_DispText],(int)(file_menu[ID_HIDETXT-100].bmflag ^ TRUE)); #endif fprintf(fp,"set %s %d\n",cfg_items[S_ShufflePlay],(int)s2); + fprintf(fp,"set %s %d\n",cfg_items[S_DispTrace],((int)file_menu[ID_HIDETRACE-100].bmflag ? 0:1)); fclose(fp); } else { fprintf(stderr, "cannot open initializing file '%s'.\n", file); @@ -922,13 +1189,13 @@ if(Type==DndFiles){ filename = Data; while (filename[0] != '\0'){ - snprintf(local_buffer,sizeof(local_buffer),"X %s\n",filename); + snprintf(local_buffer,sizeof(local_buffer),"X %s\n",filename); a_pipe_write(local_buffer); filename = filename + strlen(filename) + 1; } } else{ - snprintf(local_buffer,sizeof(local_buffer),"X %s%s\n",Data,(Type==DndDir)?"/":""); + snprintf(local_buffer,sizeof(local_buffer),"X %s%s\n",Data,(Type==DndDir)?"/":""); a_pipe_write(local_buffer); } return; @@ -940,6 +1207,7 @@ {"fix-menu", (XtActionProc)filemenuCB}, {"do-complete", (XtActionProc)completeDir}, {"do-chgdir", (XtActionProc)setDirAction}, + {"draw-trace",(XtActionProc) drawTraceAll}, #ifdef ENABLE_KEY_TRANSLATION {"do-dialog-button",(XtActionProc)popdownLoad}, {"do-load",(XtActionProc)popupLoad}, @@ -1063,7 +1331,7 @@ "*lyric_text.vertDistance: 4", #ifndef WIDGET_IS_LABEL_WIDGET "*lyric_text.horizDistance: 6", - "*lyric_text.height: 240", + "*lyric_text.height: 120", "*lyric_text.background: gray85", "*lyric_text.foreground: black", "*lyric_text.scrollVertical: WhenNeeded", @@ -1071,6 +1339,10 @@ "*lyric_text.height: 30", "*lyric_text.fontSet: -*-*-medium-r-normal--14-*", "*lyric_text.label: MessageWindow", + "*trace.width: 380", + "*trace.height: 180", + "*trace.borderWidth: 1", + "*trace.background: gray85", #endif #ifdef I18N "*lyric_text.international: True", @@ -1161,10 +1433,10 @@ ~Ctrl ~Shiftv: do-volupdown(-10)\\n\ ~Ctrl Shiftv: do-volupdown(10)", - "*load_dialog*translations: #override\\n\ + "*load_dialog.value.translations: #override\ ~CtrlReturn: do-chgdir()\\n\ ~CtrlKP_Enter: do-chgdir()\\n\ - ~Ctrl ~MetaTab: do-complete()\\n\ + ~Ctrl ~MetaTab: do-complete() end-of-line()\\n\ Ctrl ~Shiftg: do-dialog-button(1)\\n\ Escape: do-dialog-button(1)", #else @@ -1172,11 +1444,14 @@ "*file_simplemenu.saveconfig.label: Save Config", "*file_simplemenu.quit.label: Quit", #endif + "*trace.translations: #override\\n\ + : draw-trace()", NULL, }; XtAppContext app_con; char cbuf[PATH_MAX]; Pixmap bmPixmap; + char *statusfontstr= "7x14"; int bmwidth, bmheight; int i; int argc=1; @@ -1312,6 +1587,12 @@ lyriclist[0] = lyric_t; #endif + if(ctl->trace_playing) { + trace=XtVaCreateManagedWidget("trace",widgetClass,base_f, + XtNfromVert,lyric_t,NULL); + XtVaSetValues(trace,XtNwidth,trace_width,XtNheight,trace_height,NULL); + tracelist[0] = trace; + } XtAddCallback(quit_b,XtNcallback,quitCB,NULL); XtAddCallback(play_b,XtNcallback,playCB,NULL); XtAddCallback(pause_b,XtNcallback,pauseCB,NULL); @@ -1355,6 +1636,26 @@ a_pipe_write("READY"); + if(ctl->trace_playing) { + gct = XCreateGC(disp, RootWindow(disp, screen), 0, NULL); + XAllocNamedColor(disp,DefaultColormap(disp, screen),"green",&fgtmp,&defcolor); + XAllocNamedColor(disp,DefaultColormap(disp, screen),"red",&bgcolor,&defcolor); + for(i=0; ifid); + Panel = (PanelInfo *)safe_malloc(sizeof(PanelInfo)); + initTraceWindow(False); + } while (1) { a_pipe_read(local_buf,sizeof(local_buf)); if (local_buf[0] < 'A') break; @@ -1368,7 +1669,6 @@ bsb=XtVaCreateManagedWidget(local_buf,smeBSBObjectClass,title_sm,NULL); XtAddCallback(bsb,XtNcallback,menuCB,(XtPointer)i); } - for (i = 0; i < XtNumber(file_menu); i++) { bsb=XtVaCreateManagedWidget(file_menu[i].name, (file_menu[i].trap ? smeBSBObjectClass:smeLineObjectClass), @@ -1376,13 +1676,16 @@ XtAddCallback(bsb,XtNcallback,filemenuCB,(XtPointer)&file_menu[i].id); file_menu[i].widget = bsb; } - + if(!ctl->trace_playing) + XtVaSetValues(file_menu[ID_HIDETRACE-100].widget,XtNsensitive,False,NULL); if (Cfg.autostart) filemenuCB(file_menu[ID_AUTOSTART-100].widget, &file_menu[ID_AUTOSTART-100].id,NULL); #ifdef MSGWINDOW if (Cfg.hidetext) filemenuCB(file_menu[ID_HIDETXT-100].widget, &file_menu[ID_HIDETXT-100].id,NULL); #endif + if (!Cfg.disptrace) filemenuCB(file_menu[ID_HIDETRACE-100].widget, + &file_menu[ID_HIDETRACE-100].id,NULL); if (Cfg.repeat) repeatCB(NULL,&Cfg.repeat,NULL); if (Cfg.shuffle) randomCB(NULL,&Cfg.shuffle,NULL); if (Cfg.autostart) diff -ruN TiMidity++-1.0.1/interface/xskin_loadBMP.c TiMidity++-1.1.0/interface/xskin_loadBMP.c --- TiMidity++-1.0.1/interface/xskin_loadBMP.c Mon Nov 30 18:05:42 1998 +++ TiMidity++-1.1.0/interface/xskin_loadBMP.c Fri Jan 15 14:50:35 1999 @@ -22,11 +22,15 @@ Sep.23.1998 Daisuke Nagano */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ #include #include #include #include + #include "timidity.h" #include "common.h" diff -ruN TiMidity++-1.0.1/libarc/Makefile.in TiMidity++-1.1.0/libarc/Makefile.in --- TiMidity++-1.0.1/libarc/Makefile.in Thu Jan 14 17:56:50 1999 +++ TiMidity++-1.1.0/libarc/Makefile.in Mon Jan 18 06:44:46 1999 @@ -86,7 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -99,11 +99,10 @@ SHCFLAGS = @SHCFLAGS@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ INCLUDES = \ -I$(top_srcdir) \ diff -ruN TiMidity++-1.0.1/timidity/Makefile.am TiMidity++-1.1.0/timidity/Makefile.am --- TiMidity++-1.0.1/timidity/Makefile.am Wed Jan 6 08:59:54 1999 +++ TiMidity++-1.1.0/timidity/Makefile.am Sun Jan 17 06:43:45 1999 @@ -127,16 +127,8 @@ controls.o: $(top_builddir)/interface/libinterface.a -#PROJ = timidity -#$(PROJ): $(MAINOBJ) $(COBJS) -# $(CC) $(LDFLAGS) -o $(PROJ) $(MAINOBJ) $(COBJS) $(LIBS) $(EXTRALIBS) -lm - - - -#MAINSRC = timidity.c -#MAINOBJ = $(MAINSRC:.c=.o) -#timiditymain.o: $(MAINSRC) -# $(CC) $(UMPCFLAGS) -Dmain=timiditymain -o $@ -c $(MAINSRC) - version.o: version.c Makefile $(CC) $(CFLAGS) -DTIMID_VERSION=\"$(VERSION)\" -c $(srcdir)/version.c + +objs: $(timidity_OBJECTS) $(timidity_DEPENDENCIES) + @: diff -ruN TiMidity++-1.0.1/timidity/Makefile.in TiMidity++-1.1.0/timidity/Makefile.in --- TiMidity++-1.0.1/timidity/Makefile.in Thu Jan 14 17:57:01 1999 +++ TiMidity++-1.1.0/timidity/Makefile.in Mon Jan 18 06:44:58 1999 @@ -86,7 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -99,11 +99,10 @@ SHCFLAGS = @SHCFLAGS@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ INCLUDES = \ -I$(top_srcdir) \ @@ -346,6 +345,7 @@ ../utils/mblock.h output.h controls.h ../libarc/arc.h \ ../utils/memb.h ../utils/nkflib.h wrd.h controls.o: controls.c ../config.h timidity.h controls.h +dl_dlopen.o: dl_dlopen.c ../config.h timidity.h dlutils.h filter.o: filter.c ../config.h timidity.h common.h ../libarc/url.h \ ../utils/mblock.h controls.h instrum.h filter.h instrum.o: instrum.c ../config.h timidity.h common.h ../libarc/url.h \ @@ -483,17 +483,11 @@ controls.o: $(top_builddir)/interface/libinterface.a -#PROJ = timidity -#$(PROJ): $(MAINOBJ) $(COBJS) -# $(CC) $(LDFLAGS) -o $(PROJ) $(MAINOBJ) $(COBJS) $(LIBS) $(EXTRALIBS) -lm - -#MAINSRC = timidity.c -#MAINOBJ = $(MAINSRC:.c=.o) -#timiditymain.o: $(MAINSRC) -# $(CC) $(UMPCFLAGS) -Dmain=timiditymain -o $@ -c $(MAINSRC) - version.o: version.c Makefile $(CC) $(CFLAGS) -DTIMID_VERSION=\"$(VERSION)\" -c $(srcdir)/version.c + +objs: $(timidity_OBJECTS) $(timidity_DEPENDENCIES) + @: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -ruN TiMidity++-1.0.1/timidity/controls.c TiMidity++-1.1.0/timidity/controls.c --- TiMidity++-1.0.1/timidity/controls.c Thu Dec 3 20:12:52 1998 +++ TiMidity++-1.1.0/timidity/controls.c Sun Jan 17 05:52:23 1999 @@ -32,6 +32,13 @@ # define DEFAULT_CONTROL_MODE &dumb_control_mode #endif /* __MACOS__ */ +#ifdef IA_PLUGIN + extern ControlMode plugin_control_mode; +# ifndef DEFAULT_CONTROL_MODE +# define DEFAULT_CONTROL_MODE &plugin_control_mode +# endif +#endif + #ifdef IA_MOTIF extern ControlMode motif_control_mode; # ifndef DEFAULT_CONTROL_MODE @@ -171,6 +178,9 @@ #endif #ifdef IA_DYNAMIC &dynamic_control_mode, +#endif +#ifdef IA_PLUGIN + &plugin_control_mode, #endif 0 }; diff -ruN TiMidity++-1.0.1/utils/Makefile.am TiMidity++-1.1.0/utils/Makefile.am --- TiMidity++-1.0.1/utils/Makefile.am Fri Dec 11 12:00:03 1998 +++ TiMidity++-1.1.0/utils/Makefile.am Sun Jan 17 06:17:36 1999 @@ -53,7 +53,7 @@ readdir_win.c if ENABLE_NETWORK -NET_OBJS = net.o +NET_OBJS = net.o endif if ENABLE_SOUND_SPEC diff -ruN TiMidity++-1.0.1/utils/Makefile.in TiMidity++-1.1.0/utils/Makefile.in --- TiMidity++-1.0.1/utils/Makefile.in Thu Jan 14 17:56:48 1999 +++ TiMidity++-1.1.0/utils/Makefile.in Mon Jan 18 06:44:44 1999 @@ -86,7 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ -EXTRAINCS = @EXTRAINCS@ +EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ @@ -99,11 +99,10 @@ SHCFLAGS = @SHCFLAGS@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ -SYSTEM = @SYSTEM@ VERSION = @VERSION@ dynamic_targets = @dynamic_targets@ lispdir = @lispdir@ -sharedLibExtension = @sharedLibExtension@ +so = @so@ INCLUDES = \ -I$(top_srcdir)/libarc \ @@ -139,7 +138,7 @@ readdir.h \ readdir_win.c -@ENABLE_NETWORK_TRUE@NET_OBJS = net.o +@ENABLE_NETWORK_TRUE@NET_OBJS = net.o @ENABLE_SOUND_SPEC_TRUE@SOUND_SPEC_OBJS = fft.o