diff -ruN TiMidity++-2.10.4/ChangeLog TiMidity++-2.11.0/ChangeLog --- TiMidity++-2.10.4/ChangeLog Sun Mar 18 15:32:21 2001 +++ TiMidity++-2.11.0/ChangeLog Thu Dec 27 20:52:51 2001 @@ -1,3 +1,202 @@ +2001-12-27 Masanao Izumo + + * Version 2.11.0 released. + +2001-12-27 Masanao Izumo + + * timidity/{wave_a.c,output.c}: Move create_auto_output_name() from + wave_a.c to output.c. + * interface/{w32g_vorbisenc_dll.c,w32g_vorbis_dll.c,w32g_ogg_dll.c}, + timidity/{w32g_vorbisenc_dll.c,w32g_vorbis_dll.c,w32g_ogg_dll.c}, + Move them from interface to timidity. + +2001-12-26 Saito + + * timidity/sndfont.c: Bug fixed about LFO. + +2001-12-26 Thomas Klausner + + * timidity/sun_a.c: Fixed the way to find the audio queue size + on NetBSD. + +2001-12-26 Masanao Izumo + Daisuke Aoki + + * timidity/{timidity.c,wave_a.c,w32_gogo.h,w32_gogo.c,vorbis_a.c, + sndfont.c,output.c,gogo_a.h,gogo_a.c,audriv_none.c,audriv_a.c}, + interface/{w32g_i.c,w32g_res.h,w32g_vorbisenc_dll.c,w32g_pref.c, + w32g_vorbis_dll.c,w32g_ogg_dll.c,w32g_utl.c,w32g_ut2.c,w32g_subwin.h, + w32g_subwin.c,w32g_pref.h,w32g_c.c,w32g.h}: + - Marge windows code. + - Update windows resource. + +2001-12-25 Masanao Izumo + + * timidity/w32_a.c: Close&Open to reset/flush the audio device. + +2001-12-23 Thomas Klausner + + * doc/C/timidity.1: Updated. + +2001-12-23 Masanao Izumo + + * timidity/aq.c (aq_flush): Bug fixed. + * timidity/vorbis_a.c: Enable to encode to variable sample rates. + +2001-12-20 Masanao Izumo + + * timidity/playmidi.c: Bug fix. + * interface/ncurs_c.c: Chaged from 3 to 4 digits in audio queue + monitor. + * timidity/common.c: Fixed security probrem + +2001-11-28 Miloslav Trmac + + * interface/{dumb_c.c,slang_c.c,xaw_c.c,xskin_c.c}: + Fixed some probrems. + +2001-11-19 Eric A. Welsh + + * timidity/playmidi.c: + Fixed a bug and reduced voice cancellation in Chorus Mode 2. + Mod files and drums can still cancel on some full Left/Right pans. + + * timidity/mod.c: + Portas are now handled correctly for Ultimate Soundtracker mods. + +2001-11-10 Daisuke Nagano + + * doc/C/timidity.1: Updated. + +2001-11-05 Saito + + * timidity/sndfont.c: + Updates do_lowpass(). + +2001-10-25 Takashi Iwai + + * timidity/sndfont.c: Bug fix. + +2001-10-23 Lalit Chhabra + + * timidity/sun_a.c: + Modified the sun_a.c file so that it checks for the AUDIODEV + environment variable and sets the sun audio device accordingly. + +2001-10-19 Saito + + * timidity/{mix.c,mix.h,playmidi.c,playmidi.h,readmidi.c,readmidi.h, + reverb.c,reverb.h,tables.c,tables.h}, + interface/{w32g_ini.c,w32g_utl.c,w32g_utl.h,w32g_pref.c,w32g_res.h, + w32g_res.rc,w32g_res.rc}: + - Updates Win32GUI version. + - Improved GS SysEx + - Added attack/release/decay-time(CC/NRPN tone/NRPN dram) + - Added drum level + - Added CC#94 pseudo delay (like chorus method) + - Adjusted reverb level + - Added resonance filter + - Modified enverope attack + - Adjusted velocity + - Supported user drumset (SC-88) + - Added some GS SysEx'es. + +2001-10-10 Frederic LOYER + + * timidity/sffile.h: Bug fix. + Change uint8 pitchCorrection to int8 pitchCorrection. + +2001-10-09 Masanao Izumo + + * Windows: Use w32_a.c instead of w32g_a.c + + * timidity/common.c: safe_malloc(), safe_large_malloc(): Modified to + avoid malloc(0). + + * libunimod/{load_xm.c,load_imf.c,load_it.c,load_uni.c}: + Strip gcc warnings. + + * Upgrade develop environment: + - automake 1.5 + - autoconf 2.5x + - libtool 1.4.x + +2001-06-25 Forever shall I be. + + * Vorbis 1.0 support. + +2001-06-25 Masanao Izumo + + * timidity/{m2m.c,freq.c}: + Change global variables to static. + * interface/xaw_c.c: Bugfix for displaying title in random play mode. + +2001-06-24 Hiroshi Yamashita + + * timidity/{instrum.c,instrum.h,playmidi.c,sndfont.c}: + Enable to display SoundFont name. + * interface/{xaw_c.c,xaw_i.c}: + Support CTLE_DRUMPART message in xaw interface. + +2001-06-16 Eric A. Welsh + + * timidity/{m2m.c,freq.c}: + Remove some unused variables, and recast one of the + functions to void. + +2001-05-31 Eric A. Welsh + + * timidity/readmidi.c: Bugfix about restarting. + +2001-05-29 Eric A. Welsh + + * timidity/{output.c,playmidi.c,modmid_a.c,freq.c,freq.h,m2m.c}, + utils/{fft4g.c,fft4g.h}, + doc/m2m.txt; + New feature: MOD to MIDI conversion. + + +2001-05-29 Eric A. Welsh + + * timidity/instrum.c: + GUS sample pans are calculated correctly now. The old method + resulted in most pans being off by -4. + * timidity/{mix.c,playmidi.c,playmidi.h,timidity.h}: + New SMOOTH_MIXING define. Any changes to left_mix or right_mix are + now smoothed over a 0.5 msec window, eliminating "cliffs" which + could result in popping noises. This should be defined by default. + * timidity/mod2midi.c: + period2note patch from Paolo Bonzini (you should already have this). + New shrink_huge_sample(Sample *sp) function. Some mod samples are + bigger than 1 meg (the maximum size in TiMidity++) and need to be + resampled down to fit under the limit. + * timidity/mod.c: + Tempo/BPM events are implemented more "correctly" now. + Sample pans are no longer applied twice (which was usually resulting + in everything coming out of the left speaker). + +2001-05-26 Marcus Herbert + + * timidity/mod.h, libunimod/load_okt.c: Change CR/LF -> LF + * libunimod/load_med.c, timidity/wrd_read.c: Fix cast probrems. + +2001-05-05 Paolo Bonzini + + * timidity/mod2midi.c (period2note): always pick the + closest note instead of the lowest one. + +2001-04-06 Takaya Nogami + + * timidity/resample.c: Bug fix. + +2001-04-05 Joakim Verona + + * interface/alsaseq_c.c: Bug fix about quiet channel + +2001-03-24 David Lawrence Ramsey + + * timidity/readmidi.c: support for RMI/RMID/RMIDI files. + 2001-03-18 Masanao Izumo * Version 2.10.4 released. @@ -29,7 +228,6 @@ free local var 'currdir' (which was nevered malloced) Solution: Copy 'currdir' to heapspace (new strsav routine). Of course this may have introduced a memory leak 8-) - * timidity/common.c: Bug fix. Electric Fence doesn't like it if you try to alloc 0 bytes. Besides, why first malloc 0 bytes and then check for a 0 diff -ruN TiMidity++-2.10.4/Makefile.am TiMidity++-2.11.0/Makefile.am --- TiMidity++-2.10.4/Makefile.am Tue Mar 13 10:07:39 2001 +++ TiMidity++-2.11.0/Makefile.am Tue Oct 9 17:40:17 2001 @@ -63,7 +63,7 @@ CONFIG_HEADERS='' CONFIG_FILES=configs/msc-config.h $(SHELL) ./config.status cp -r configs $(distdir) chmod -R a+r $(distdir) - $(TAR) chof - $(distdir) | bzip2 -9 - > $(distdir).tar.bz2 + $(AMTAR) chof - $(distdir) | bzip2 -9 - > $(distdir).tar.bz2 ## ## Targets for timidity-tools diff -ruN TiMidity++-2.10.4/Makefile.in TiMidity++-2.11.0/Makefile.in --- TiMidity++-2.10.4/Makefile.in Sun Mar 18 15:32:38 2001 +++ TiMidity++-2.11.0/Makefile.in Thu Dec 27 19:55:55 2001 @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen @@ -30,7 +33,6 @@ # # This Makefile is known to work with GNU make. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -51,13 +53,9 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . ACLOCAL = @ACLOCAL@ @@ -66,11 +64,11 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -85,122 +83,165 @@ target_triplet = @target@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AWK = @AWK@ CC = @CC@ +DEPDIR = @DEPDIR@ ELFILES = @ELFILES@ EMACS = @EMACS@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ +OBJEXT = @OBJEXT@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SHCFLAGS = @SHCFLAGS@ -SHELL = @SHELL@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ VERSION = @VERSION@ +VORBISENC_LIBS = @VORBISENC_LIBS@ +VORBISFILE_LIBS = @VORBISFILE_LIBS@ +VORBIS_CFLAGS = @VORBIS_CFLAGS@ +VORBIS_LIBS = @VORBIS_LIBS@ WISH = @WISH@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +am__include = @am__include@ +am__quote = @am__quote@ dynamic_targets = @dynamic_targets@ +install_sh = @install_sh@ lispdir = @lispdir@ program_transform_name = @program_transform_name@ so = @so@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ -SUBDIRS = utils libarc interface libunimod timidity doc - - -EXTRA_DIST = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL INSTALL.jp NEWS README README.jp timidity.ide timidity.mak TiMidity-uj.ad TiMidity.ad +SUBDIRS = \ + utils \ + libarc \ + interface \ + libunimod \ + timidity \ + doc + + +EXTRA_DIST = \ + AUTHORS \ + COPYING \ + ChangeLog \ + ChangeLog.1 \ + INSTALL \ + INSTALL.jp \ + NEWS \ + README \ + README.jp \ + timidity.ide \ + timidity.mak \ + TiMidity-uj.ad \ + TiMidity.ad TOOLSDIR = timidity-tools UMPDIR = ump +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h interface.h -CONFIG_CLEAN_FILES = common.makefile -DIST_COMMON = README ./stamp-h1.in ./stamp-h2.in AUTHORS COPYING \ -ChangeLog INSTALL Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 \ -common.makefile.in config.guess config.h.in config.sub configure \ -configure.in install-sh interface.h.in missing mkinstalldirs - +CONFIG_CLEAN_FILES = common.makefile +DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive +DIST_COMMON = README ./stamp-h1.in ./stamp-h2.in AUTHORS COPYING \ + ChangeLog INSTALL Makefile.am Makefile.in NEWS TODO \ + acinclude.m4 aclocal.m4 common.makefile.in config.guess \ + config.h.in config.sub configure configure.in depcomp \ + install-sh interface.h.in missing mkinstalldirs +DIST_SUBDIRS = $(SUBDIRS) +all: config.h interface.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -$(ACLOCAL_M4): configure.in acinclude.m4 - cd $(srcdir) && $(ACLOCAL) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$@ $(SHELL) ./config.status -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): configure.in acinclude.m4 + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ $(MAKE) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 stamp-h1T + @echo timestamp > stamp-h1T 2> /dev/null cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=config.h \ $(SHELL) ./config.status - @echo timestamp > stamp-h1 2> /dev/null -$(srcdir)/config.h.in: $(srcdir)/stamp-h1.in + @mv stamp-h1T stamp-h1 +$(srcdir)/config.h.in: $(srcdir)/./stamp-h1.in @if test ! -f $@; then \ - rm -f $(srcdir)/stamp-h1.in; \ - $(MAKE) $(srcdir)/stamp-h1.in; \ + rm -f $(srcdir)/./stamp-h1.in; \ + $(MAKE) $(srcdir)/./stamp-h1.in; \ else :; fi -$(srcdir)/stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/./stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) + @rm -f $(srcdir)/./stamp-h1.in $(srcdir)/./stamp-h1.inT + @echo timestamp > $(srcdir)/./stamp-h1.inT 2> /dev/null cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h1.in 2> /dev/null - + @mv $(srcdir)/./stamp-h1.inT $(srcdir)/./stamp-h1.in interface.h: stamp-h2 @if test ! -f $@; then \ rm -f stamp-h2; \ $(MAKE) stamp-h2; \ else :; fi stamp-h2: $(srcdir)/interface.h.in $(top_builddir)/config.status + @rm -f stamp-h2 stamp-h2T + @echo timestamp > stamp-h2T 2> /dev/null cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=interface.h \ $(SHELL) ./config.status - @echo timestamp > stamp-h2 2> /dev/null -$(srcdir)/interface.h.in: $(srcdir)/stamp-h2.in + @mv stamp-h2T stamp-h2 +$(srcdir)/interface.h.in: $(srcdir)/./stamp-h2.in @if test ! -f $@; then \ - rm -f $(srcdir)/stamp-h2.in; \ - $(MAKE) $(srcdir)/stamp-h2.in; \ + rm -f $(srcdir)/./stamp-h2.in; \ + $(MAKE) $(srcdir)/./stamp-h2.in; \ else :; fi -$(srcdir)/stamp-h2.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/./stamp-h2.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) + @rm -f $(srcdir)/./stamp-h2.in $(srcdir)/./stamp-h2.inT + @echo timestamp > $(srcdir)/./stamp-h2.inT 2> /dev/null cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h2.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: + @mv $(srcdir)/./stamp-h2.inT $(srcdir)/./stamp-h2.in distclean-hdr: -rm -f config.h interface.h - -maintainer-clean-hdr: common.makefile: $(top_builddir)/config.status common.makefile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status +uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -208,12 +249,7 @@ # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: +$(RECURSIVE_TARGETS): @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ @@ -236,11 +272,16 @@ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ done; \ - test "$$dot_seen" = "no" && rev="$$rev ."; \ + rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -259,84 +300,66 @@ tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in interface.h.in $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in interface.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ + fi; \ done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)config.h.in interface.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in interface.h.in $$unique $(LISP) -o $$here/TAGS) - -mostlyclean-tags: + || etags $(ETAGS_ARGS) $$tags config.h.in interface.h.in $$unique $(LISP) -clean-tags: +GTAGS: + here=`CDPATH=: && cd $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -maintainer-clean-tags: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +top_distdir = . +# Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) +GZIP_ENV = --best + distdir: $(DISTFILES) - -rm -rf $(distdir) + -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) - -chmod 777 $(distdir) + $(mkinstalldirs) $(distdir)/. @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done for subdir in $(SUBDIRS); do \ @@ -344,84 +367,141 @@ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" \ + distdir=../$(distdir)/$$subdir \ + distdir) \ || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="${top_distdir}" distdir="$(distdir)" \ + dist-hook + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) +dist: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/=build + mkdir $(distdir)/=inst + chmod a-w $(distdir) + dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ + && cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ + || (echo "Error: files left after uninstall" 1>&2; \ + exit 1) ) \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && $(MAKE) $(AM_MAKEFLAGS) distclean \ + && rm -f $(distdir).tar.gz \ + && (test `find . -type f -print | wc -l` -eq 0 \ + || (echo "Error: files left after distclean" 1>&2; \ + exit 1) ) + -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + @echo "$(distdir).tar.gz is ready for distribution" | \ + sed 'h;s/./=/g;p;x;p;x' check-am: all-am check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -all-recursive-am: config.h interface.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive +all-am: Makefile config.h interface.h +installdirs: installdirs-recursive +installdirs-am: -install-exec-am: +install: install-recursive install-exec: install-exec-recursive - -install-data-am: install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: -uninstall: uninstall-recursive -all-am: Makefile config.h interface.h -all-redirect: all-recursive-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive -mostlyclean: mostlyclean-recursive +clean-am: clean-generic mostlyclean-am -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am +dist-all: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) +distclean: distclean-recursive + -rm -f config.status config.cache config.log +distclean-am: clean-am distclean-generic distclean-hdr distclean-tags -clean: clean-recursive +dvi: dvi-recursive -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am +dvi-am: -distclean: distclean-recursive - -rm -f config.status +info: info-recursive -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f config.status -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -install-data-recursive uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-recursive dist dist-all distcheck distclean \ + distclean-generic distclean-hdr distclean-recursive \ + distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-data install-data-am \ + install-data-recursive install-exec install-exec-am \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-generic mostlyclean-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-info-am \ + uninstall-info-recursive uninstall-recursive dynamics: @@ -443,7 +523,7 @@ CONFIG_HEADERS='' CONFIG_FILES=configs/msc-config.h $(SHELL) ./config.status cp -r configs $(distdir) chmod -R a+r $(distdir) - $(TAR) chof - $(distdir) | bzip2 -9 - > $(distdir).tar.bz2 + $(AMTAR) chof - $(distdir) | bzip2 -9 - > $(distdir).tar.bz2 tools:: tools-targets cd $(TOOLSDIR); $(MAKE) @@ -469,7 +549,6 @@ #$(UMPDIR)/Makefile.in: $(UMPDIR)/Makefile.am # $(AUTOMAKE) --gnu $(UMPSDIR)/Makefile - # 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. .NOEXPORT: diff -ruN TiMidity++-2.10.4/NEWS TiMidity++-2.11.0/NEWS --- TiMidity++-2.10.4/NEWS Sun Mar 18 15:32:32 2001 +++ TiMidity++-2.11.0/NEWS Thu Dec 27 20:54:26 2001 @@ -1,3 +1,28 @@ +12/27, 2001 + * Version 2.11.0 released. + * Configuration menu of Windows GUI was changed. + * Supported vorbis for Windows GUI version. + * Supported gogo for Windows GUI version. + * (ncursese interface) Chaged from 3 to 4 digits in audio queue monitor. + * (Sun audio): Enabled specify audio device file with AUDIODEV environment. + * Updates Win32GUI version. + * Improved GS SysEx + * Added attack/release/decay-time(CC/NRPN tone/NRPN dram) + * Added drum level + * Added CC#94 pseudo delay (like chorus method) + * Adjusted reverb level + * Added resonance filter + * Modified enverope attack + * Adjusted velocity + * Supported user drumset (SC-88) + * Added some GS SysEx'es. + * Upgrade develop environment: + automake 1.5 + autoconf 2.5x + libtool 1.4.x + * Vorbis 1.0 support + * MOD to MIDI conversion. + * -EFchorus=2 is default. + * Support RIFF MIDI. + 03/18, 2001 * Version 2.10.4 released. diff -ruN TiMidity++-2.10.4/README TiMidity++-2.11.0/README --- TiMidity++-2.10.4/README Thu Nov 4 11:11:18 1999 +++ TiMidity++-2.11.0/README Sun Jun 17 14:52:28 2001 @@ -175,10 +175,9 @@ with the -h option to see a list. The following identifiers may be available: -id dumb interface - -in ncurses interface(old version) - -iN NEW ncurses interface + -in ncurses interface -is slang interface - -ia X Ahtena Widget interface + -ia X Athena Widget interface -ik Tcl/Tk interface -im motif interface -iT vt100 interface diff -ruN TiMidity++-2.10.4/README.jp TiMidity++-2.11.0/README.jp --- TiMidity++-2.10.4/README.jp Tue Apr 27 23:22:26 1999 +++ TiMidity++-2.11.0/README.jp Sun Jun 17 14:52:28 2001 @@ -179,7 +179,6 @@ mode が存在します． -id dumb interface -in ncurses interface - -iN NEW ncurses interface (拡張版のみ) -is slang interface -ia X Athena Widget interface (拡張版のみ) -ik Tcl/Tk interface diff -ruN TiMidity++-2.10.4/TODO TiMidity++-2.11.0/TODO --- TiMidity++-2.10.4/TODO Thu Jan 1 09:00:00 1970 +++ TiMidity++-2.11.0/TODO Thu Dec 20 19:03:19 2001 @@ -0,0 +1,39 @@ +BUG: + +- About the Xaw interface troubles with the file-selector. + YMMV since I know near to 0% about Xaw. + +- The tcl interface doesn't like filenames with white space. + (but doesn't mind if it happens in the config file ?). + +Private notes: + +@mail 35 +timidity-io.c: +http://www.mega-tokyo.com/cgi-bin/yabb/YaBB.pl?board=SIERRA_AGI_SCI&action=display&num=990734937 + +SEQ_DEFINEBUF(128); +#define seqbuf_dump timidity_seqbuf_dump + +という行を挿入しなければならない？ + +@mail 36 +BSD ライセンスで使いたい。 + +@mail 37 +timidity -idqqqqqqq /home/bryce/tmp/test.midi +でも +mcop warning: user defined signal handler found for SIG_PIPE, overriding +と表示されてしまう。 + +-> 'q' オプションが多いときは stderr,stdout を /dev/null にリダイレクト + +@mail 41 +alsa 0.9 対応 + +@mail 46 +-io という organ インターフェースを作りたい。 +#define INTERACTIVE_INTERFACE_IDS "kmqagrwA" + +に o を追加しなければならないの？ + diff -ruN TiMidity++-2.10.4/acinclude.m4 TiMidity++-2.11.0/acinclude.m4 --- TiMidity++-2.10.4/acinclude.m4 Tue Sep 7 00:53:00 1999 +++ TiMidity++-2.11.0/acinclude.m4 Thu Dec 20 21:24:55 2001 @@ -751,3 +751,206 @@ ]) # end of gtk.m4 + + +# Configure paths for libogg +# Jack Moffitt 10-21-2000 +# Shamelessly stolen from Owen Taylor and Manish Singh + +dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS +dnl +AC_DEFUN(AM_PATH_OGG, +[dnl +dnl Get the cflags and libraries +dnl +AC_ARG_WITH(ogg-prefix,[ --with-ogg-prefix=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") +AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) + + if test "x$ogg_prefix" != "x"; then + ogg_args="$ogg_args --prefix=$ogg_prefix" + OGG_CFLAGS="-I$ogg_prefix/include" + OGG_LIBS="-L$ogg_prefix/lib" + elif test "x$prefix" != "xNONE"; then + ogg_args="$ogg_args --prefix=$prefix" + OGG_CFLAGS="-I$prefix/include" + OGG_LIBS="-L$prefix/lib" + fi + + OGG_LIBS="$OGG_LIBS -logg" + + AC_MSG_CHECKING(for Ogg) + no_ogg="" + + + if test "x$enable_oggtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $OGG_CFLAGS" + LIBS="$LIBS $OGG_LIBS" +dnl +dnl Now check if the installed Ogg is sufficiently new. +dnl + rm -f conf.oggtest + AC_TRY_RUN([ +#include +#include +#include +#include + +int main () +{ + system("touch conf.oggtest"); + return 0; +} + +],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_ogg" = "x" ; then + AC_MSG_RESULT(yes) + ifelse([$1], , :, [$1]) + else + AC_MSG_RESULT(no) + if test -f conf.oggtest ; then + : + else + echo "*** Could not run Ogg test program, checking why..." + CFLAGS="$CFLAGS $OGG_CFLAGS" + LIBS="$LIBS $OGG_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding Ogg or finding the wrong" + echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means Ogg was incorrectly installed" + echo "*** or that you have moved Ogg since it was installed. In the latter case, you" + echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + OGG_CFLAGS="" + OGG_LIBS="" + ifelse([$2], , :, [$2]) + fi + AC_SUBST(OGG_CFLAGS) + AC_SUBST(OGG_LIBS) + rm -f conf.oggtest +]) + +# end of ogg.m4 + + +# Configure paths for libvorbis +# Jack Moffitt 10-21-2000 +# Shamelessly stolen from Owen Taylor and Manish Singh + +dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS +dnl +AC_DEFUN(AM_PATH_VORBIS, +[dnl +dnl Get the cflags and libraries +dnl +AC_ARG_WITH(vorbis-prefix,[ --with-vorbis-prefix=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="") +AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes) + + if test "x$vorbis_prefix" != "x" ; then + vorbis_args="$vorbis_args --prefix=$vorbis_prefix" + VORBIS_CFLAGS="-I$vorbis_prefix/include" + VORBIS_LIBDIR="-L$vorbis_prefix/lib" + elif test "x$prefix" != "xNONE"; then + vorbis_args="$vorbis_args --prefix=$prefix" + VORBIS_CFLAGS="-I$prefix/include" + VORBIS_LIBDIR="-L$prefix/lib" + fi + + VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm" + VORBISFILE_LIBS="-lvorbisfile" + VORBISENC_LIBS="-lvorbisenc" + + AC_MSG_CHECKING(for Vorbis) + no_vorbis="" + + + if test "x$enable_vorbistest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $VORBIS_CFLAGS" + LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" +dnl +dnl Now check if the installed Vorbis is sufficiently new. +dnl + rm -f conf.vorbistest + AC_TRY_RUN([ +#include +#include +#include +#include + +int main () +{ + system("touch conf.vorbistest"); + return 0; +} + +],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_vorbis" = "x" ; then + AC_MSG_RESULT(yes) + ifelse([$1], , :, [$1]) + else + AC_MSG_RESULT(no) + if test -f conf.vorbistest ; then + : + else + echo "*** Could not run Vorbis test program, checking why..." + CFLAGS="$CFLAGS $VORBIS_CFLAGS" + LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding Vorbis or finding the wrong" + echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means Vorbis was incorrectly installed" + echo "*** or that you have moved Vorbis since it was installed." ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + VORBIS_CFLAGS="" + VORBIS_LIBS="" + VORBISFILE_LIBS="" + VORBISENC_LIBS="" + ifelse([$2], , :, [$2]) + fi + AC_SUBST(VORBIS_CFLAGS) + AC_SUBST(VORBIS_LIBS) + AC_SUBST(VORBISFILE_LIBS) + AC_SUBST(VORBISENC_LIBS) + rm -f conf.vorbistest +]) + +# end of vorbis.m4 \ No newline at end of file diff -ruN TiMidity++-2.10.4/aclocal.m4 TiMidity++-2.11.0/aclocal.m4 --- TiMidity++-2.10.4/aclocal.m4 Tue Mar 13 12:55:44 2001 +++ TiMidity++-2.11.0/aclocal.m4 Thu Dec 27 19:55:54 2001 @@ -1,14 +1,15 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +# aclocal.m4 generated automatically by aclocal 1.5 -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. dnl MY_DEFINE(VARIABLE) AC_DEFUN(MY_DEFINE, @@ -764,11 +765,227 @@ # end of gtk.m4 -# Define a conditional. -AC_DEFUN(AM_CONDITIONAL, -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) +# Configure paths for libogg +# Jack Moffitt 10-21-2000 +# Shamelessly stolen from Owen Taylor and Manish Singh + +dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS +dnl +AC_DEFUN(AM_PATH_OGG, +[dnl +dnl Get the cflags and libraries +dnl +AC_ARG_WITH(ogg-prefix,[ --with-ogg-prefix=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") +AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) + + if test "x$ogg_prefix" != "x"; then + ogg_args="$ogg_args --prefix=$ogg_prefix" + OGG_CFLAGS="-I$ogg_prefix/include" + OGG_LIBS="-L$ogg_prefix/lib" + elif test "x$prefix" != "xNONE"; then + ogg_args="$ogg_args --prefix=$prefix" + OGG_CFLAGS="-I$prefix/include" + OGG_LIBS="-L$prefix/lib" + fi + + OGG_LIBS="$OGG_LIBS -logg" + + AC_MSG_CHECKING(for Ogg) + no_ogg="" + + + if test "x$enable_oggtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $OGG_CFLAGS" + LIBS="$LIBS $OGG_LIBS" +dnl +dnl Now check if the installed Ogg is sufficiently new. +dnl + rm -f conf.oggtest + AC_TRY_RUN([ +#include +#include +#include +#include + +int main () +{ + system("touch conf.oggtest"); + return 0; +} + +],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_ogg" = "x" ; then + AC_MSG_RESULT(yes) + ifelse([$1], , :, [$1]) + else + AC_MSG_RESULT(no) + if test -f conf.oggtest ; then + : + else + echo "*** Could not run Ogg test program, checking why..." + CFLAGS="$CFLAGS $OGG_CFLAGS" + LIBS="$LIBS $OGG_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding Ogg or finding the wrong" + echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means Ogg was incorrectly installed" + echo "*** or that you have moved Ogg since it was installed. In the latter case, you" + echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + OGG_CFLAGS="" + OGG_LIBS="" + ifelse([$2], , :, [$2]) + fi + AC_SUBST(OGG_CFLAGS) + AC_SUBST(OGG_LIBS) + rm -f conf.oggtest +]) + +# end of ogg.m4 + + +# Configure paths for libvorbis +# Jack Moffitt 10-21-2000 +# Shamelessly stolen from Owen Taylor and Manish Singh + +dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS +dnl +AC_DEFUN(AM_PATH_VORBIS, +[dnl +dnl Get the cflags and libraries +dnl +AC_ARG_WITH(vorbis-prefix,[ --with-vorbis-prefix=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="") +AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes) + + if test "x$vorbis_prefix" != "x" ; then + vorbis_args="$vorbis_args --prefix=$vorbis_prefix" + VORBIS_CFLAGS="-I$vorbis_prefix/include" + VORBIS_LIBDIR="-L$vorbis_prefix/lib" + elif test "x$prefix" != "xNONE"; then + vorbis_args="$vorbis_args --prefix=$prefix" + VORBIS_CFLAGS="-I$prefix/include" + VORBIS_LIBDIR="-L$prefix/lib" + fi + + VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm" + VORBISFILE_LIBS="-lvorbisfile" + VORBISENC_LIBS="-lvorbisenc" + + AC_MSG_CHECKING(for Vorbis) + no_vorbis="" + + + if test "x$enable_vorbistest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $VORBIS_CFLAGS" + LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" +dnl +dnl Now check if the installed Vorbis is sufficiently new. +dnl + rm -f conf.vorbistest + AC_TRY_RUN([ +#include +#include +#include +#include + +int main () +{ + system("touch conf.vorbistest"); + return 0; +} + +],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_vorbis" = "x" ; then + AC_MSG_RESULT(yes) + ifelse([$1], , :, [$1]) + else + AC_MSG_RESULT(no) + if test -f conf.vorbistest ; then + : + else + echo "*** Could not run Vorbis test program, checking why..." + CFLAGS="$CFLAGS $VORBIS_CFLAGS" + LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding Vorbis or finding the wrong" + echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means Vorbis was incorrectly installed" + echo "*** or that you have moved Vorbis since it was installed." ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + VORBIS_CFLAGS="" + VORBIS_LIBS="" + VORBISFILE_LIBS="" + VORBISENC_LIBS="" + ifelse([$2], , :, [$2]) + fi + AC_SUBST(VORBIS_CFLAGS) + AC_SUBST(VORBIS_LIBS) + AC_SUBST(VORBISFILE_LIBS) + AC_SUBST(VORBISENC_LIBS) + rm -f conf.vorbistest +]) + +# end of vorbis.m4 +# serial 3 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +# +# FIXME: Once using 2.50, use this: +# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_DEFUN([AM_CONDITIONAL], +[ifelse([$1], [TRUE], + [errprint(__file__:__line__: [$0: invalid condition: $1 +])dnl +m4exit(1)])dnl +ifelse([$1], [FALSE], + [errprint(__file__:__line__: [$0: invalid condition: $1 +])dnl +m4exit(1)])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) if $2; then $1_TRUE= $1_FALSE='#' @@ -781,57 +998,119 @@ # some checks are only needed if your package does certain things. # But this isn't really a big deal. -# serial 1 +# serial 5 -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - -AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# We require 2.13 because we rely on SHELL being computed by configure. +AC_PREREQ([2.13]) + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. +# The purpose of this macro is to provide the user with a means to +# check macros which are provided without letting her know how the +# information is coded. +# If this macro is not defined by Autoconf, define it here. +ifdef([AC_PROVIDE_IFELSE], + [], + [define([AC_PROVIDE_IFELSE], + [ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) + + +# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) +# ---------------------------------------------- +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) fi + +# Define the identity of the package. +PACKAGE=$1 +AC_SUBST(PACKAGE)dnl +VERSION=$2 +AC_SUBST(VERSION)dnl ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) + +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +ifdef([m4_pattern_allow], + [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl + +# Autoconf 2.50 always computes EXEEXT. However we need to be +# compatible with 2.13, for now. So we always define EXEEXT, but we +# don't compute it. +AC_SUBST(EXEEXT) +# Similar for OBJEXT -- only we only use OBJEXT if the user actually +# requests that it be used. This is a bit dumb. +: ${OBJEXT=o} +AC_SUBST(OBJEXT) + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl +AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_PROVIDE_IFELSE([AC_PROG_][CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_][CC], + defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_][CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_][CXX], + defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) # # Check to make sure that the build environment is sane. # -AC_DEFUN(AM_SANITY_CHECK, +# serial 3 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 -echo timestamp > conftestfile +echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` + set X `ls -t $srcdir/configure conftest.file` fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a @@ -841,7 +1120,7 @@ alias in your environment]) fi - test "[$]2" = conftestfile + test "$[2]" = conftest.file ) then # Ok. @@ -850,79 +1129,416 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -rm -f conftest* AC_MSG_RESULT(yes)]) -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. -AC_DEFUN(AM_MISSING_PROG, -[AC_MSG_CHECKING(for working $2) -# 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. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) + +# serial 2 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - $1="$3/missing $2" - AC_MSG_RESULT(missing) + am_missing_run= + am_backtick='`' + AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) fi -AC_SUBST($1)]) +]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. +# AM_AUX_DIR_EXPAND -AC_DEFUN(AM_CONFIG_HEADER, -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], [ +# expand $ac_aux_dir to an absolute path +am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +]) + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# serial 4 -*- Autoconf -*- + + + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + + +# _AM_DEPENDENCIES(NAME) +# --------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX" or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" +AC_SUBST([$1DEPMODE]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then + DEPDIR=.deps +else + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps +fi +rmdir .deps 2>/dev/null +AC_SUBST(DEPDIR) +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +pushdef([subst], defn([AC_SUBST])) +subst(AMDEPBACKSLASH) +popdef([subst]) +]) + +# Generate code to set up dependency tracking. +# This macro should only be invoked once -- use via AC_REQUIRE. +# Usage: +# AM_OUTPUT_DEPENDENCY_COMMANDS + +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ +AC_OUTPUT_COMMANDS([ +test x"$AMDEP_TRUE" != x"" || +for mf in $CONFIG_FILES; do + case "$mf" in + Makefile) dirpart=.;; + */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; + *) continue;; esac - am_indx=`expr "<<$>>am_indx" + 1` -done<<>>dnl>>) -changequote([,]))]) + grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`echo "$file" | sed -e 's|/[^/]*$||'` + $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +], [AMDEP_TRUE="$AMDEP_TRUE" +ac_aux_dir="$ac_aux_dir"])]) +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +doit: + @echo done +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include='#' +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote='"' + _am_result=BSD + fi +fi +AC_SUBST(am__include) +AC_SUBST(am__quote) +AC_MSG_RESULT($_am_result) +rm -f confinc confmf +]) -# serial 1 +# Like AC_CONFIG_HEADER, but automatically create stamp file. + +# serial 3 -AC_DEFUN(AM_PATH_LISPDIR, - [# If set to t, that means we are running in a shell under Emacs. +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. We must strip everything past the first ":", +# and everything past the last "/". + +AC_PREREQ([2.12]) + +AC_DEFUN([AM_CONFIG_HEADER], +[ifdef([AC_FOREACH],dnl + [dnl init our file count if it isn't already + m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) + dnl prepare to store our destination file list for use in config.status + AC_FOREACH([_AM_File], [$1], + [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) + m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) + dnl and add it to the list of files AC keeps track of, along + dnl with our hook + AC_CONFIG_HEADERS(_AM_File, +dnl COMMANDS, [, INIT-CMDS] +[# update the timestamp +echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index[" +][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS + m4_popdef([_AM_Dest])])],dnl +[AC_CONFIG_HEADER([$1]) + AC_OUTPUT_COMMANDS( + ifelse(patsubst([$1], [[^ ]], []), + [], + [test -z "$CONFIG_HEADERS" || echo timestamp >dnl + patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl +[am_indx=1 +for am_file in $1; do + case " \$CONFIG_HEADERS " in + *" \$am_file "*) + am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` + if test -n "\$am_dir"; then + am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` + for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do + am_tmpdir=\$am_tmpdir\$am_subdir/ + if test ! -d \$am_tmpdir; then + mkdir \$am_tmpdir + fi + done + fi + echo timestamp > "\$am_dir"stamp-h\$am_indx + ;; + esac + am_indx=\`expr \$am_indx + 1\` +done]) +])]) # AM_CONFIG_HEADER + +# _AM_DIRNAME(PATH) +# ----------------- +# Like AS_DIRNAME, only do it during macro expansion +AC_DEFUN([_AM_DIRNAME], + [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, + m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, + m4_if(m4_regexp([$1], [^/.*]), -1, + [.], + m4_patsubst([$1], [^\(/\).*], [\1])), + m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), + m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl +]) # _AM_DIRNAME + + +# serial 3 + +AC_DEFUN([AM_PATH_LISPDIR], + [AC_ARG_WITH(lispdir, + [ --with-lispdir Override the default lisp directory ], + [ lispdir="$withval" + AC_MSG_CHECKING([where .elc files should go]) + AC_MSG_RESULT([$lispdir])], + [ + # If set to t, that means we are running in a shell under Emacs. # If you have an Emacs named "t", then use the full path. - test "$EMACS" = t && EMACS= - AC_PATH_PROGS(EMACS, emacs xemacs, no) + test x"$EMACS" = xt && EMACS= + AC_CHECK_PROGS(EMACS, emacs xemacs, no) if test $EMACS != "no"; then - AC_MSG_CHECKING([where .elc files should go]) - dnl Set default value - lispdir="\$(datadir)/emacs/site-lisp" - emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'` - if test "x$prefix" = "xNONE"; then - if test -d $ac_default_prefix/share/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/share/$emacs_flavor/site-lisp" - else - if test -d $ac_default_prefix/lib/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp" + if test x${lispdir+set} != xset; then + AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir], [dnl + am_cv_lispdir=`$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' | sed -n -e 's,/$,,' -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}'` + if test -z "$am_cv_lispdir"; then + am_cv_lispdir='${datadir}/emacs/site-lisp' fi - fi - else - if test -d $prefix/share/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/share/$emacs_flavor/site-lisp" - else - if test -d $prefix/lib/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp" - fi - fi + ]) + lispdir="$am_cv_lispdir" fi - AC_MSG_RESULT($lispdir) fi - AC_SUBST(lispdir)]) + ]) + AC_SUBST(lispdir)]) diff -ruN TiMidity++-2.10.4/config.guess TiMidity++-2.11.0/config.guess --- TiMidity++-2.10.4/config.guess Sun Jan 9 18:15:59 2000 +++ TiMidity++-2.11.0/config.guess Wed Oct 31 17:17:17 2001 @@ -1,7 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. -# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. + +timestamp='2001-08-21' + # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -22,35 +25,153 @@ # the same distribution terms that you use for the rest of that program. # Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. +# Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # # The plan is that this can be called by configure scripts if you -# don't specify an explicit system type (host/target name). -# -# Only a few systems have been added to this list; please add others -# (but try to keep the structure clean). -# +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + + +dummy=dummy-$$ +trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int dummy(){}" > $dummy.c ; + for c in cc gcc c89 ; do + ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; + if test $? = 0 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + rm -f $dummy.c $dummy.o $dummy.rel ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 8/24/94.) +# (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # Netbsd (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # Determine the machine/vendor (is the vendor relevant). + case "${UNAME_MACHINE}" in + amiga) machine=m68k-unknown ;; + arm32) machine=arm-unknown ;; + atari*) machine=m68k-atari ;; + sun3*) machine=m68k-sun ;; + mac68k) machine=m68k-apple ;; + macppc) machine=powerpc-apple ;; + hp3[0-9][05]) machine=m68k-hp ;; + ibmrt|romp-ibm) machine=romp-ibm ;; + *) machine=${UNAME_MACHINE}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE}" in + i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -59,56 +180,73 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <dummy.s + cat <$dummy.s + .data +\$Lformat: + .byte 37,100,45,37,120,10,0 # "%d-%x\n" + + .text .globl main + .align 4 .ent main main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d80 # implver \$0 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,\$Lformat + mov \$0,\$17 + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit .end main EOF - ${CC-cc} dummy.s -o dummy 2>/dev/null + eval $set_cc_for_build + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then - ./dummy - case "$?" in - 7) + case `./$dummy` in + 0-0) UNAME_MACHINE="alpha" ;; - 15) + 1-0) UNAME_MACHINE="alphaev5" ;; - 14) + 1-1) UNAME_MACHINE="alphaev56" ;; - 10) + 1-101) UNAME_MACHINE="alphapca56" ;; - 16) + 2-303) UNAME_MACHINE="alphaev6" ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; + 2-1307) + UNAME_MACHINE="alphaev68" + ;; esac fi - rm -f dummy.s dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` + rm -f $dummy.s $dummy + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit 0 ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 + echo m68k-unknown-sysv4 exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -133,16 +271,16 @@ wgrisc:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; - arm32:NetBSD:*:*) - echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - SR2?01:HI-UX/MPP:*:*) + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*) + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 @@ -150,7 +288,7 @@ echo pyramid-pyramid-bsd fi exit 0 ;; - NILE:*:*:dcosx) + NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; sun4H:SunOS:5.*:*) @@ -195,21 +333,41 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - atari*:NetBSD:*:*) - echo m68k-atari-netbsd${UNAME_RELEASE} + sparc*:NetBSD:*) + echo `uname -p`-unknown-netbsd${UNAME_RELEASE} exit 0 ;; atari*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - sun3*:NetBSD:*:*) - echo m68k-sun-netbsd${UNAME_RELEASE} + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} exit 0 ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit 0 ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit 0 ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; sun3*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - mac68k:NetBSD:*:*) - echo m68k-apple-netbsd${UNAME_RELEASE} - exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -222,9 +380,6 @@ powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; - macppc:NetBSD:*:*) - echo powerpc-apple-netbsd${UNAME_RELEASE} - exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit 0 ;; @@ -234,12 +389,17 @@ VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} exit 0 ;; - 2020:CLIX:*:*) + 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >dummy.c - int main (argc, argv) int argc; char **argv; { + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); @@ -254,12 +414,16 @@ exit (-1); } EOF - ${CC-cc} dummy.c -o dummy \ - && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + eval $set_cc_for_build + $CC_FOR_BUILD $dummy.c -o $dummy \ + && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; @@ -275,15 +439,18 @@ AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ - -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then echo m88k-dg-dgux${UNAME_RELEASE} - else + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 @@ -304,12 +471,20 @@ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i?86:AIX:*:*) + i*86:AIX:*:*) echo i386-ibm-aix exit 0 ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >dummy.c + sed 's/^ //' << EOF >$dummy.c #include main() @@ -320,8 +495,9 @@ exit(0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + eval $set_cc_for_build + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -329,9 +505,9 @@ echo rs6000-ibm-aix3.2 fi exit 0 ;; - *:AIX:*:4) + *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` - if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -339,7 +515,7 @@ if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=4.${UNAME_RELEASE} + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} exit 0 ;; @@ -349,7 +525,7 @@ ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) @@ -365,28 +541,48 @@ echo m68k-hp-bsd4.4 exit 0 ;; 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 ) - sed 's/^ //' << EOF >dummy.c + 9000/[678][0-9][0-9]) + case "${HPUX_REV}" in + 11.[0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + esac ;; + esac + fi ;; + esac + if [ "${HP_ARCH}" = "" ]; then + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE #include #include - + int main () { #if defined(_SC_KERNEL_BITS) long bits = sysconf(_SC_KERNEL_BITS); - #endif + #endif long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) + + switch (cpu) { case CPU_PA_RISC1_0: puts ("hppa1.0"); break; case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: + case CPU_PA_RISC2_0: #if defined(_SC_KERNEL_BITS) - switch (bits) + switch (bits) { case 64: puts ("hppa2.0w"); break; case 32: puts ("hppa2.0n"); break; @@ -394,20 +590,26 @@ } break; #else /* !defined(_SC_KERNEL_BITS) */ puts ("hppa2.0"); break; - #endif + #endif default: puts ("hppa1.0"); break; } exit (0); } EOF - (${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy` - rm -f dummy.c dummy + eval $set_cc_for_build + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi + rm -f $dummy.c $dummy + fi ;; esac - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit 0 ;; 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >dummy.c + sed 's/^ //' << EOF >$dummy.c #include int main () @@ -432,8 +634,9 @@ exit (0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + eval $set_cc_for_build + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -442,13 +645,16 @@ 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf exit 0 ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf exit 0 ;; - i?86:OSF1:*:*) + i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else @@ -458,6 +664,9 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -480,45 +689,50 @@ echo xmp-cray-unicos exit 0 ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*T3D:*:*:*) + echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos exit 0 ;; - F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - F301:UNIX_System_V:*:*) - echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` - exit 0 ;; - hp3[0-9][05]:NetBSD:*:*) - echo m68k-hp-netbsd${UNAME_RELEASE} - exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - i?86:BSD/386:*:* | *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; @@ -528,6 +742,18 @@ i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit 0 ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i386-pc-interix + exit 0 ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit 0 ;; @@ -537,145 +763,130 @@ *:GNU:*:*) echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; - *:Linux:*:*) - # uname on the ARM produces all sorts of strangeness, and we need to - # filter it out. - case "$UNAME_MACHINE" in - arm* | sa110*) UNAME_MACHINE="arm" ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux + exit 0 ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + mips:Linux:*:*) + case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in + big) echo mips-unknown-linux-gnu && exit 0 ;; + little) echo mipsel-unknown-linux-gnu && exit 0 ;; esac - + ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit 0 ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit 0 ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit 0 ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit 0 ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit 0 ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit 0 ;; + i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so - # first see if it will tell us. - ld_help_string=`ld --help 2>&1` - ld_supported_emulations=`echo $ld_help_string \ - | sed -ne '/supported emulations:/!d + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + ld_supported_targets=`cd /; ld --help 2>&1 \ + | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g - s/.*supported emulations: *// + s/.*supported targets: *// s/ .*// p'` - case "$ld_supported_emulations" in - i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; - i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; - sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit 0 ;; esac - - if test "${UNAME_MACHINE}" = "alpha" ; then - sed 's/^ //' <dummy.s - .globl main - .ent main - main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 - .end main -EOF - LIBC="" - ${CC-cc} dummy.s -o dummy 2>/dev/null - if test "$?" = 0 ; then - ./dummy - case "$?" in - 7) - UNAME_MACHINE="alpha" - ;; - 15) - UNAME_MACHINE="alphaev5" - ;; - 14) - UNAME_MACHINE="alphaev56" - ;; - 10) - UNAME_MACHINE="alphapca56" - ;; - 16) - UNAME_MACHINE="alphaev6" - ;; - esac - - objdump --private-headers dummy | \ - grep ld.so.1 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f dummy.s dummy - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 - elif test "${UNAME_MACHINE}" = "mips" ; then - cat >dummy.c </dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - else - # Either a pre-BFD a.out linker (linux-gnuoldld) - # or one that does not give us useful --help. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" - test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - - case "${UNAME_MACHINE}" in - i?86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; - esac - # Determine whether the default compiler is a.out or elf - cat >dummy.c <$dummy.c < -main(argc, argv) - int argc; - char *argv[]; -{ +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #ifdef __ELF__ # ifdef __GLIBC__ # if __GLIBC__ >= 2 - printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); + printf ("%s-pc-linux-gnu\n", argv[1]); # else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); + printf ("%s-pc-linux-gnulibc1\n", argv[1]); # endif # else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); + printf ("%s-pc-linux-gnulibc1\n", argv[1]); # endif #else - printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); + printf ("%s-pc-linux-gnuaout\n", argv[1]); #endif return 0; } EOF - ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - fi ;; -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions -# are messed up and put the nodename in both sysname and nodename. - i?86:DYNIX/ptx:4*:*) + eval $set_cc_for_build + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. echo i386-sequent-sysv4 exit 0 ;; - i?86:UNIX_SV:4.2MP:2.*) + i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, @@ -683,14 +894,23 @@ # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; - i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; - i?86:*:3.2:*) + i*86:*:5:[78]*) + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit 0 ;; + i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 + (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i?86:UnixWare:*:*) - if /bin/uname -X 2>/dev/null >/dev/null ; then - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - fi - echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION} + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp exit 0 ;; pc:*:*:*) + # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp @@ -735,7 +956,7 @@ exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -746,24 +967,30 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:*) + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i?86:LynxOS:2.*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; - rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit 0 ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 exit 0 ;; @@ -775,8 +1002,8 @@ echo ns32k-sni-sysv fi exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says echo i586-unisys-sysv4 exit 0 ;; *:UNIX_System_V:4*:FTX*) @@ -788,13 +1015,17 @@ # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 exit 0 ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; - news*:NEWS-OS:*:6*) + news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit 0 ;; - R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*) + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -810,12 +1041,85 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit 0 ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit 0 ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Darwin:*:*) + echo `uname -p`-apple-darwin${UNAME_RELEASE} + exit 0 ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_MACHINE=pc + fi + echo `uname -p`-${UNAME_MACHINE}-nto-qnx + exit 0 ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; + NSR-[KW]:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit 0 ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit 0 ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit 0 ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit 0 ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit 0 ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -cat >dummy.c <$dummy.c < # include @@ -853,7 +1157,10 @@ #endif int version; version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); exit (0); #endif @@ -898,11 +1205,24 @@ #endif #if defined (vax) -#if !defined (ultrix) - printf ("vax-dec-bsd\n"); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif #endif #if defined (alliant) && defined (i860) @@ -913,8 +1233,9 @@ } EOF -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 -rm -f dummy.c dummy +eval $set_cc_for_build +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 +rm -f $dummy.c $dummy # Apollos put the system type in the environment. @@ -946,6 +1267,48 @@ esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -ruN TiMidity++-2.10.4/config.h.in TiMidity++-2.11.0/config.h.in --- TiMidity++-2.10.4/config.h.in Wed Nov 15 12:58:40 2000 +++ TiMidity++-2.11.0/config.h.in Thu Dec 20 22:03:10 2001 @@ -1,237 +1,262 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -/* Define if type char is unsigned and you are not using gcc. */ -#ifndef __CHAR_UNSIGNED__ -#undef __CHAR_UNSIGNED__ -#endif - -/* Define to empty if the keyword does not work. */ -#undef const - -/* Define if you don't have vprintf but do have _doprnt. */ -#undef HAVE_DOPRNT - -/* Define if you have a working `mmap' system call. */ -#undef HAVE_MMAP - -/* Define if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_WAIT_H - -/* Define if you have the vprintf function. */ -#undef HAVE_VPRINTF - -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline - -/* Define to `long' if doesn't define. */ -#undef off_t - -/* Define to `int' if doesn't define. */ -#undef pid_t - -/* Define as the return type of signal handlers (int or void). */ -#undef RETSIGTYPE - -/* Define if the setvbuf function takes the buffering type as its second - argument and the buffer pointer as the third, as on System V - before release 3. */ -#undef SETVBUF_REVERSED - -/* Define to `unsigned' if doesn't define. */ -#undef size_t - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define if you have the header file. */ +#undef HAVE_CURSES_H -/* Define if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME +/* Define if you have the header file, and it defines `DIR'. */ +#undef HAVE_DIRENT_H -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +/* Define if you have the header file. */ +#undef HAVE_DLFCN_H -/* Define if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING +/* Define if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT -/* Define if you have the XShmCreatePixmap function. */ -#undef HAVE_XSHMCREATEPIXMAP +/* Define if you have the header file. */ +#undef HAVE_ERRNO_H -/* Define if you have the XmuRegisterExternalAgent function. */ -#undef HAVE_XMUREGISTEREXTERNALAGENT +/* Define if you have the header file. */ +#undef HAVE_FCNTL_H -/* Define if you have the getcwd function. */ +/* Define if you have the `getcwd' function. */ #undef HAVE_GETCWD -/* Define if you have the gethostbyname function. */ +/* Define if you have the `gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME -/* Define if you have the getopt function. */ +/* Define if you have the `getopt' function. */ #undef HAVE_GETOPT -/* Define if you have the getpagesize function. */ +/* Define if you have the header file. */ +#undef HAVE_GETOPT_H + +/* Define if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE -/* Define if you have the gettimeofday function. */ +/* Define if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY -/* Define if you have the isatty function. */ -#undef HAVE_ISATTY +/* Define if you have the header file. */ +#undef HAVE_GLOB_H -/* Define if you have the popen function. */ -#undef HAVE_POPEN +/* Define if you have the header file. */ +#undef HAVE_INTTYPES_H -/* Define if you have the select function. */ -#undef HAVE_SELECT +/* Define if you have the `isatty' function. */ +#undef HAVE_ISATTY -/* Define if you have the signal function. */ -#undef HAVE_SIGNAL +/* Define if you have the `asound' library (-lasound). */ +#undef HAVE_LIBASOUND -/* Define if you have the sleep function. */ -#undef HAVE_SLEEP +/* Define if you have the `ICE' library (-lICE). */ +#undef HAVE_LIBICE -/* Define if you have the snprintf function. */ -#undef HAVE_SNPRINTF +/* Define if you have the `m' library (-lm). */ +#undef HAVE_LIBM -/* Define if you have the socket function. */ -#undef HAVE_SOCKET +/* Define if you have the `nsl' library (-lnsl). */ +#undef HAVE_LIBNSL -/* Define if you have the strdup function. */ -#undef HAVE_STRDUP +/* Define if you have the `ossaudio' library (-lossaudio). */ +#undef HAVE_LIBOSSAUDIO -/* Define if you have the strerror function. */ -#undef HAVE_STRERROR +/* Define if you have the `socket' library (-lsocket). */ +#undef HAVE_LIBSOCKET -/* Define if you have the strncasecmp function. */ -#undef HAVE_STRNCASECMP +/* Define if you have the `X11' library (-lX11). */ +#undef HAVE_LIBX11 -/* Define if you have the strstr function. */ -#undef HAVE_STRSTR +/* Define if you have the header file. */ +#undef HAVE_LIMITS_H -/* Define if you have the usleep function. */ -#undef HAVE_USLEEP +/* Define if you have the header file. */ +#undef HAVE_MACHINE_ENDIAN_H -/* Define if you have the vsnprintf function. */ -#undef HAVE_VSNPRINTF +/* Define if you have the header file. */ +#undef HAVE_MALLOC_H -/* Define if you have the header file. */ -#undef HAVE_X11_XMU_EXTAGENT_H +/* Define if you have the header file. */ +#undef HAVE_MEMORY_H -/* Define if you have the header file. */ -#undef HAVE_X11_EXTENSIONS_XSHM_H +/* Define if you have a working `mmap' system call. */ +#undef HAVE_MMAP -/* Define if you have the header file. */ -#undef HAVE_CURSES_H +/* Define if you have the header file. */ +#undef HAVE_NCURSES_CURSES_H -/* Define if you have the header file. */ -#undef HAVE_DIRENT_H +/* Define if you have the header file. */ +#undef HAVE_NCURSES_H -/* Define if you have the header file. */ -#undef HAVE_DLFCN_H +/* Define if you have the header file, and it defines `DIR'. */ +#undef HAVE_NDIR_H -/* Define if you have the header file. */ -#undef HAVE_ERRNO_H +/* Define if you have the `popen' function. */ +#undef HAVE_POPEN -/* Define if you have the header file. */ -#undef HAVE_FCNTL_H +/* Define if you have the `select' function. */ +#undef HAVE_SELECT -/* Define if you have the header file. */ -#undef HAVE_GETOPT_H +/* Define if you have the `signal' function. */ +#undef HAVE_SIGNAL -/* Define if you have the header file. */ -#undef HAVE_GLOB_H +/* Define if you have the header file. */ +#undef HAVE_SLANG_H -/* Define if you have the header file. */ -#undef HAVE_LIMITS_H +/* Define if you have the header file. */ +#undef HAVE_SLANG_SLANG_H -/* Define if you have the header file. */ -#undef HAVE_MACHINE_ENDIAN_H +/* Define if you have the `sleep' function. */ +#undef HAVE_SLEEP -/* Define if you have the header file. */ -#undef HAVE_MALLOC_H +/* Define if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF -/* Define if you have the header file. */ -#undef HAVE_NCURSES_H +/* Define if you have the `socket' function. */ +#undef HAVE_SOCKET -/* Define if you have the header file. */ -#undef HAVE_NCURSES_CURSES_H +/* Define if you have the header file. */ +#undef HAVE_SOUNDCARD_H -/* Define if you have the header file. */ -#undef HAVE_NDIR_H +/* Define if you have the header file. */ +#undef HAVE_STDINT_H -/* Define if you have the header file. */ -#undef HAVE_SLANG_H +/* Define if you have the header file. */ +#undef HAVE_STDLIB_H -/* Define if you have the header file. */ -#undef HAVE_SLANG_SLANG_H +/* Define if you have the `strdup' function. */ +#undef HAVE_STRDUP -/* Define if you have the header file. */ -#undef HAVE_SOUNDCARD_H +/* Define if you have the `strerror' function. */ +#undef HAVE_STRERROR -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_STRINGS_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ +#undef HAVE_STRING_H + +/* Define if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define if you have the header file. */ #undef HAVE_STROPTS_H -/* Define if you have the header file. */ +/* Define if you have the `strstr' function. */ +#undef HAVE_STRSTR + +/* Define if you have the header file. */ #undef HAVE_SUN_AUDIOIO_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_ASOUNDLIB_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_AUDIOIO_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_AWE_VOICE_H -/* Define if you have the header file. */ +/* Define if you have the header file, and it defines `DIR'. */ #undef HAVE_SYS_DIR_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_IOCTL_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_IPC_H -/* Define if you have the header file. */ +/* Define if you have the header file, and it defines `DIR'. */ #undef HAVE_SYS_NDIR_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_PARAM_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_SHM_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_SOUNDCARD_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define if you have the header file. */ #undef HAVE_SYS_TIME_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* Define if you have the header file. */ +/* Define if you have that is POSIX.1 compatible. */ +#undef HAVE_SYS_WAIT_H + +/* Define if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if you have the ICE library (-lICE). */ -#undef HAVE_LIBICE +/* Define if you have the `usleep' function. */ +#undef HAVE_USLEEP -/* Define if you have the X11 library (-lX11). */ -#undef HAVE_LIBX11 +/* Define if you have the `vprintf' function. */ +#undef HAVE_VPRINTF -/* Define if you have the asound library (-lasound). */ -#undef HAVE_LIBASOUND +/* Define if you have the `vsnprintf' function. */ +#undef HAVE_VSNPRINTF -/* Define if you have the m library (-lm). */ -#undef HAVE_LIBM +/* Define if you have the header file. */ +#undef HAVE_X11_EXTENSIONS_XSHM_H -/* Define if you have the ossaudio library (-lossaudio). */ -#undef HAVE_LIBOSSAUDIO +/* Define if you have the header file. */ +#undef HAVE_X11_XMU_EXTAGENT_H -/* Define if you have the socket library (-lsocket). */ -#undef HAVE_LIBSOCKET +/* Define if you have the `XmuRegisterExternalAgent' function. */ +#undef HAVE_XMUREGISTEREXTERNALAGENT + +/* Define if you have the `XShmCreatePixmap' function. */ +#undef HAVE_XSHMCREATEPIXMAP + +/* Name of package */ +#undef PACKAGE + +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE + +/* Define if the `setvbuf' function takes the buffering type as its second + argument and the buffer pointer as the third, as on System V before release + 3. */ +#undef SETVBUF_REVERSED + +/* Define if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME + +/* Version number of package */ +#undef VERSION + +/* Define if your processor stores words with the most significant byte first + (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN + +/* Define if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + +/* Define if type `char' is unsigned and you are not using gcc. */ +#ifndef __CHAR_UNSIGNED__ +# undef __CHAR_UNSIGNED__ +#endif -/* Define if you have the vorbis library (-lvorbis). */ -#undef HAVE_LIBVORBIS +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +#undef inline + +/* Define to `long' if does not define. */ +#undef off_t + +/* Define to `int' if does not define. */ +#undef pid_t + +/* Define to `unsigned' if does not define. */ +#undef size_t diff -ruN TiMidity++-2.10.4/config.sub TiMidity++-2.11.0/config.sub --- TiMidity++-2.10.4/config.sub Sun Jan 9 18:15:21 2000 +++ TiMidity++-2.11.0/config.sub Wed Oct 31 17:17:17 2001 @@ -1,6 +1,10 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc. +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. + +timestamp='2001-08-13' + # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -25,6 +29,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# Please send patches to . +# # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. @@ -45,30 +51,73 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit 0;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - linux-gnu*) + nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -94,15 +143,33 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) + -apple | -axis) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; -sco5) - os=sco3.2v5 + os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) @@ -121,6 +188,9 @@ os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -isc) os=-isc2.2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -143,26 +213,59 @@ -psos*) os=-psos ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ - | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ - | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \ - | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \ - | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \ - | mips64 | mipsel | mips64el | mips64orion | mips64orionel \ - | mipstx39 | mipstx39el \ - | sparc | sparclet | sparclite | sparc64 | v850) + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | c4x | clipper \ + | d10v | d30v | dsp16xx \ + | fr30 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | m32r | m68000 | m68k | m88k | mcore \ + | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el | mips64vr4300 \ + | mips64vr4300el | mips64vr5000 | mips64vr5000el \ + | mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | ns16k | ns32k \ + | openrisc \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | s390 | s390x \ + | sh | sh[34] | sh[34]eb | shbe | shle \ + | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic80 | tron \ + | v850 \ + | we32k \ + | x86 | xscale \ + | z8k) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[34567]86) + i*86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -171,27 +274,64 @@ exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ - | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \ - | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \ - | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \ - | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mipstx39-* | mipstx39el-* \ - | f301-*) + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alphapca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armv*-* \ + | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c54x-* \ + | clipper-* | cray2-* | cydra-* \ + | d10v-* | d30v-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | m32r-* \ + | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | mcore-* \ + | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ + | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \ + | mipsle-* | mipstx39-* | mipstx39el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | s390-* | s390x-* \ + | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \ + | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ + | v850-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ + | ymp-* \ + | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; alliant | fx80) basic_machine=fx80-alliant ;; @@ -207,20 +347,24 @@ os=-sysv ;; amiga | amiga-*) - basic_machine=m68k-cbm + basic_machine=m68k-unknown ;; amigaos | amigados) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-amigaos ;; amigaunix | amix) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-sysv4 ;; apollo68) basic_machine=m68k-apollo os=-sysv ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; aux) basic_machine=m68k-apple os=-aux @@ -257,13 +401,16 @@ basic_machine=cray2-cray os=-unicos ;; - [ctj]90-cray) - basic_machine=c90-cray + [cjt]90) + basic_machine=${basic_machine}-cray os=-unicos ;; crds | unos) basic_machine=m68k-crds ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -297,6 +444,10 @@ encore | umax | mmax) basic_machine=ns32k-encore ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; fx2800) basic_machine=i860-alliant ;; @@ -307,6 +458,10 @@ basic_machine=tron-gmicro os=-sysv ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -315,6 +470,14 @@ basic_machine=h8300-hitachi os=-hms ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; harris) basic_machine=m88k-harris os=-sysv3 @@ -330,13 +493,30 @@ basic_machine=m68k-hp os=-hpux ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) basic_machine=m68k-hp ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) @@ -345,27 +525,42 @@ hppa-next) os=-nextstep3 ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[34567]86v32) + i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[34567]86v4*) + i*86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[34567]86v) + i*86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[34567]86sol2) + i*86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -391,9 +586,17 @@ basic_machine=ns32k-utek os=-sysv ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; miniframe) basic_machine=m68000-convergent ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; mipsel*-linux*) basic_machine=mipsel-unknown os=-linux-gnu @@ -408,10 +611,34 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; news | news700 | news800 | news900) basic_machine=m68k-sony os=-newsos @@ -424,6 +651,10 @@ basic_machine=mips-sony os=-newsos ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; next | m*-next ) basic_machine=m68k-next case $os in @@ -449,9 +680,32 @@ basic_machine=i960-intel os=-nindy ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) basic_machine=np1-gould ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -469,28 +723,28 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | nexen) + pentium | p5 | k5 | k6 | nexgen) basic_machine=i586-pc ;; - pentiumpro | p6 | k6 | 6x86) + pentiumpro | p6 | 6x86 | athlon) basic_machine=i686-pc ;; pentiumii | pentium2) - basic_machine=i786-pc + basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | nexen-*) + pentium-* | p5-* | k5-* | k6-* | nexgen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-* | k6-* | 6x86-*) + pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; - power) basic_machine=rs6000-ibm + power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ;; @@ -502,15 +756,37 @@ ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; sequent) basic_machine=i386-sequent ;; @@ -518,6 +794,10 @@ basic_machine=sh-hitachi os=-hms ;; + sparclite-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; sps7) basic_machine=m68k-bull os=-sysv2 @@ -525,6 +805,13 @@ spur) basic_machine=spur-unknown ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; sun2) basic_machine=m68000-sun ;; @@ -565,10 +852,22 @@ sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; symmetry) basic_machine=i386-sequent os=-dynix ;; + t3e) + basic_machine=t3e-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -586,6 +885,10 @@ basic_machine=a29k-nyu os=-sym1 ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; vaxv) basic_machine=vax-dec os=-sysv @@ -609,6 +912,18 @@ basic_machine=a29k-wrs os=-vxworks ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + windows32) + basic_machine=i386-pc + os=-windows32-msvcrt + ;; xmp) basic_machine=xmp-cray os=-unicos @@ -616,6 +931,10 @@ xps | xps100) basic_machine=xps100-honeywell ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -623,6 +942,15 @@ # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; mips) if [ x$os = x-linux-gnu ]; then basic_machine=mips-unknown @@ -639,13 +967,20 @@ vax) basic_machine=vax-dec ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; - sparc) + sh3 | sh4 | sh3eb | sh4eb) + basic_machine=sh-unknown + ;; + sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -657,6 +992,19 @@ orion105) basic_machine=clipper-highlevel ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 @@ -710,13 +1058,37 @@ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos*) + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto*) + os=-nto-qnx + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -726,6 +1098,12 @@ -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; + -wince*) + os=-wince + ;; -osfrose*) os=-osfrose ;; @@ -741,12 +1119,18 @@ -acis*) os=-aos ;; + -386bsd) + os=-bsd + ;; -ctix* | -uts*) os=-sysv ;; -ns2 ) os=-nextstep2 ;; + -nsk*) + os=-nsk + ;; # Preserve the version number of sinix5. -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` @@ -772,9 +1156,18 @@ # This must come after -sysvr4. -sysv*) ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; -xenix) os=-xenix ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; -none) ;; *) @@ -800,9 +1193,15 @@ *-acorn) os=-riscix1.2 ;; + arm*-rebel) + os=-linux + ;; arm*-semi) os=-aout ;; + pdp10-*) + os=-tops20 + ;; pdp11-*) os=-none ;; @@ -821,6 +1220,15 @@ # default. # os=-sunos4 ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -833,6 +1241,15 @@ *-ibm) os=-aix ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; *-hp) os=-hpux ;; @@ -893,9 +1310,21 @@ *-masscomp) os=-rtu ;; - f301-fujitsu) + f30[01]-fujitsu | f700-fujitsu) os=-uxpv ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; *) os=-none ;; @@ -917,9 +1346,15 @@ -aix*) vendor=ibm ;; + -beos*) + vendor=be + ;; -hpux*) vendor=hp ;; + -mpeix*) + vendor=hp + ;; -hiux*) vendor=hitachi ;; @@ -935,7 +1370,7 @@ -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) vendor=ibm ;; -ptx*) @@ -947,9 +1382,29 @@ -aux*) vendor=apple ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -ruN TiMidity++-2.10.4/configs/msc-config.h TiMidity++-2.11.0/configs/msc-config.h --- TiMidity++-2.10.4/configs/msc-config.h Sun Mar 18 15:32:48 2001 +++ TiMidity++-2.11.0/configs/msc-config.h Thu Dec 27 20:54:39 2001 @@ -256,18 +256,28 @@ /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET +/* Define if you have the vorbis library (-lvorbis). */ +#define HAVE_LIBVORBIS + +/* Define if you have the vorbis library (-lgogo). */ +#define HAVE_LIBGOGO + /* Define if you havee the header file for Win32. */ #define HAVE_MMSYSTEM_H /* In VDS Macro AAA=BBB is not available. */ #define __W32__ -#define TIMID_VERSION "2.10.4" +#define TIMID_VERSION "2.11.0" #define DEFAULT_PATH ".\\" #define AU_W32 +#define AU_VORBIS +#define AU_GOGO #define WINSOCK #define __W32READDIR__ // #define URL_DIR_CACHE_ENABLE #define ANOTHER_MAIN +#define __W32G__ /* for Win32 GUI */ +#define SUPPORT_SOCKET /* for Visual Studio Project Option LIB: mmsystem.lib comdlg32.lib diff -ruN TiMidity++-2.10.4/configs/msc-config.h.in TiMidity++-2.11.0/configs/msc-config.h.in --- TiMidity++-2.10.4/configs/msc-config.h.in Sun Mar 18 15:32:48 2001 +++ TiMidity++-2.11.0/configs/msc-config.h.in Thu Dec 27 20:54:39 2001 @@ -256,6 +256,12 @@ /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET +/* Define if you have the vorbis library (-lvorbis). */ +#define HAVE_LIBVORBIS + +/* Define if you have the vorbis library (-lgogo). */ +#define HAVE_LIBGOGO + /* Define if you havee the header file for Win32. */ #define HAVE_MMSYSTEM_H @@ -264,10 +270,14 @@ #define TIMID_VERSION "@VERSION@" #define DEFAULT_PATH ".\\" #define AU_W32 +#define AU_VORBIS +#define AU_GOGO #define WINSOCK #define __W32READDIR__ // #define URL_DIR_CACHE_ENABLE #define ANOTHER_MAIN +#define __W32G__ /* for Win32 GUI */ +#define SUPPORT_SOCKET /* for Visual Studio Project Option LIB: mmsystem.lib comdlg32.lib diff -ruN TiMidity++-2.10.4/configure TiMidity++-2.11.0/configure --- TiMidity++-2.10.4/configure Tue Mar 13 12:55:45 2001 +++ TiMidity++-2.11.0/configure Thu Dec 27 19:55:57 2001 @@ -1,136 +1,155 @@ #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# Generated by Autoconf 2.52. # +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# Defaults: -ac_help= +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Name of the executable. +as_me=`echo "$0" |sed 's,.*[\\/],,'` + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +as_executable_p="test -f" + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + +# NLS nuisances. +$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } +$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } +$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } +$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } +$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } +$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } +$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } +$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } + +# Name of the host. +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +exec 6>&1 + +# +# Initializations. +# ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_help="$ac_help - --enable-debug Build a debugging version." -ac_help="$ac_help - --with-includes=DIR Specify include directories (colon separated)" -ac_help="$ac_help - --with-libraries=DIR Specify library directories (colon separated)" -ac_help="$ac_help - --with-elf create ELF shared object instead of AOUT " -ac_help="$ac_help - --with-x use the X Window System" -ac_help="$ac_help - --with-tcl-includes=DIR Tcl include file path " -ac_help="$ac_help - --with-tcl-libs=DIR Tcl library file path " -ac_help="$ac_help - --with-tk-includes=DIR Tk include file path " -ac_help="$ac_help - --with-tk-libs=DIR Tk library 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 - --with-nas-library=library NAS absolute library path (Don't use -laudio)" -ac_help="$ac_help - --with-nas-includes=DIR NAS include files are in dir" -ac_help="$ac_help - --enable-audio[=mode_list] Enable audio (Specify comma separated mode list): - default: Automatically select audio device. - oss: OSS /dev/dsp - sun: SunOS /dev/audio - hpux: HPUX /dev/audio - irix: IRIX audio library - mme: OSF/1 MME - sb_dsp: BSD/OS 2.0 /dev/sb_dsp - w32: Windows MMS - alsa: ALSA pcm device - alib: HPUX network audio (Alib) - nas: NAS - Network Audio System - esd: EsounD - vorbis: Ogg Vorbis" -ac_help="$ac_help - --with-default-output= Specify default output mode (optional): - default|alsa|alib|nas|esd|wav|au|aiff|list|vorbis" -ac_help="$ac_help - --enable-esd EsounD (Obsoleted. Use --enable-audio=esd)" -ac_help="$ac_help - --enable-nas NAS (Obsoleted. Use --enable-audio=nas)" -ac_help="$ac_help - --enable-alsa ALSA (Obsoleted. Use --enable-audio=alsa)" -ac_help="$ac_help - --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)" -ac_help="$ac_help - --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)" -ac_help="$ac_help - --disable-alsatest Do not try to compile and run a test Alsa program" -ac_help="$ac_help - --with-esd-prefix=PFX Prefix where ESD is installed (optional)" -ac_help="$ac_help - --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)" -ac_help="$ac_help - --disable-esdtest Do not try to compile and run a test ESD program" -ac_help="$ac_help - --enable-interface=[interface_list] Comma separated interface list " -ac_help="$ac_help - --enable-dynamic Enable dynamic link interface (default is no) - --enable-dynamic=dynamic_list Comma separated dynamic interface list" -ac_help="$ac_help - --enable-ncurses Enable ncurses interface (default is no)" -ac_help="$ac_help - --enable-slang Enable slang interface (default is no)" -ac_help="$ac_help - --enable-motif Enable motif interface (default is no)" -ac_help="$ac_help - --enable-tcltk Enable tcltk interface (default is no)" -ac_help="$ac_help - --enable-emacs Enable emacs interface (default is no)" -ac_help="$ac_help - --enable-vt100 Enable VT100 interface (default is no)" -ac_help="$ac_help - --enable-xaw Enable athena interface (default is no)" -ac_help="$ac_help - --enable-xskin Enable X skin interface (default is no)" -ac_help="$ac_help - --enable-gtk Enable GTK+ interface (default is no)" -ac_help="$ac_help - --with-gtk-prefix=PFX Prefix where GTK is installed (optional)" -ac_help="$ac_help - --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)" -ac_help="$ac_help - --disable-gtktest Do not try to compile and run a test GTK program" -ac_help="$ac_help - --enable-server Enable server interface (default is no)" -ac_help="$ac_help - --enable-alsaseq Enable ALSA sequencer server interface (default is no)" -ac_help="$ac_help - --enable-w32gui Enable Windows GUI interface (default is no)" -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-spline=[method] Specify spline method: no|linear|cubic|lagrange - (default is linear)" -ac_help="$ac_help - --enable-wrd Enable WRD interface for X (default is no)" +cross_compiling=no +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} + +# Maximum number of lines to put in a shell here document. +# This variable seems obsolete. It should probably be removed, and +# only ac_max_sed_lines should be used. +: ${ac_max_here_lines=38} + +ac_unique_file="timidity/timidity.c" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif +#if HAVE_UNISTD_H +# include +#endif" # Initialize some variables set by options. +ac_init_help= +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -build=NONE -cache_file=./config.cache +cache_file=/dev/null exec_prefix=NONE -host=NONE no_create= -nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -139,10 +158,15 @@ silent= site= srcdir= -target=NONE verbose= x_includes=NONE x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' @@ -156,17 +180,16 @@ infodir='${prefix}/info' mandir='${prefix}/man' -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= ac_prev= for ac_option do - # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then eval "$ac_prev=\$ac_option" @@ -174,59 +197,59 @@ continue fi - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` # Accept the important Cygnus configure options, so we can diagnose typos. - case "$ac_option" in + case $ac_option in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; + bindir=$ac_optarg ;; -build | --build | --buil | --bui | --bu) - ac_prev=build ;; + ac_prev=build_alias ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; + build_alias=$ac_optarg ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | --da=*) - datadir="$ac_optarg" ;; + datadir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + eval "enable_$ac_feature=no" ;; -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac - eval "enable_${ac_feature}='$ac_optarg'" ;; + eval "enable_$ac_feature='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -235,95 +258,47 @@ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; + exec_prefix=$ac_optarg ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; -host | --host | --hos | --ho) - ac_prev=host ;; + ac_prev=host_alias ;; -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; + host_alias=$ac_optarg ;; -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; + includedir=$ac_optarg ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; + infodir=$ac_optarg ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; + libdir=$ac_optarg ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; + libexecdir=$ac_optarg ;; -localstatedir | --localstatedir | --localstatedi | --localstated \ | --localstate | --localstat | --localsta | --localst \ @@ -332,12 +307,12 @@ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; + localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; + mandir=$ac_optarg ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. @@ -358,26 +333,26 @@ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; + oldincludedir=$ac_optarg ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; + prefix=$ac_optarg ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; + program_prefix=$ac_optarg ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; + program_suffix=$ac_optarg ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -394,7 +369,7 @@ | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; + program_transform_name=$ac_optarg ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) @@ -404,7 +379,7 @@ ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; + sbindir=$ac_optarg ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -415,58 +390,57 @@ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; + sharedstatedir=$ac_optarg ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; + site=$ac_optarg ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; + srcdir=$ac_optarg ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; + sysconfdir=$ac_optarg ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; + ac_prev=target_alias ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; + target_alias=$ac_optarg ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac - eval "with_${ac_package}='$ac_optarg'" ;; + eval "with_$ac_package='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/-/_/g'` + eval "with_$ac_package=no" ;; --x) # Obsolete; use --with-x. @@ -477,98 +451,98 @@ ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; + x_includes=$ac_optarg ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; + x_libraries=$ac_optarg ;; - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` + eval "$ac_envvar='$ac_optarg'" + export $ac_envvar ;; + *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac done if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi -exec 5>./config.log -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 +# Be sure to have absolute paths. +for ac_var in exec_prefix prefix +do + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac +done -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg +# Be sure to have absolute paths. +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* ) ;; + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; esac done -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: should be removed in autoconf 3.0. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=timidity/timidity.c +test "$silent" = yes && exec 6>/dev/null # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then @@ -579,13 +553,388 @@ fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { (exit 1); exit 1; }; } else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { (exit 1); exit 1; }; } fi fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +ac_env_build_alias_set=${build_alias+set} +ac_env_build_alias_value=$build_alias +ac_cv_env_build_alias_set=${build_alias+set} +ac_cv_env_build_alias_value=$build_alias +ac_env_host_alias_set=${host_alias+set} +ac_env_host_alias_value=$host_alias +ac_cv_env_host_alias_set=${host_alias+set} +ac_cv_env_host_alias_value=$host_alias +ac_env_target_alias_set=${target_alias+set} +ac_env_target_alias_value=$target_alias +ac_cv_env_target_alias_set=${target_alias+set} +ac_cv_env_target_alias_value=$target_alias +ac_env_CC_set=${CC+set} +ac_env_CC_value=$CC +ac_cv_env_CC_set=${CC+set} +ac_cv_env_CC_value=$CC +ac_env_CFLAGS_set=${CFLAGS+set} +ac_env_CFLAGS_value=$CFLAGS +ac_cv_env_CFLAGS_set=${CFLAGS+set} +ac_cv_env_CFLAGS_value=$CFLAGS +ac_env_LDFLAGS_set=${LDFLAGS+set} +ac_env_LDFLAGS_value=$LDFLAGS +ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +ac_cv_env_LDFLAGS_value=$LDFLAGS +ac_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_env_CPPFLAGS_value=$CPPFLAGS +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_cv_env_CPPFLAGS_value=$CPPFLAGS +ac_env_CPP_set=${CPP+set} +ac_env_CPP_value=$CPP +ac_cv_env_CPP_set=${CPP+set} +ac_cv_env_CPP_value=$CPP + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat < Specify default output mode (optional): + default|alsa|alib|nas|esd|wav|au|aiff|list|vorbis|gogo + --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional) + --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional) + --with-esd-prefix=PFX Prefix where ESD is installed (optional) + --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional) + --with-ogg-prefix=PFX Prefix where libogg is installed (optional) + --with-vorbis-prefix=PFX Prefix where libvorbis is installed (optional) + --with-gtk-prefix=PFX Prefix where GTK is installed (optional) + --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory + CPP C preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +EOF +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + ac_popdir=`pwd` + for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue + cd $ac_subdir + # A "../" for each directory in /$ac_subdir. + ac_dots=`echo $ac_subdir | + sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` + + case $srcdir in + .) # No --srcdir option. We are building in place. + ac_sub_srcdir=$srcdir ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_sub_srcdir=$srcdir/$ac_subdir ;; + *) # Relative path. + ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; + esac + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_sub_srcdir/configure.gnu; then + echo + $SHELL $ac_sub_srcdir/configure.gnu --help=recursive + elif test -f $ac_sub_srcdir/configure; then + echo + $SHELL $ac_sub_srcdir/configure --help=recursive + elif test -f $ac_sub_srcdir/configure.ac || + test -f $ac_sub_srcdir/configure.in; then + echo + $ac_configure --help + else + echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 + fi + cd $ac_popdir + done +fi + +test -n "$ac_init_help" && exit 0 +if $ac_init_version; then + cat <<\EOF + +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +EOF + exit 0 +fi +exec 5>config.log +cat >&5 </dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +PATH = $PATH + +_ASUNAME +} >&5 + +cat >&5 <\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + ac_sep=" " ;; + *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" + ac_sep=" " ;; + esac + # Get rid of the leading space. +done + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + echo >&5 + echo "## ----------------- ##" >&5 + echo "## Cache variables. ##" >&5 + echo "## ----------------- ##" >&5 + echo >&5 + # The following way of writing the cache mishandles newlines in values, +{ + (set) 2>&1 | + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in + *ac_space=\ *) + sed -n \ + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + ;; + *) + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} >&5 + sed "/^$/d" confdefs.h >conftest.log + if test -s conftest.log; then + echo >&5 + echo "## ------------ ##" >&5 + echo "## confdefs.h. ##" >&5 + echo "## ------------ ##" >&5 + echo >&5 + cat conftest.log >&5 + fi + (echo; echo) >&5 + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" >&5 + echo "$as_me: exit $exit_status" >&5 + rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && + exit $exit_status + ' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo >confdefs.h +# Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then @@ -596,40 +945,107 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" + { echo "$as_me:948: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 . "$ac_site_file" fi done if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { echo "$as_me:959: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; + *) . ./$cache_file;; + esac + fi else - echo "creating cache $cache_file" - > $cache_file + { echo "$as_me:967: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in `(set) 2>&1 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val="\$ac_cv_env_${ac_var}_value" + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:983: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { echo "$as_me:987: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + { echo "$as_me:993: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:995: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:997: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. It doesn't matter if + # we pass some twice (in addition to the command line arguments). + if test "$ac_new_set" = set; then + case $ac_new_val in + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" + ;; + esac + fi +done +if $ac_cache_corrupted; then + { echo "$as_me:1016: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:1018: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } fi ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac +echo "#! $SHELL" >conftest.sh +echo "exit 0" >>conftest.sh +chmod +x conftest.sh +if { (echo "$as_me:1038: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? + echo "$as_me:1041: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' else - ac_n= ac_c='\c' ac_t= + ac_path_separator=: fi - +PATH_SEPARATOR="$ac_path_separator" +rm -f conftest.sh SHELL=${CONFIG_SHELL-/bin/sh} ac_aux_dir= @@ -642,104 +1058,100 @@ ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break + elif test -f $ac_dir/shtool; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + { { echo "$as_me:1068: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); exit 1; }; } +fi +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - -# Do some error checking and defaulting for the host and target type. -# The inputs are: -# configure --host=HOST --target=TARGET --build=BUILD NONOPT -# -# The rules are: -# 1. You are not allowed to specify --host, --target, and nonopt at the -# same time. -# 2. Host defaults to nonopt. -# 3. If nonopt is not specified, then host defaults to the current host, -# as determined by config.guess. -# 4. Target and build default to nonopt. -# 5. If nonopt is not specified, then target and build default to host. +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:1078: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:1082: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:1091: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:1095: error: $ac_config_sub $ac_cv_build_alias failed." >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1100: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +echo "$as_me:1107: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:1116: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1121: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 +host=$ac_cv_host +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +echo "$as_me:1128: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6 +if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_target_alias=$target_alias +test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias +ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || + { { echo "$as_me:1137: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1142: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6 +target=$ac_cv_target +target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` # The aliases save the names the user supplied, while $host etc. # will get canonicalized. -case $host---$target---$nonopt in -NONE---*---* | *---NONE---* | *---*---NONE) ;; -*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; -esac - - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:683: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - -echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:704: checking target system type" >&5 - -target_alias=$target -case "$target_alias" in -NONE) - case $nonopt in - NONE) target_alias=$host_alias ;; - *) target_alias=$nonopt ;; - esac ;; -esac - -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$target" 1>&6 - -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:722: checking build system type" >&5 - -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; -esac - -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 - -test "$host_alias" != "$target_alias" && +test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -747,31 +1159,39 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # 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:756: checking for a BSD compatible install" >&5 +echo "$as_me:1167: checking for a BSD compatible install" >&5 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + ac_save_IFS=$IFS; IFS=$ac_path_separator for ac_dir in $PATH; do + IFS=$ac_save_IFS # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + case $ac_dir/ in + / | ./ | .// | /cC/* \ + | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ + | /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if $as_executable_p "$ac_dir/$ac_prog"; then if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : + elif test $ac_prog = install && + grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -781,208 +1201,265 @@ ;; esac done - IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" + INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. We don't cache a # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the path is relative. - INSTALL="$ac_install_sh" + INSTALL=$ac_install_sh fi fi -echo "$ac_t""$INSTALL" 1>&6 +echo "$as_me:1216: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:809: checking whether build environment is sane" >&5 +echo "$as_me:1227: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 -echo timestamp > conftestfile +echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` + set X `ls -t $srcdir/configure conftest.file` fi - if test "$*" != "X $srcdir/configure conftestfile" \ - && test "$*" != "X conftestfile $srcdir/configure"; then + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { echo "configure: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" 1>&2; exit 1; } + { { echo "$as_me:1251: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&5 +echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&2;} + { (exit 1); exit 1; }; } fi - test "$2" = conftestfile + test "$2" = conftest.file ) then # Ok. : else - { echo "configure: error: newly created file is older than distributed files! -Check your system clock" 1>&2; exit 1; } -fi -rm -f conftest* -echo "$ac_t""yes" 1>&6 -if test "$program_transform_name" = s,x,x,; then - program_transform_name= -else - # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g -EOF_SED - program_transform_name="`echo $program_transform_name|sed -f conftestsed`" - rm -f conftestsed + { { echo "$as_me:1264: error: newly created file is older than distributed files! +Check your system clock" >&5 +echo "$as_me: error: newly created file is older than distributed files! +Check your system clock" >&2;} + { (exit 1); exit 1; }; } fi +echo "$as_me:1270: result: yes" >&5 +echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},; $program_transform_name" + program_transform_name="s,^,$program_prefix,;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" + program_transform_name="s,\$,$program_suffix,;$program_transform_name" +# Double any \ or $. echo might interpret backslashes. +# By default was `s,x,x', remove it if useless. +cat <<\_ACEOF >conftest.sed +s/[\\$]/&&/g;s/;s,x,x,$// +_ACEOF +program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +rm conftest.sed + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` + +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + am_backtick='`' + { echo "$as_me:1295: WARNING: ${am_backtick}missing' script is too old or missing" >&5 +echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} +fi + +for ac_prog in mawk gawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:1303: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_AWK="$ac_prog" +echo "$as_me:1318: found $ac_dir/$ac_word" >&5 +break +done -# sed with no file args requires a program. -test "$program_transform_name" = "" && program_transform_name="s,x,x," +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + echo "$as_me:1326: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6 +else + echo "$as_me:1329: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:866: 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 + test -n "$AWK" && break +done + +echo "$as_me:1336: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftestmake <<\EOF + cat >conftest.make <<\EOF all: @echo 'ac_maketemp="${MAKE}"' EOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then eval ac_cv_prog_make_${ac_make}_set=yes else eval ac_cv_prog_make_${ac_make}_set=no fi -rm -f conftestmake +rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 + echo "$as_me:1356: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$ac_t""no" 1>&6 + echo "$as_me:1360: result: no" >&5 +echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi +# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval="$enable_dependency_tracking" -PACKAGE=TiMidity++ - -VERSION=2.10.4 - -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; } +fi; +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' fi - - -missing_dir=`cd $ac_aux_dir && pwd` -echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:905: 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. -if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal - echo "$ac_t""found" 1>&6 +if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' else - ACLOCAL="$missing_dir/missing aclocal" - echo "$ac_t""missing" 1>&6 + AMDEP_TRUE='#' + AMDEP_FALSE= fi -echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:918: 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. -if (autoconf --version) < /dev/null > /dev/null 2>&1; then - AUTOCONF=autoconf - echo "$ac_t""found" 1>&6 +rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then + DEPDIR=.deps else - AUTOCONF="$missing_dir/missing autoconf" - echo "$ac_t""missing" 1>&6 + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps fi +rmdir .deps 2>/dev/null -echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:931: 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. -if (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake - echo "$ac_t""found" 1>&6 -else - AUTOMAKE="$missing_dir/missing automake" - echo "$ac_t""missing" 1>&6 +# test to see if srcdir already configured +if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + { { echo "$as_me:1396: error: source directory already configured; run \"make distclean\" there first" >&5 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } fi -echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:944: 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. -if (autoheader --version) < /dev/null > /dev/null 2>&1; then - AUTOHEADER=autoheader - echo "$ac_t""found" 1>&6 -else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$ac_t""missing" 1>&6 -fi +# Define the identity of the package. +PACKAGE=TiMidity++ +VERSION=2.11.0 -echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:957: 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. -if (makeinfo --version) < /dev/null > /dev/null 2>&1; then - MAKEINFO=makeinfo - echo "$ac_t""found" 1>&6 -else - MAKEINFO="$missing_dir/missing makeinfo" - echo "$ac_t""missing" 1>&6 -fi +cat >>confdefs.h <>confdefs.h <&6 -echo "configure:972: checking whether grep returns status" >&5 -echo "grimblepritz" >grimble -if grep blurfldyick grimble >/dev/null 2>&1 ; then - contains="./contains" -elif grep grimblepritz grimble >/dev/null 2>&1 ; then - contains=grep +# Autoconf 2.50 always computes EXEEXT. However we need to be +# compatible with 2.13, for now. So we always define EXEEXT, but we +# don't compute it. + +# Similar for OBJEXT -- only we only use OBJEXT if the user actually +# requests that it be used. This is a bit dumb. +: ${OBJEXT=o} + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +install_sh=${install_sh-"$am_aux_dir/install-sh"} + +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. + +echo "$as_me:1445: checking whether grep returns status" >&5 +echo $ECHO_N "checking whether grep returns status... $ECHO_C" >&6 +echo "grimblepritz" >grimble +if grep blurfldyick grimble >/dev/null 2>&1 ; then + contains="./contains" +elif grep grimblepritz grimble >/dev/null 2>&1 ; then + contains=grep else contains="./contains" fi rm -f grimble case "$contains" in -grep) echo "$ac_t""yes" 1>&6 +grep) echo "$as_me:1457: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; ./contains) - echo "$ac_t""AGH! Grep doesn't return a status. Attempting remedial action." 1>&6 + echo "$as_me:1461: result: AGH! Grep doesn't return a status. Attempting remedial action." >&5 +echo "${ECHO_T}AGH! Grep doesn't return a status. Attempting remedial action." >&6 cat >./contains <<'EOSS' grep "$1" "$2" >.greptmp && cat .greptmp && test -s .greptmp EOSS @@ -990,91 +1467,91 @@ ;; esac + ac_config_headers="$ac_config_headers config.h" + ac_config_headers="$ac_config_headers interface.h" +# Check whether --with-lispdir or --without-lispdir was given. +if test "${with_lispdir+set}" = set; then + withval="$with_lispdir" + lispdir="$withval" + echo "$as_me:1478: checking where .elc files should go" >&5 +echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6 + echo "$as_me:1480: result: $lispdir" >&5 +echo "${ECHO_T}$lispdir" >&6 +else - - -# If set to t, that means we are running in a shell under Emacs. + # If set to t, that means we are running in a shell under Emacs. # If you have an Emacs named "t", then use the full path. - test "$EMACS" = t && EMACS= + test x"$EMACS" = xt && EMACS= for ac_prog in emacs xemacs do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1007: 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 - case "$EMACS" in - /*) - ac_cv_path_EMACS="$EMACS" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_EMACS="$EMACS" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_EMACS="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac +echo "$as_me:1491: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_EMACS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$EMACS"; then + ac_cv_prog_EMACS="$EMACS" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_EMACS="$ac_prog" +echo "$as_me:1506: found $ac_dir/$ac_word" >&5 +break +done + fi -EMACS="$ac_cv_path_EMACS" +fi +EMACS=$ac_cv_prog_EMACS if test -n "$EMACS"; then - echo "$ac_t""$EMACS" 1>&6 + echo "$as_me:1514: result: $EMACS" >&5 +echo "${ECHO_T}$EMACS" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:1517: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$EMACS" && break + test -n "$EMACS" && break done test -n "$EMACS" || EMACS="no" if test $EMACS != "no"; then - echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:1045: checking where .elc files should go" >&5 - lispdir="\$(datadir)/emacs/site-lisp" - emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'` - if test "x$prefix" = "xNONE"; then - if test -d $ac_default_prefix/share/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/share/$emacs_flavor/site-lisp" - else - if test -d $ac_default_prefix/lib/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp" + if test x${lispdir+set} != xset; then + echo "$as_me:1527: checking where .elc files should go" >&5 +echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6 +if test "${am_cv_lispdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + am_cv_lispdir=`$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' | sed -n -e 's,/$,,' -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}'` + if test -z "$am_cv_lispdir"; then + am_cv_lispdir='${datadir}/emacs/site-lisp' fi - fi - else - if test -d $prefix/share/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/share/$emacs_flavor/site-lisp" - else - if test -d $prefix/lib/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp" - fi - fi + +fi +echo "$as_me:1538: result: $am_cv_lispdir" >&5 +echo "${ECHO_T}$am_cv_lispdir" >&6 + lispdir="$am_cv_lispdir" fi - echo "$ac_t""$lispdir" 1>&6 fi - + +fi; # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" if test "$enableval" = "yes"; then CFLAGS="$CFLAGS -g" - fi + fi else - CFLAGS=${CFLAGS--O2} -fi - + CFLAGS=${CFLAGS--O2} +fi; EXTRACFLAGS= EXTRADEFS= @@ -1132,9 +1609,8 @@ j="${j}-I${i} " done CPPFLAGS="$j$CPPFLAGS" - -fi +fi; # Check whether --with-libraries or --without-libraries was given. if test "${with_libraries+set}" = set; then @@ -1144,218 +1620,581 @@ j="${j}-L${i} " done LDFLAGS="$j$LDFLAGS" - -fi +fi; + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +echo "$as_me:1634: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="${ac_tool_prefix}gcc" +echo "$as_me:1649: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:1657: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:1660: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -# Extract the first word of "gcc", so it can be a program name with args. +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # 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:1155: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:1669: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="gcc" +echo "$as_me:1684: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1692: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1695: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +echo "$as_me:1708: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="${ac_tool_prefix}cc" +echo "$as_me:1723: found $ac_dir/$ac_word" >&5 +break +done + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$as_me:1731: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:1734: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:1743: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="cc" +echo "$as_me:1758: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1766: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1769: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC else - echo "$ac_t""no" 1>&6 + CC="$ac_cv_prog_CC" fi +fi if test -z "$CC"; then # 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:1185: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:1782: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +fi +ac_cv_prog_CC="cc" +echo "$as_me:1802: found $ac_dir/$ac_word" >&5 +break +done + if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC shift - if test $# -gt 0; then + if test $# != 0; then # We chose a different compiler from the bogus one. # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" "$@" + set dummy "$ac_dir/$ac_word" ${1+"$@"} shift ac_cv_prog_CC="$@" fi fi fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$as_me:1824: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:1827: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1236: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:1838: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +echo "$as_me:1853: found $ac_dir/$ac_word" >&5 +break +done + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$as_me:1861: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:1864: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:1877: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="$ac_prog" +echo "$as_me:1892: found $ac_dir/$ac_word" >&5 +break +done + fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1900: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1903: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_CC" && break +done -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1268: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + CC=$ac_ct_CC +fi -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +fi -cat > conftest.$ac_ext << EOF +test -z "$CC" && { { echo "$as_me:1915: error: no acceptable cc found in \$PATH" >&5 +echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + +# Provide some information about the compiler. +echo "$as_me:1920:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:1923: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:1926: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1928: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:1931: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1933: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:1936: \$? = $ac_status" >&5 + (exit $ac_status); } -#line 1279 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 1940 "configure" #include "confdefs.h" -main(){return(0);} -EOF -if { (eval echo configure:1284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.exe" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +echo "$as_me:1956: checking for C compiler default output" >&5 +echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +if { (eval echo "$as_me:1959: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? + echo "$as_me:1962: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is +# not robust to junk in `.', hence go to wildcards (a.*) only as a last +# resort. +for ac_file in `ls a.exe conftest.exe 2>/dev/null; + ls a.out conftest 2>/dev/null; + ls a.* conftest.* 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + a.out ) # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool --akim. + export ac_cv_exeext + break;; + * ) break;; + esac +done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:1985: error: C compiler cannot create executables" >&5 +echo "$as_me: error: C compiler cannot create executables" >&2;} + { (exit 77); exit 77; }; } +fi + +ac_exeext=$ac_cv_exeext +echo "$as_me:1991: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6 + +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:1996: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (eval echo "$as_me:2002: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2005: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no else - ac_cv_prog_cc_cross=yes + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { echo "$as_me:2012: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'." >&5 +echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'." >&2;} + { (exit 1); exit 1; }; } + fi fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +echo "$as_me:2020: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +rm -f a.out a.exe conftest$ac_cv_exeext +ac_clean_files=$ac_clean_files_save +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:2027: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +echo "$as_me:2029: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6 + +echo "$as_me:2032: checking for executable suffix" >&5 +echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +if { (eval echo "$as_me:2034: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2037: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + export ac_cv_exeext + break;; + * ) break;; + esac +done +else + { { echo "$as_me:2053: error: cannot compute EXEEXT: cannot compile and link" >&5 +echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } +fi + +rm -f conftest$ac_cv_exeext +echo "$as_me:2059: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6 + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +echo "$as_me:2065: checking for object suffix" >&5 +echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 2071 "configure" +#include "confdefs.h" -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { 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:1310: 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 +int +main () +{ -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1315: 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 + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (eval echo "$as_me:2083: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2086: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:2098: error: cannot compute OBJEXT: cannot compile" >&5 +echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} + { (exit 1); exit 1; }; } +fi + +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +echo "$as_me:2105: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6 +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +echo "$as_me:2109: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_gcc=no -fi -fi + cat >conftest.$ac_ext <<_ACEOF +#line 2115 "configure" +#include "confdefs.h" -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 +int +main () +{ +#ifndef __GNUC__ + choke me +#endif -if test $ac_cv_prog_gcc = yes; then - GCC=yes + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2130: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2133: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2136: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2139: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_compiler_gnu=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +echo "$as_me:2151: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +GCC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +CFLAGS="-g" +echo "$as_me:2157: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - GCC= -fi + cat >conftest.$ac_ext <<_ACEOF +#line 2163 "configure" +#include "confdefs.h" -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1343: 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 - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2175: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2178: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2181: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2184: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else - ac_cv_prog_cc_g=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_prog_cc_g=no fi -rm -f conftest* - +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +echo "$as_me:2194: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" + CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then CFLAGS="-g -O2" @@ -1369,6 +2208,223 @@ CFLAGS= fi fi +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2221: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2224: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2227: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2230: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +#line 2242 "configure" +#include "confdefs.h" +#include +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2255: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2258: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2261: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2264: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +#line 2274 "configure" +#include "confdefs.h" +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2286: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2289: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2292: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2295: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_config_commands="$ac_config_commands default-1" + +am_make=${MAKE-make} +cat > confinc << 'END' +doit: + @echo done +END +# If we don't find an include directive, just comment out the code. +echo "$as_me:2330: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +am__include='#' +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote='"' + _am_result=BSD + fi +fi + +echo "$as_me:2357: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6 +rm -f confinc confmf + +depcc="$CC" am_compiler_list= + +echo "$as_me:2363: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +echo "$as_me:2425: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1377,31 +2433,39 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # 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:1386: checking for a BSD compatible install" >&5 +echo "$as_me:2441: checking for a BSD compatible install" >&5 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + ac_save_IFS=$IFS; IFS=$ac_path_separator for ac_dir in $PATH; do + IFS=$ac_save_IFS # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + case $ac_dir/ in + / | ./ | .// | /cC/* \ + | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ + | /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if $as_executable_p "$ac_dir/$ac_prog"; then if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : + elif test $ac_prog = install && + grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -1411,85 +2475,119 @@ ;; esac done - IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" + INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. We don't cache a # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the path is relative. - INSTALL="$ac_install_sh" + INSTALL=$ac_install_sh fi fi -echo "$ac_t""$INSTALL" 1>&6 +echo "$as_me:2490: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# 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:1441: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +echo "$as_me:2504: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +echo "$as_me:2519: found $ac_dir/$ac_word" >&5 +break +done + fi fi -RANLIB="$ac_cv_prog_RANLIB" +RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + echo "$as_me:2527: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:2530: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1469: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftestdata -if ln -s X conftestdata 2>/dev/null -then - rm -f conftestdata - ac_cv_prog_LN_S="ln -s" +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo "$as_me:2539: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_RANLIB="ranlib" +echo "$as_me:2554: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:2563: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - ac_cv_prog_LN_S=ln + echo "$as_me:2566: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + + RANLIB=$ac_ct_RANLIB +else + RANLIB="$ac_cv_prog_RANLIB" fi -LN_S="$ac_cv_prog_LN_S" -if test "$ac_cv_prog_LN_S" = "ln -s"; then - echo "$ac_t""yes" 1>&6 + +echo "$as_me:2575: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + echo "$as_me:2579: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:2582: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6 fi -echo $ac_n "checking whether -rdynamic option is recognized""... $ac_c" 1>&6 -echo "configure:1490: checking whether -rdynamic option is recognized" >&5 +echo "$as_me:2586: checking whether -rdynamic option is recognized" >&5 +echo $ECHO_N "checking whether -rdynamic option is recognized... $ECHO_C" >&6 ac_ccoption=`echo rdynamic | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'timidity_cv_ccoption_$ac_ccoption'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if eval "test \"\${timidity_cv_ccoption_$ac_ccoption+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat > conftest.$ac_ext <&6 - + echo "$as_me:2608: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else - echo "$ac_t""no" 1>&6 + echo "$as_me:2612: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - # Check whether --with-elf or --without-elf was given. if test "${with_elf+set}" = set; then withval="$with_elf" - ELFFORMAT=$withval + ELFFORMAT=$withval else - ELFFORMAT="yes" -fi - + ELFFORMAT="yes" +fi; case "$target" in *-*-hpux*) @@ -1601,336 +2699,512 @@ ;; esac - -echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:1607: 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 +echo "$as_me:2702: checking for sqrt in -lm" >&5 +echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6 +if test "${ac_cv_lib_m_sqrt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2710 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char sqrt(); - -int main() { -sqrt() -; return 0; } -EOF -if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2732: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2735: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2738: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_m_sqrt=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_m_sqrt=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:2749: result: $ac_cv_lib_m_sqrt" >&5 +echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6 +if test $ac_cv_lib_m_sqrt = yes; then + cat >>confdefs.h <&6 fi -echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1654: 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 +echo "$as_me:2760: checking for socket in -lsocket" >&5 +echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_socket+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2768 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socket(); - -int main() { -socket() -; return 0; } -EOF -if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2790: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2793: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2796: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_socket=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_socket_socket=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:2807: result: $ac_cv_lib_socket_socket" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 +if test $ac_cv_lib_socket_socket = yes; then + cat >>confdefs.h <&6 fi -echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1701: 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 +echo "$as_me:2818: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2826 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen(); - -int main() { -dlopen() -; return 0; } -EOF -if { (eval echo configure:1720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:2845: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2848: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2851: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2854: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:2865: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then lib_dl_opt=-ldl -else - echo "$ac_t""no" 1>&6 fi for ac_func in gethostbyname do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1743: 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 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:2874: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2880 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* 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() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +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(); +f = $ac_func; #endif -; return 0; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:2911: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2914: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2917: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2920: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:2930: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1793: 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 + +echo "$as_me:2939: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2947 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { -gethostbyname() -; return 0; } -EOF -if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2969: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2972: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2975: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_nsl_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:2986: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +if test $ac_cv_lib_nsl_gethostbyname = yes; then + cat >>confdefs.h <&6 fi - + fi done -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1843: checking how to run the C preprocessor" >&5 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +echo "$as_me:3005: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3026 "configure" #include "confdefs.h" #include -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then + Syntax error +_ACEOF +if { (eval echo "$as_me:3031: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:3037: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - 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:1881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line 3060 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:3064: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:3070: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <&5 +echo "${ECHO_T}$CPP" >&6 +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +#line 3117 "configure" #include "confdefs.h" #include -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then + Syntax error +_ACEOF +if { (eval echo "$as_me:3122: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:3128: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp + # Broken: fails on valid input. +continue fi -rm -f conftest* -fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line 3151 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:3155: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:3161: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break fi - CPP="$ac_cv_prog_CPP" +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : else - ac_cv_prog_CPP="$CPP" + { { echo "$as_me:3189: error: C preprocessor \"$CPP\" fails sanity check" >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } fi -echo "$ac_t""$CPP" 1>&6 -# If we find X, set shell vars x_includes and x_libraries to the -# paths, otherwise set no_x=yes. -# 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:1927: checking for X" >&5 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:3200: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then withval="$with_x" - : -fi +fi; # $have_x is `yes', `no', `disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. @@ -1940,16 +3214,16 @@ # Both variables are already set. have_x=yes else -if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else # One or both of the vars are not set, and there is no cached value. -ac_x_includes=NO ac_x_libraries=NO -rm -fr conftestdir -if mkdir conftestdir; then - cd conftestdir +ac_x_includes=no ac_x_libraries=no +rm -fr conftest.dir +if mkdir conftest.dir; then + cd conftest.dir # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' + cat >Imakefile <<'EOF' acfindx: @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' EOF @@ -1959,174 +3233,155 @@ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then + test -f $ac_im_libdir/libX11.$ac_extension; then ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. - case "$ac_im_incroot" in + case $ac_im_incroot in /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac - case "$ac_im_usrlibdir" in + case $ac_im_usrlibdir in /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi cd .. - rm -fr conftestdir + rm -fr conftest.dir fi -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include + +/usr/include/X11 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 + +/usr/local/X11/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include + +/usr/local/include/X11 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 + +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 + +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include + +/usr/openwin/include +/usr/openwin/share/include' +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3297 "configure" #include "confdefs.h" -#include <$x_direct_test_include> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* +#include +_ACEOF +if { (eval echo "$as_me:3301: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:3307: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # We can compile using X headers with no special include directory. ac_x_includes= else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - # Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Intrinsic.h"; then + ac_x_includes=$ac_dir + break + fi +done fi -rm -f conftest* -fi # $ac_x_includes = NO +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no -if test "$ac_x_libraries" = NO; then +if test "$ac_x_libraries" = no; then # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - # See if we find them without any special options. # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3340 "configure" #include "confdefs.h" - -int main() { -${x_direct_test_function}() -; return 0; } -EOF -if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" +#include +int +main () +{ +XtMalloc (0) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3352: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3355: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3358: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3361: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ - /usr/X11/lib \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11 \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11/lib \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11 \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - /lib/usr/lib/X11 \ - \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - ; \ + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do + # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then + if test -r $ac_dir/libXt.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi done done fi -rm -f conftest* -fi # $ac_x_libraries = NO +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi # $ac_x_libraries = no -if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then +if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then # Didn't find X anywhere. Cache the known absence of X. ac_cv_have_x="have_x=no" else @@ -2135,12 +3390,14 @@ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi fi + fi eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - echo "$ac_t""$have_x" 1>&6 + echo "$as_me:3399: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6 no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -2149,12 +3406,14 @@ # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 + echo "$as_me:3409: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define X_DISPLAY_MISSING 1 EOF @@ -2169,60 +3428,89 @@ X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - case "`(uname -sr) 2>/dev/null`" in + 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:2176: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + cat >conftest.$ac_ext <<_ACEOF +#line 3437 "configure" #include "confdefs.h" -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:2186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3449: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3452: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3455: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3458: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_R_nospace=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_R_nospace=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_R_nospace=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$ac_t""no" 1>&6 + echo "$as_me:3468: result: no" >&5 +echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3474 "configure" #include "confdefs.h" -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3486: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3489: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3492: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3495: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_R_space=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_R_space=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_R_space=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$ac_t""yes" 1>&6 + echo "$as_me:3505: result: yes" >&5 +echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$ac_t""neither works" 1>&6 + echo "$as_me:3509: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6 fi fi - LIBS="$ac_xsave_LIBS" + LIBS=$ac_xsave_LIBS esac fi @@ -2233,533 +3521,765 @@ if test "$ISC" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" else - # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And karl@cs.umb.edu says + # Martyn Johnson says this is needed for Ultrix, if the X + # libraries were built with DECnet support. And Karl Berry 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:2241: 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 -else - ac_save_LIBS="$LIBS" -LIBS="-ldnet $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3529 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa(); - -int main() { -dnet_ntoa() -; return 0; } -EOF -if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (); +int +main () +{ +XOpenDisplay (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3548: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3551: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3557: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : 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" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:3563: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 3571 "configure" +#include "confdefs.h" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dnet_ntoa (); +int +main () +{ +dnet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3590: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3593: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3596: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3599: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_dnet_ntoa=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dnet_dnet_ntoa=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:3610: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -else - echo "$ac_t""no" 1>&6 fi 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:2282: 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 + echo "$as_me:3617: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3625 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa(); - -int main() { -dnet_ntoa() -; return 0; } -EOF -if { (eval echo configure:2301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char dnet_ntoa (); +int +main () +{ +dnet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3644: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3647: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3650: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3653: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dnet_stub_dnet_ntoa=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:3664: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 +if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -else - echo "$ac_t""no" 1>&6 fi fi +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, # to get the SysV transport functions. - # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) + # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) # needs -lnsl. # 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:2330: checking for gethostbyname" >&5 -if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. + echo "$as_me:3683: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 +if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3689 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname(); below. */ + which can conflict with char gethostbyname (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +char (*f) (); +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_gethostbyname) || defined (__stub___gethostbyname) choke me #else -gethostbyname(); +f = gethostbyname; #endif -; return 0; } -EOF -if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_gethostbyname=no" -fi -rm -f conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3720: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3723: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3726: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3729: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_gethostbyname=no fi - -if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:3739: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2379: 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 + echo "$as_me:3743: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3751 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { -gethostbyname() -; return 0; } -EOF -if { (eval echo configure:2398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main () +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3770: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3773: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3776: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3779: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_nsl_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:3790: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -else - echo "$ac_t""no" 1>&6 fi + if test $ac_cv_lib_nsl_gethostbyname = no; then + echo "$as_me:3797: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 3805 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main () +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3824: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3827: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3830: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3833: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_bsd_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:3844: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 +if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +fi + + fi fi # lieder@skyler.mavd.honeywell.com says without -lsocket, # socket/setsockopt and other routines are undefined under SCO ODT # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says simon@lia.di.epfl.ch: it contains - # gethostby* variants that don't use the nameserver (or something). - # -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:2428: checking for connect" >&5 -if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # on later versions), says Simon Leinen: it contains gethostby* + # variants that don't use the nameserver (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. + echo "$as_me:3860: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6 +if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3866 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect(); below. */ + which can conflict with char connect (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect(); - -int main() { + builtin and then its argument prototype would still apply. */ +char connect (); +char (*f) (); +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_connect) || defined (__stub___connect) choke me #else -connect(); +f = connect; #endif -; return 0; } -EOF -if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_connect=no" -fi -rm -f conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3897: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3900: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3903: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3906: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_connect=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_connect=no fi - -if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:3916: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2477: 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 + echo "$as_me:3920: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3928 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect(); - -int main() { -connect() -; return 0; } -EOF -if { (eval echo configure:2496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char connect (); +int +main () +{ +connect (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3947: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3950: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3953: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3956: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_connect=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_socket_connect=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:3967: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 +if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -else - echo "$ac_t""no" 1>&6 fi fi - # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. - echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2520: checking for remove" >&5 -if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # Guillermo Gomez says -lposix is necessary on A/UX. + echo "$as_me:3976: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6 +if test "${ac_cv_func_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3982 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove(); below. */ + which can conflict with char remove (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove(); - -int main() { + builtin and then its argument prototype would still apply. */ +char remove (); +char (*f) (); +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_remove) || defined (__stub___remove) choke me #else -remove(); +f = remove; #endif -; return 0; } -EOF -if { (eval echo configure:2548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_remove=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_remove=no" -fi -rm -f conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4013: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4016: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4019: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4022: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_remove=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_remove=no fi - -if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:4032: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2569: 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 + echo "$as_me:4036: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 +if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4044 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove(); - -int main() { -remove() -; return 0; } -EOF -if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char remove (); +int +main () +{ +remove (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4063: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4066: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4069: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4072: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_posix_remove=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_posix_remove=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4083: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 +if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -else - echo "$ac_t""no" 1>&6 fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2612: checking for shmat" >&5 -if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:4092: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6 +if test "${ac_cv_func_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4098 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat(); below. */ + which can conflict with char shmat (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat(); - -int main() { + builtin and then its argument prototype would still apply. */ +char shmat (); +char (*f) (); +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_shmat) || defined (__stub___shmat) choke me #else -shmat(); +f = shmat; #endif -; return 0; } -EOF -if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shmat=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_shmat=no" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4129: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4132: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4135: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4138: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shmat=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_shmat=no fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:4148: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2661: 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 + echo "$as_me:4152: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4160 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat(); - -int main() { -shmat() -; return 0; } -EOF -if { (eval echo configure:2680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char shmat (); +int +main () +{ +shmat (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4179: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4182: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4185: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4188: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ipc_shmat=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ipc_shmat=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4199: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 +if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -else - echo "$ac_t""no" 1>&6 fi fi fi # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS="$LDFLAGS" + ac_save_LDFLAGS=$LDFLAGS test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to # check for ICE first), but we must link in the order -lSM -lICE or # we get undefined symbols. So assume we have SM if we have ICE. # These have to be linked with before -lX11, unlike the other # 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:2713: 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 + # John Interrante, Karl Berry + echo "$as_me:4217: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4225 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber(); - -int main() { -IceConnectionNumber() -; return 0; } -EOF -if { (eval echo configure:2732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char IceConnectionNumber (); +int +main () +{ +IceConnectionNumber (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4244: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4247: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4250: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4253: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ICE_IceConnectionNumber=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4264: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -else - echo "$ac_t""no" 1>&6 fi - LDFLAGS="$ac_save_LDFLAGS" + LDFLAGS=$ac_save_LDFLAGS fi - - if test "x$with_x" = xyes; then if test "x$have_x" = xno; then if test "x$x_config_flag" = xyes; then - { echo "configure: error: Could not configure X" 1>&2; exit 1; } + { { echo "$as_me:4277: error: Could not configure X" >&5 +echo "$as_me: error: Could not configure X" >&2;} + { (exit 1); exit 1; }; } else - echo "configure: warning: Could not configure X" 1>&2 + { echo "$as_me:4281: WARNING: Could not configure X" >&5 +echo "$as_me: WARNING: Could not configure X" >&2;} fi fi fi @@ -2775,699 +4295,911 @@ CPPFLAGS="$CPPFLAGS -I$x_includes" fi - echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2780: 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 +echo "$as_me:4298: checking for XOpenDisplay in -lX11" >&5 +echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 +if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4306 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay(); - -int main() { -XOpenDisplay() -; return 0; } -EOF -if { (eval echo configure:2799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 X11 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4328: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4331: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4334: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_X11_XOpenDisplay=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4345: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 +if test $ac_cv_lib_X11_XOpenDisplay = yes; then + cat >>confdefs.h <&6 fi - echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 -echo "configure:2827: 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 + echo "$as_me:4356: checking X11 version 6" >&5 +echo $ECHO_N "checking X11 version 6... $ECHO_C" >&6 + if test "${timidity_cv_x11_version_6+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4362 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ #if XlibSpecificationRelease < 6 fail; #endif -; return 0; } -EOF -if { (eval echo configure:2842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4377: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4380: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4383: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4386: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then timidity_cv_x11_version_6=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - timidity_cv_x11_version_6=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +timidity_cv_x11_version_6=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi if test "$timidity_cv_x11_version_6" = "yes"; then - echo "$ac_t""6 or newer" 1>&6 + echo "$as_me:4398: result: 6 or newer" >&5 +echo "${ECHO_T}6 or newer" >&6 else - echo "$ac_t""before 6" 1>&6 + echo "$as_me:4401: result: before 6" >&5 +echo "${ECHO_T}before 6" >&6 fi KEEPLIBS=$LIBS - echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6 -echo "configure:2862: 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 + echo "$as_me:4406: checking for XShapeCombineMask in -lXext" >&5 +echo $ECHO_N "checking for XShapeCombineMask in -lXext... $ECHO_C" >&6 +if test "${ac_cv_lib_Xext_XShapeCombineMask+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4414 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XShapeCombineMask(); - -int main() { -XShapeCombineMask() -; return 0; } -EOF -if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char XShapeCombineMask (); +int +main () +{ +XShapeCombineMask (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4433: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4436: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4439: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4442: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xext_XShapeCombineMask=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xext_XShapeCombineMask=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4453: result: $ac_cv_lib_Xext_XShapeCombineMask" >&5 +echo "${ECHO_T}$ac_cv_lib_Xext_XShapeCombineMask" >&6 +if test $ac_cv_lib_Xext_XShapeCombineMask = yes; then have_xext=yes; LIBS="-lXext $LIBS" else - echo "$ac_t""no" 1>&6 -have_xext=no + have_xext=no fi - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2903: 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 +echo "$as_me:4461: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4469 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber(); - -int main() { -IceConnectionNumber() -; return 0; } -EOF -if { (eval echo configure:2922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 ICE | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4491: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4494: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4497: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ICE_IceConnectionNumber=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4508: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then + cat >>confdefs.h <&6 fi - echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6 -echo "configure:2950: 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 + echo "$as_me:4519: checking for SmcOpenConnection in -lSM" >&5 +echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6 +if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lSM $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4527 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char SmcOpenConnection(); - -int main() { -SmcOpenConnection() -; return 0; } -EOF -if { (eval echo configure:2969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char SmcOpenConnection (); +int +main () +{ +SmcOpenConnection (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4546: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4549: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4552: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4555: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_SM_SmcOpenConnection=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_SM_SmcOpenConnection=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4566: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 +echo "${ECHO_T}$ac_cv_lib_SM_SmcOpenConnection" >&6 +if test $ac_cv_lib_SM_SmcOpenConnection = yes; then have_xprelibs=yes; LIBS="-lSM $LIBS" else - echo "$ac_t""no" 1>&6 -have_xprelibs=no + have_xprelibs=no fi - echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2991: 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 + echo "$as_me:4574: checking for XtVaAppInitialize in -lXt" >&5 +echo $ECHO_N "checking for XtVaAppInitialize in -lXt... $ECHO_C" >&6 +if test "${ac_cv_lib_Xt_XtVaAppInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4582 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XtVaAppInitialize(); - -int main() { -XtVaAppInitialize() -; return 0; } -EOF -if { (eval echo configure:3010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char XtVaAppInitialize (); +int +main () +{ +XtVaAppInitialize (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4601: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4604: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4607: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4610: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xt_XtVaAppInitialize=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xt_XtVaAppInitialize=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4621: result: $ac_cv_lib_Xt_XtVaAppInitialize" >&5 +echo "${ECHO_T}$ac_cv_lib_Xt_XtVaAppInitialize" >&6 +if test $ac_cv_lib_Xt_XtVaAppInitialize = yes; then have_xt=yes; LIBS="-lXt $LIBS" else - echo "$ac_t""no" 1>&6 -have_xt=no + have_xt=no fi - echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6 -echo "configure:3032: 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 + echo "$as_me:4629: checking for XmuInternAtom in -lXmu" >&5 +echo $ECHO_N "checking for XmuInternAtom in -lXmu... $ECHO_C" >&6 +if test "${ac_cv_lib_Xmu_XmuInternAtom+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXmu $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4637 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XmuInternAtom(); - -int main() { -XmuInternAtom() -; return 0; } -EOF -if { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char XmuInternAtom (); +int +main () +{ +XmuInternAtom (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4656: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4659: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4662: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4665: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xmu_XmuInternAtom=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xmu_XmuInternAtom=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4676: result: $ac_cv_lib_Xmu_XmuInternAtom" >&5 +echo "${ECHO_T}$ac_cv_lib_Xmu_XmuInternAtom" >&6 +if test $ac_cv_lib_Xmu_XmuInternAtom = yes; then LIBS="-lXmu $LIBS" -else - echo "$ac_t""no" 1>&6 fi - for ac_func in XmuRegisterExternalAgent +for ac_func in XmuRegisterExternalAgent do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3074: 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 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:4685: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4691 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* 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() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +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(); +f = $ac_func; #endif -; return 0; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4722: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4725: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4728: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4731: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:4741: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 -echo "configure:3127: 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 + echo "$as_me:4751: checking for XawInitializeWidgetSet in -lXaw3d" >&5 +echo $ECHO_N "checking for XawInitializeWidgetSet in -lXaw3d... $ECHO_C" >&6 +if test "${ac_cv_lib_Xaw3d_XawInitializeWidgetSet+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXaw3d $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4759 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XawInitializeWidgetSet(); - -int main() { -XawInitializeWidgetSet() -; return 0; } -EOF -if { (eval echo configure:3146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char XawInitializeWidgetSet (); +int +main () +{ +XawInitializeWidgetSet (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4778: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4781: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4784: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4787: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xaw3d_XawInitializeWidgetSet=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xaw3d_XawInitializeWidgetSet=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4798: result: $ac_cv_lib_Xaw3d_XawInitializeWidgetSet" >&5 +echo "${ECHO_T}$ac_cv_lib_Xaw3d_XawInitializeWidgetSet" >&6 +if test $ac_cv_lib_Xaw3d_XawInitializeWidgetSet = yes; then have_xaw=3d else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 -echo "configure:3165: 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 + echo "$as_me:4803: checking for XawInitializeWidgetSet in -lXaw" >&5 +echo $ECHO_N "checking for XawInitializeWidgetSet in -lXaw... $ECHO_C" >&6 +if test "${ac_cv_lib_Xaw_XawInitializeWidgetSet+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXaw $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4811 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XawInitializeWidgetSet(); - -int main() { -XawInitializeWidgetSet() -; return 0; } -EOF -if { (eval echo configure:3184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char XawInitializeWidgetSet (); +int +main () +{ +XawInitializeWidgetSet (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4830: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4833: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4836: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4839: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xaw_XawInitializeWidgetSet=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xaw_XawInitializeWidgetSet=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4850: result: $ac_cv_lib_Xaw_XawInitializeWidgetSet" >&5 +echo "${ECHO_T}$ac_cv_lib_Xaw_XawInitializeWidgetSet" >&6 +if test $ac_cv_lib_Xaw_XawInitializeWidgetSet = yes; then have_xaw=yes else - echo "$ac_t""no" 1>&6 -have_xaw=no + have_xaw=no fi - + fi - echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 -echo "configure:3208: 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 + echo "$as_me:4860: checking for XmCreateForm in -lXm" >&5 +echo $ECHO_N "checking for XmCreateForm in -lXm... $ECHO_C" >&6 +if test "${ac_cv_lib_Xm_XmCreateForm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4868 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XmCreateForm(); - -int main() { -XmCreateForm() -; return 0; } -EOF -if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char XmCreateForm (); +int +main () +{ +XmCreateForm (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4887: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4890: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4893: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4896: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xm_XmCreateForm=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xm_XmCreateForm=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:4907: result: $ac_cv_lib_Xm_XmCreateForm" >&5 +echo "${ECHO_T}$ac_cv_lib_Xm_XmCreateForm" >&6 +if test $ac_cv_lib_Xm_XmCreateForm = yes; then have_xm=yes else - echo "$ac_t""no" 1>&6 -have_xm=no + have_xm=no fi - for ac_func in XShmCreatePixmap +for ac_func in XShmCreatePixmap do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3251: 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 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:4918: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4924 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* 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() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +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(); +f = $ac_func; #endif -; return 0; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4955: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4958: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4961: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4964: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:4974: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done 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:3312: 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 +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +echo "$as_me:4990: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4996 "configure" #include "confdefs.h" #include #include <$ac_hdr> -int main() { -DIR *dirp = 0; -; return 0; } -EOF -if { (eval echo configure:3325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5014: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5017: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5020: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:5030: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + +ac_header_dirent=$ac_hdr; break fi + done # 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:3350: 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 + echo "$as_me:5043: checking for opendir in -ldir" >&5 +echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 +if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5051 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir(); - -int main() { -opendir() -; return 0; } -EOF -if { (eval echo configure:3369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5070: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5073: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5076: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5079: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dir_opendir=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dir_opendir=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:5090: result: $ac_cv_lib_dir_opendir" >&5 +echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 +if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" -else - echo "$ac_t""no" 1>&6 fi else -echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3391: 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 + echo "$as_me:5097: checking for opendir in -lx" >&5 +echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 +if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5105 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir(); - -int main() { -opendir() -; return 0; } -EOF -if { (eval echo configure:3410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5124: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5127: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5130: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5133: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_x_opendir=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_x_opendir=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:5144: result: $ac_cv_lib_x_opendir" >&5 +echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 +if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" -else - echo "$ac_t""no" 1>&6 fi fi -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3433: 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 +echo "$as_me:5152: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5158 "configure" #include "confdefs.h" #include #include #include #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* + +_ACEOF +if { (eval echo "$as_me:5166: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:5172: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5194 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "memchr" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -3476,16 +5208,16 @@ 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 <conftest.$ac_ext <<_ACEOF +#line 5212 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "free" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -3494,360 +5226,586 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5233 "configure" #include "confdefs.h" #include -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif -EOF -if { (eval echo configure:3513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:5259: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5262: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:5264: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5267: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_stdc=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 +echo "$as_me:5280: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define STDC_HEADERS 1 EOF fi -echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3537: 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 +echo "$as_me:5290: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 +if test "${ac_cv_header_sys_wait_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5296 "configure" #include "confdefs.h" #include #include #ifndef WEXITSTATUS -#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) #endif #ifndef WIFEXITED -#define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -int main() { -int s; -wait (&s); -s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; -; return 0; } -EOF -if { (eval echo configure:3558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main () +{ + int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5318: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5321: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5324: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5327: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_sys_wait_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_sys_wait_h=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_sys_wait_h=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6 +echo "$as_me:5337: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 if test $ac_cv_header_sys_wait_h = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_SYS_WAIT_H 1 EOF fi -for ac_hdr in fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h \ +for ac_header in fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h \ unistd.h dlfcn.h glob.h getopt.h errno.h machine/endian.h \ stropts.h sys/audioio.h sun/audioio.h sys/types.h \ sys/ipc.h sys/shm.h sys/param.h X11/extensions/XShm.h \ X11/Xmu/ExtAgent.h sys/soundcard.h soundcard.h sys/awe_voice.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3586: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:5354: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 5360 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:5364: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:5370: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done -ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:3624: 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 +echo "$as_me:5399: checking for string.h" >&5 +echo $ECHO_N "checking for string.h... $ECHO_C" >&6 +if test "${ac_cv_header_string_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5405 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +_ACEOF +if { (eval echo "$as_me:5409: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:5415: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_string_h=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_string_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 +echo "$as_me:5434: result: $ac_cv_header_string_h" >&5 +echo "${ECHO_T}$ac_cv_header_string_h" >&6 +if test $ac_cv_header_string_h = yes; then : else - echo "$ac_t""no" 1>&6 - EXTRADEFS="$EXTRADEFS -DNO_STRING_H " + EXTRADEFS="$EXTRADEFS -DNO_STRING_H " fi +echo "$as_me:5442: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line 5450 "configure" +#include "confdefs.h" +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:5499: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5502: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5505: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5508: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC -echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3658: checking for working const" >&5 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:5525: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:5528: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + +echo "$as_me:5533: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5539 "configure" #include "confdefs.h" -int main() { +int +main () +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } +#endif -/* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x; -/* SunOS 4.1.1 cc rejects this. */ -char const *const *ccp; -char **p; -/* NEC SVR4.0.2 mips cc rejects this. */ -struct point {int x, y;}; -static struct point const zero = {0,0}; -/* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in an arm - of an if-expression whose if-part is not a constant expression */ -const char *g = "string"; -ccp = &g + (g ? g-g : 0); -/* HPUX 7.0 cc rejects these. */ -++ccp; -p = (char**) ccp; -ccp = (char const *const *) p; -{ /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -} -{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; -} -{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; -} -{ /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + ; + return 0; } -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -} - -; return 0; } -EOF -if { (eval echo configure:3712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5597: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5600: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5603: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5606: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_const=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_const=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_const" 1>&6 +echo "$as_me:5616: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then - cat >> confdefs.h <<\EOF -#define const + +cat >>confdefs.h <<\EOF +#define const EOF fi -echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3733: 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 <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 5638 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5644: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5647: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5650: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5653: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:5663: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_c_char_unsigned=yes -else - rm -rf conftest* - ac_cv_c_char_unsigned=no + fi -rm -f conftest* +done +echo "$as_me:5673: checking whether char is unsigned" >&5 +echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6 +if test "${ac_cv_c_char_unsigned+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else -if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5679 "configure" #include "confdefs.h" -/* volatile prevents gcc2 from optimizing the test away on sparcs. */ -#if !defined(__STDC__) || __STDC__ != 1 -#define volatile -#endif -main() { - volatile char c = 255; exit(c < 0); -} -EOF -if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_c_char_unsigned=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !(((char) -1) < 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5691: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5694: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5697: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5700: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_char_unsigned=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_char_unsigned=yes fi -rm -fr conftest* -fi - -fi +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_char_unsigned" 1>&6 +echo "$as_me:5710: result: $ac_cv_c_char_unsigned" >&5 +echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6 if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define __CHAR_UNSIGNED__ 1 EOF fi -echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3796: 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 +echo "$as_me:5719: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 +if test "${ac_cv_c_bigendian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5727 "configure" #include "confdefs.h" #include #include -int main() { +int +main () +{ #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN bogus endian macros #endif -; return 0; } -EOF -if { (eval echo configure:3814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5744: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5747: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5750: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5753: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then # It does; now see whether it defined to BIG_ENDIAN or not. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5757 "configure" #include "confdefs.h" #include #include -int main() { +int +main () +{ #if BYTE_ORDER != BIG_ENDIAN not big endian #endif -; return 0; } -EOF -if { (eval echo configure:3829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5774: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5777: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5780: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5783: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_bigendian=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_bigendian=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_bigendian=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { { echo "$as_me:5799: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5804 "configure" #include "confdefs.h" -main () { +int +main () +{ /* Are we little or big endian? From Harbison&Steele. */ union { @@ -3857,490 +5815,673 @@ u.l = 1; exit (u.c[sizeof (long) - 1] == 1); } -EOF -if { (eval echo configure:3862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:5820: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5823: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:5825: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5828: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_bigendian=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_c_bigendian=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_bigendian=yes fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi - -echo "$ac_t""$ac_cv_c_bigendian" 1>&6 +echo "$as_me:5841: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6 if test $ac_cv_c_bigendian = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define WORDS_BIGENDIAN 1 EOF fi -echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3886: checking for inline" >&5 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:5851: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5859 "configure" #include "confdefs.h" +#ifndef __cplusplus +static $ac_kw int static_foo () {return 0; } +$ac_kw int foo () {return 0; } +#endif -int main() { -} $ac_kw foo() { -; return 0; } -EOF -if { (eval echo configure:3900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5868: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5871: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5874: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5877: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done fi - -echo "$ac_t""$ac_cv_c_inline" 1>&6 -case "$ac_cv_c_inline" in +echo "$as_me:5888: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 +case $ac_cv_c_inline in inline | yes) ;; - no) cat >> confdefs.h <<\EOF -#define inline + no) +cat >>confdefs.h <<\EOF +#define inline EOF ;; - *) cat >> confdefs.h <>confdefs.h <&6 -echo "configure:3926: 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 +echo "$as_me:5903: checking for off_t" >&5 +echo $ECHO_N "checking for off_t... $ECHO_C" >&6 +if test "${ac_cv_type_off_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5909 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +$ac_includes_default +int +main () +{ +if ((off_t *) 0) + return 0; +if (sizeof (off_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5924: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5927: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5930: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5933: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_off_t=yes else - rm -rf conftest* - ac_cv_type_off_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_off_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:5943: result: $ac_cv_type_off_t" >&5 +echo "${ECHO_T}$ac_cv_type_off_t" >&6 +if test $ac_cv_type_off_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_off_t" 1>&6 -if test $ac_cv_type_off_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:3959: 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 +echo "$as_me:5955: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5961 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +$ac_includes_default +int +main () +{ +if ((pid_t *) 0) + return 0; +if (sizeof (pid_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5976: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5979: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5982: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5985: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else - rm -rf conftest* - ac_cv_type_pid_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_pid_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:5995: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +if test $ac_cv_type_pid_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_pid_t" 1>&6 -if test $ac_cv_type_pid_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:3992: 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 +echo "$as_me:6007: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6013 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +$ac_includes_default +int +main () +{ +if ((size_t *) 0) + return 0; +if (sizeof (size_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6028: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6031: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6034: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6037: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_size_t=yes else - rm -rf conftest* - ac_cv_type_size_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_size_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:6047: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 +if test $ac_cv_type_size_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:4025: 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 +echo "$as_me:6059: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6065 "configure" #include "confdefs.h" #include #include #include -int main() { -struct tm *tp; -; return 0; } -EOF -if { (eval echo configure:4039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6081: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6084: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6087: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6090: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_time=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_time=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_time=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_header_time" 1>&6 +echo "$as_me:6100: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define TIME_WITH_SYS_TIME 1 EOF fi - -echo $ac_n "checking volatile declaration""... $ac_c" 1>&6 -echo "configure:4061: checking volatile declaration" >&5 -if eval "test \"`echo '$''{'timidity_cv_type_volatile'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:6110: checking volatile declaration" >&5 +echo $ECHO_N "checking volatile declaration... $ECHO_C" >&6 +if test "${timidity_cv_type_volatile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6116 "configure" #include "confdefs.h" -int main() { +int +main () +{ volatile int x -; return 0; } -EOF -if { (eval echo configure:4073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6128: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6131: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6134: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6137: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then timidity_cv_type_volatile=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - timidity_cv_type_volatile=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +timidity_cv_type_volatile=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$timidity_cv_type_volatile" 1>&6 +echo "$as_me:6147: result: $timidity_cv_type_volatile" >&5 +echo "${ECHO_T}$timidity_cv_type_volatile" >&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:4091: checking union semun declaration" >&5 -if eval "test \"`echo '$''{'timidity_cv_type_union_semun'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:6153: checking union semun declaration" >&5 +echo $ECHO_N "checking union semun declaration... $ECHO_C" >&6 +if test "${timidity_cv_type_union_semun+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6159 "configure" #include "confdefs.h" #include #include #include -int main() { +int +main () +{ union semun x -; return 0; } -EOF -if { (eval echo configure:4105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6173: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6176: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6179: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6182: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then timidity_cv_type_union_semun=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - timidity_cv_type_union_semun=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +timidity_cv_type_union_semun=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$timidity_cv_type_union_semun" 1>&6 +echo "$as_me:6192: result: $timidity_cv_type_union_semun" >&5 +echo "${ECHO_T}$timidity_cv_type_union_semun" >&6 if test $timidity_cv_type_union_semun = yes; then EXTRADEFS="$EXTRADEFS -DHAVE_UNION_SEMUN" fi if test "x$CYGNUS" = xyes; then - echo $ac_n "checking Cygwin new mmsystem""... $ac_c" 1>&6 -echo "configure:4124: checking Cygwin new mmsystem" >&5 -if eval "test \"`echo '$''{'timidity_cv_header_new_mmsystem'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:6199: checking Cygwin new mmsystem" >&5 +echo $ECHO_N "checking Cygwin new mmsystem... $ECHO_C" >&6 +if test "${timidity_cv_header_new_mmsystem+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6205 "configure" #include "confdefs.h" #include #include -int main() { +int +main () +{ return WOM_OPEN != 0x3BB -; return 0; } -EOF -if { (eval echo configure:4137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6218: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6221: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6224: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6227: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then timidity_cv_header_new_mmsystem=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - timidity_cv_header_new_mmsystem=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +timidity_cv_header_new_mmsystem=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$timidity_cv_header_new_mmsystem" 1>&6 +echo "$as_me:6237: result: $timidity_cv_header_new_mmsystem" >&5 +echo "${ECHO_T}$timidity_cv_header_new_mmsystem" >&6 if test $timidity_cv_header_new_mmsystem = yes; then EXTRADEFS="$EXTRADEFS -DHAVE_NEW_MMSYSTEM=1" fi fi -if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4157: 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 +if test $ac_cv_c_compiler_gnu = yes; then + echo "$as_me:6245: checking whether $CC needs -traditional" >&5 +echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 +if test "${ac_cv_prog_gcc_traditional+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6252 "configure" #include "confdefs.h" #include Autoconf TIOCGETP -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "$ac_pattern" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_prog_gcc_traditional=yes else - rm -rf conftest* ac_cv_prog_gcc_traditional=no fi rm -f conftest* - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6267 "configure" #include "confdefs.h" #include Autoconf TCGETA -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "$ac_pattern" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_prog_gcc_traditional=yes fi rm -f conftest* fi fi - -echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 +echo "$as_me:6280: result: $ac_cv_prog_gcc_traditional" >&5 +echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:4203: 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 +echo "$as_me:6287: checking for working memcmp" >&5 +echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 +if test "${ac_cv_func_memcmp_working+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - ac_cv_func_memcmp_clean=no + ac_cv_func_memcmp_working=no else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6296 "configure" #include "confdefs.h" -main() +int +main () { - char c0 = 0x40, c1 = 0x80, c2 = 0x81; - exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1); -} -EOF -if { (eval echo configure:4221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_func_memcmp_clean=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_memcmp_clean=no -fi -rm -fr conftest* -fi + /* Some versions of memcmp are not 8-bit clean. */ + char c0 = 0x40, c1 = 0x80, c2 = 0x81; + if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) + exit (1); -fi + /* The Next x86 OpenStep bug shows up only when comparing 16 bytes + or more and with at least one buffer not starting on a 4-byte boundary. + William Lewis provided this test program. */ + { + char foo[21]; + char bar[21]; + int i; + for (i = 0; i < 4; i++) + { + char *a = foo + i; + char *b = bar + i; + strcpy (a, "--------01111111"); + strcpy (b, "--------10000000"); + if (memcmp (a, b, 16) >= 0) + exit (1); + } + exit (0); + } -echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 -test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:6332: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6335: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:6337: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6340: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_memcmp_working=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_memcmp_working=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:6352: result: $ac_cv_func_memcmp_working" >&5 +echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6 +test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext" -for ac_hdr in unistd.h +for ac_header in stdlib.h unistd.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4242: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:6359: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 6365 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:6369: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:6375: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done for ac_func in getpagesize do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4281: 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 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:6407: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6413 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* 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() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +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(); +f = $ac_func; #endif -; return 0; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6444: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6447: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6450: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6453: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:6463: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done -echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:4334: 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 +echo "$as_me:6473: checking for working mmap" >&5 +echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 +if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6482 "configure" #include "confdefs.h" - +$ac_includes_default /* Thanks to Mike Haertel and Jim Avera for this test. Here is a matrix of mmap possibilities: mmap private not fixed @@ -4353,7 +6494,7 @@ back from the file, nor mmap's back from the file at a different address. (There have been systems where private was not correctly implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the filesystem buffer cache + VM page cache was not coherent with the file system buffer cache like early versions of FreeBSD and possibly contemporary NetBSD.) For shared mappings, we should conversely verify that changes get propogated back to all the places they're supposed to be. @@ -4362,25 +6503,25 @@ The main things grep needs to know about mmap are: * does it exist and is it safe to write into the mmap'd area * how to use it (BSD variants) */ -#include + #include #include -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE -# ifdef HAVE_UNISTD_H -# include -# endif +#if !STDC_HEADERS && !HAVE_STDLIB_H +char *malloc (); +#endif +/* This mess was copied from the GNU getpagesize.h. */ +#if !HAVE_GETPAGESIZE /* Assume that all systems that can run configure have sys/param.h. */ -# ifndef HAVE_SYS_PARAM_H +# if !HAVE_SYS_PARAM_H # define HAVE_SYS_PARAM_H 1 # endif # ifdef _SC_PAGESIZE # define getpagesize() sysconf(_SC_PAGESIZE) # else /* no _SC_PAGESIZE */ -# ifdef HAVE_SYS_PARAM_H +# if HAVE_SYS_PARAM_H # include # ifdef EXEC_PAGESIZE # define getpagesize() EXEC_PAGESIZE @@ -4407,113 +6548,113 @@ #endif /* no HAVE_GETPAGESIZE */ -#ifdef __cplusplus -extern "C" { void *malloc(unsigned); } -#else -char *malloc(); -#endif - int -main() +main () { - char *data, *data2, *data3; - int i, pagesize; - int fd; - - pagesize = getpagesize(); - - /* - * First, make a file with some known garbage in it. - */ - data = malloc(pagesize); - if (!data) - exit(1); - for (i = 0; i < pagesize; ++i) - *(data + i) = rand(); - umask(0); - fd = creat("conftestmmap", 0600); - if (fd < 0) - exit(1); - if (write(fd, data, pagesize) != pagesize) - exit(1); - close(fd); - - /* - * Next, try to mmap the file at a fixed address which - * already has something else allocated at it. If we can, - * also make sure that we see the same garbage. - */ - fd = open("conftestmmap", O_RDWR); - if (fd < 0) - exit(1); - data2 = malloc(2 * pagesize); - if (!data2) - exit(1); - data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - exit(1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - exit(1); - - /* - * Finally, make sure that changes to the mapped area - * do not percolate back to the file as seen by read(). - * (This is a bug on some variants of i386 svr4.0.) - */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = malloc(pagesize); - if (!data3) - exit(1); - if (read(fd, data3, pagesize) != pagesize) - exit(1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - exit(1); - close(fd); - unlink("conftestmmap"); - exit(0); + char *data, *data2, *data3; + int i, pagesize; + int fd; + + pagesize = getpagesize (); + + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); + if (!data) + exit (1); + for (i = 0; i < pagesize; ++i) + *(data + i) = rand (); + umask (0); + fd = creat ("conftest.mmap", 0600); + if (fd < 0) + exit (1); + if (write (fd, data, pagesize) != pagesize) + exit (1); + close (fd); + + /* Next, try to mmap the file at a fixed address which already has + something else allocated at it. If we can, also make sure that + we see the same garbage. */ + fd = open ("conftest.mmap", O_RDWR); + if (fd < 0) + exit (1); + data2 = (char *) malloc (2 * pagesize); + if (!data2) + exit (1); + data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + exit (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + exit (1); + + /* Finally, make sure that changes to the mapped area do not + percolate back to the file as seen by read(). (This is a bug on + some variants of i386 svr4.0.) */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); + if (!data3) + exit (1); + if (read (fd, data3, pagesize) != pagesize) + exit (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + exit (1); + close (fd); + exit (0); } - -EOF -if { (eval echo configure:4482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:6609: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6612: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:6614: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6617: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_mmap_fixed_mapped=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_mmap_fixed_mapped=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_mmap_fixed_mapped=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi - -echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6 +echo "$as_me:6629: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 if test $ac_cv_func_mmap_fixed_mapped = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_MMAP 1 EOF fi +rm -f conftest.mmap -echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:4505: 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 +echo "$as_me:6640: checking whether setvbuf arguments are reversed" >&5 +echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 +if test "${ac_cv_func_setvbuf_reversed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { { echo "$as_me:6646: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6651 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ -main () { +int +main () +{ /* This call has the arguments reversed. A reversed system may check and see that the address of main is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ @@ -4522,42 +6663,51 @@ putc('\r', stdout); exit(0); /* Non-reversed systems segv here. */ } -EOF -if { (eval echo configure:4527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:6668: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6671: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:6673: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6676: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_setvbuf_reversed=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_setvbuf_reversed=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - rm -f core core.* *.core fi - -echo "$ac_t""$ac_cv_func_setvbuf_reversed" 1>&6 +echo "$as_me:6689: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 if test $ac_cv_func_setvbuf_reversed = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define SETVBUF_REVERSED 1 EOF fi -echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4551: 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 +echo "$as_me:6699: checking return type of signal handlers" >&5 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +if test "${ac_cv_type_signal+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6705 "configure" #include "confdefs.h" #include #include #ifdef signal -#undef signal +# undef signal #endif #ifdef __cplusplus extern "C" void (*signal (int, void (*)(int)))(int); @@ -4565,241 +6715,312 @@ void (*signal ()) (); #endif -int main() { +int +main () +{ int i; -; return 0; } -EOF -if { (eval echo configure:4573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6727: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6730: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6733: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6736: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_signal=void else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_type_signal=int + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_signal=int fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:6746: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6 -echo "$ac_t""$ac_cv_type_signal" 1>&6 -cat >> confdefs.h <>confdefs.h <&6 -echo "configure:4592: checking for vprintf" >&5 -if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +for ac_func in vprintf +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:6756: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6762 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char vprintf(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char vprintf(); - -int main() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +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_vprintf) || defined (__stub___vprintf) +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -vprintf(); +f = $ac_func; #endif -; return 0; } -EOF -if { (eval echo configure:4620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_vprintf=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_vprintf=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_VPRINTF 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi - -if test "$ac_cv_func_vprintf" != yes; then -echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4644: checking for _doprnt" >&5 -if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6793: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6796: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6799: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6802: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:6812: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 +if test "${ac_cv_func__doprnt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6825 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt(); below. */ + which can conflict with char _doprnt (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char _doprnt(); - -int main() { + builtin and then its argument prototype would still apply. */ +char _doprnt (); +char (*f) (); +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__doprnt) || defined (__stub____doprnt) choke me #else -_doprnt(); +f = _doprnt; #endif -; return 0; } -EOF -if { (eval echo configure:4672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func__doprnt=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func__doprnt=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6856: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6859: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6862: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6865: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func__doprnt=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func__doprnt=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:6875: result: $ac_cv_func__doprnt" >&5 +echo "${ECHO_T}$ac_cv_func__doprnt" >&6 +if test $ac_cv_func__doprnt = yes; then + +cat >>confdefs.h <<\EOF #define HAVE_DOPRNT 1 EOF -else - echo "$ac_t""no" 1>&6 fi fi +done for ac_func in gettimeofday select socket strdup strstr vsnprintf snprintf \ sleep usleep strncasecmp strerror getopt getcwd popen signal isatty do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4700: 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 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:6892: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6898 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* 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() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +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(); +f = $ac_func; #endif -; return 0; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6929: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6932: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6935: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6938: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:6948: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - if test "x$CYGNUS" = xyes; then case "$ac_cv_header_dirent_dirent_h$ac_cv_header_dirent_sys_ndir_h$ac_cv_header_dirent_sys_dir_h$ac_cv_header_dirent_ndir_h" in *yes*) - echo $ac_n "checking for opendir""... $ac_c" 1>&6 -echo "configure:4757: checking for opendir" >&5 -if eval "test \"`echo '$''{'ac_cv_func_opendir'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:6961: checking for opendir" >&5 +echo $ECHO_N "checking for opendir... $ECHO_C" >&6 +if test "${ac_cv_func_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6967 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char opendir(); below. */ + which can conflict with char opendir (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir(); - -int main() { + builtin and then its argument prototype would still apply. */ +char opendir (); +char (*f) (); +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_opendir) || defined (__stub___opendir) choke me #else -opendir(); +f = opendir; #endif -; return 0; } -EOF -if { (eval echo configure:4785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_opendir=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_opendir=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'opendir`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6998: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7001: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7004: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7007: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_opendir=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_opendir=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:7017: result: $ac_cv_func_opendir" >&5 +echo "${ECHO_T}$ac_cv_func_opendir" >&6 +if test $ac_cv_func_opendir = yes; then : else - echo "$ac_t""no" 1>&6 - EXTRADEFS="$EXTRADEFS -D__W32READDIR__" - W32READDIR=yes + EXTRADEFS="$EXTRADEFS -D__W32READDIR__" + W32READDIR=yes fi ;; @@ -4808,89 +7029,119 @@ ;; esac if test "x$enable_network" = "xyes"; then - echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4813: checking for socket" >&5 -if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:7032: checking for socket" >&5 +echo $ECHO_N "checking for socket... $ECHO_C" >&6 +if test "${ac_cv_func_socket+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7038 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char socket(); below. */ + which can conflict with char socket (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socket(); - -int main() { + builtin and then its argument prototype would still apply. */ +char socket (); +char (*f) (); +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_socket) || defined (__stub___socket) choke me #else -socket(); +f = socket; #endif -; return 0; } -EOF -if { (eval echo configure:4841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_socket=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_socket=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7069: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7072: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7075: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7078: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_socket=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_socket=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:7088: result: $ac_cv_func_socket" >&5 +echo "${ECHO_T}$ac_cv_func_socket" >&6 +if test $ac_cv_func_socket = yes; then : else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6 -echo "configure:4859: checking for WSAStartup in -lwsock32" >&5 + echo "$as_me:7093: checking for WSAStartup in -lwsock32" >&5 +echo $ECHO_N "checking for WSAStartup in -lwsock32... $ECHO_C" >&6 ac_lib_var=`echo wsock32'_'WSAStartup | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'wapi_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if eval "test \"\${wapi_cv_lib_$ac_lib_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_save_LIBS="$LIBS" LIBS="-lwsock32 $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7102 "configure" #include "confdefs.h" #include #include -int main() { +int +main () +{ WSAStartup(0,0); -; return 0; } -EOF -if { (eval echo configure:4876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7116: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7119: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7122: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7125: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "wapi_cv_lib_$ac_lib_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "wapi_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "wapi_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$wapi_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + echo "$as_me:7138: result: yes" >&5 +echo "${ECHO_T}yes" >&6 EXTRALIBS="$EXTRALIBS -lwsock32" - EXTRADEFS="$EXTRADEFS -DWINSOCK" + EXTRADEFS="$EXTRADEFS -DWINSOCK" else - echo "$ac_t""no" 1>&6 + echo "$as_me:7143: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi @@ -4898,92 +7149,90 @@ fi fi - # Check whether --with-tcl-includes or --without-tcl-includes was given. if test "${with_tcl_includes+set}" = set; then withval="$with_tcl_includes" if test ! -d $withval; then - echo "configure: warning: $withval is not found." 1>&2 + { echo "$as_me:7156: WARNING: $withval is not found." >&5 +echo "$as_me: WARNING: $withval is not found." >&2;} fi tcl_include_dir="-I$withval" - -fi + +fi; # Check whether --with-tcl-libs or --without-tcl-libs was given. if test "${with_tcl_libs+set}" = set; then withval="$with_tcl_libs" if test ! -d $withval; then - echo "configure: warning: $withval is not found." 1>&2 + { echo "$as_me:7167: WARNING: $withval is not found." >&5 +echo "$as_me: WARNING: $withval is not found." >&2;} fi - tcl_libdir="-L$withval" -fi + tcl_libdir="-L$withval" +fi; # Check whether --with-tk-includes or --without-tk-includes was given. if test "${with_tk_includes+set}" = set; then withval="$with_tk_includes" if test ! -d $withval; then - echo "configure: warning: $withval is not found." 1>&2 + { echo "$as_me:7177: WARNING: $withval is not found." >&5 +echo "$as_me: WARNING: $withval is not found." >&2;} fi - tk_includes="-I$withval" -fi + tk_includes="-I$withval" +fi; # Check whether --with-tk-libs or --without-tk-libs was given. if test "${with_tk_libs+set}" = set; then withval="$with_tk_libs" if test ! -d $withval; then - echo "configure: warning: $withval is not found." 1>&2 + { echo "$as_me:7187: WARNING: $withval is not found." >&5 +echo "$as_me: WARNING: $withval is not found." >&2;} fi - tk_libdir="-L$withval" -fi - + tk_libdir="-L$withval" +fi; # Check whether --with-offix-includes or --without-offix-includes was given. if test "${with_offix_includes+set}" = set; then withval="$with_offix_includes" if test ! -d $withval; then - echo "configure: warning: $withval is not found." 1>&2 + { echo "$as_me:7197: WARNING: $withval is not found." >&5 +echo "$as_me: WARNING: $withval is not found." >&2;} fi - offix_include_dir="-I$withval" -fi + offix_include_dir="-I$withval" +fi; # Check whether --with-offix-libs or --without-offix-libs was given. if test "${with_offix_libs+set}" = set; then withval="$with_offix_libs" if test ! -d $withval; then - echo "configure: warning: $withval is not found." 1>&2 + { echo "$as_me:7207: WARNING: $withval is not found." >&5 +echo "$as_me: WARNING: $withval is not found." >&2;} fi - offix_lib_dir="-L$withval" -fi - + offix_lib_dir="-L$withval" +fi; - - -audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd vorbis' +audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd vorbis gogo' # Check whether --with-nas-library or --without-nas-library was given. if test "${with_nas_library+set}" = set; then withval="$with_nas_library" - : -fi + +fi; # Check whether --with-nas-includes or --without-nas-includes was given. if test "${with_nas_includes+set}" = set; then withval="$with_nas_includes" - : -fi - +fi; # Check whether --enable-audio or --disable-audio was given. if test "${enable_audio+set}" = set; then enableval="$enable_audio" enable_audio=$enableval - have_audio_opt=yes + have_audio_opt=yes else enable_audio=yes - have_audio_opt=no -fi - + have_audio_opt=no +fi; test "x$enable_audio" = xyes && enable_audio=default @@ -4994,6 +7243,7 @@ fi DEFAULT_PLAYMODE= + # Check whether --with-default-output or --without-default-output was given. if test "${with_default_output+set}" = set; then withval="$with_default_output" @@ -5001,29 +7251,26 @@ DEFAULT_PLAYMODE=$withval eval "au_enable_$DEFAULT_PLAYMODE=yes" else - echo "configure: warning: --with-default-output=$withval: audio is not enabled" 1>&2 + { echo "$as_me:7254: WARNING: --with-default-output=$withval: audio is not enabled" >&5 +echo "$as_me: WARNING: --with-default-output=$withval: audio is not enabled" >&2;} fi -fi - +fi; # Check whether --enable-esd or --disable-esd was given. if test "${enable_esd+set}" = set; then enableval="$enable_esd" - au_enable_esd=$enableval -fi - + au_enable_esd=$enableval +fi; # Check whether --enable-nas or --disable-nas was given. if test "${enable_nas+set}" = set; then enableval="$enable_nas" - au_enable_nas=$enableval -fi - + au_enable_nas=$enableval +fi; # Check whether --enable-alsa or --disable-alsa was given. if test "${enable_alsa+set}" = set; then enableval="$enable_alsa" - au_enable_alsa=$enableval -fi - + au_enable_alsa=$enableval +fi; if test "x$au_enable_default" = xyes; then case "$target" in @@ -5058,80 +7305,96 @@ au_enable_w32=yes ;; *) - echo "configure: warning: No --enable-audio=default audio for $target" 1>&2 + { echo "$as_me:7308: WARNING: No --enable-audio=default audio for $target" >&5 +echo "$as_me: WARNING: No --enable-audio=default audio for $target" >&2;} ;; esac fi -echo $ac_n "checking enable_audio=oss""... $ac_c" 1>&6 -echo "configure:5068: checking enable_audio=oss" >&5 +echo "$as_me:7314: checking enable_audio=oss" >&5 +echo $ECHO_N "checking enable_audio=oss... $ECHO_C" >&6 if test "x$au_enable_oss" = xyes; then EXTRADEFS="$EXTRADEFS -DAU_OSS" SYSEXTRAS="$SYSEXTRAS oss_a.c" if test "x$ac_cv_header_sys_soundcard_h" = xyes; then - echo "$ac_t""yes - " 1>&6 + echo "$as_me:7320: result: yes - " >&5 +echo "${ECHO_T}yes - " >&6 else case "$target" in *linux*|*freebsd*) - echo "$ac_t""yes" 1>&6 + echo "$as_me:7325: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; *) if test "x$ac_cv_header_soundcard_h" = xyes; then - echo "$ac_t""yes - " 1>&6 + echo "$as_me:7330: result: yes - " >&5 +echo "${ECHO_T}yes - " >&6 else - echo "configure: warning: is not found" 1>&2 + { echo "$as_me:7333: WARNING: is not found" >&5 +echo "$as_me: WARNING: is not found" >&2;} fi ;; esac fi - echo $ac_n "checking for open in -lossaudio""... $ac_c" 1>&6 -echo "configure:5089: checking for open in -lossaudio" >&5 -ac_lib_var=`echo ossaudio'_'open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:7340: checking for open in -lossaudio" >&5 +echo $ECHO_N "checking for open in -lossaudio... $ECHO_C" >&6 +if test "${ac_cv_lib_ossaudio_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lossaudio $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7348 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char open(); - -int main() { -open() -; return 0; } -EOF -if { (eval echo configure:5108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 ossaudio | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7370: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7373: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7376: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ossaudio_open=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ossaudio_open=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7387: result: $ac_cv_lib_ossaudio_open" >&5 +echo "${ECHO_T}$ac_cv_lib_ossaudio_open" >&6 +if test $ac_cv_lib_ossaudio_open = yes; then + cat >>confdefs.h <&6 fi - case "$target" in *openbsd*) if test ! -e "/dev/dsp"; then @@ -5140,137 +7403,157 @@ ;; esac else - echo "$ac_t""no" 1>&6 + echo "$as_me:7406: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=sun""... $ac_c" 1>&6 -echo "configure:5148: checking enable_audio=sun" >&5 +echo "$as_me:7410: checking enable_audio=sun" >&5 +echo $ECHO_N "checking enable_audio=sun... $ECHO_C" >&6 if test "x$au_enable_sun" = xyes; then case "$target" in *-*-sunos4*) if test -f /usr/demo/SOUND/libaudio.a; then EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/libaudio.a" - echo "$ac_t""yes" 1>&6 + echo "$as_me:7417: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""Notice: libaudio.a is not found (ignore)" 1>&6 + echo "$as_me:7420: result: Notice: libaudio.a is not found (ignore)" >&5 +echo "${ECHO_T}Notice: libaudio.a is not found (ignore)" >&6 fi ;; *-*-solaris*) if test -f /usr/demo/SOUND/lib/libaudio.a; then EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/lib/libaudio.a" - echo "$ac_t""yes" 1>&6 + echo "$as_me:7427: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""Notice: libaudio.a is not found (ignore)" 1>&6 + echo "$as_me:7430: result: Notice: libaudio.a is not found (ignore)" >&5 +echo "${ECHO_T}Notice: libaudio.a is not found (ignore)" >&6 fi ;; - *) echo "$ac_t""yes" 1>&6 + *) echo "$as_me:7434: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; esac EXTRADEFS="$EXTRADEFS -DAU_SUN" - SYSEXTRAS="$SYSEXTRAS sun_a.c" + SYSEXTRAS="$SYSEXTRAS sun_a.c" else - echo "$ac_t""no" 1>&6 + echo "$as_me:7441: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=hpux""... $ac_c" 1>&6 -echo "configure:5177: checking enable_audio=hpux" >&5 +echo "$as_me:7445: checking enable_audio=hpux" >&5 +echo $ECHO_N "checking enable_audio=hpux... $ECHO_C" >&6 if test "x$au_enable_hpux" = xyes; then case "$target" in - *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; - *) echo "configure: warning: may not work on $target" 1>&2 ;; + *-*-hpux*) echo "$as_me:7449: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; + *) { echo "$as_me:7451: WARNING: may not work on $target" >&5 +echo "$as_me: WARNING: may not work on $target" >&2;} ;; esac EXTRADEFS="$EXTRADEFS -DAU_HPUX_AUDIO" SYSEXTRAS="$SYSEXTRAS hpux_d_a.c" else - echo "$ac_t""no" 1>&6 + echo "$as_me:7457: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=irix""... $ac_c" 1>&6 -echo "configure:5190: checking enable_audio=irix" >&5 +echo "$as_me:7461: checking enable_audio=irix" >&5 +echo $ECHO_N "checking enable_audio=irix... $ECHO_C" >&6 if test "x$au_enable_irix" = xyes; then case "$target" in *-sgi-irix5*|*-sgi-irix6.2) EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_OLDAL" - echo "$ac_t""yes" 1>&6 + echo "$as_me:7467: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; *-sgi-irix6*) EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL" - echo "$ac_t""yes" 1>&6 + echo "$as_me:7472: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; - *) echo "configure: warning: may not work on $target" 1>&2 ;; + *) { echo "$as_me:7475: WARNING: may not work on $target" >&5 +echo "$as_me: WARNING: may not work on $target" >&2;} ;; esac SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c" EXTRALIBS="$EXTRASLIBS -laudio" else - echo "$ac_t""no" 1>&6 + echo "$as_me:7481: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=mme""... $ac_c" 1>&6 -echo "configure:5210: checking enable_audio=mme" >&5 +echo "$as_me:7485: checking enable_audio=mme" >&5 +echo $ECHO_N "checking enable_audio=mme... $ECHO_C" >&6 if test "x$au_enable_mme" = xyes; then case "$target" in - *-dec-*) echo "$ac_t""yes" 1>&6 ;; - *) echo "configure: warning: may not work on $target" 1>&2 ;; + *-dec-*) echo "$as_me:7489: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; + *) { echo "$as_me:7491: WARNING: may not work on $target" >&5 +echo "$as_me: WARNING: may not work on $target" >&2;} ;; esac EXTRADEFS="$EXTRADEFS -DAU_DEC -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_mme.c" CPPFLAGS="$CPPFLAGS -I/usr/opt/MME210/include" EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a" else - echo "$ac_t""no" 1>&6 + echo "$as_me:7499: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=sb_dsp""... $ac_c" 1>&6 -echo "configure:5225: checking enable_audio=sb_dsp" >&5 +echo "$as_me:7503: checking enable_audio=sb_dsp" >&5 +echo $ECHO_N "checking enable_audio=sb_dsp... $ECHO_C" >&6 if test "x$au_enable_sb_dsp" = xyes; then case "$target" in - *-*-bsdi2.0) echo "$ac_t""yes" 1>&6 ;; - *) echo "configure: warning: may not work on $target" 1>&2 ;; + *-*-bsdi2.0) echo "$as_me:7507: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; + *) { echo "$as_me:7509: WARNING: may not work on $target" >&5 +echo "$as_me: WARNING: may not work on $target" >&2;} ;; esac EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500" SYSEXTRAS="$SYSEXTRAS bsd20_a.c" else - echo "$ac_t""no" 1>&6 + echo "$as_me:7515: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=w32""... $ac_c" 1>&6 -echo "configure:5238: checking enable_audio=w32" >&5 +echo "$as_me:7519: checking enable_audio=w32" >&5 +echo $ECHO_N "checking enable_audio=w32... $ECHO_C" >&6 if test "x$au_enable_w32" = xyes; then case "$target" in *-*-cygwin*) - if test "x$enable_w32gui" = xyes; then - SYSEXTRAS="$SYSEXTRAS w32g_a.c" - else - SYSEXTRAS="$SYSEXTRAS w32_a.c" - fi - echo "$ac_t""yes" 1>&6 + echo "$as_me:7524: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; - *) - echo "configure: warning: may not work on $target" 1>&2 - SYSEXTRAS="$SYSEXTRAS w32_a.c" + *) + { echo "$as_me:7528: WARNING: may not work on $target" >&5 +echo "$as_me: WARNING: may not work on $target" >&2;} ;; esac + SYSEXTRAS="$SYSEXTRAS w32_a.c" EXTRALIBS="$EXTRALIBS -lwinmm" EXTRADEFS="$EXTRADEFS -DAU_W32" else - echo "$ac_t""no" 1>&6 + echo "$as_me:7536: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=alsa""... $ac_c" 1>&6 -echo "configure:5261: checking enable_audio=alsa" >&5 +echo "$as_me:7540: checking enable_audio=alsa" >&5 +echo $ECHO_N "checking enable_audio=alsa... $ECHO_C" >&6 if test "x$au_enable_alsa" = xyes; then - echo "$ac_t""" 1>&6 + echo "$as_me:7543: result: " >&5 +echo "${ECHO_T}" >&6 KEEPCFLAGS=$CFLAGS KEEPLIBS=$LIBS KEEPLDFLAGS=$LDFLAGS have_alsa=no + # Check whether --with-alsa-prefix or --without-alsa-prefix was given. if test "${with_alsa_prefix+set}" = set; then withval="$with_alsa_prefix" alsa_prefix="$withval" else alsa_prefix="" -fi +fi; # Check whether --with-alsa-inc-prefix or --without-alsa-inc-prefix was given. if test "${with_alsa_inc_prefix+set}" = set; then @@ -5278,39 +7561,38 @@ alsa_inc_prefix="$withval" else alsa_inc_prefix="" -fi - +fi; # Check whether --enable-alsatest or --disable-alsatest was given. if test "${enable_alsatest+set}" = set; then enableval="$enable_alsatest" enable_alsatest=no else enable_alsatest=yes -fi +fi; - -echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:5294: checking for ALSA CFLAGS" >&5 +echo "$as_me:7573: checking for ALSA CFLAGS" >&5 +echo $ECHO_N "checking for ALSA CFLAGS... $ECHO_C" >&6 if test "$alsa_inc_prefix" != "" ; then ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" CFLAGS="$CFLAGS -I$alsa_inc_prefix" fi -echo "$ac_t""$ALSA_CFLAGS" 1>&6 +echo "$as_me:7579: result: $ALSA_CFLAGS" >&5 +echo "${ECHO_T}$ALSA_CFLAGS" >&6 -echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:5302: checking for ALSA LDFLAGS" >&5 +echo "$as_me:7582: checking for ALSA LDFLAGS" >&5 +echo $ECHO_N "checking for ALSA LDFLAGS... $ECHO_C" >&6 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" fi ALSA_LIBS="$ALSA_LIBS -lasound" -echo "$ac_t""$ALSA_LIBS" 1>&6 - +echo "$as_me:7590: result: $ALSA_LIBS" >&5 +echo "${ECHO_T}$ALSA_LIBS" >&6 min_alsa_version=0.1.1 -echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:5314: checking for libasound headers version >= $min_alsa_version" >&5 +echo "$as_me:7594: checking for libasound headers version >= $min_alsa_version" >&5 +echo $ECHO_N "checking for libasound headers version >= $min_alsa_version... $ECHO_C" >&6 no_alsa="" alsa_min_major_version=`echo $min_alsa_version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` @@ -5319,13 +7601,15 @@ alsa_min_micro_version=`echo $min_alsa_version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7605 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ /* ensure backward compatibility */ #if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) @@ -5359,81 +7643,105 @@ # endif exit(0); -; return 0; } -EOF -if { (eval echo configure:5365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""found." 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:7651: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7654: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:7657: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7660: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:7662: result: found." >&5 +echo "${ECHO_T}found." >&6 have_alsa=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""not present." 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:7668: result: not present." >&5 +echo "${ECHO_T}not present." >&6 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext -echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:5379: 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 +echo "$as_me:7674: checking for snd_cards in -lasound" >&5 +echo $ECHO_N "checking for snd_cards in -lasound... $ECHO_C" >&6 +if test "${ac_cv_lib_asound_snd_cards+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lasound $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7682 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char snd_cards(); - -int main() { -snd_cards() -; return 0; } -EOF -if { (eval echo configure:5398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 asound | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7704: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7707: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7710: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_asound_snd_cards=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_asound_snd_cards=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7721: result: $ac_cv_lib_asound_snd_cards" >&5 +echo "${ECHO_T}$ac_cv_lib_asound_snd_cards" >&6 +if test $ac_cv_lib_asound_snd_cards = yes; then + cat >>confdefs.h <&6 -echo "$ac_t""No linkable libasound was found." 1>&6 + echo "$as_me:7731: result: No linkable libasound was found." >&5 +echo "${ECHO_T}No linkable libasound was found." >&6 fi - - - - if test have_alsa = no; then - echo "configure: warning: ALSA: Couldn't configure" 1>&2 + { echo "$as_me:7737: WARNING: ALSA: Couldn't configure" >&5 +echo "$as_me: WARNING: ALSA: Couldn't configure" >&2;} CFLAGS=$KEEPCFLAGS LIBS=$KEEPLIBS LDFLAGS=$KEEPLDFLAGS else - echo "$ac_t""ALSA: Enabled" 1>&6 + echo "$as_me:7743: result: ALSA: Enabled" >&5 +echo "${ECHO_T}ALSA: Enabled" >&6 EXTRADEFS="$EXTRADEFS -DAU_ALSA" SYSEXTRAS="$SYSEXTRAS alsa_a.c" for f in $ALSA_CFLAGS; do @@ -5446,15 +7754,18 @@ LIBS="$KEEPLIBS $ALSA_LIBS" fi else - echo "$ac_t""no" 1>&6 + echo "$as_me:7757: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=alib""... $ac_c" 1>&6 -echo "configure:5454: checking enable_audio=alib" >&5 +echo "$as_me:7761: checking enable_audio=alib" >&5 +echo $ECHO_N "checking enable_audio=alib... $ECHO_C" >&6 if test "x$au_enable_alib" = xyes; then case "$target" in - *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; - *) echo "configure: warning: may not work on $target" 1>&2 ;; + *-*-hpux*) echo "$as_me:7765: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; + *) { echo "$as_me:7767: WARNING: may not work on $target" >&5 +echo "$as_me: WARNING: may not work on $target" >&2;} ;; esac SYSEXTRAS="$SYSEXTRAS hpux_a.c" EXTRADEFS="$EXTRADEFS -DAU_HPUX_ALIB" @@ -5466,28 +7777,32 @@ fi EXTRALIBS="$EXTRALIBS -lAlib" else - echo "$ac_t""no" 1>&6 + echo "$as_me:7780: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=nas""... $ac_c" 1>&6 -echo "configure:5474: checking enable_audio=nas" >&5 +echo "$as_me:7784: checking enable_audio=nas" >&5 +echo $ECHO_N "checking enable_audio=nas... $ECHO_C" >&6 if test "x$au_enable_nas" = xyes; then if test "x$with_x" != xyes; then - { echo "configure: error: nas: --with-x option must be specified" 1>&2; exit 1; } + { { echo "$as_me:7788: error: nas: --with-x option must be specified" >&5 +echo "$as_me: error: nas: --with-x option must be specified" >&2;} + { (exit 1); exit 1; }; } fi EXTRADEFS="$EXTRADEFS -DAU_NAS" SYSEXTRAS="$SYSEXTRAS nas_a.c" - if test "x$with_nas_library" != x; then - echo "$ac_t""$with_nas_library" 1>&6; + echo "$as_me:7796: result: $with_nas_library" >&5 +echo "${ECHO_T}$with_nas_library" >&6; EXTRALIBS="$EXTRALIBS $with_nas_library" else - echo "$ac_t""" 1>&6 - echo $ac_n "checking for library containing AuOpenServer""... $ac_c" 1>&6 -echo "configure:5489: checking for library containing AuOpenServer" >&5 -if eval "test \"`echo '$''{'timidity_cv_search_AuOpenServer'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:7800: result: " >&5 +echo "${ECHO_T}" >&6 + echo "$as_me:7802: checking for library containing AuOpenServer" >&5 +echo $ECHO_N "checking for library containing AuOpenServer... $ECHO_C" >&6 +if test "${timidity_cv_search_AuOpenServer+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS="$LIBS" timidity_cv_search_AuOpenServer="no" @@ -5495,36 +7810,55 @@ /usr/lib/libaudio.so \ /usr/lib/libaudio.a ; do LIBS="$i $ac_func_search_save_LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7814 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char AuOpenServer(); - -int main() { -AuOpenServer() -; return 0; } -EOF -if { (eval echo configure:5511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + builtin and then its argument prototype would still apply. */ +char AuOpenServer (); +int +main () +{ +AuOpenServer (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7833: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7836: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7839: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7842: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then timidity_cv_search_AuOpenServer="$i"; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done LIBS="$ac_func_search_save_LIBS" fi - -echo "$ac_t""$timidity_cv_search_AuOpenServer" 1>&6 +echo "$as_me:7853: result: $timidity_cv_search_AuOpenServer" >&5 +echo "${ECHO_T}$timidity_cv_search_AuOpenServer" >&6 if test "$timidity_cv_search_AuOpenServer" != "no"; then - echo "$ac_t""NAS: $timidity_cv_search_AuOpenServer" 1>&6 + echo "$as_me:7856: result: NAS: $timidity_cv_search_AuOpenServer" >&5 +echo "${ECHO_T}NAS: $timidity_cv_search_AuOpenServer" >&6 EXTRALIBS="$EXTRALIBS $timidity_cv_search_AuOpenServer" else : - echo "configure: warning: NAS library is not found." 1>&2 + { echo "$as_me:7860: WARNING: NAS library is not found." >&5 +echo "$as_me: WARNING: NAS library is not found." >&2;} fi fi test "x$with_nas_includes" != x && CPPFLAGS="$CPPFLAGS -I$with_nas_includes" @@ -5536,23 +7870,26 @@ lib_xprelibs_opt='-lSM -lICE' fi else - echo "$ac_t""no" 1>&6 + echo "$as_me:7873: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=esd""... $ac_c" 1>&6 -echo "configure:5544: checking enable_audio=esd" >&5 +echo "$as_me:7877: checking enable_audio=esd" >&5 +echo $ECHO_N "checking enable_audio=esd... $ECHO_C" >&6 if test "x$au_enable_esd" = xyes; then - echo "$ac_t""" 1>&6 + echo "$as_me:7880: result: " >&5 +echo "${ECHO_T}" >&6 KEEPCFLAGS=$CFLAGS KEEPLIBS=$LIBS KEEPLDFLAGS=$LDFLAGS - # Check whether --with-esd-prefix or --without-esd-prefix was given. + +# Check whether --with-esd-prefix or --without-esd-prefix was given. if test "${with_esd_prefix+set}" = set; then withval="$with_esd_prefix" esd_prefix="$withval" else esd_prefix="" -fi +fi; # Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given. if test "${with_esd_exec_prefix+set}" = set; then @@ -5560,16 +7897,14 @@ esd_exec_prefix="$withval" else esd_exec_prefix="" -fi - +fi; # Check whether --enable-esdtest or --disable-esdtest was given. if test "${enable_esdtest+set}" = set; then enableval="$enable_esdtest" - : + else enable_esdtest=yes -fi - +fi; if test x$esd_exec_prefix != x ; then esd_args="$esd_args --exec-prefix=$esd_exec_prefix" @@ -5586,43 +7921,45 @@ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5591: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7924: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ESD_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$ESD_CONFIG" in - /*) + case $ESD_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word" + echo "$as_me:7941: found $ac_dir/$ac_word" >&5 + break +fi +done + test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no" ;; esac fi -ESD_CONFIG="$ac_cv_path_ESD_CONFIG" +ESD_CONFIG=$ac_cv_path_ESD_CONFIG + if test -n "$ESD_CONFIG"; then - echo "$ac_t""$ESD_CONFIG" 1>&6 + echo "$as_me:7953: result: $ESD_CONFIG" >&5 +echo "${ECHO_T}$ESD_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:7956: result: no" >&5 +echo "${ECHO_T}no" >&6 fi min_esd_version=0.2.7 - echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 -echo "configure:5626: checking for ESD - version >= $min_esd_version" >&5 + echo "$as_me:7961: checking for ESD - version >= $min_esd_version" >&5 +echo $ECHO_N "checking for ESD - version >= $min_esd_version... $ECHO_C" >&6 no_esd="" if test "$ESD_CONFIG" = "no" ; then no_esd=yes @@ -5645,8 +7982,8 @@ if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7986 "configure" #include "confdefs.h" #include @@ -5658,7 +7995,7 @@ my_strdup (char *str) { char *new_str; - + if (str) { new_str = malloc ((strlen (str) + 1) * sizeof(char)); @@ -5666,7 +8003,7 @@ } else new_str = NULL; - + return new_str; } @@ -5702,29 +8039,38 @@ } } - -EOF -if { (eval echo configure:5708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:8044: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8047: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:8049: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8052: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - no_esd=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +no_esd=yes fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_esd" = x ; then - echo "$ac_t""yes" 1>&6 - : + echo "$as_me:8068: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + : else - echo "$ac_t""no" 1>&6 + echo "$as_me:8072: result: no" >&5 +echo "${ECHO_T}no" >&6 if test "$ESD_CONFIG" = "no" ; then echo "*** The esd-config script installed by ESD could not be found" echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" @@ -5737,19 +8083,33 @@ echo "*** Could not run ESD test program, checking why..." CFLAGS="$CFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8087 "configure" #include "confdefs.h" #include #include -int main() { - return 0; -; return 0; } -EOF -if { (eval echo configure:5752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +int +main () +{ + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8102: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8105: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8108: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8111: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding ESD or finding the wrong" echo "*** version of ESD. If it is not finding ESD, you'll need to set your" @@ -5760,15 +8120,14 @@ echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "*** The test program failed to compile or link. See the file config.log for the" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means ESD was incorrectly installed" echo "*** or that you have moved ESD since it was installed. In the latter case, you" - echo "*** may want to edit the esd-config script: $ESD_CONFIG" + echo "*** may want to edit the esd-config script: $ESD_CONFIG" fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi @@ -5777,15 +8136,15 @@ ESD_LIBS="" : fi - - + rm -f conf.esdtest CFLAGS=$KEEPCFLAGS LIBS=$KEEPLIBS LDFLAGS=$KEEPLDFLAGS if test "x$no_esd" = x; then - echo "$ac_t""EsounD: Enabled" 1>&6 + echo "$as_me:8146: result: EsounD: Enabled" >&5 +echo "${ECHO_T}EsounD: Enabled" >&6 EXTRADEFS="$EXTRADEFS -DAU_ESD" SYSEXTRAS="$SYSEXTRAS esd_a.c" for f in $ESD_CFLAGS; do @@ -5797,120 +8156,365 @@ LIBS="$LIBS $ESD_LIBS" else - echo "configure: warning: EsounD: Couldn't configure" 1>&2 + { echo "$as_me:8159: WARNING: EsounD: Couldn't configure" >&5 +echo "$as_me: WARNING: EsounD: Couldn't configure" >&2;} fi else - echo "$ac_t""no" 1>&6 + echo "$as_me:8163: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking enable_audio=vorbis""... $ac_c" 1>&6 -echo "configure:5808: checking enable_audio=vorbis" >&5 +echo "$as_me:8167: checking enable_audio=vorbis" >&5 +echo $ECHO_N "checking enable_audio=vorbis... $ECHO_C" >&6 if test "x$au_enable_vorbis" = xyes; then - echo "$ac_t""" 1>&6 - have_vorbis=yes - ac_safe=`echo "vorbis/modes.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for vorbis/modes.h""... $ac_c" 1>&6 -echo "configure:5814: checking for vorbis/modes.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:8170: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +# Check whether --with-ogg-prefix or --without-ogg-prefix was given. +if test "${with_ogg_prefix+set}" = set; then + withval="$with_ogg_prefix" + ogg_prefix="$withval" +else + ogg_prefix="" +fi; +# Check whether --enable-oggtest or --disable-oggtest was given. +if test "${enable_oggtest+set}" = set; then + enableval="$enable_oggtest" + +else + enable_oggtest=yes +fi; + + if test "x$ogg_prefix" != "x"; then + ogg_args="$ogg_args --prefix=$ogg_prefix" + OGG_CFLAGS="-I$ogg_prefix/include" + OGG_LIBS="-L$ogg_prefix/lib" + elif test "x$prefix" != "xNONE"; then + ogg_args="$ogg_args --prefix=$prefix" + OGG_CFLAGS="-I$prefix/include" + OGG_LIBS="-L$prefix/lib" + fi + + OGG_LIBS="$OGG_LIBS -logg" + + echo "$as_me:8200: checking for Ogg" >&5 +echo $ECHO_N "checking for Ogg... $ECHO_C" >&6 + no_ogg="" + + if test "x$enable_oggtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $OGG_CFLAGS" + LIBS="$LIBS $OGG_LIBS" + rm -f conf.oggtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8214 "configure" #include "confdefs.h" -#include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + +#include +#include +#include +#include + +int main () +{ + system("touch conf.oggtest"); + return 0; +} + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:8230: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8233: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:8235: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8238: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : 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" + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +no_ogg=yes fi -rm -f conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_ogg" = "x" ; then + echo "$as_me:8254: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +# Check whether --with-vorbis-prefix or --without-vorbis-prefix was given. +if test "${with_vorbis_prefix+set}" = set; then + withval="$with_vorbis_prefix" + vorbis_prefix="$withval" +else + vorbis_prefix="" +fi; +# Check whether --enable-vorbistest or --disable-vorbistest was given. +if test "${enable_vorbistest+set}" = set; then + enableval="$enable_vorbistest" + +else + enable_vorbistest=yes +fi; + + if test "x$vorbis_prefix" != "x" ; then + vorbis_args="$vorbis_args --prefix=$vorbis_prefix" + VORBIS_CFLAGS="-I$vorbis_prefix/include" + VORBIS_LIBDIR="-L$vorbis_prefix/lib" + elif test "x$prefix" != "xNONE"; then + vorbis_args="$vorbis_args --prefix=$prefix" + VORBIS_CFLAGS="-I$prefix/include" + VORBIS_LIBDIR="-L$prefix/lib" + fi + + VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm" + VORBISFILE_LIBS="-lvorbisfile" + VORBISENC_LIBS="-lvorbisenc" + + echo "$as_me:8286: checking for Vorbis" >&5 +echo $ECHO_N "checking for Vorbis... $ECHO_C" >&6 + no_vorbis="" + + if test "x$enable_vorbistest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $VORBIS_CFLAGS" + LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" + rm -f conf.vorbistest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +else + cat >conftest.$ac_ext <<_ACEOF +#line 8300 "configure" +#include "confdefs.h" + +#include +#include +#include +#include + +int main () +{ + system("touch conf.vorbistest"); + return 0; +} + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:8316: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8319: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:8321: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8324: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "$ac_t""no" 1>&6 -have_vorbis=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +no_vorbis=yes +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi - echo $ac_n "checking for vorbis_analysis_init in -lvorbis""... $ac_c" 1>&6 -echo "configure:5847: checking for vorbis_analysis_init in -lvorbis" >&5 -ac_lib_var=`echo vorbis'_'vorbis_analysis_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 -else - ac_save_LIBS="$LIBS" -LIBS="-lvorbis $LIBS" -cat > conftest.$ac_ext <&5 +echo "${ECHO_T}yes" >&6 + + have_vorbis=yes + SYSEXTRAS="$SYSEXTRAS vorbis_a.c" + EXTRADEFS="$EXTRADEFS -DAU_VORBIS $OGG_CFLAGS $VORBIS_CFLAGS" + EXTRALIBS="$EXTRALIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS" + if test "x$CYGNUS" = "xyes"; then + SYSEXTRAS="$SYSEXTRAS w32g_vorbisenc_dll.c w32g_vorbis_dll.c w32g_ogg_dll.c" + fi + + else + echo "$as_me:8352: result: no" >&5 +echo "${ECHO_T}no" >&6 + if test -f conf.vorbistest ; then + : + else + echo "*** Could not run Vorbis test program, checking why..." + CFLAGS="$CFLAGS $VORBIS_CFLAGS" + LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 8361 "configure" +#include "confdefs.h" + +#include +#include + +int +main () +{ + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8376: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8379: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8382: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8385: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding Vorbis or finding the wrong" + echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means Vorbis was incorrectly installed" + echo "*** or that you have moved Vorbis since it was installed." +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + VORBIS_CFLAGS="" + VORBIS_LIBS="" + VORBISFILE_LIBS="" + VORBISENC_LIBS="" + + { echo "$as_me:8412: WARNING: Unable to configure vorbis, but ogg is there (???)" >&5 +echo "$as_me: WARNING: Unable to configure vorbis, but ogg is there (???)" >&2;} + + fi + + rm -f conf.vorbistest + + else + echo "$as_me:8420: result: no" >&5 +echo "${ECHO_T}no" >&6 + if test -f conf.oggtest ; then + : + else + echo "*** Could not run Ogg test program, checking why..." + CFLAGS="$CFLAGS $OGG_CFLAGS" + LIBS="$LIBS $OGG_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 8429 "configure" #include "confdefs.h" -/* 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 vorbis_analysis_init(); -int main() { -vorbis_analysis_init() -; return 0; } -EOF -if { (eval echo configure:5866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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" +#include +#include +int +main () +{ + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8444: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8447: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8450: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8453: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding Ogg or finding the wrong" + echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means Ogg was incorrectly installed" + echo "*** or that you have moved Ogg since it was installed. In the latter case, you" + echo "*** may want to edit the ogg-config script: $OGG_CONFIG" 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 vorbis | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 +echo "$as_me: WARNING: Unable to configure vorbis!" >&2;} + have_vorbis=no + + fi + + rm -f conf.oggtest else - echo "$ac_t""no" 1>&6 -have_vorbis=no + echo "$as_me:8488: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$have_vorbis" = "yes"; then - SYSEXTRAS="$SYSEXTRAS vorbis_a.c" - EXTRADEFS="$EXTRADEFS -DAU_VORBIS" - EXTRALIBS="$EXTRALIBS -lvorbis" - echo "$ac_t""Ogg Vorbis: Enabled" 1>&6 +echo "$as_me:8492: checking enable_audio=gogo" >&5 +echo $ECHO_N "checking enable_audio=gogo... $ECHO_C" >&6 +if test "x$au_enable_gogo" = xyes; then + if test "x$CYGNUS" = "xyes"; then + echo "$as_me:8496: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "configure: warning: Ogg Vorbis: Couldn't configure" 1>&2 + { echo "$as_me:8499: WARNING: May be gogo is not supported. You need hack the gogo_a.c" >&5 +echo "$as_me: WARNING: May be gogo is not supported. You need hack the gogo_a.c" >&2;} fi + have_gogo=yes + SYSEXTRAS="$SYSEXTRAS gogo_a.c w32_gogo.c" + EXTRADEFS="$EXTRADEFS -DAU_GOGO" + EXTRALIBS="$EXTRALIBS -lgogo" else - echo "$ac_t""no" 1>&6 + echo "$as_me:8507: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "x$au_enable_none" = xyes; then EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c" fi - -echo $ac_n "checking default output mode""... $ac_c" 1>&6 -echo "configure:5914: checking default output mode" >&5 +echo "$as_me:8516: checking default output mode" >&5 +echo $ECHO_N "checking default output mode... $ECHO_C" >&6 if test "x$DEFAULT_PLAYMODE" = x; then DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'` fi @@ -5932,12 +8536,11 @@ .aiff) TIMIDITY_OUTPUT_ID=a ;; .list) TIMIDITY_OUTPUT_ID=l ;; .vorbis) TIMIDITY_OUTPUT_ID=v ;; + .gogo) TIMIDITY_OUTPUT_ID=g ;; *) TIMIDITY_OUTPUT_ID= ;; esac -echo "$ac_t""$DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID" 1>&6 - - - +echo "$as_me:8542: result: $DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID" >&5 +echo "${ECHO_T}$DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID" >&6 interface_targets='dynamic ncurses slang motif tcltk emacs vt100 xaw xskin gtk alsaseq' @@ -5946,9 +8549,8 @@ enableval="$enable_interface" for i in `echo $enableval | sed 's/,/ /g'`; do eval "enable_$i=yes" - done -fi - + done +fi; # Check whether --enable-dynamic or --disable-dynamic was given. if test "${enable_dynamic+set}" = set; then @@ -5960,8 +8562,7 @@ eval "enable_$i=dynamic" done fi -fi - +fi; join_targets= for i in $interface_targets; do @@ -5979,89 +8580,117 @@ if test "$NEEDDLOPEN" = "yes"; then have_dl=no - echo $ac_n "checking for LoadLibrary""... $ac_c" 1>&6 -echo "configure:5984: checking for LoadLibrary" >&5 -if eval "test \"`echo '$''{'wapi_cv_func_LoadLibrary'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:8583: checking for LoadLibrary" >&5 +echo $ECHO_N "checking for LoadLibrary... $ECHO_C" >&6 +if test "${wapi_cv_func_LoadLibrary+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8589 "configure" #include "confdefs.h" #include - -int main() { +int +main () +{ LoadLibrary(0); -; return 0; } -EOF -if { (eval echo configure:5998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8602: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8605: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8608: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8611: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then wapi_cv_func_LoadLibrary=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - wapi_cv_func_LoadLibrary=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +wapi_cv_func_LoadLibrary=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi if eval "test \"`echo '$wapi_cv_func_'LoadLibrary`\" = yes"; then - echo "$ac_t""yes" 1>&6 + echo "$as_me:8623: result: yes" >&5 +echo "${ECHO_T}yes" >&6 have_dl=w32 else - echo "$ac_t""no" 1>&6 + echo "$as_me:8627: result: no" >&5 +echo "${ECHO_T}no" >&6 fi test $wapi_cv_func_LoadLibrary = yes && have_dl=w32 if test "$have_dl" = "no"; then - echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:6021: checking for shl_load" >&5 -if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:8634: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8640 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load(); below. */ + which can conflict with char shl_load (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load(); - -int main() { + builtin and then its argument prototype would still apply. */ +char shl_load (); +char (*f) (); +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_shl_load) || defined (__stub___shl_load) choke me #else -shl_load(); +f = shl_load; #endif -; return 0; } -EOF -if { (eval echo configure:6049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shl_load=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_shl_load=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8671: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8674: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8677: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8680: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_shl_load=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8690: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +if test $ac_cv_func_shl_load = yes; then have_dl=hpux -else - echo "$ac_t""no" 1>&6 fi fi @@ -6069,158 +8698,200 @@ have_dl=dlopen fi if test "$have_dl" = "no"; then - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:6074: checking for dlopen" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:8701: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8707 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen(); below. */ + which can conflict with char dlopen (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen(); - -int main() { + builtin and then its argument prototype would still apply. */ +char dlopen (); +char (*f) (); +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_dlopen) || defined (__stub___dlopen) choke me #else -dlopen(); +f = dlopen; #endif -; return 0; } -EOF -if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dlopen=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8738: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8741: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8744: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8747: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8757: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +if test $ac_cv_func_dlopen = yes; then have_dl=dlopen -else - echo "$ac_t""no" 1>&6 fi fi if test "$have_dl" = "no"; then - echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:6124: checking for dld_init" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dld_init'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:8765: checking for dld_init" >&5 +echo $ECHO_N "checking for dld_init... $ECHO_C" >&6 +if test "${ac_cv_func_dld_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8771 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dld_init(); below. */ + which can conflict with char dld_init (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dld_init(); - -int main() { + builtin and then its argument prototype would still apply. */ +char dld_init (); +char (*f) (); +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_dld_init) || defined (__stub___dld_init) choke me #else -dld_init(); +f = dld_init; #endif -; return 0; } -EOF -if { (eval echo configure:6152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dld_init=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dld_init=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'dld_init`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8802: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8805: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8808: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8811: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dld_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_dld_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8821: result: $ac_cv_func_dld_init" >&5 +echo "${ECHO_T}$ac_cv_func_dld_init" >&6 +if test $ac_cv_func_dld_init = yes; then have_dl=dld -else - echo "$ac_t""no" 1>&6 fi fi if test "$have_dl" = "no"; then - echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:6174: checking for dld_init in -ldld" >&5 -ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:8829: checking for dld_init in -ldld" >&5 +echo $ECHO_N "checking for dld_init in -ldld... $ECHO_C" >&6 +if test "${ac_cv_lib_dld_dld_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8837 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dld_init(); - -int main() { -dld_init() -; return 0; } -EOF -if { (eval echo configure:6193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char dld_init (); +int +main () +{ +dld_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8856: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8859: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8862: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8865: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dld_dld_init=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dld_dld_init=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8876: result: $ac_cv_lib_dld_dld_init" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_init" >&6 +if test $ac_cv_lib_dld_dld_init = yes; then have_dl=dld;lib_dl_opt=-ldld -else - echo "$ac_t""no" 1>&6 fi fi - echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:6216: checking dynamic link method" >&5 + echo "$as_me:8884: checking dynamic link method" >&5 +echo $ECHO_N "checking dynamic link method... $ECHO_C" >&6 case "$have_dl" in dlopen) - echo "$ac_t""use dl_dlopen.c" 1>&6 + echo "$as_me:8888: result: use dl_dlopen.c" >&5 +echo "${ECHO_T}use dl_dlopen.c" >&6 SYSEXTRAS="$SYSEXTRAS dl_dlopen.c" - echo $ac_n "checking whether your dlsym() needs a leading underscore""... $ac_c" 1>&6 -echo "configure:6222: 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 + echo "$as_me:8891: checking whether your dlsym() needs a leading underscore" >&5 +echo $ECHO_N "checking whether your dlsym() needs a leading underscore... $ECHO_C" >&6 +if test "${timidity_cv_func_dlsym_underscore+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case "$ac_cv_header_dlfcn_h" in yes) i_dlfcn=define;; @@ -6282,9 +8953,11 @@ ${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.c $LIBS $lib_dl_opt > /dev/null 2>&1; then xxx=`./fred` case $xxx in - 1) echo "configure: warning: Test program failed using dlopen. Perhaps you should not use dynamic loading." 1>&2 + 1) { echo "$as_me:8956: WARNING: Test program failed using dlopen. Perhaps you should not use dynamic loading." >&5 +echo "$as_me: WARNING: Test program failed using dlopen. Perhaps you should not use dynamic loading." >&2;} ;; - 2) echo "configure: warning: Test program failed using dlsym. Perhaps you should not use dynamic loading." 1>&2 + 2) { echo "$as_me:8959: WARNING: Test program failed using dlsym. Perhaps you should not use dynamic loading." >&5 +echo "$as_me: WARNING: Test program failed using dlsym. Perhaps you should not use dynamic loading." >&2;} ;; 3) timidity_cv_func_dlsym_underscore=yes ;; @@ -6292,7 +8965,8 @@ ;; esac else - echo "configure: warning: I can't compile and run the test program." 1>&2 + { echo "$as_me:8968: WARNING: I can't compile and run the test program." >&5 +echo "$as_me: WARNING: I can't compile and run the test program." >&2;} fi rm -f dyna.c dyna.o dyna.$so tmp-dyna.o fred.c fred.o fred @@ -6300,30 +8974,36 @@ case "x$timidity_cv_func_dlsym_underscore" in xyes) EXTRADEFS="$EXTRADEFS -DDLSYM_NEEDS_UNDERSCORE" - echo "$ac_t""yes" 1>&6 + echo "$as_me:8977: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; -xno) - echo "$ac_t""no" 1>&6 +xno) + echo "$as_me:8981: result: no" >&5 +echo "${ECHO_T}no" >&6 ;; esac ;; dld) - echo "$ac_t""use dl_dld.c" 1>&6 + echo "$as_me:8988: result: use dl_dld.c" >&5 +echo "${ECHO_T}use dl_dld.c" >&6 SYSEXTRAS="$SYSEXTRAS dl_dld.c" ;; hpux) - echo "$ac_t""use dl_hpux.c" 1>&6 + echo "$as_me:8993: result: use dl_hpux.c" >&5 +echo "${ECHO_T}use dl_hpux.c" >&6 SYSEXTRAS="$SYSEXTRAS dl_hpux.c" LDFLAGS="$LDFLAGS -Wl,-E $LDFLAGS" ;; w32) - echo "$ac_t""use dl_w32.c" 1>&6 + echo "$as_me:8999: result: use dl_w32.c" >&5 +echo "${ECHO_T}use dl_w32.c" >&6 SYSEXTRAS="$SYSEXTRAS dl_w32.c" ;; *) NEEDDLOPEN="no" - echo "configure: warning: no method to open a shared object" 1>&2 + { echo "$as_me:9005: WARNING: no method to open a shared object" >&5 +echo "$as_me: WARNING: no method to open a shared object" >&2;} ;; esac fi @@ -6338,8 +9018,6 @@ test "x$GCC" = xyes -a "x$timidity_cv_ccoption_rdynamic" = xyes && timidity_LDFLAGS="-rdynamic" fi - - if test "$NEEDDLOPEN" = "yes"; then NEEDDLOPEN_TRUE= NEEDDLOPEN_FALSE='#' @@ -6348,10 +9026,6 @@ NEEDDLOPEN_FALSE= fi - - - - if false; then ENABLE_NCURSES_TRUE= ENABLE_NCURSES_FALSE='#' @@ -6362,53 +9036,62 @@ # Check whether --enable-ncurses or --disable-ncurses was given. if test "${enable_ncurses+set}" = set; then enableval="$enable_ncurses" - case "x$enable_ncurses" in xyes|xdynamic) for ac_hdr in ncurses.h ncurses/curses.h curses.h + case "x$enable_ncurses" in xyes|xdynamic) + +for ac_header in ncurses.h ncurses/curses.h curses.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6370: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:9044: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 9050 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:9054: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:9060: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - - case "$ac_cv_header_curses_h$ac_cv_header_ncurses_curses_h$ac_cv_header_ncurses_h" in *yes*);; *) for i in /usr/include /usr/local/include; do if test -f "$i/ncurses/curses.h" -a -f "$i/ncurses/unctrl.h"; then - echo "configure: warning: ncurses test is failure. Please check config.h and common.makefile later" 1>&2 + { echo "$as_me:9093: WARNING: ncurses test is failure. Please check config.h and common.makefile later" >&5 +echo "$as_me: WARNING: ncurses test is failure. Please check config.h and common.makefile later" >&2;} CPPFLAGS="$CPPFLAGS -I$i/ncurses" break fi @@ -6416,195 +9099,248 @@ ;; esac - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:6421: 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 + echo "$as_me:9102: checking for initscr in -lncurses" >&5 +echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6 +if test "${ac_cv_lib_ncurses_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lncurses $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9110 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); - -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:6440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main () +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9129: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9132: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9135: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9138: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ncurses_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ncurses_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9149: result: $ac_cv_lib_ncurses_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6 +if test $ac_cv_lib_ncurses_initscr = yes; then lib_curses_opt=-lncurses else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for PDC_set_ctrl_break in -lcurses""... $ac_c" 1>&6 -echo "configure:6459: checking for PDC_set_ctrl_break in -lcurses" >&5 -ac_lib_var=`echo curses'_'PDC_set_ctrl_break | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:9154: checking for PDC_set_ctrl_break in -lcurses" >&5 +echo $ECHO_N "checking for PDC_set_ctrl_break in -lcurses... $ECHO_C" >&6 +if test "${ac_cv_lib_curses_PDC_set_ctrl_break+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $lib_user32_test $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9162 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char PDC_set_ctrl_break(); - -int main() { -PDC_set_ctrl_break() -; return 0; } -EOF -if { (eval echo configure:6478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char PDC_set_ctrl_break (); +int +main () +{ +PDC_set_ctrl_break (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9181: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9184: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9187: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9190: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_curses_PDC_set_ctrl_break=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_curses_PDC_set_ctrl_break=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9201: result: $ac_cv_lib_curses_PDC_set_ctrl_break" >&5 +echo "${ECHO_T}$ac_cv_lib_curses_PDC_set_ctrl_break" >&6 +if test $ac_cv_lib_curses_PDC_set_ctrl_break = yes; then lib_curses_opt=-lcurses CPPFLAGS="$CPPFLAGS -DUSE_PDCURSES=1" lib_user32_opt="$lib_user32_test" - + else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for PDC_set_ctrl_break in -lpdcurses""... $ac_c" 1>&6 -echo "configure:6500: checking for PDC_set_ctrl_break in -lpdcurses" >&5 -ac_lib_var=`echo pdcurses'_'PDC_set_ctrl_break | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:9209: checking for PDC_set_ctrl_break in -lpdcurses" >&5 +echo $ECHO_N "checking for PDC_set_ctrl_break in -lpdcurses... $ECHO_C" >&6 +if test "${ac_cv_lib_pdcurses_PDC_set_ctrl_break+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpdcurses $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9217 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char PDC_set_ctrl_break(); - -int main() { -PDC_set_ctrl_break() -; return 0; } -EOF -if { (eval echo configure:6519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char PDC_set_ctrl_break (); +int +main () +{ +PDC_set_ctrl_break (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9236: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9239: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9242: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9245: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pdcurses_PDC_set_ctrl_break=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pdcurses_PDC_set_ctrl_break=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9256: result: $ac_cv_lib_pdcurses_PDC_set_ctrl_break" >&5 +echo "${ECHO_T}$ac_cv_lib_pdcurses_PDC_set_ctrl_break" >&6 +if test $ac_cv_lib_pdcurses_PDC_set_ctrl_break = yes; then lib_curses_opt=-lpdcurses CPPFLAGS="$CPPFLAGS -DUSE_PDCURSES=1" lib_user32_opt="$lib_user32_test" - + else - echo "$ac_t""no" 1>&6 - case "$target" in + case "$target" in *openbsd*) - echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:6543: checking for initscr in -lcurses" >&5 -ac_lib_var=`echo curses'_'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 + echo "$as_me:9266: checking for initscr in -lcurses" >&5 +echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 +if test "${ac_cv_lib_curses_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9274 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); - -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:6562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main () +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9293: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9296: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9299: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9302: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_curses_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_curses_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9313: result: $ac_cv_lib_curses_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 +if test $ac_cv_lib_curses_initscr = yes; then lib_curses_opt=-lcurses else - echo "$ac_t""no" 1>&6 - echo "configure: warning: ncurses interface is not enabled" 1>&2 - enable_ncurses=no + { echo "$as_me:9318: WARNING: ncurses interface is not enabled" >&5 +echo "$as_me: WARNING: ncurses interface is not enabled" >&2;} + enable_ncurses=no fi ;; - *) echo "configure: warning: ncurses interface is not enabled" 1>&2 + *) { echo "$as_me:9324: WARNING: ncurses interface is not enabled" >&5 +echo "$as_me: WARNING: ncurses interface is not enabled" >&2;} enable_ncurses=no ;; esac - -fi - fi - fi - ;; esac fi + ;; esac +fi; case "x$enable_ncurses" in xyes) cat >> confdefs.h <&6 -echo "configure:6656: 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 + case "x$enable_slang" in xyes|xdynamic) echo "$as_me:9384: checking for SLang_init_tty in -lslang" >&5 +echo $ECHO_N "checking for SLang_init_tty in -lslang... $ECHO_C" >&6 +if test "${ac_cv_lib_slang_SLang_init_tty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lslang $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9392 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char SLang_init_tty(); - -int main() { -SLang_init_tty() -; return 0; } -EOF -if { (eval echo configure:6675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char SLang_init_tty (); +int +main () +{ +SLang_init_tty (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9411: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9414: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9417: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9420: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_slang_SLang_init_tty=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_slang_SLang_init_tty=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9431: result: $ac_cv_lib_slang_SLang_init_tty" >&5 +echo "${ECHO_T}$ac_cv_lib_slang_SLang_init_tty" >&6 +if test $ac_cv_lib_slang_SLang_init_tty = yes; then : else - echo "$ac_t""no" 1>&6 - enable_slang=no - echo "configure: warning: slang interface is not enabled" 1>&2 + enable_slang=no + { echo "$as_me:9437: WARNING: slang interface is not enabled" >&5 +echo "$as_me: WARNING: slang interface is not enabled" >&2;} fi - for ac_hdr in slang/slang.h slang.h +for ac_header in slang/slang.h slang.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6701: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:9444: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 9450 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:9454: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:9460: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done ;; esac -fi - +fi; case "x$enable_slang" in xyes) cat >> confdefs.h <&6 -echo "configure:6763: 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 + echo "$as_me:9511: checking for initscr in -ltermcap" >&5 +echo $ECHO_N "checking for initscr in -ltermcap... $ECHO_C" >&6 +if test "${ac_cv_lib_termcap_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9519 "configure" #include "confdefs.h" -/* 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 initscr(); - -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:6782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main () +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9538: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9541: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9544: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9547: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_termcap_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_termcap_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9558: result: $ac_cv_lib_termcap_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_termcap_initscr" >&6 +if test $ac_cv_lib_termcap_initscr = yes; then s_so_libs="$s_so_libs -ltermcap" -else - echo "$ac_t""no" 1>&6 fi - ;; *) - + ;; esac - - - - - - if false; then ENABLE_MOTIF_TRUE= ENABLE_MOTIF_FALSE='#' @@ -6822,22 +9578,22 @@ if test "${enable_motif+set}" = set; then enableval="$enable_motif" case "x$enable_motif" in xyes|xdynamic) if test "x$with_x" != xyes; then - { echo "configure: error: motif: --with-x option must be specified" 1>&2; exit 1; } + { { echo "$as_me:9581: error: motif: --with-x option must be specified" >&5 +echo "$as_me: error: motif: --with-x option must be specified" >&2;} + { (exit 1); exit 1; }; } fi if test "x$have_xm" != xyes; then - echo "configure: warning: Motif library is not found." 1>&2 + { echo "$as_me:9586: WARNING: Motif library is not found." >&5 +echo "$as_me: WARNING: Motif library is not found." >&2;} enable_motif=no fi ;; esac -fi - +fi; case "x$enable_motif" in xyes) cat >> confdefs.h <&2; exit 1; } + { { echo "$as_me:9637: error: tcltk: --with-x option must be specified" >&5 +echo "$as_me: error: tcltk: --with-x option must be specified" >&2;} + { (exit 1); exit 1; }; } fi KEEPCPPFLAGS=$CPPFLAGS @@ -6897,87 +9650,115 @@ tcl_lib= tk_lib= for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do - case "x$tcl_lib" in x) echo $ac_n "checking for Tcl_Init in -l$l""... $ac_c" 1>&6 -echo "configure:6902: 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 + case "x$tcl_lib" in x) as_ac_Lib=`echo "ac_cv_lib_$l''_Tcl_Init" | $as_tr_sh` +echo "$as_me:9654: checking for Tcl_Init in -l$l" >&5 +echo $ECHO_N "checking for Tcl_Init in -l$l... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$l $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9662 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char Tcl_Init(); - -int main() { -Tcl_Init() -; return 0; } -EOF -if { (eval echo configure:6921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char Tcl_Init (); +int +main () +{ +Tcl_Init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9681: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9684: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9687: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9690: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Lib=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9701: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +if test `eval echo '${'$as_ac_Lib'}'` = yes; then tcl_lib=-l$l -else - echo "$ac_t""no" 1>&6 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:6945: 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 + case "x$tk_lib" in x) as_ac_Lib=`echo "ac_cv_lib_$l''_Tk_Init" | $as_tr_sh` +echo "$as_me:9711: checking for Tk_Init in -l$l" >&5 +echo $ECHO_N "checking for Tk_Init in -l$l... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-l$l $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9719 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char Tk_Init(); - -int main() { -Tk_Init() -; return 0; } -EOF -if { (eval echo configure:6964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char Tk_Init (); +int +main () +{ +Tk_Init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9738: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9741: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9744: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9747: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Lib=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9758: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +if test `eval echo '${'$as_ac_Lib'}'` = yes; then tk_lib=-l$l -else - echo "$ac_t""no" 1>&6 fi ;; esac done @@ -6987,21 +9768,19 @@ CPPFLAGS=$KEEPCPPFLAGS LDFLAGS=$KEEPLDFLAGS enable_tcltk=no - echo "configure: warning: tcl/tk is not enable" 1>&2 + { echo "$as_me:9771: WARNING: tcl/tk is not enable" >&5 +echo "$as_me: WARNING: tcl/tk is not enable" >&2;} else tcltk_dep='tclIndex' fi ;; esac -fi - +fi; case "x$enable_tcltk" in xyes) cat >> confdefs.h <> confdefs.h <> confdefs.h <&2; exit 1; } + { { echo "$as_me:9909: error: xaw: --with-x option must be specified" >&5 +echo "$as_me: error: xaw: --with-x option must be specified" >&2;} + { (exit 1); exit 1; }; } fi if test "x$have_xaw" != "xyes" -a "x$have_xaw" != "x3d"; then - echo "configure: warning: X Athena Widget library is not found." 1>&2 + { echo "$as_me:9914: WARNING: X Athena Widget library is not found." >&5 +echo "$as_me: WARNING: X Athena Widget library is not found." >&2;} enable_xaw=no fi ;; esac -fi - +fi; case "x$enable_xaw" in xyes) cat >> confdefs.h <&2; exit 1; } + { { echo "$as_me:9992: error: xskin: --with-x option must be specified" >&5 +echo "$as_me: error: xskin: --with-x option must be specified" >&2;} + { (exit 1); exit 1; }; } fi ;; esac -fi - +fi; case "x$enable_xskin" in xyes) cat >> confdefs.h <&6 -echo "configure:7328: 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 +echo "$as_me:10070: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GTK_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$GTK_CONFIG" in - /*) + case $GTK_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" + echo "$as_me:10087: found $ac_dir/$ac_word" >&5 + break +fi +done + test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" ;; esac fi -GTK_CONFIG="$ac_cv_path_GTK_CONFIG" +GTK_CONFIG=$ac_cv_path_GTK_CONFIG + if test -n "$GTK_CONFIG"; then - echo "$ac_t""$GTK_CONFIG" 1>&6 + echo "$as_me:10099: result: $GTK_CONFIG" >&5 +echo "${ECHO_T}$GTK_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:10102: result: no" >&5 +echo "${ECHO_T}no" >&6 fi min_gtk_version=1.1.3 - echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7363: checking for GTK - version >= $min_gtk_version" >&5 + echo "$as_me:10107: checking for GTK - version >= $min_gtk_version" >&5 +echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -7381,14 +10127,14 @@ if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10131 "configure" #include "confdefs.h" #include #include -int +int main () { int major, minor, micro; @@ -7407,7 +10153,7 @@ (gtk_minor_version != $gtk_config_minor_version) || (gtk_micro_version != $gtk_config_micro_version)) { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, gtk_major_version, gtk_minor_version, gtk_micro_version); printf ("*** was found! If gtk-config was correct, then it is best\n"); @@ -7418,7 +10164,7 @@ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); printf("*** before re-running configure\n"); - } + } else { if ((gtk_major_version > major) || @@ -7447,28 +10193,38 @@ return 1; } -EOF -if { (eval echo configure:7452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:10198: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10201: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:10203: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10206: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - no_gtk=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +no_gtk=yes fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_gtk" = x ; then - echo "$ac_t""yes" 1>&6 - : + echo "$as_me:10222: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + : else - echo "$ac_t""no" 1>&6 + echo "$as_me:10226: result: no" >&5 +echo "${ECHO_T}no" >&6 if test "$GTK_CONFIG" = "no" ; then echo "*** The gtk-config script installed by GTK could not be found" echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" @@ -7481,19 +10237,33 @@ echo "*** Could not run GTK test program, checking why..." CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10241 "configure" #include "confdefs.h" #include #include -int main() { - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); -; return 0; } -EOF -if { (eval echo configure:7496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +int +main () +{ + return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10256: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10259: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10262: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10265: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then 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" echo "*** version of GTK. If it is not finding GTK, you'll need to set your" @@ -7507,17 +10277,16 @@ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" echo "*** came with the system with the command" echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" + echo "*** rpm --erase --nodeps gtk gtk-devel" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "*** The test program failed to compile or link. See the file config.log for the" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means GTK was incorrectly installed" echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" + echo "*** may want to edit the gtk-config script: $GTK_CONFIG" fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi @@ -7526,20 +10295,16 @@ GTK_LIBS="" enable_gtk=no fi - - + rm -f conf.gtktest ;; esac -fi - +fi; case "x$enable_gtk" in xyes) cat >> confdefs.h <> confdefs.h <&6 -echo "configure:7625: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:10381: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 10387 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:10391: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:10397: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - ;; xdynamic) dynamic_targets="$dynamic_targets interface_r.\$(so)" - + ;; *) - + ;; esac - - - - if false; then ENABLE_ALSASEQ_TRUE= ENABLE_ALSASEQ_FALSE='#' @@ -7683,16 +10444,13 @@ if test "${enable_alsaseq+set}" = set; then enableval="$enable_alsaseq" case "x$enable_alsaseq" in xyes|xdynamic) ;; esac -fi - +fi; case "x$enable_alsaseq" in xyes) cat >> confdefs.h <&6 -echo "configure:7709: 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 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:10466: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 10472 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:10476: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:10482: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - ;; xdynamic) dynamic_targets="$dynamic_targets interface_A.\$(so)" - + ;; *) - + ;; esac - - - - - if false; then ENABLE_W32GUI_TRUE= ENABLE_W32GUI_FALSE='#' @@ -7768,16 +10529,13 @@ if test "${enable_w32gui+set}" = set; then enableval="$enable_w32gui" case "x$enable_w32gui" in xyes|xdynamic) ;; esac -fi - +fi; case "x$enable_w32gui" in xyes) cat >> confdefs.h <&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:7815: 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 + { { echo "$as_me:10565: error: UMP Package is not exists. Can't configure it." >&5 +echo "$as_me: error: UMP Package is not exists. Can't configure it." >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:10569: checking for X11/xpm.h" >&5 +echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_xpm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10575 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +_ACEOF +if { (eval echo "$as_me:10579: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:10585: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_X11_xpm_h=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_X11_xpm_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 +echo "$as_me:10604: result: $ac_cv_header_X11_xpm_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 +if test $ac_cv_header_X11_xpm_h = yes; then : else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: UMP Package needs xpm.h, but could not find it." 1>&2; exit 1; } + { { echo "$as_me:10609: error: UMP Package needs xpm.h, but could not find it." >&5 +echo "$as_me: error: UMP Package needs xpm.h, but could not find it." >&2;} + { (exit 1); exit 1; }; } fi - echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:7848: 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 + echo "$as_me:10614: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6 +if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromData+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10622 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XpmCreatePixmapFromData(); - -int main() { -XpmCreatePixmapFromData() -; return 0; } -EOF -if { (eval echo configure:7867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char XpmCreatePixmapFromData (); +int +main () +{ +XpmCreatePixmapFromData (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10641: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10644: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10647: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10650: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xpm_XpmCreatePixmapFromData=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:10661: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 +echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6 +if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then : else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: UMP Package needs libXpm.a, but could not find it." 1>&2; exit 1; } + { { echo "$as_me:10666: error: UMP Package needs libXpm.a, but could not find it." >&5 +echo "$as_me: error: UMP Package needs libXpm.a, but could not find it." >&2;} + { (exit 1); exit 1; }; } fi if test "x$have_xext" = xyes; then @@ -7893,16 +10677,13 @@ lib_xmu_opt=-lXmu lib_xt_opt=-lXt ;; esac -fi - +fi; case "x$enable_ump" in xyes) cat >> confdefs.h <&6 -echo "configure:7939: 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 + echo "$as_me:10715: checking for DndInitialize in -lDnd" >&5 +echo $ECHO_N "checking for DndInitialize in -lDnd... $ECHO_C" >&6 +if test "${ac_cv_lib_Dnd_DndInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lDnd $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10723 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char DndInitialize(); - -int main() { -DndInitialize() -; return 0; } -EOF -if { (eval echo configure:7958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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" + builtin and then its argument prototype would still apply. */ +char DndInitialize (); +int +main () +{ +DndInitialize (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10742: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10745: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10748: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10751: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Dnd_DndInitialize=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Dnd_DndInitialize=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:10762: result: $ac_cv_lib_Dnd_DndInitialize" >&5 +echo "${ECHO_T}$ac_cv_lib_Dnd_DndInitialize" >&6 +if test $ac_cv_lib_Dnd_DndInitialize = yes; then -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS=$KEEPLIBS lib_offix_opt="-lDnd" EXTRADEFS="$EXTRADEFS -DOFFIX" - + else - echo "$ac_t""no" 1>&6 - LDFLAGS=$KEEPLDFLAGS + LDFLAGS=$KEEPLDFLAGS CPPFLAGS=$KEEPCPPFLAGS LIBS=$KEEPLIBS - + fi 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 EXTRADEFS="$EXTRADEFS -DSUPPORT_SOCKET" - fi -fi - - + fi +fi; if test "x$enable_network" = "xyes"; then ENABLE_NETWORK_TRUE= @@ -8011,13 +10799,13 @@ enableval="$enable_spectrogram" if test "$enableval" = "yes"; then if test "x$with_x" != xyes; then - { echo "configure: error: spectrogram: --with-x option must be specified" 1>&2; exit 1; } + { { echo "$as_me:10802: error: spectrogram: --with-x option must be specified" >&5 +echo "$as_me: error: spectrogram: --with-x option must be specified" >&2;} + { (exit 1); exit 1; }; } fi EXTRADEFS="$EXTRADEFS -DSUPPORT_SOUNDSPEC" - fi -fi - - + fi +fi; if test "x$enable_spectrogram" = "xyes"; then ENABLE_SOUND_SPEC_TRUE= @@ -8044,136 +10832,175 @@ EXTRADEFS="$EXTRADEFS -DNO_INTERPOLATION" ;; *) - { echo "configure: error: Invalid method of --enable-spline" 1>&2; exit 1; } + { { echo "$as_me:10835: error: Invalid method of --enable-spline" >&5 +echo "$as_me: error: Invalid method of --enable-spline" >&2;} + { (exit 1); exit 1; }; } ;; - esac -fi - - + esac +fi; # Check whether --enable-wrd or --disable-wrd was given. if test "${enable_wrd+set}" = set; then enableval="$enable_wrd" if test "$enableval" = "yes"; then if test "x$with_x" != xyes; then - { echo "configure: error: wrd: --with-x option must be specified" 1>&2; exit 1; } + { { echo "$as_me:10847: error: wrd: --with-x option must be specified" >&5 +echo "$as_me: error: wrd: --with-x option must be specified" >&2;} + { (exit 1); exit 1; }; } fi EXTRADEFS="$EXTRADEFS -DWRDT_X" enable_sherry_wrd=yes - echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6 -echo "configure:8065: checking for zlibVersion in -lz" >&5 -ac_lib_var=`echo z'_'zlibVersion | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:10853: checking for zlibVersion in -lz" >&5 +echo $ECHO_N "checking for zlibVersion in -lz... $ECHO_C" >&6 +if test "${ac_cv_lib_z_zlibVersion+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10861 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char zlibVersion(); - -int main() { -zlibVersion() -; return 0; } -EOF -if { (eval echo configure:8084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char zlibVersion (); +int +main () +{ +zlibVersion (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10880: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10883: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10886: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10889: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_z_zlibVersion=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_z_zlibVersion=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:10900: result: $ac_cv_lib_z_zlibVersion" >&5 +echo "${ECHO_T}$ac_cv_lib_z_zlibVersion" >&6 +if test $ac_cv_lib_z_zlibVersion = yes; then : else - echo "$ac_t""no" 1>&6 -enable_sherry_wrd=no + enable_sherry_wrd=no fi - ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:8107: checking for png.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:10908: checking for png.h" >&5 +echo $ECHO_N "checking for png.h... $ECHO_C" >&6 +if test "${ac_cv_header_png_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10914 "configure" #include "confdefs.h" #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +_ACEOF +if { (eval echo "$as_me:10918: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:10924: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_png_h=yes +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_header_png_h=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 +echo "$as_me:10943: result: $ac_cv_header_png_h" >&5 +echo "${ECHO_T}$ac_cv_header_png_h" >&6 +if test $ac_cv_header_png_h = yes; then : else - echo "$ac_t""no" 1>&6 -enable_sherry_wrd=no + enable_sherry_wrd=no fi - echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6 -echo "configure:8140: checking for png_init_io in -lpng" >&5 -ac_lib_var=`echo png'_'png_init_io | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:10951: checking for png_init_io in -lpng" >&5 +echo $ECHO_N "checking for png_init_io in -lpng... $ECHO_C" >&6 +if test "${ac_cv_lib_png_png_init_io+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpng -lz $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10959 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char png_init_io(); - -int main() { -png_init_io() -; return 0; } -EOF -if { (eval echo configure:8159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - 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 + builtin and then its argument prototype would still apply. */ +char png_init_io (); +int +main () +{ +png_init_io (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10978: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10981: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10984: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10987: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_png_png_init_io=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_png_png_init_io=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:10998: result: $ac_cv_lib_png_png_init_io" >&5 +echo "${ECHO_T}$ac_cv_lib_png_png_init_io" >&6 +if test $ac_cv_lib_png_png_init_io = yes; then : else - echo "$ac_t""no" 1>&6 -enable_sherry_wrd=no + enable_sherry_wrd=no fi if test "$enable_sherry_wrd" = yes; then @@ -8181,15 +11008,14 @@ lib_zip_opt=-lz lib_png_opt=-lpng else - echo "configure: warning: Sherry WRD is disabled: png.h, libpng.a, libz.a are required" 1>&2 + { echo "$as_me:11011: WARNING: Sherry WRD is disabled: png.h, libpng.a, libz.a are required" >&5 +echo "$as_me: WARNING: Sherry WRD is disabled: png.h, libpng.a, libz.a are required" >&2;} fi if test "x$have_xext" = xyes; then lib_xext_opt=-lXext fi - fi -fi - - + fi +fi; if test "x$enable_wrd" = "xyes"; then ENABLE_WRD_TRUE= @@ -8199,8 +11025,6 @@ ENABLE_WRD_FALSE= fi - - if test "x$CYGNUS" = xyes; then CYGNUS_TRUE= CYGNUS_FALSE='#' @@ -8209,7 +11033,6 @@ CYGNUS_FALSE= fi - if test "x$W32READDIR" = "xyes"; then W32READDIR_TRUE= W32READDIR_FALSE='#' @@ -8270,7 +11093,6 @@ CPPFLAGS="$val" rm -f wordtmp >/dev/null 2>&1 - CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR) \$(DEF_DEFAULT_PATH)" if test "x$oss_device" != x; then @@ -8287,518 +11109,1029 @@ LIBS="$LIBS $lib_dl_opt $lib_png_opt $lib_zip_opt $lib_user32_opt $lib_w32gui_opt $EXTRALIBS" SHLD="$SHLD $SHLDFLAGS" - - - - - - - - - - - - - - - - -trap '' 1 2 15 -cat > confcache <<\EOF +ac_config_files="$ac_config_files Makefile common.makefile interface/Makefile interface/motif_bitmaps/Makefile interface/bitmaps/Makefile interface/pixmaps/Makefile libarc/Makefile libunimod/Makefile timidity/Makefile utils/Makefile doc/Makefile doc/C/Makefile doc/ja_JP.ujis/Makefile" +cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. # -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. # -EOF +# `ac_cv_env_foo' variables (set or unset) will be overriden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. # So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else +{ + (set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} | + sed ' + t clear + : clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + : end' >>confcache +if cmp -s $cache_file confcache; then :; else if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + cat confcache >$cache_file else echo "not updating unwritable cache $cache_file" fi fi rm -f confcache -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/; +s/:*\${srcdir}:*/:/; +s/:*@srcdir@:*/:/; +s/^\([^=]*=[ ]*\):*/\1/; +s/:*$//; +s/^[^=]*=[ ]*$//; +}' fi -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - DEFS=-DHAVE_CONFIG_H -# Without the "./", some shells look in PATH for config.status. : ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS <&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF +#! $SHELL # Generated automatically by configure. # Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# # Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. +# configure, is in config.log if it exists. -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option +debug=false +SHELL=\${CONFIG_SHELL-$SHELL} +ac_cs_invocation="\$0 \$@" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Name of the executable. +as_me=`echo "$0" |sed 's,.*[\\/],,'` + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +as_executable_p="test -f" + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + +# NLS nuisances. +$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } +$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } +$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } +$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } +$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } +$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } +$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } +$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } + +exec 6>&1 + +_ACEOF + +# Files that config.status was made for. +if test -n "$ac_config_files"; then + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_headers"; then + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_links"; then + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_commands"; then + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +fi + +cat >>$CONFIG_STATUS <<\EOF + +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. + +Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number, then exit + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to ." +EOF + +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. +ac_need_defaults=: +while test $# != 0 do - case "\$ac_option" in + case $1 in + --*=*) + ac_option=`expr "x$1" : 'x\([^=]*\)='` + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + shift + set dummy "$ac_option" "$ac_optarg" ${1+"$@"} + shift + ;; + -*);; + *) # This is not an option, so the user has probably given explicit + # arguments. + ac_need_defaults=false;; + esac + + case $1 in + # Handling of the options. +EOF +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header + { { echo "$as_me:11368: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + shift + CONFIG_FILES="$CONFIG_FILES $1" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + shift + CONFIG_HEADERS="$CONFIG_HEADERS $1" + ac_need_defaults=false;; + + # This is an error. + -*) { { echo "$as_me:11387: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; } ;; + + *) ac_config_targets="$ac_config_targets $1" ;; + esac + shift done -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" +exec 5>>config.log +cat >&5 << _ACEOF -trap 'rm -fr `echo " -Makefile -common.makefile -interface/Makefile -interface/motif_bitmaps/Makefile -interface/bitmaps/Makefile -interface/pixmaps/Makefile -libarc/Makefile -libunimod/Makefile -timidity/Makefile -utils/Makefile -doc/Makefile -doc/C/Makefile -doc/ja_JP.ujis/Makefile config.h interface.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@target@%$target%g -s%@target_alias@%$target_alias%g -s%@target_cpu@%$target_cpu%g -s%@target_vendor@%$target_vendor%g -s%@target_os@%$target_os%g -s%@build@%$build%g -s%@build_alias@%$build_alias%g -s%@build_cpu@%$build_cpu%g -s%@build_vendor@%$build_vendor%g -s%@build_os@%$build_os%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@PACKAGE@%$PACKAGE%g -s%@VERSION@%$VERSION%g -s%@ACLOCAL@%$ACLOCAL%g -s%@AUTOCONF@%$AUTOCONF%g -s%@AUTOMAKE@%$AUTOMAKE%g -s%@AUTOHEADER@%$AUTOHEADER%g -s%@MAKEINFO@%$MAKEINFO%g -s%@SET_MAKE@%$SET_MAKE%g -s%@EMACS@%$EMACS%g -s%@lispdir@%$lispdir%g -s%@CC@%$CC%g -s%@RANLIB@%$RANLIB%g -s%@LN_S@%$LN_S%g -s%@CPP@%$CPP%g -s%@X_CFLAGS@%$X_CFLAGS%g -s%@X_PRE_LIBS@%$X_PRE_LIBS%g -s%@X_LIBS@%$X_LIBS%g -s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g -s%@LIBOBJS@%$LIBOBJS%g -s%@ALSA_CFLAGS@%$ALSA_CFLAGS%g -s%@ALSA_LIBS@%$ALSA_LIBS%g -s%@ESD_CONFIG@%$ESD_CONFIG%g -s%@ESD_CFLAGS@%$ESD_CFLAGS%g -s%@ESD_LIBS@%$ESD_LIBS%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 -s%@ENABLE_SLANG_TRUE@%$ENABLE_SLANG_TRUE%g -s%@ENABLE_SLANG_FALSE@%$ENABLE_SLANG_FALSE%g -s%@s_so_libs@%$s_so_libs%g -s%@ENABLE_MOTIF_TRUE@%$ENABLE_MOTIF_TRUE%g -s%@ENABLE_MOTIF_FALSE@%$ENABLE_MOTIF_FALSE%g -s%@m_so_libs@%$m_so_libs%g -s%@ENABLE_TCLTK_TRUE@%$ENABLE_TCLTK_TRUE%g -s%@ENABLE_TCLTK_FALSE@%$ENABLE_TCLTK_FALSE%g -s%@k_so_libs@%$k_so_libs%g -s%@ENABLE_DYNAMIC_TCLTK_TRUE@%$ENABLE_DYNAMIC_TCLTK_TRUE%g -s%@ENABLE_DYNAMIC_TCLTK_FALSE@%$ENABLE_DYNAMIC_TCLTK_FALSE%g -s%@ENABLE_EMACS_TRUE@%$ENABLE_EMACS_TRUE%g -s%@ENABLE_EMACS_FALSE@%$ENABLE_EMACS_FALSE%g -s%@e_so_libs@%$e_so_libs%g -s%@ENABLE_VT100_TRUE@%$ENABLE_VT100_TRUE%g -s%@ENABLE_VT100_FALSE@%$ENABLE_VT100_FALSE%g -s%@T_so_libs@%$T_so_libs%g -s%@ENABLE_XAW_TRUE@%$ENABLE_XAW_TRUE%g -s%@ENABLE_XAW_FALSE@%$ENABLE_XAW_FALSE%g -s%@a_so_libs@%$a_so_libs%g -s%@ENABLE_DYNAMIC_XAW_TRUE@%$ENABLE_DYNAMIC_XAW_TRUE%g -s%@ENABLE_DYNAMIC_XAW_FALSE@%$ENABLE_DYNAMIC_XAW_FALSE%g -s%@ENABLE_XSKIN_TRUE@%$ENABLE_XSKIN_TRUE%g -s%@ENABLE_XSKIN_FALSE@%$ENABLE_XSKIN_FALSE%g -s%@i_so_libs@%$i_so_libs%g -s%@ENABLE_GTK_TRUE@%$ENABLE_GTK_TRUE%g -s%@ENABLE_GTK_FALSE@%$ENABLE_GTK_FALSE%g -s%@GTK_CONFIG@%$GTK_CONFIG%g -s%@GTK_CFLAGS@%$GTK_CFLAGS%g -s%@GTK_LIBS@%$GTK_LIBS%g -s%@g_so_libs@%$g_so_libs%g -s%@ENABLE_SERVER_TRUE@%$ENABLE_SERVER_TRUE%g -s%@ENABLE_SERVER_FALSE@%$ENABLE_SERVER_FALSE%g -s%@r_so_libs@%$r_so_libs%g -s%@ENABLE_ALSASEQ_TRUE@%$ENABLE_ALSASEQ_TRUE%g -s%@ENABLE_ALSASEQ_FALSE@%$ENABLE_ALSASEQ_FALSE%g -s%@A_so_libs@%$A_so_libs%g -s%@ENABLE_W32GUI_TRUE@%$ENABLE_W32GUI_TRUE%g -s%@ENABLE_W32GUI_FALSE@%$ENABLE_W32GUI_FALSE%g -s%@w_so_libs@%$w_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 -s%@ENABLE_SOUND_SPEC_FALSE@%$ENABLE_SOUND_SPEC_FALSE%g -s%@ENABLE_WRD_TRUE@%$ENABLE_WRD_TRUE%g -s%@ENABLE_WRD_FALSE@%$ENABLE_WRD_FALSE%g -s%@CYGNUS_TRUE@%$CYGNUS_TRUE%g -s%@CYGNUS_FALSE@%$CYGNUS_FALSE%g -s%@W32READDIR_TRUE@%$W32READDIR_TRUE%g -s%@W32READDIR_FALSE@%$W32READDIR_FALSE%g -s%@timidity_LDFLAGS@%$timidity_LDFLAGS%g -s%@SYSEXTRAS@%$SYSEXTRAS%g -s%@EXTRALIBS@%$EXTRALIBS%g -s%@NETSRCS@%$NETSRCS%g -s%@ELFILES@%$ELFILES%g -s%@SHLD@%$SHLD%g -s%@SHCFLAGS@%$SHCFLAGS%g -s%@dynamic_targets@%$dynamic_targets%g -s%@so@%$so%g -s%@WISH@%$WISH%g -s%@tcltk_dep@%$tcltk_dep%g -s%@INTERFACE_SRCS@%$INTERFACE_SRCS%g +## ----------------------- ## +## Running config.status. ## +## ----------------------- ## -CEOF +This file was extended by $as_me 2.52, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + > $ac_cs_invocation +on `(hostname || uname -n) 2>/dev/null | sed 1q` + +_ACEOF EOF -cat >> $CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS < conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi +AMDEP_TRUE="$AMDEP_TRUE" +ac_aux_dir="$ac_aux_dir" + +EOF + +cat >>$CONFIG_STATUS <<\EOF +for ac_config_target in $ac_config_targets +do + case "$ac_config_target" in + # Handling of arguments. + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "common.makefile" ) CONFIG_FILES="$CONFIG_FILES common.makefile" ;; + "interface/Makefile" ) CONFIG_FILES="$CONFIG_FILES interface/Makefile" ;; + "interface/motif_bitmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES interface/motif_bitmaps/Makefile" ;; + "interface/bitmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES interface/bitmaps/Makefile" ;; + "interface/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES interface/pixmaps/Makefile" ;; + "libarc/Makefile" ) CONFIG_FILES="$CONFIG_FILES libarc/Makefile" ;; + "libunimod/Makefile" ) CONFIG_FILES="$CONFIG_FILES libunimod/Makefile" ;; + "timidity/Makefile" ) CONFIG_FILES="$CONFIG_FILES timidity/Makefile" ;; + "utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; + "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "doc/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/C/Makefile" ;; + "doc/ja_JP.ujis/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ja_JP.ujis/Makefile" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "interface.h" ) CONFIG_HEADERS="$CONFIG_HEADERS interface.h" ;; + *) { { echo "$as_me:11448: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi + +# Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/cs$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} + +EOF + +cat >>$CONFIG_STATUS <\$tmp/subs.sed <<\\CEOF +s,@SHELL@,$SHELL,;t t +s,@exec_prefix@,$exec_prefix,;t t +s,@prefix@,$prefix,;t t +s,@program_transform_name@,$program_transform_name,;t t +s,@bindir@,$bindir,;t t +s,@sbindir@,$sbindir,;t t +s,@libexecdir@,$libexecdir,;t t +s,@datadir@,$datadir,;t t +s,@sysconfdir@,$sysconfdir,;t t +s,@sharedstatedir@,$sharedstatedir,;t t +s,@localstatedir@,$localstatedir,;t t +s,@libdir@,$libdir,;t t +s,@includedir@,$includedir,;t t +s,@oldincludedir@,$oldincludedir,;t t +s,@infodir@,$infodir,;t t +s,@mandir@,$mandir,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +s,@build_alias@,$build_alias,;t t +s,@host_alias@,$host_alias,;t t +s,@target_alias@,$target_alias,;t t +s,@ECHO_C@,$ECHO_C,;t t +s,@ECHO_N@,$ECHO_N,;t t +s,@ECHO_T@,$ECHO_T,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@DEFS@,$DEFS,;t t +s,@LIBS@,$LIBS,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t +s,@target@,$target,;t t +s,@target_cpu@,$target_cpu,;t t +s,@target_vendor@,$target_vendor,;t t +s,@target_os@,$target_os,;t t +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@PACKAGE@,$PACKAGE,;t t +s,@VERSION@,$VERSION,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@ACLOCAL@,$ACLOCAL,;t t +s,@AUTOCONF@,$AUTOCONF,;t t +s,@AUTOMAKE@,$AUTOMAKE,;t t +s,@AUTOHEADER@,$AUTOHEADER,;t t +s,@MAKEINFO@,$MAKEINFO,;t t +s,@AMTAR@,$AMTAR,;t t +s,@install_sh@,$install_sh,;t t +s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +s,@AWK@,$AWK,;t t +s,@SET_MAKE@,$SET_MAKE,;t t +s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t +s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t +s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t +s,@DEPDIR@,$DEPDIR,;t t +s,@EMACS@,$EMACS,;t t +s,@lispdir@,$lispdir,;t t +s,@CC@,$CC,;t t +s,@CFLAGS@,$CFLAGS,;t t +s,@LDFLAGS@,$LDFLAGS,;t t +s,@CPPFLAGS@,$CPPFLAGS,;t t +s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@am__include@,$am__include,;t t +s,@am__quote@,$am__quote,;t t +s,@CCDEPMODE@,$CCDEPMODE,;t t +s,@RANLIB@,$RANLIB,;t t +s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +s,@LN_S@,$LN_S,;t t +s,@CPP@,$CPP,;t t +s,@X_CFLAGS@,$X_CFLAGS,;t t +s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t +s,@X_LIBS@,$X_LIBS,;t t +s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@ALSA_CFLAGS@,$ALSA_CFLAGS,;t t +s,@ALSA_LIBS@,$ALSA_LIBS,;t t +s,@ESD_CONFIG@,$ESD_CONFIG,;t t +s,@ESD_CFLAGS@,$ESD_CFLAGS,;t t +s,@ESD_LIBS@,$ESD_LIBS,;t t +s,@VORBIS_CFLAGS@,$VORBIS_CFLAGS,;t t +s,@VORBIS_LIBS@,$VORBIS_LIBS,;t t +s,@VORBISFILE_LIBS@,$VORBISFILE_LIBS,;t t +s,@VORBISENC_LIBS@,$VORBISENC_LIBS,;t t +s,@OGG_CFLAGS@,$OGG_CFLAGS,;t t +s,@OGG_LIBS@,$OGG_LIBS,;t t +s,@NEEDDLOPEN_TRUE@,$NEEDDLOPEN_TRUE,;t t +s,@NEEDDLOPEN_FALSE@,$NEEDDLOPEN_FALSE,;t t +s,@ENABLE_NCURSES_TRUE@,$ENABLE_NCURSES_TRUE,;t t +s,@ENABLE_NCURSES_FALSE@,$ENABLE_NCURSES_FALSE,;t t +s,@n_so_libs@,$n_so_libs,;t t +s,@ENABLE_SLANG_TRUE@,$ENABLE_SLANG_TRUE,;t t +s,@ENABLE_SLANG_FALSE@,$ENABLE_SLANG_FALSE,;t t +s,@s_so_libs@,$s_so_libs,;t t +s,@ENABLE_MOTIF_TRUE@,$ENABLE_MOTIF_TRUE,;t t +s,@ENABLE_MOTIF_FALSE@,$ENABLE_MOTIF_FALSE,;t t +s,@m_so_libs@,$m_so_libs,;t t +s,@ENABLE_TCLTK_TRUE@,$ENABLE_TCLTK_TRUE,;t t +s,@ENABLE_TCLTK_FALSE@,$ENABLE_TCLTK_FALSE,;t t +s,@k_so_libs@,$k_so_libs,;t t +s,@ENABLE_DYNAMIC_TCLTK_TRUE@,$ENABLE_DYNAMIC_TCLTK_TRUE,;t t +s,@ENABLE_DYNAMIC_TCLTK_FALSE@,$ENABLE_DYNAMIC_TCLTK_FALSE,;t t +s,@ENABLE_EMACS_TRUE@,$ENABLE_EMACS_TRUE,;t t +s,@ENABLE_EMACS_FALSE@,$ENABLE_EMACS_FALSE,;t t +s,@e_so_libs@,$e_so_libs,;t t +s,@ENABLE_VT100_TRUE@,$ENABLE_VT100_TRUE,;t t +s,@ENABLE_VT100_FALSE@,$ENABLE_VT100_FALSE,;t t +s,@T_so_libs@,$T_so_libs,;t t +s,@ENABLE_XAW_TRUE@,$ENABLE_XAW_TRUE,;t t +s,@ENABLE_XAW_FALSE@,$ENABLE_XAW_FALSE,;t t +s,@a_so_libs@,$a_so_libs,;t t +s,@ENABLE_DYNAMIC_XAW_TRUE@,$ENABLE_DYNAMIC_XAW_TRUE,;t t +s,@ENABLE_DYNAMIC_XAW_FALSE@,$ENABLE_DYNAMIC_XAW_FALSE,;t t +s,@ENABLE_XSKIN_TRUE@,$ENABLE_XSKIN_TRUE,;t t +s,@ENABLE_XSKIN_FALSE@,$ENABLE_XSKIN_FALSE,;t t +s,@i_so_libs@,$i_so_libs,;t t +s,@ENABLE_GTK_TRUE@,$ENABLE_GTK_TRUE,;t t +s,@ENABLE_GTK_FALSE@,$ENABLE_GTK_FALSE,;t t +s,@GTK_CONFIG@,$GTK_CONFIG,;t t +s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t +s,@GTK_LIBS@,$GTK_LIBS,;t t +s,@g_so_libs@,$g_so_libs,;t t +s,@ENABLE_SERVER_TRUE@,$ENABLE_SERVER_TRUE,;t t +s,@ENABLE_SERVER_FALSE@,$ENABLE_SERVER_FALSE,;t t +s,@r_so_libs@,$r_so_libs,;t t +s,@ENABLE_ALSASEQ_TRUE@,$ENABLE_ALSASEQ_TRUE,;t t +s,@ENABLE_ALSASEQ_FALSE@,$ENABLE_ALSASEQ_FALSE,;t t +s,@A_so_libs@,$A_so_libs,;t t +s,@ENABLE_W32GUI_TRUE@,$ENABLE_W32GUI_TRUE,;t t +s,@ENABLE_W32GUI_FALSE@,$ENABLE_W32GUI_FALSE,;t t +s,@w_so_libs@,$w_so_libs,;t t +s,@ENABLE_PLUGIN_TRUE@,$ENABLE_PLUGIN_TRUE,;t t +s,@ENABLE_PLUGIN_FALSE@,$ENABLE_PLUGIN_FALSE,;t t +s,@p_so_libs@,$p_so_libs,;t t +s,@ENABLE_NETWORK_TRUE@,$ENABLE_NETWORK_TRUE,;t t +s,@ENABLE_NETWORK_FALSE@,$ENABLE_NETWORK_FALSE,;t t +s,@ENABLE_SOUND_SPEC_TRUE@,$ENABLE_SOUND_SPEC_TRUE,;t t +s,@ENABLE_SOUND_SPEC_FALSE@,$ENABLE_SOUND_SPEC_FALSE,;t t +s,@ENABLE_WRD_TRUE@,$ENABLE_WRD_TRUE,;t t +s,@ENABLE_WRD_FALSE@,$ENABLE_WRD_FALSE,;t t +s,@CYGNUS_TRUE@,$CYGNUS_TRUE,;t t +s,@CYGNUS_FALSE@,$CYGNUS_FALSE,;t t +s,@W32READDIR_TRUE@,$W32READDIR_TRUE,;t t +s,@W32READDIR_FALSE@,$W32READDIR_FALSE,;t t +s,@timidity_LDFLAGS@,$timidity_LDFLAGS,;t t +s,@SYSEXTRAS@,$SYSEXTRAS,;t t +s,@EXTRALIBS@,$EXTRALIBS,;t t +s,@NETSRCS@,$NETSRCS,;t t +s,@ELFILES@,$ELFILES,;t t +s,@SHLD@,$SHLD,;t t +s,@SHCFLAGS@,$SHCFLAGS,;t t +s,@dynamic_targets@,$dynamic_targets,;t t +s,@so@,$so,;t t +s,@WISH@,$WISH,;t t +s,@tcltk_dep@,$tcltk_dep,;t t +s,@INTERFACE_SRCS@,$INTERFACE_SRCS,;t t +CEOF + EOF -cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + else + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + fi + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat + fi +fi # test -n "$CONFIG_FILES" -CONFIG_FILES=\${CONFIG_FILES-"Makefile -common.makefile -interface/Makefile -interface/motif_bitmaps/Makefile -interface/bitmaps/Makefile -interface/pixmaps/Makefile -libarc/Makefile -libunimod/Makefile -timidity/Makefile -utils/Makefile -doc/Makefile -doc/C/Makefile -doc/ja_JP.ujis/Makefile"} EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then +cat >>$CONFIG_STATUS <<\EOF +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || mkdir "$as_incr_dir" + ;; + esac +done; } + + ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` else ac_dir_suffix= ac_dots= fi - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + case $srcdir in + .) ac_srcdir=. + if test -z "$ac_dots"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; + ac_srcdir=$ac_dots$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_dots$srcdir ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_dots$INSTALL ;; esac - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac + if test x"$ac_file" != x-; then + { echo "$as_me:11777: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated automatically by config.status. */ + configure_input="Generated automatically from `echo $ac_file_in | + sed 's,.*/,,'` by configure." + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:11795: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:11808: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } +EOF +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s,@configure_input@,$configure_input,;t t +s,@srcdir@,$ac_srcdir,;t t +s,@top_srcdir@,$ac_top_srcdir,;t t +s,@INSTALL@,$ac_INSTALL,;t t +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out + rm -f $tmp/stdin + if test x"$ac_file" != x-; then + mv $tmp/out $ac_file + else + cat $tmp/out + rm -f $tmp/out + fi + +done +EOF +cat >>$CONFIG_STATUS <<\EOF - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* +# +# CONFIG_HEADER section. +# # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' +ac_dC=' ' +ac_dD=',;t' +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='$,\1#\2define\3' ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' +ac_uD=',;t' -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - echo creating $ac_file + test x"$ac_file" != x- && { echo "$as_me:11869: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:11880: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:11893: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in EOF -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr +# Transform confdefs.h into two sed scripts, `conftest.defines' and +# `conftest.undefs', that substitutes the proper values into +# config.h.in to produce config.h. The first handles `#define' +# templates, and the second `#undef' templates. +# And first: Protect against being on the right side of a sed subst in +# config.status. Protect against being in an unquoted here document +# in config.status. +rm -f conftest.defines conftest.undefs +# Using a here document instead of a string reduces the quoting nightmare. +# Putting comments in sed scripts is not portable. +# +# `end' is used to avoid that the second main sed command (meant for +# 0-ary CPP macros) applies to n-ary macro definitions. +# See the Autoconf documentation for `clear'. +cat >confdef2sed.sed <<\EOF +s/[\\&,]/\\&/g +s,[\\$`],\\&,g +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp +t end +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +: end +EOF +# If some macros were called several times there might be several times +# the same #defines, which is useless. Nevertheless, we may not want to +# sort them, since we want the *last* AC-DEFINE to be honored. +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +rm -f confdef2sed.sed # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +cat >>conftest.undefs <<\EOF +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, EOF -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. - +# Break up conftest.defines because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +echo ' :' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.defines >/dev/null +do + # Write a limited-size here document to $tmp/defines.sed. + echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#define' lines. + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines +echo ' fi # egrep' >>$CONFIG_STATUS +echo >>$CONFIG_STATUS + +# Break up conftest.undefs because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #undef templates' >>$CONFIG_STATUS rm -f conftest.tail -while : +while grep . conftest.undefs >/dev/null do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + # Write a limited-size here document to $tmp/undefs.sed. + echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#undef' + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals -done -rm -f conftest.vals - -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail + rm -f conftest.undefs + mv conftest.tail conftest.undefs +done +rm -f conftest.undefs + +cat >>$CONFIG_STATUS <<\EOF + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated automatically by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated automatically by configure. */" >$tmp/config.h else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + fi + cat $tmp/in >>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s $ac_file $tmp/config.h 2>/dev/null; then + { echo "$as_me:12010: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || mkdir "$as_incr_dir" + ;; + esac +done; } + + fi + rm -f $ac_file + mv $tmp/config.h $ac_file fi - rm -f $ac_file - mv conftest.h $ac_file + else + cat $tmp/config.h + rm -f $tmp/config.h fi -fi; done - + # Run the commands associated with the file. + case $ac_file in + config.h ) # update the timestamp +echo timestamp >"./stamp-h1" + ;; + interface.h ) # update the timestamp +echo timestamp >"./stamp-h2" + ;; + esac +done EOF -cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF - -EOF -cat >> $CONFIG_STATUS <<\EOF -am_indx=1 -for am_file in config.h interface.h; do - case " $CONFIG_HEADERS " in - *" $am_file "*) - echo timestamp > `echo $am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; +# +# CONFIG_COMMANDS section. +# +for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue + ac_dest=`echo "$ac_file" | sed 's,:.*,,'` + ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` + + case $ac_dest in + default-1 ) +test x"$AMDEP_TRUE" != x"" || +for mf in $CONFIG_FILES; do + case "$mf" in + Makefile) dirpart=.;; + */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; + *) continue;; + esac + grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`echo "$file" | sed -e 's|/[^/]*$||'` + $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; esac - am_indx=`expr "$am_indx" + 1` done +EOF + +cat >>$CONFIG_STATUS <<\EOF -exit 0 +{ (exit 0); exit 0; } EOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_clean_files=$ac_clean_files_save + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + exec 5>/dev/null + $SHELL $CONFIG_STATUS || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi diff -ruN TiMidity++-2.10.4/configure.in TiMidity++-2.11.0/configure.in --- TiMidity++-2.10.4/configure.in Tue Mar 13 12:55:35 2001 +++ TiMidity++-2.11.0/configure.in Thu Dec 27 19:55:52 2001 @@ -55,7 +55,7 @@ AC_INIT(timidity/timidity.c) SHELL=${CONFIG_SHELL-/bin/sh} AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.10.4, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.11.0) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -442,8 +442,9 @@ dnl nas(n): Network Audio System dnl esd(e): EsounD dnl vorbis(v): Ogg Vorbis +dnl gogo(g): MP3 GOGO -audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd vorbis' +audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd vorbis gogo' AC_ARG_WITH(nas-library, [ --with-nas-library=library NAS absolute library path (Don't use -laudio)]) @@ -465,7 +466,8 @@ alib: HPUX network audio (Alib) nas: NAS - Network Audio System esd: EsounD - vorbis: Ogg Vorbis], + vorbis: Ogg Vorbis + gogo: MP3 GOGO (Only Windows is supported)], [ enable_audio=$enableval have_audio_opt=yes ], [ enable_audio=yes @@ -484,7 +486,7 @@ DEFAULT_PLAYMODE= AC_ARG_WITH(default-output, [ --with-default-output= Specify default output mode (optional): - default|alsa|alib|nas|esd|wav|au|aiff|list|vorbis], + default|alsa|alib|nas|esd|wav|au|aiff|list|vorbis|gogo], [ if test "$enable_audio" != no; then DEFAULT_PLAYMODE=$withval eval "au_enable_$DEFAULT_PLAYMODE=yes" @@ -670,18 +672,13 @@ if test "x$au_enable_w32" = xyes; then case "$target" in *-*-cygwin*) - if test "x$enable_w32gui" = xyes; then - SYSEXTRAS="$SYSEXTRAS w32g_a.c" - else - SYSEXTRAS="$SYSEXTRAS w32_a.c" - fi AC_MSG_RESULT(yes) ;; - *) + *) AC_MSG_WARN(may not work on $target) - SYSEXTRAS="$SYSEXTRAS w32_a.c" ;; esac + SYSEXTRAS="$SYSEXTRAS w32_a.c" EXTRALIBS="$EXTRALIBS -lwinmm" EXTRADEFS="$EXTRADEFS -DAU_W32" else @@ -791,23 +788,42 @@ AC_MSG_CHECKING(enable_audio=vorbis) if test "x$au_enable_vorbis" = xyes; then - AC_MSG_RESULT() - have_vorbis=yes - AC_CHECK_HEADER(vorbis/modes.h,,have_vorbis=no) - AC_CHECK_LIB(vorbis,vorbis_analysis_init,,have_vorbis=no) - if test "$have_vorbis" = "yes"; then - SYSEXTRAS="$SYSEXTRAS vorbis_a.c" - EXTRADEFS="$EXTRADEFS -DAU_VORBIS" - EXTRALIBS="$EXTRALIBS -lvorbis" - AC_MSG_RESULT(Ogg Vorbis: Enabled) + AC_MSG_RESULT(yes, configuring vorbis) + AM_PATH_OGG([ + AM_PATH_VORBIS([ + have_vorbis=yes + SYSEXTRAS="$SYSEXTRAS vorbis_a.c" + EXTRADEFS="$EXTRADEFS -DAU_VORBIS $OGG_CFLAGS $VORBIS_CFLAGS" + EXTRALIBS="$EXTRALIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS" + if test "x$CYGNUS" = "xyes"; then + SYSEXTRAS="$SYSEXTRAS w32g_vorbisenc_dll.c w32g_vorbis_dll.c w32g_ogg_dll.c" + fi + ],[ + AC_MSG_WARN([Unable to configure vorbis, but ogg is there (???)]) + ]) + ],[ + AC_MSG_WARN(Unable to configure vorbis!) + have_vorbis=no + ]) +else + AC_MSG_RESULT(no) +fi + +AC_MSG_CHECKING(enable_audio=gogo) +if test "x$au_enable_gogo" = xyes; then + if test "x$CYGNUS" = "xyes"; then + AC_MSG_RESULT(yes, configuring gogo) else - AC_MSG_WARN(Ogg Vorbis: Couldn't configure) + AC_MSG_WARN(May be gogo is not supported. You need hack the gogo_a.c) fi + have_gogo=yes + SYSEXTRAS="$SYSEXTRAS gogo_a.c w32_gogo.c" + EXTRADEFS="$EXTRADEFS -DAU_GOGO" + EXTRALIBS="$EXTRALIBS -lgogo" else AC_MSG_RESULT(no) fi - dnl Pseudo audio device (Undocumented). if test "x$au_enable_none" = xyes; then EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV" @@ -840,6 +856,7 @@ .aiff) TIMIDITY_OUTPUT_ID=a ;; .list) TIMIDITY_OUTPUT_ID=l ;; .vorbis) TIMIDITY_OUTPUT_ID=v ;; + .gogo) TIMIDITY_OUTPUT_ID=g ;; *) TIMIDITY_OUTPUT_ID= ;; esac AC_MSG_RESULT($DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID) @@ -1244,12 +1261,11 @@ CONFIG_INTERFACE(w32gui, W32GUI, w, [ --enable-w32gui Enable Windows GUI interface (default is no)], , - [ lib_w32gui_opt='-lgdi32 -lcomctl32 -lcomdlg32' + [ lib_w32gui_opt='-lgdi32 -lcomctl32 -lcomdlg32 -lole32' lib_user32_opt='-luser32' LDFLAGS="-mwindows $LDFLAGS" INTERFACE_SRCS="$INTERFACE_SRCS w32g_c.c w32g_ini.c w32g_i.c w32g_playlist.c w32g_utl.c w32g_pref.c w32g_subwin.c w32g_ut2.c" ]) - dnl UMP configuration CONFIG_INTERFACE(ump, PLUGIN, p, diff -ruN TiMidity++-2.10.4/depcomp TiMidity++-2.11.0/depcomp --- TiMidity++-2.10.4/depcomp Thu Jan 1 09:00:00 1970 +++ TiMidity++-2.11.0/depcomp Wed Oct 31 17:17:17 2001 @@ -0,0 +1,411 @@ +#! /bin/sh + +# depcomp - compile a program generating dependencies as side-effects +# Copyright 1999, 2000 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi +# `libtool' can also be set to `yes' or `no'. + +depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. + "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> $depfile + echo >> $depfile + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> $depfile + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. This file always lives in the current directory. + # Also, the AIX compiler puts `$object:' at the start of each line; + # $object doesn't have directory information. + stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + tmpdepfile="$stripped.u" + outname="$stripped.o" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + + if test -f "$tmpdepfile"; then + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +tru64) + # The Tru64 AIX compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + + tmpdepfile1="$object.d" + tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` + if test "$libtool" = yes; then + "$@" -Wc,-MD + else + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + else + tmpdepfile="$tmpdepfile2" + fi + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a space and a tab in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + test -z "$dashmflag" && dashmflag=-M + ( IFS=" " + case " $* " in + *" --mode=compile "*) # this is libtool, let us make it quiet + for arg + do # cycle over the arguments + case "$arg" in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + # X makedepend + ( + shift + cleared=no + for arg in "$@"; do + case $cleared in no) + set ""; shift + cleared=yes + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift;; + -*) + ;; + *) + set fnord "$@" "$arg"; shift;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tail +3 "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + ( IFS=" " + case " $* " in + *" --mode=compile "*) + for arg + do # cycle over the arguments + case $arg in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" -E | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + ( IFS=" " + case " $* " in + *" --mode=compile "*) + for arg + do # cycle over the arguments + case $arg in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 diff -ruN TiMidity++-2.10.4/doc/C/Makefile.in TiMidity++-2.11.0/doc/C/Makefile.in --- TiMidity++-2.10.4/doc/C/Makefile.in Sun Mar 18 15:32:47 2001 +++ TiMidity++-2.11.0/doc/C/Makefile.in Thu Dec 27 19:56:25 2001 @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen @@ -28,7 +31,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -49,13 +51,9 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,11 +62,11 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -83,138 +81,180 @@ target_triplet = @target@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AWK = @AWK@ CC = @CC@ +DEPDIR = @DEPDIR@ ELFILES = @ELFILES@ EMACS = @EMACS@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ +OBJEXT = @OBJEXT@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SHCFLAGS = @SHCFLAGS@ -SHELL = @SHELL@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ VERSION = @VERSION@ +VORBISENC_LIBS = @VORBISENC_LIBS@ +VORBISFILE_LIBS = @VORBISFILE_LIBS@ +VORBIS_CFLAGS = @VORBIS_CFLAGS@ +VORBIS_LIBS = @VORBIS_LIBS@ WISH = @WISH@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +am__include = @am__include@ +am__quote = @am__quote@ dynamic_targets = @dynamic_targets@ +install_sh = @install_sh@ lispdir = @lispdir@ program_transform_name = @program_transform_name@ so = @so@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ -EXTRA_DIST = timidity.1 timidity.cfg.5 CHANGES.02i FAQ README.dl README.sf README.tk README.xskin README.xaw +EXTRA_DIST = \ + timidity.1 \ + timidity.cfg.5 \ + CHANGES.02i \ + FAQ \ + README.dl \ + README.sf \ + README.tk \ + README.xskin \ + README.xaw +subdir = doc/C mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h ../../interface.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/C/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/C/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = doc/C +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic mostlyclean-am -clean-am: clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-generic -distclean-am: distclean-generic clean-am +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am +mostlyclean-am: mostlyclean-generic -include $(top_builddir)/common.makefile +uninstall-am: uninstall-info-am +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-info-am + + +include $(top_builddir)/common.makefile # 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. .NOEXPORT: diff -ruN TiMidity++-2.10.4/doc/C/timidity.1 TiMidity++-2.11.0/doc/C/timidity.1 --- TiMidity++-2.10.4/doc/C/timidity.1 Tue Mar 13 10:01:18 2001 +++ TiMidity++-2.11.0/doc/C/timidity.1 Thu Dec 27 10:12:39 2001 @@ -1,50 +1,47 @@ -.TH TiMidity++ 1 "Jan 06 1999" "1.0.0" +.TH TiMidity++ 1 "Nov 10 2001" "2.11.0" .SH NAME TiMidity++ \- MIDI to WAV converter and player .SH SYNOPSIS .B timidity [\-options] filename [filenames ...] -.P .SH DESCRIPTION TiMidity++ is a converter that converts some of MIDI files -( formats : Standard MIDI file (*.MID), Recomposer files (*.RCP, *.R36, -*.G18, *.G36) and Module file (*.mod) ) into formatted audio file -(ex. RIFF WAVE ). -TiMidity uses Gravis Ultrasound\-compatible patch files or -Soundfonts( *.sfx, *.sf2 ) to generate digital audio data from MIDI files. +(supported formats: Standard MIDI files (*.MID), Recomposer files (*.RCP, *.R36, +*.G18, *.G36) and Module files (*.mod)) into formatted audio files +(e.g. RIFF WAVE). +TiMidity uses Gravis Ultrasound\-compatible patch files or +Soundfonts (*.sfx, *.sf2) to generate digital audio data from MIDI files. The digital audio data generated by TiMidity can be stored in a file for processing, or played in real time through an audio device. .br -In real time playing, TiMidity if able to show the lylic contained -in KAR file or WRD file. - -.P +In real time playing, TiMidity can show the lyrics contained +in KAR or WRD files. .SH FILENAME -You can use the following expressions in \fBfilename\fP fields -to specify the location of the file: +You can use the following expressions as the \fBfilename\fP +argument: .TP .B \- Read a MIDI file from standard input. .TP .B /path/filename -Read a MIDI file on filesystems. +Read a MIDI file from the specified path on a filesystem. .TP .BI dir: "directory" .br .ns .TP .B directory/ -Read and play all MIDI files in specified directory. +Read and play all MIDI files in the specified directory. .TP .B Archive File -Extracts and play the file(s) in the archive. +Extract and play the file(s) in the archive. If you want to specify a certain MIDI file in the archive, -describe the \fI#\fP expression following to the archive name. -The expressions after the \fI#\fP is allowed to use regular expressions +append \fI#\fP to the archive name. +The expression after \fI#\fP can use regular expressions (case insensitive). .RS -For Examples: +For example: .TP .B timidity "'file.zip#file.mid'" Plays file.mid in file.zip @@ -53,15 +50,15 @@ Plays any files that match the regular expression '*.mid' in file.zip .TP .B timidity "'file.tgz#*'" -This expression is same as +This expression is the same as .br \fBtimidity 'file.tgz'\fP .PP Since these mechanism are contained in TiMidity itself, -you can use it even if on MS Windows environment. +you can use this syntax even in the MS Windows environment. .PP -TiMidity can handle the following archive format: +TiMidity can handle the following archive formats: .RS .TP \fBtar\fP (*.tar) @@ -70,7 +67,7 @@ .TP \fBzip\fP (*.zip) .TP -.fBlzh\fP (*.lzh, *.lha) +\fBlzh\fP (*.lzh, *.lha) (lh0, lh1, lh2, lh3, lh4, lh5, lh6, lzs, lz5, lz4 are available) .RE .RE @@ -81,17 +78,16 @@ .ns .TP .B news://news\-server[:port]/newsgroup[/first\-last] -Play the MIDI file in the specified article in news server. -If newsgroup is specified TiMidity plays (all) articles contains -MIDI files posted in the newsgroup. +Play the MIDI file in the specified article on the news server. +If a newsgroup is specified TiMidity plays all MIDI files found +in any article posted to that newsgroup. .br -In this case TiMidity recognize the MIME Multi\-part message, and -extract the articles contains MIDI files and play. +TiMidity parses MIME Multi\-part messages. .br -The following MIME\-type are allowed: +The following MIME\-types are allowed: .RS .TP -.B uu\-encoded file +.B uuencoded file "begin" is required .TP .B base64 encoded @@ -110,62 +106,62 @@ .ns .TP .B ftp://url -Play the file specified these URLs. +Play the file specified in the URL. .sp For example: "timidity http://www.goice.co.jp/member/mo/dist/midi/impromptu.mid" .br -plays MIDI\-file via network. +plays the specified MIDI\-file directly from the network. .sp -If these expression are applied to the *.cfg files, you can use -patch\-files or else on the remote machines. +If these expression are used in the *.cfg files, you can even use +patch\-files (and others) from remote machines. .P .SH INPUT FILE Timidity can handle the following file formats: .TP -\fB .MID\fP ( Format 0, 1, 2 ) +\fB .MID\fP (Format 0, 1, 2) Standard MIDI File .TP -\fB .RCP, .R36, .G18, .G36\fP ( formats of Recomposer (products of COME ON MUSIC co.) ) -Windows version converts these with \fIrcpcv.dll\fP. +\fB .RCP, .R36, .G18, .G36\fP (Recomposer formats (product of COME ON MUSIC co.)) +The Windows version converts these with \fIrcpcv.dll\fP. .TP -\fB .KAR\fP ( Karaoke format ) -Displays lylics same as Lylic Meta Event message. +\fB .KAR\fP (Karaoke format) +Displays the lyrics as a Lyric Meta Event message. .TP -\fB .MOD, MOD.*\fP ( module file ) +\fB .MOD, MOD.*\fP (module file) .TP -\fB .WRD\fP ( WRD format ) +\fB .WRD\fP (WRD format) .P .SH OPTIONS -The following command line optinos are accepted by TiMidity: +The following command line options are accepted by TiMidity: .TP .B \-A \fIamplification\fP Multiplies the master volume by \fIamplification\fP %. Default value is 70%. -The grater number of amplification makes louder sounds. -Range of the amplification is from 0 to 800%. +Higher amplification makes louder sounds. +The allowed values of amplification range from 0 to 800%. .TP .B \-a -Turns on antialiasing. Samples are run through a +Turns on antialiasing. Samples are run through a lowpass filter before playing, which reduces aliasing noise at low resampling frequencies. .TP .B \-B \fIfragments\fP[,\fIbuffer-bits\fP] -For the Linux / FreeBSD / OSS / ALSA / Windows sound driver, -selects the number of -buffer fragments in interactive mode. Increasing -the number of fragments may reduce choppiness when -many processes are running. It will make TiMidity +For the Linux/FreeBSD/OSS/ALSA/Windows sound driver, +selects the number of +buffer fragments in interactive mode. Increasing +the number of fragments may reduce choppiness when +many processes are running. It will make TiMidity seem to respond sluggishly to fast forward, rewind, -and volume controls, and it will throw the status -display off sync. Specify a fragments of 0 to use +and volume controls, and it will throw the status +display off sync. Specify a fragments number of 0 to use the maximum number of fragments available. .TP @@ -175,9 +171,8 @@ .TP .BI \-C " ratio" - Sets the ratio of sampling and control frequencies. -This determines how often envelopes are recalculated +This determines how often envelopes are recalculated -- small ratios yield better quality but use more CPU time. @@ -187,106 +182,103 @@ .TP .BI \-D " channel" -Marks channel as a drum channel. If channel is -negative, channel -channel is marked as an instru- -mental channel. If channel is 0, all channels are +Marks channel as a drum channel. If channel is +negative, channel -channel is marked as an instru- +mental channel. If channel is 0, all channels are marked as instrumental. .TP .BI \-d " dir" -Specifies the directory contains installed dynamic-link interface modules. +Specifies the directory containing installed dynamic-link interface modules. .TP .B \-e -Make TiMidity evil. On Win32 version, this -increases the task priority by one. It can give -better playback when you switch tasks at the +Make TiMidity evil. For the Win32 version, this +increases the task priority by one. It can give +better playback when you switch tasks at the expense of slowing all other tasks down. .TP .BI \-E " mode" -Set TiMidity extend modes. The following modes are available +Set TiMidity extend modes. The following modes are available (capitalized switch means disable this feature): .RS .TP .B w/W -Enables/disables modulation controlling. +Enable/disable modulation controlling. .TP .B p/P -Enables/disables portamento controlling. +Enable/disable portamento controlling. .TP .B v/V -Enables/disables NRPM vibration. -.TP -.B r/R -Enables/disables reverb effect controlling. -.TP -.B c/C -Enables/disables chorus effect controlling. -.TP -.BI c " ratio" -Sets the chorus effect value of all channels to \fIratio\fP. +Enable/disable NRPM vibration. .TP .B s/S -Enables/disables channel pressure controlling. +Enable/disable channel pressure controlling. .TP .B t/T -Enables/disables tracing all Text Meta Events. +Enable/disable tracing all Text Meta Events. .TP .B o/O -Accepts/rejects pronouncing multiple same notes. +Accept/reject pronouncing multiple same notes. .TP .BI m " HH" -Sets the manufacture ID to \fIHH\fP ( \fIHH\fP is the two hex-digits ). +Sets the manufacturer ID to \fIHH\fP (where \fIHH\fP are two hex-digits). .br -In addition if \fIHH\fP is \fIGM/gm\fP , \fIGS/gs\fP or \fIXG/xg\fP -that are same as to \fI41\fP , \fI43\fP and \fI7e\fP. +\fIHH\fP values of \fIGM/gm\fP, \fIGS/gs\fP or \fIXG/xg\fP +are understood as \fI41\fP, \fI43\fP and \fI7e\fP respectively. +.TP +.BI b " n" +Use tone bank \fIn\fP as the default. .TP .BI B " bank" Sets the bank number of all channels to \fIbank\fP. +.TP +.BI F " args" +For effects. See below. .RE .TP .B \-F -Turns on fast panning to accommodate MIDI pieces -that expect panning adjustments to affect notes -that are already playing. Some files that don't -expect this have a habit of flipping balance -rapidly between left and right, which can cause +Turns on fast panning to accommodate MIDI pieces +that expect panning adjustments to affect notes +that are already playing. Some files that don't +expect this have a habit of flipping balance +rapidly between left and right, which can cause severe popping when the -F flag is used. .br -In current versions of TiMidity this option are toggled. +In the current version of TiMidity this option is a toggle. .TP .B \-f -Toggles fast envelopes. This option makes TiMidity do fast -but the release time of the notes are shorten. +Toggles fast envelopes. This option makes TiMidity faster +but the release time of the notes are shortened. .TP .BI \-g " sec" -Open the Sound-Spectrogram window. This option is activated if -the system has support for X Window System. +Open the Sound-Spectrogram window. This option is activated if +the system has support for the X Window System. .TP .B \-h -Show this help message. +Show the help message. .TP .BI \-I " voice" [/c] -Uses the program number as the default instrument. -Any Program Change events in MIDI files will override +Use the program number as the default instrument. +Any Program Change events in MIDI files will override this option. .br -If the \fIvoice\fP followed by \fI/c\fP the default program number -of the channel \fIc\fP is specified by the \fIvoice\fP. +If \fIvoice\fP is followed by \fI/c\fP the default program number +of the channel \fIc\fP is specified by \fIvoice\fP. .TP .BI \-i " interface" Selects the user interfaces from the compiled\-in -alternatives. \fIinterface\fP must be begun with one of the +alternatives. \fIinterface\fP must be begun with one of the supported interface identifiers. Run TiMidity with the \-h option to see a list. The following identifiers -may be available: +may be available: .RS .TP .B \-id @@ -296,31 +288,31 @@ ncurses interface .TP .B \-is -slang interface +S-Lang interface .TP .B \-ia -X Ahtena Widget interface +X Athena Widget interface .TP .B \-ik Tcl/Tk interface .TP .B \-im -motif interface +Motif interface .TP .B \-iT vt100 interface .TP .B \-ie -Emacs interface (press \fBM\-x timidity\fP on \fIEmacs\fP) +Emacs interface (use \fBM\-x timidity\fP in \fIEmacs\fP) .TP .B \-ii skin interface .br -Environment variable \fBTIMIDITY_SKIN\fP must be specified with -path of the skin data(compressed data are also available). +Environment variable \fBTIMIDITY_SKIN\fP must be set to +the path of the skin data (compressed data are also supported). .TP .B \-ig -gtk interface +GTK interface .TP .B \-ir Launch timidity as MIDI server. @@ -330,7 +322,7 @@ .br .TP .B Interface options -Option characters may be added immediately +Option characters may be added immediately after the interface identifier. The following options are recognized: .PP @@ -342,56 +334,84 @@ Decreases verbosity level. This option is cumulative. .TP .B t -Toggles trace mode. In trace mode, -TiMidity attempts to display its +Toggles trace mode. In trace mode, +TiMidity attempts to display its current state in real time. For the -Linux sound driver, this is accomplished +Linux sound driver, this is accomplished through the use of short DMA buffer fragments, which can be tuned via the -B option. .TP .B l -Loop playing (some interface ignore this option) +Loop playing (some interfaces ignore this option) .TP .B r Randomize file list arguments before playing .TP .B s -Sorting file list arguments before playing +Sort file list arguments before playing .RE .TP .B \-j -This option enables to load the patch file while playing. +Enable the loading of patch files during play. + +.TP +.B \-k " msec" +Specify audio queue time limit to reduce voices. +If the remaining audio buffer is less than \fImsec\fB milliseconds, +TiMidity tries to kill some voices. +This feature makes it possible to play complicated MIDI files on slow CPUs. +Setting \fImsec\fB to zero tells TiMidity to never remove any voices. .TP .B \-L " directory" Adds \fIdirectory\fP to the library path. Patch, configuration, -and MIDI files are searched along this -path. Directories added last will be searched -first. Note that the current directory is always +and MIDI files are searched along this +path. Directories added last will be searched +first. Note that the current directory is always searched first before the library path. .TP +.BI \-m " time" +Modify envelope volume decay time. \fItime\fP is the minimum +number of milliseconds to sustain a sustained note. +.RS +.TP +.B \-m 1 +Effectively behaves as if all sustains are ignored, volume ramping is +the same as normal stage 3. +.TP +.B \-m 0 +Disable sustain ramping, causes constant volume sustains (default). +.TP +.B \-m 3000 +A note at full volume will decay for 3 seconds once it begins +to be sustained (assuming the regular stage 3 rate would not +cause it to decay even longer). Softer notes will of course +die sooner. +.RE + +.TP .BI \-n " degree" -Enables Noise Shaping Filter. \fIdegree\fP is from -\fI0\fP(min) to \fI4\fP(max). +Enables Noise Shaping Filter. \fIdegree\fP ranges from +\fI0\fP (min) to \fI4\fP (max). .TP .BI \-O " mode" -Selects the output mode from the compiled-in alternatives. +Selects the output mode from the compiled-in alternatives. mode must begin with one of the supported -output mode identifiers. Run TiMidity with the -h -option to see a list. The following identifiers -should be available in all versions: +output mode identifiers. Run TiMidity with the -h +option to see the list. The following identifiers +are available in all versions: .RS .TP .B \-Od Outputs via audio device (default) .TP .B \-Or -Generate raw waveform data. All format -options are supported. Common formats +Generate raw waveform data. All format +options are supported. Common formats include: .RS .TP @@ -406,14 +426,14 @@ .RE .TP .B \-Ou -Generate Sun Audio (au) file +Generate Sun Audio (au) data .TP .B \-Oa -Genetate AIFF file +Generate AIFF data .TP .B \-Ow Generate RIFF WAVE format output. If output -is directed to a non-seekable file, or if +is directed to a non-seekable file, or if TiMidity is interrupted before closing the file, the file header will contain 0xFFFFFFFF in the RIFF and data block length fields. The popular sound conversion utility \fIsox\fP @@ -463,84 +483,106 @@ .BI \-o " filename" Place output on \fIfilename\fP, which may be a file, device, or HP-UX audio server, depending on the output mode selected with the \fB\-O\fP -option. The special filename ``\-'' causes output to be placed on +option. The special filename ``\-'' causes output to be placed on stdout. .TP +.BI \-P +Use patch file for all programs. + +.TP .BI \-p " voices" Sets polyphony (maximum number of simultaneous voices) to \fIvoices\fP. .TP +.BI \-p " a" +Toggle automatic polyphony reduction. + +.TP .BI \-Q " channel" Causes \fIchannel\fP to be quiet. If \fIchannel\fP is negative, channel \-\fIchannel\fP is turned back on. If \fIchannel\fP is 0, all channels are turned on. - + .TP -.BI \-R " msec" -Enables Pseudo Reverb Mode. \fImsec\fP are envelope release time. -.RE +.BI \-q " m/n" +Specify audio buffer in seconds. +m: maximum size of buffer, n: percentage filled at the beginning +(default is 5.0/100%) +(size of 100% equals the whole device buffer size) .TP -.B \-r -This options causes another reverb effects. +.BI \-R " n" +Enables Pseudo Reverb Mode. +It sets every instrument's release to n ms. If n=0, n is set to 800 (default). +.RE .TP .BI \-S " size" Sets the re-sample cache size to \fIsize\fP bytes. -If \fIsize\fP equals to 0 any sample caches are disabled. -Default value of \fIsize\fP is 2097152(2MB). +If \fIsize\fP equals 0 any sample caches are disabled. +The default value of \fIsize\fP is 2097152 (2MB). .TP .BI \-s " frequency" -Sets the resampling frequency(\fBHz\fP or \fBkHz\fP). +Sets the resampling frequency (\fBHz\fP or \fBkHz\fP). Not all sound devices are capable of all frequencies -- an approximate frequency may be selected, depending on the implementation. .TP .BI -t " code" -Sets output coding of Japanese text. \fIcode\fP are the following: +Sets output coding of Japanese text. Possible values of \fIcode\fP are: .RS .TP .B auto -determined by \fILANG\fP environment variable. +determined by the \fILANG\fP environment variable. .TP .B ascii -Transrates non-ascii code to period. +Translates non-ASCII code to period. +.TP +.B nocnv +No conversion. +.TP +.B 1251 +Convert from windows-1251 to koi8-r. .TP .B euc -Outputs by EUC(Japan) coding. +Outputs EUC (Japan) coding. .TP .B jis -Outputs by JIS coding. +Outputs JIS coding. .TP .B sjis -Outputs by SJIS coding. +Outputs SJIS coding. .RE .TP +.BI \-T " n" +Adjust tempo to n%; 120=play MOD files with an NTSC Amiga's timing. + +.TP .B \-U -Instructs TiMidity to unload all instruments from memory between -MIDI files. This can reduce memory requirements when playing many +Unload all instruments from memory between MIDI files. +This can reduce memory requirements when playing many files in succession. .TP .BI \-w " mode" -Extend mode for MS\-Windows. The following options are available: +Extended mode for MS Windows. The following options are available: .RS .TP .BI \-w "r" Use \fIrcpcv.dll\fP to play RCP/R36 files. .TP .BI \-w "R" -Not use \fIrcpcv.dll\fP (default). +Do not use \fIrcpcv.dll\fP (default). .RE .TP .BI \-W " mode" -Play with WRD file. -\fImode\fP are the follwing: +Play WRD file. +Allowed values of \fImode\fP are: .RS .TP .B x @@ -550,13 +592,13 @@ TTY mode .TP .B d -Dumb mode (outputs WRD events directry) +Dumb mode (outputs WRD events directory) .TP .B \- -not traces WRD +do not trace WRD .RE -WRD mode must be with trace mode(option \fB\-i?t\fP) or -timing of WRD events are terrible. +WRD mode must also use trace mode (option \fB\-i?t\fP) or +the timing of the WRD events will be terrible. .TP .B \-WR[opts] @@ -564,36 +606,35 @@ .RS .TP .B a1=b1,a2=b2, ... -Sets the WRD options. \fBan\fP is the name of option and \fBbn\fP is the +Sets the WRD options. \fBan\fP is the name of option and \fBbn\fP is the value. .TP .BI d="n" -Emulates timing(\fB@WAIT\fP,\fB@WMODE\fP) bugs of the original MIMPI player. -The emulate level is following: +Emulates timing (\fB@WAIT\fP,\fB@WMODE\fP) bugs of the original MIMPI player. +The emulation levels are: .RS .TP .B -WRd=0 -not emulates any bugs of MIMPI +do not emulate any bugs of MIMPI .TP .B -WRd=1 -only emulates some bugs (default) +only emulate some bugs (default) .TP .B -WRd=2 -emulates all known bugs +emulate all known bugs .RE .TP .BI F="filename" -Uses \fIfilename\fP as WRD file only (input\-file\-name):r.wrd -(like csh syntax) is not available. +Use \fIfilename\fP as WRD file only no file matching *.wrd is found. .TP .BI f="filename" -Uses \fIfilername\fP as WRD file. +Uses \fIfilename\fP as WRD file. .RE .TP .BI \-x " string" -Configure TiMidity by the \fIstring\fP. The format of \fIstring\fP +Configure TiMidity with \fIstring\fP. The format of \fIstring\fP is the same as timidity.cfg. .br @@ -603,17 +644,64 @@ .br Sets the instrument number 0 to violin. -Character \fB\\\fP(Ascii 0x5c) in the \fIstring\fP is treated -as escape character like C literal. For example \fB\\n\fP is treated -as carridge return. +Character \fB\\\fP (Ascii 0x5c) in the \fIstring\fP is treated +as escape character like in C literals. For example \fB\\n\fP is treated +as carriage return. .RE .TP .BI \-Z " file" -Causes the table of frequencies to be read from \fIfile\fP. This is +Cause the table of frequencies to be read from \fIfile\fP. This is useful to define a tuning different from the occidental temperate scale. .P +.SH EFFECT OPTIONS +In \fI-EF \fP option, you can specify following effect options: +.br +.RS +.TP +.BI -EFdelay= "l" +Left delay. +.TP +.BI -EFdelay= "r" +Right delay. +.TP +.BI -EFdelay= "b" +Swap left & right. +.TP +.BI -EFdelay= "0" +Disabled delay effect. +.TP +.BI -EFchorus= "1[,level]" +Enable MIDI chorus effect control. +.br +The optional parameter `level' specifies the chorus level [0..127] +.TP +.BI -EFchorus= "2[,level]" +Surround sound, chorus detuned to a lesser degree (default). +.br +The optional parameter `level' specifies the chorus level [0..127]. +.TP +.BI -EFreverb= "0" +Disable MIDI reverb effect control. +.TP +.BI -EFreverb= "1[,level]" +Enable MIDI reverb effect control. +.br +The optional parameter `level' specifies the reverb level [0..127] +This effect is only available in stereo (default). +.TP +.BI -EFreverb= "2" +Global reverb effect. +.TP +.BI -EFns= "n" +Enable the n th degree noiseshaping filter. Valid values of n are in the +interval [0..4]. +.br +This effect is only available for 8-bit linear encoding +.RE + +.P .SH SEE ALSO lsmidiprog(1), mididump(1), patinfo(1), sf2text(1), wav2pat(1), timidity.cfg(5) @@ -622,9 +710,9 @@ Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen .P -Original version was developed under the name of Tuukka Toivonen - until the version of TiMidity-0.2i. His development was -discontinued because of his busy work. +The original version was developed by Tuukka Toivonen + until the release of TiMidity-0.2i. His development was +discontinued because of his being busy with work. .P This program is free software; you can redistribute it and/or modify it under the terms of the \fIGNU General Public License\fP as published by @@ -633,7 +721,7 @@ .P This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \fIGNU +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \fIGNU General Public License\fP for more details. .P You should have received a copy of the GNU General Public License @@ -652,8 +740,8 @@ .P Eats more CPU time than a small CPU-time-eating animal. .P -This man page translated from Japanese to English by me with -heavily poor English skill :-) +This man page was translated from Japanese to English by me with +poor English skill :-) .P .SH AUTHORS @@ -695,7 +783,7 @@ .br TAKEKAWA Hiroshi .br -NAGANO Daisuke +NAGANO Daisuke .br YAMAHATA Isaku .br @@ -705,11 +793,11 @@ .br Glenn Trigg .P -and other many people sends information and bug\-fix codes. +and other many people sent information and bug\-fixes. .P -English version of this man page is written by -NAGANO Daisuke . +The english version of this man page was written by +NAGANO Daisuke breeze.nagano@nifty.ne.jp>. .br -If any comments or suggestions or claims :) about this man page you have, +If you have any comments or suggestions or complaints :) about this man page, please tell me it. diff -ruN TiMidity++-2.10.4/doc/Makefile.am TiMidity++-2.11.0/doc/Makefile.am --- TiMidity++-2.10.4/doc/Makefile.am Tue Mar 13 10:07:39 2001 +++ TiMidity++-2.11.0/doc/Makefile.am Mon Jun 25 20:09:53 2001 @@ -26,6 +26,8 @@ timidity.1 \ timidity.cfg.5 +EXTRA_DIST = m2m.txt + .1.txt: groff -man -Tlatin1 -P-b -P-u $< >$@ .1.ps: diff -ruN TiMidity++-2.10.4/doc/Makefile.in TiMidity++-2.11.0/doc/Makefile.in --- TiMidity++-2.10.4/doc/Makefile.in Sun Mar 18 15:32:46 2001 +++ TiMidity++-2.11.0/doc/Makefile.in Thu Dec 27 19:56:25 2001 @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen @@ -28,7 +31,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -49,13 +51,9 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -64,11 +62,11 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -83,29 +81,46 @@ target_triplet = @target@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AWK = @AWK@ CC = @CC@ +DEPDIR = @DEPDIR@ ELFILES = @ELFILES@ EMACS = @EMACS@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ +OBJEXT = @OBJEXT@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SHCFLAGS = @SHCFLAGS@ -SHELL = @SHELL@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ VERSION = @VERSION@ +VORBISENC_LIBS = @VORBISENC_LIBS@ +VORBISFILE_LIBS = @VORBISFILE_LIBS@ +VORBIS_CFLAGS = @VORBIS_CFLAGS@ +VORBIS_LIBS = @VORBIS_LIBS@ WISH = @WISH@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +am__include = @am__include@ +am__quote = @am__quote@ dynamic_targets = @dynamic_targets@ +install_sh = @install_sh@ lispdir = @lispdir@ program_transform_name = @program_transform_name@ so = @so@ @@ -116,38 +131,52 @@ SUBDIRS = C ja_JP.ujis lang_target = C -man_MANS = timidity.1 timidity.cfg.5 +man_MANS = \ + timidity.1 \ + timidity.cfg.5 + +EXTRA_DIST = m2m.txt +subdir = doc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.h ../interface.h -CONFIG_CLEAN_FILES = -man1dir = $(mandir)/man1 -man5dir = $(mandir)/man5 -MANS = $(man_MANS) +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DIST_SOURCES = NROFF = nroff -DIST_COMMON = Makefile.am Makefile.in - +MANS = $(man_MANS) -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive +DIST_COMMON = Makefile.am Makefile.in +DIST_SUBDIRS = $(SUBDIRS) +all: all-recursive -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -.SUFFIXES: .1 .5 .ps .txt -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile +.SUFFIXES: .1 .5 .txt .ps +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-man1: +man1dir = $(mandir)/man1 +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(man1dir) - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ case "$$i" in \ *.1*) list="$$list $$i" ;; \ esac; \ @@ -157,14 +186,16 @@ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ done - uninstall-man1: - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ case "$$i" in \ *.1*) list="$$list $$i" ;; \ esac; \ @@ -172,15 +203,19 @@ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ rm -f $(DESTDIR)$(man1dir)/$$inst; \ done -install-man5: +man5dir = $(mandir)/man5 +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(man5dir) - @list='$(man5_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ case "$$i" in \ *.5*) list="$$list $$i" ;; \ esac; \ @@ -190,14 +225,16 @@ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ done - uninstall-man5: - @list='$(man5_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ case "$$i" in \ *.5*) list="$$list $$i" ;; \ esac; \ @@ -205,16 +242,11 @@ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \ rm -f $(DESTDIR)$(man5dir)/$$inst; \ done -install-man: $(MANS) - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-man1 install-man5 -uninstall-man: - @$(NORMAL_UNINSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man5 # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -222,12 +254,7 @@ # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: +$(RECURSIVE_TARGETS): @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ @@ -250,11 +277,16 @@ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ done; \ - test "$$dot_seen" = "no" && rev="$$rev ."; \ + rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -273,51 +305,60 @@ tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ + fi; \ done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) - -mostlyclean-tags: + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -clean-tags: +GTAGS: + here=`CDPATH=: && cd $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -maintainer-clean-tags: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = doc +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done for subdir in $(SUBDIRS); do \ @@ -325,80 +366,98 @@ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" \ + distdir=../$(distdir)/$$subdir \ + distdir) \ || exit 1; \ fi; \ done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive check-am: all-am check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: -install-exec: install-exec-recursive +all-am: Makefile $(MANS) +installdirs: installdirs-recursive +installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) -install-data-am: install-man +install: install-recursive +install-exec: install-exec-recursive install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: uninstall-man -uninstall: uninstall-recursive -all-am: Makefile $(MANS) -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 - +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive -mostlyclean: mostlyclean-recursive +clean-am: clean-generic mostlyclean-am -clean-am: clean-tags clean-generic mostlyclean-am +distclean: distclean-recursive -clean: clean-recursive +distclean-am: clean-am distclean-generic distclean-tags -distclean-am: distclean-tags distclean-generic clean-am +dvi: dvi-recursive -distclean: distclean-recursive +dvi-am: -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-recursive + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-recursive + +install-man: install-man1 install-man5 + +installcheck-am: maintainer-clean: maintainer-clean-recursive -.PHONY: install-man1 uninstall-man1 install-man5 uninstall-man5 \ -install-man uninstall-man install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-info: uninstall-info-recursive + +uninstall-man: uninstall-man1 uninstall-man5 + +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-recursive distclean distclean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ + install-exec install-exec-am install-exec-recursive \ + install-info install-info-am install-info-recursive install-man \ + install-man1 install-man5 install-recursive install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + installdirs-recursive maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive tags tags-recursive uninstall \ + uninstall-am uninstall-info-am uninstall-info-recursive \ + uninstall-man uninstall-man1 uninstall-man5 uninstall-recursive include $(top_builddir)/common.makefile @@ -431,7 +490,6 @@ clean: rm -f timidity.1 rm -f timidity.cfg.5 - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -ruN TiMidity++-2.10.4/doc/ja_JP.ujis/Makefile.in TiMidity++-2.11.0/doc/ja_JP.ujis/Makefile.in --- TiMidity++-2.10.4/doc/ja_JP.ujis/Makefile.in Sun Mar 18 15:32:47 2001 +++ TiMidity++-2.11.0/doc/ja_JP.ujis/Makefile.in Thu Dec 27 19:56:26 2001 @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen @@ -28,7 +31,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -49,13 +51,9 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,11 +62,11 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -83,138 +81,178 @@ target_triplet = @target@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AWK = @AWK@ CC = @CC@ +DEPDIR = @DEPDIR@ ELFILES = @ELFILES@ EMACS = @EMACS@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ +OBJEXT = @OBJEXT@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SHCFLAGS = @SHCFLAGS@ -SHELL = @SHELL@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ VERSION = @VERSION@ +VORBISENC_LIBS = @VORBISENC_LIBS@ +VORBISFILE_LIBS = @VORBISFILE_LIBS@ +VORBIS_CFLAGS = @VORBIS_CFLAGS@ +VORBIS_LIBS = @VORBIS_LIBS@ WISH = @WISH@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +am__include = @am__include@ +am__quote = @am__quote@ dynamic_targets = @dynamic_targets@ +install_sh = @install_sh@ lispdir = @lispdir@ program_transform_name = @program_transform_name@ so = @so@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ -EXTRA_DIST = timidity.1 timidity.cfg.5 README.dl README.sf README.tk README.xskin README.xaw +EXTRA_DIST = \ + timidity.1 \ + timidity.cfg.5 \ + README.dl \ + README.sf \ + README.tk \ + README.xskin \ + README.xaw +subdir = doc/ja_JP.ujis mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h ../../interface.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/ja_JP.ujis/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/ja_JP.ujis/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = doc/ja_JP.ujis +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic mostlyclean-am -clean-am: clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-generic -distclean-am: distclean-generic clean-am +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am +mostlyclean-am: mostlyclean-generic -include $(top_builddir)/common.makefile +uninstall-am: uninstall-info-am +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-info-am + + +include $(top_builddir)/common.makefile # 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. .NOEXPORT: diff -ruN TiMidity++-2.10.4/doc/m2m.txt TiMidity++-2.11.0/doc/m2m.txt --- TiMidity++-2.10.4/doc/m2m.txt Thu Jan 1 09:00:00 1970 +++ TiMidity++-2.11.0/doc/m2m.txt Sat May 12 11:15:48 2001 @@ -0,0 +1,301 @@ +m2m mod->midi file converter for TiMidity++ +Release 1.00 +May 2001 + + + + +BRIEF SYNOPSIS: + +This adds the new -Om output mode to TiMidity++, which will read in a mod file +and output a midi file. All parameters needed for the conversion are +contained in a .m2m file of the same base name as the mod. If this file can +not be found, it will generate one for you. Chord assignment and +transposition values can be very difficult and tedious to assign by hand. It +is STRONGLY recommended that you let the program generate the initial .m2m +file, so that it can do most (if not all) of this for you. You will still +need to assign drums, correct banks/programs, and tweak volume amps by hand. + + + + +EXAMPLE USAGE: + +timidity -c c:\timidity\timidity.cfg -Om -idt foo.mod + +This will try to read in foo.m2m as the config file for the conversion, and +will output a file called foo.mid. You can use the -o flag to specify any +other output name you wish. I haven't bothered to add an option for +specifying a different .m2m file because I'm running out of letters in the +alphabet for new flags :) + +If you don't have timidity installed, so that you don't have a valid +timidity.cfg file, just create a 0 byte file and use it instead of the real +thing. Since you're playing mod files, timidity doesn't need to load any +midi instruments, so you don't need to have a set of patches or a real +timidity.cfg file :) + + + + +BACKGROUND: + +MOD files are a lot like MIDI files. Both formats are basicly a series of +events that control how notes get played with which instruments. MODs +package the instruments along with the events into a single file, while MIDI +relies on external sources of instruments. It is this fundamental +difference that creates the most difficulty in performing a mod->midi file +conversion. The mod file does not need to know what pitch each sample is +tuned to, if it is a drum, or if it is a chord. MOD players simply play the +packaged sample at the requested pitch, assuming all samples are tuned to +the same fixed frequency, whether they actually are or not. Thus, if you +were to do a direct mod->midi event conversion, you would wind up with midi +instruments playing in the wrong keys, snare drums being treated as normal +melodic instruments, and single notes where there should be chords. +Transposition, drum related channel movements, and chord emissions are the +most noticable obstacles to overcome when performing an accurace mod->midi +conversoin. + +Paolo Bonzini has already done half of my job for me. He contributed a good +amount of code that turns TiMidity++ into a first rate mod player. This, +alone, would not have helped me very much; it was how he implemented it. +Rather than handle the events like every other mod player known to man, +TiMidity++ converts them into standard midi events, loads the mod instruments +in as special patches, and then renders them just like it would any normal +midi file. The mod event parsing, instrument parsing, and direct event +conversion was already done! All I had to do was handle the problems I +mentioned above, along with many more minor ones I haven't mentioned, before +writing the internal TiMidity++ events out to a midi file. See the comments +at the top of m2m.c if you are interested in some of the other issues that +needed to be addressed during the conversion process. Although some of +these other issues were non-trivial to deal with, and pitch bends beyond 4 +octaves may still sound a bit odd, they are nothing that the average user +needs to know about or keep in mind when trying to succesfully convert a mod +file. The only thing you need to know is that, in order to address the +conversion problems disscussed above, some information about each sample in +the mod must be specified in a config file (.m2m) associated with each mod +file. The format of this file is given below. + + + + +M2M CONFIG FILE FORMAT: + +Comment lines must begin with a #. Blank lines (no spaces or any other +character besides a newline or carriage return) are allowed. All other lines +must specify ALL FIVE of the fields described below. Each field is separated +by white space. + + + +FIELD 1: Sample Number + +This is the number of the sample that you are defining information for. +The first sample in the mod file is 1 (not zero). + + + +FIELD 2: Bank/Program, drum flag, chord, silent flag + +This field specifies several different properties of the sample. Optional +paramaters are given surrounded by parentheses. The format for this field +is: + +(!)(bank/)program(chord)(*) + +If the field begins with an exclaimation mark, ! , then no notes will be +issued for this sample. This can be used to silence samples that you can +not assign to a general midi instrument, such as speech, complicated drum +tracks, or any sound effect that you can not create a close approximation to +using GS sfx banks. + +The bank portion of the field specifies an optional bank selection. This is +the number of the bank to use, followed by a / to separate it from the +program number. + +The program number is the midi instrument you are assigning to the sample. +If the sample is a drum, this is the note that the drum is mapped to in the +drum set. + +The optional chord field specifies what type of chord the sample is composed +of. There are 4 types of chords, each of which has 3 subtypes. The +supported chord types are (M)ajor, (m)inor, (d)iminished minor, and (f)ifth. +Each chord is specified by the letter surrounded by parantheses in the +previous line. The subtype of the chord describes how much the chord is +"rotated" from a standard chord, which can be 0, 1, or 2. As an example of +what I mean by "rotated", a major chord is composed of the following note +semitone offsets: 0,4,7. If you were to rotate the chord one to the left, it +would be: -5,0,4. Two to the left is: -8,-5,0. If no subtype is given, +zero rotation is assumed. + +The final part specifies if the sample is a drum. Put a * at the end of the +field to indicate this. Chord assignments will be ignored if the drum flag +is set. + +Examples: +8/48M bank 8, program 48 (Orchestra Strings), with a normal major chord +!8/48M silence this sample +8/48M2 same as the first example, only the chord is rotated down twice +48 normal Marcato Strings in tone bank 0 +16/38* Power drum set, Snare1 +38* Snare1 on the regular drum set 0 + + + +FIELD 3: Transposition + +This is how much to transpose the original note specified in the mod file. +If the sample is tuned at middle C (pitch 60), it will need to be transposed ++24 semitones for the midi instrument to play on the correct pitch. Samples +marked as drums will not be transposed, since they are fixed to a single +note on the drum channel. You must still enter a value for the +transposition field, even if it is ignored by the drums, so that the config +file parser will not crash. + + + +FIELD 4: Fine Tuning + +All pitch bend events for this sample will be adjusted by the given fraction +of a pitch. This is sometimes necessary for highly out of tune samples. +Some MOD composers, instead of tuning their samples correctly, use pitch +bends to tune the samples. When you play this music with correctly tuned +samples, these pitch bends detune the note and it sounds out of tune. So the +fine tuning value is used to compensate for these detuning pitchbends. + +It is also common to find out of tune samples that were NOT tuned with +pitchbends, so adding in a pitch bend adjustment would only make them sound +worse in a midi file. To disable fine tuning, an optional ! can be placed +before the fine tuning value. This is the DEFAULT SETTING in the automatic +config file generator. If you find that a mod requires fine tuning for a +sample, simply delete the ! and redo the conversion. + +This feature is not yet fully implemented. Only existing pitch bend events +are affected, so no new pitch bend events are issued. This is not usually a +problem, however, since most cases where this feature needs to be applied +involve mods that issue pitch bends before the affected notes, since they +were intended to tune the samples to begin with. I plan to eventually +implement insertion of new pitch bend events, so that this will be a true +fine tuning feature. + + + +FIELD 5: %Volume + +Each sample can be amplified by scaling the expression events. 100 is the +default amount, which is 100% of the original volume. 50 would decrease it +to half of the original volume, while 150 would be 1.5 times the original +volume. Don't forget that the maximum expression value is 127, so any +expression events that get scaled higher than this will cap off at 127 and +you won't hear any difference. It is mainly used for quieting instruments +that are too loud in the midi file, or for amplifying instruments whoose +expression values are too low to begin with. + +Any fields beyond the first 5 will not be parsed. You can type anything +here that you want. You do not have to place a # before comment text, but +it is conventional to do so. + + + + +FREQUENCY ANALYSIS: + +So, how do you figure out how much to transpose each sample and what chord +it is? Load it up in a program that can perform an FFT on the sample and +display the frequency peaks. The first peak is usually, but not always, the +fundamental pitch of the sample. If the sample is a chord, take the first 3 +major peaks and assign the chord from these. Then enter the appropriate +chord and transposition values in the .m2m file and see if it sounds correct. +It is VERY time consuming to do all of this by hand.... So, I wrote routines +to do all of the assignments for you :) It is not 100% accurate, but it's +pretty darn close. And when it does miss a pitch or a chord, it always +assigns it the correct LOOKING answer. That is, if I were to visually +inspect the FFT data, I would pick the same pitch the algorithm does. I'm +no expert at this, but after spending so many hours testing this on many +different difficult to assign pitches, I think I'm pretty good at it now :) +The only way I can see to improve it is to build in some sort of +psychoacoustical model that takes into account how the human ear percieves +the sound. And I don't think I want to do that at the moment.... It does an +above average job at dealing with samples that have more than one pitch or +chord in them, but don't be surprised if a noisy or multi-tonal sample +doesn't get assigned correctly. Garbage in, garbage out :) The automatic +assignment is very good for the vast majority of samples and should DEFINATELY +be tried first before you start changing things by hand. When it does mess +up, it's usually only off by a single semitone or an octave multiple, so it's +easy to tweak from there. + +Before I wrote the automatic frequency analysis routines, I knew very little +about the field. Pitch detection is a very old problem in the audio signal +processing literature. I looked up references in the library dating from +the 1960's. The stuff from back then is just as relevant as the later +literature, since the methods really haven't improved much since then. The +two major camps on how to do this are "autocorrelation" and "cepstrum" +analysis. It turns out that autocorrelation was not the answer to my +problems. While it works well on "well behaved" samples, it breaks down +very quickly on synth instruments, noisy instruments, and instruments with +multiple fundamental frequencies. A large number of samples encountered in +mod files exhibit these properties. No matter what I did to try to tweak it, +and I tried a lot of good things, I just could not make it robust enough to +handle real world samples. It's a good theory, but it falls apart in +practice. + +Cepstrum analysis proved to be much more robust. But even so, I had to do a +good deal of pitch filtering and peak weighting before I could get it to work +well. The 2nd FFT analysis kept giving me frequency peaks that didn't exist +in the 1st FFT spectrum. They were, however, very close to real peaks. So I +throw away all frequencies that fall below a pitch peak area and maximum +magnitude filter, then force the cepstrum analysis to only choose pitches that +have made it through the filter in the 1st FFT spectrum. I set a maximum +frequency based on zero point crossing analysis, going out two zero crossings +from the largest amplitude in the sample. This was necessary to prevent +octave jumping errors. I found that it is also important to weight the +cepstrum peak areas by the maximum magnitude within the corresponding pitch +peak in the 1st FFT. This was a desperate attempt to get some especially +troublesome bass samples to assign correctly. Surprisingly enough, it works +great, giving me a higher success rate on all my samples without inducing any +new misassignments! The only catch is that the weighting only works well for +< 2 seconds of audio analysis. Any larger than that and the FFT size gets +so big that the pitch peaks are too diffused, so the maximum magnitudes for +the pitches are too small, and the weighting starts to give wrong answers. +If anyone wants to analyze >= 2 seconds of data, which isn't neccessary for +assigning pitches to mod/midi instruments, it would be easy to implement a +sliding window average that calls the existing frequency assignment +function. + +It appears to work better than any of the other sample analysis software I +have. If you are interested in more details of how I did the cepstrum +analysis, try looking over the code in freq.c and/or email me for a more +complete description of the algorithm I wound up with. The new FFT routines +are not mine, but are public domain. From all the benchmarks I could find, +this is the best FFT implementation for doing what I need to do (and for +future effects processing, should they ever be added to TiMidity++). See +fft4g.c for info on where to get the original FFT package. + + + + +SUGGESTIONS ?: + +Feel free to email me with any suggestions you may have on how I can do a +better job of converting the mods, or how I can implement things on the TODO +or WISH lists in m2m.c. I am considering turning this into a stand alone +program, but until I get more free time and energy, it's going to stay as +just an addon for TiMidity++. + + + + +LEGAL STUFF: + +TiMidity++ is distributed under the GPL, and since my code is derived from +and makes use of it, I guess it's under the GPL too. So blah blah blah, +legal stuff, blah blah blah, etc.. You know the drill. + + + + +Eric A. Welsh +Center for Molecular Design +Center for Computational Biology +Washington University +St. Louis, MO diff -ruN TiMidity++-2.10.4/interface/Makefile.am TiMidity++-2.11.0/interface/Makefile.am --- TiMidity++-2.10.4/interface/Makefile.am Tue Mar 13 10:07:39 2001 +++ TiMidity++-2.11.0/interface/Makefile.am Thu Dec 27 19:45:29 2001 @@ -20,15 +20,12 @@ SUFFIXES = .ptcl .tcl .@so@ - SUBDIRS = motif_bitmaps bitmaps pixmaps INCLUDES = \ - -I$(top_srcdir) \ -I$(top_srcdir)/timidity \ -I$(top_srcdir)/libarc \ - -I$(top_srcdir)/utils \ - $(EXTRAINCS) + -I$(top_srcdir)/utils noinst_LIBRARIES = libinterface.a @@ -148,12 +145,18 @@ $(DYNAMIC_OBJS) \ $(SOUND_SPEC_OBJS) -libinterface_a_DEPENDENCIES = \ +libinterface_dep = \ $(top_builddir)/interface.h \ $(libinterface_a_LIBADD) \ $(tcltk_dep) \ $(W32GUI_DEPS) +libinterface.a: $(libinterface_a_OBJECTS) $(libinterface_a_DEPENDENCIES) $(libinterface_dep) + -rm -f libinterface.a + $(AR) cru libinterface.a $(libinterface_a_OBJECTS) $(libinterface_a_LIBADD) + $(RANLIB) libinterface.a + + # Tcl interface sources TCLSRCS = tkmidity.ptcl tkpanel.tcl browser.tcl misc.tcl # Tcl/Tk sources @@ -224,6 +227,15 @@ w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp windres -o $@ -O coff w32g_res.rc +## This needs to build japanese resource. +#BRCC32 = c:/borland/bcc55/bin/brcc32.exe +#BRCC32_FLAGS = -ic:/mingw/include +#w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \ +# w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp +# $(BRCC32) $(BRCC32_FLAGS) w32g_res.rc +# windres -o tmp.res -O coff w32g_res.RES +# mv tmp.res w32g_res.res + ### ### For dynamic interfaces ### @@ -299,6 +311,8 @@ clean-compile: -rm -f *.$(so) + -rm -f *.res + -rm -f *.RES install-exec-local: $(install_tk) $(install_xaw) $(install_el) $(install_dynamics) ########## End of Makefile diff -ruN TiMidity++-2.10.4/interface/Makefile.in TiMidity++-2.11.0/interface/Makefile.in --- TiMidity++-2.10.4/interface/Makefile.in Sun Mar 18 15:32:41 2001 +++ TiMidity++-2.11.0/interface/Makefile.in Thu Dec 27 19:56:13 2001 @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen @@ -28,7 +31,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -49,13 +51,9 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -64,11 +62,11 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -83,64 +81,196 @@ target_triplet = @target@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AWK = @AWK@ CC = @CC@ +DEPDIR = @DEPDIR@ EMACS = @EMACS@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ +OBJEXT = @OBJEXT@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SHCFLAGS = @SHCFLAGS@ -SHELL = @SHELL@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ VERSION = @VERSION@ +VORBISENC_LIBS = @VORBISENC_LIBS@ +VORBISFILE_LIBS = @VORBISFILE_LIBS@ +VORBIS_CFLAGS = @VORBIS_CFLAGS@ +VORBIS_LIBS = @VORBIS_LIBS@ WISH = @WISH@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ lispdir = @lispdir@ program_transform_name = @program_transform_name@ so = @so@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ -SUFFIXES = .ptcl .tcl .@so@ +ELFILES = @ELFILES@ +@ENABLE_EMACS_TRUE@ELFILES = @ELFILES@ -SUBDIRS = motif_bitmaps bitmaps pixmaps -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/timidity -I$(top_srcdir)/libarc -I$(top_srcdir)/utils $(EXTRAINCS) +#BRCC32 = c:/borland/bcc55/bin/brcc32.exe +#BRCC32_FLAGS = -ic:/mingw/include +#w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \ +# w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp +# $(BRCC32) $(BRCC32_FLAGS) w32g_res.rc +# windres -o tmp.res -O coff w32g_res.RES +# mv tmp.res w32g_res.res + +### +### For dynamic interfaces +### +dynamic_targets = @dynamic_targets@ +@NEEDDLOPEN_TRUE@dynamic_targets = @dynamic_targets@ +SUFFIXES = .ptcl .tcl .@so@ -noinst_LIBRARIES = libinterface.a +SUBDIRS = motif_bitmaps bitmaps pixmaps -libinterface_a_SOURCES = dumb_c.c wrdt_dumb.c wrdt_tty.c +INCLUDES = \ + -I$(top_srcdir)/timidity \ + -I$(top_srcdir)/libarc \ + -I$(top_srcdir)/utils -EXTRA_libinterface_a_SOURCES = ncurs_c.c slang_c.c motif.h motif_c.c motif_i.c motif_p.c tk_c.c emacs_c.c vt100.h vt100.c vt100_c.c xaw.h xaw_c.c xaw_i.c xaw_redef.c xskin.h xskin_c.c xskin_i.c xskin_loadBMP.c xskin_spectrum.c wrdt_x.c x_sherry.c x_sherry.h x_wrdwindow.c x_wrdwindow.h VTPrsTbl.c VTparse.h x_mag.c x_mag.h dynamic_c.c mac_c.c mac_c.h mac_mag.c mac_mag.h mac_trace.c mac_wrdwindow.c mac_wrdwindow.h wrdt_mac.c wrdt_wcon.c gtk_c.c gtk_h.h gtk_i.c gtk_p.c soundspec.c soundspec.h x_sherry.c x_sherry.h check.xbm arrow.xbm on.xbm off.xbm server_c.c server_defs.h alsaseq_c.c w32g.h w32g_c.c w32g_ini.c w32g_rec.h w32g_res.h w32g_res.rc w32g_utl.c w32g_utl.h w32g_ut2.c w32g_ut2.h w32g_i.c w32g_playlist.c w32g_pref.c w32g_pref.h w32g_subwin.c w32g_subwin.h w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp +noinst_LIBRARIES = libinterface.a +libinterface_a_SOURCES = \ + dumb_c.c \ + wrdt_dumb.c \ + wrdt_tty.c + + +EXTRA_libinterface_a_SOURCES = \ + ncurs_c.c \ + slang_c.c \ + motif.h \ + motif_c.c \ + motif_i.c \ + motif_p.c \ + tk_c.c \ + emacs_c.c \ + vt100.h \ + vt100.c \ + vt100_c.c \ + xaw.h \ + xaw_c.c \ + xaw_i.c \ + xaw_redef.c \ + xskin.h \ + xskin_c.c \ + xskin_i.c \ + xskin_loadBMP.c \ + xskin_spectrum.c \ + wrdt_x.c \ + x_sherry.c \ + x_sherry.h \ + x_wrdwindow.c \ + x_wrdwindow.h \ + VTPrsTbl.c \ + VTparse.h \ + x_mag.c \ + x_mag.h \ + dynamic_c.c \ + mac_c.c \ + mac_c.h \ + mac_mag.c \ + mac_mag.h \ + mac_trace.c \ + mac_wrdwindow.c \ + mac_wrdwindow.h \ + wrdt_mac.c \ + wrdt_wcon.c \ + gtk_c.c \ + gtk_h.h \ + gtk_i.c \ + gtk_p.c \ + soundspec.c \ + soundspec.h \ + x_sherry.c \ + x_sherry.h \ + check.xbm \ + arrow.xbm \ + on.xbm \ + off.xbm \ + server_c.c \ + server_defs.h \ + alsaseq_c.c \ + w32g.h \ + w32g_c.c \ + w32g_ini.c \ + w32g_rec.h \ + w32g_res.h \ + w32g_res.rc \ + w32g_utl.c \ + w32g_utl.h \ + w32g_ut2.c \ + w32g_ut2.h \ + w32g_i.c \ + w32g_playlist.c \ + w32g_pref.c \ + w32g_pref.h \ + w32g_subwin.c \ + w32g_subwin.h \ + w32g_btn.bmp \ + w32g_icon.ico \ + w32g_sleep.bmp \ + w32g_subbtn.bmp + + +@ENABLE_WRD_TRUE@WRD_OBJS = \ +@ENABLE_WRD_TRUE@ wrdt_x.o \ +@ENABLE_WRD_TRUE@ x_wrdwindow.o \ +@ENABLE_WRD_TRUE@ VTPrsTbl.o \ +@ENABLE_WRD_TRUE@ x_mag.o \ +@ENABLE_WRD_TRUE@ x_sherry.o -@ENABLE_WRD_TRUE@WRD_OBJS = wrdt_x.o x_wrdwindow.o VTPrsTbl.o x_mag.o x_sherry.o @CYGNUS_TRUE@WRD_WINCON_OBJS = wrdt_wcon.o @NEEDDLOPEN_TRUE@DYNAMIC_OBJS = dynamic_c.o -@ENABLE_SOUND_SPEC_TRUE@SOUND_SPEC_OBJS = soundspec.o +@ENABLE_SOUND_SPEC_TRUE@SOUND_SPEC_OBJS = \ +@ENABLE_SOUND_SPEC_TRUE@ soundspec.o + @ENABLE_W32GUI_TRUE@W32GUI_DEPS = w32g_res.res INTERFACE_OBJS = $(INTERFACE_SRCS:.c=.o) -libinterface_a_LIBADD = $(INTERFACE_OBJS) $(WRD_OBJS) $(WRD_WINCON_OBJS) $(DYNAMIC_OBJS) $(SOUND_SPEC_OBJS) +libinterface_a_LIBADD = \ + $(INTERFACE_OBJS) \ + $(WRD_OBJS) \ + $(WRD_WINCON_OBJS) \ + $(DYNAMIC_OBJS) \ + $(SOUND_SPEC_OBJS) -libinterface_a_DEPENDENCIES = $(top_builddir)/interface.h $(libinterface_a_LIBADD) $(tcltk_dep) $(W32GUI_DEPS) +libinterface_dep = \ + $(top_builddir)/interface.h \ + $(libinterface_a_LIBADD) \ + $(tcltk_dep) \ + $(W32GUI_DEPS) # Tcl interface sources @@ -149,21 +279,29 @@ TCLF = tkmidity.tcl tkpanel.tcl browser.tcl misc.tcl ALLTCLF = $(TCLF) tclIndex -EXTRA_DIST = tkmidity.ptcl tkpanel.tcl browser.tcl misc.tcl timidity.el tclIndex interface_T.txt interface_a.txt interface_e.txt interface_g.txt interface_i.txt interface_m.txt interface_n.txt interface_s.txt +EXTRA_DIST = \ + tkmidity.ptcl \ + tkpanel.tcl \ + browser.tcl \ + misc.tcl \ + timidity.el \ + tclIndex \ + interface_T.txt \ + interface_a.txt \ + interface_e.txt \ + interface_g.txt \ + interface_i.txt \ + interface_m.txt \ + interface_n.txt \ + interface_s.txt + -@ENABLE_TCLTK_TRUE@install_tk = install.tk @ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk -@ENABLE_XAW_TRUE@install_xaw = install.xaw -@ENABLE_DYNAMIC_XAW_TRUE@install_xaw = install.xaw +@ENABLE_TCLTK_TRUE@install_tk = install.tk -@ENABLE_EMACS_TRUE@ELFILES = @ELFILES@ +@ENABLE_DYNAMIC_XAW_TRUE@install_xaw = install.xaw +@ENABLE_XAW_TRUE@install_xaw = install.xaw @ENABLE_EMACS_TRUE@install_el = install.el - -### -### For dynamic interfaces -### - -@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@ @@ -174,77 +312,226 @@ @NEEDDLOPEN_TRUE@a_so_libs = @a_so_libs@ @NEEDDLOPEN_TRUE@i_so_libs = @i_so_libs@ @NEEDDLOPEN_TRUE@g_so_libs = @g_so_libs@ +subdir = interface mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.h ../interface.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) - +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +libinterface_a_AR = $(AR) cru +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.o +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ wrdt_x.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_wrdwindow.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ VTPrsTbl.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_mag.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_sherry.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.o +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ wrdt_x.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_wrdwindow.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ VTPrsTbl.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_mag.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_sherry.o +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@ soundspec.o +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_FALSE@ soundspec.o +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ wrdt_x.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_wrdwindow.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ VTPrsTbl.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_mag.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_sherry.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ soundspec.o +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ wrdt_x.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_wrdwindow.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ VTPrsTbl.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_mag.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_sherry.o \ +@CYGNUS_FALSE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ soundspec.o +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@ wrdt_wcon.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.o +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_FALSE@ wrdt_wcon.o +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ wrdt_x.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_wrdwindow.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ VTPrsTbl.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_mag.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_sherry.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.o +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ wrdt_x.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_wrdwindow.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ VTPrsTbl.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_mag.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_sherry.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_FALSE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.o +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@ wrdt_wcon.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@ dynamic_c.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_TRUE@ soundspec.o +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_FALSE@ wrdt_wcon.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_FALSE@@NEEDDLOPEN_FALSE@ soundspec.o +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ wrdt_x.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_wrdwindow.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ VTPrsTbl.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_mag.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ x_sherry.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ wrdt_wcon.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ dynamic_c.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_TRUE@ soundspec.o +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@libinterface_a_DEPENDENCIES = \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ wrdt_x.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_wrdwindow.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ VTPrsTbl.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_mag.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ x_sherry.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ wrdt_wcon.o \ +@CYGNUS_TRUE@@ENABLE_SOUND_SPEC_TRUE@@ENABLE_WRD_TRUE@@NEEDDLOPEN_FALSE@ soundspec.o +am_libinterface_a_OBJECTS = dumb_c.$(OBJEXT) wrdt_dumb.$(OBJEXT) \ + wrdt_tty.$(OBJEXT) +libinterface_a_OBJECTS = $(am_libinterface_a_OBJECTS) -DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I.. +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -libinterface_a_OBJECTS = dumb_c.o wrdt_dumb.o wrdt_tty.o -AR = ar -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +depcomp = $(SHELL) $(top_srcdir)/depcomp +@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/VTPrsTbl.Po $(DEPDIR)/alsaseq_c.Po \ +@AMDEP_TRUE@ $(DEPDIR)/dumb_c.Po $(DEPDIR)/dynamic_c.Po \ +@AMDEP_TRUE@ $(DEPDIR)/emacs_c.Po $(DEPDIR)/gtk_c.Po \ +@AMDEP_TRUE@ $(DEPDIR)/gtk_i.Po $(DEPDIR)/gtk_p.Po \ +@AMDEP_TRUE@ $(DEPDIR)/mac_c.Po $(DEPDIR)/mac_mag.Po \ +@AMDEP_TRUE@ $(DEPDIR)/mac_trace.Po $(DEPDIR)/mac_wrdwindow.Po \ +@AMDEP_TRUE@ $(DEPDIR)/motif_c.Po $(DEPDIR)/motif_i.Po \ +@AMDEP_TRUE@ $(DEPDIR)/motif_p.Po $(DEPDIR)/ncurs_c.Po \ +@AMDEP_TRUE@ $(DEPDIR)/server_c.Po $(DEPDIR)/slang_c.Po \ +@AMDEP_TRUE@ $(DEPDIR)/soundspec.Po $(DEPDIR)/tk_c.Po \ +@AMDEP_TRUE@ $(DEPDIR)/vt100.Po $(DEPDIR)/vt100_c.Po \ +@AMDEP_TRUE@ $(DEPDIR)/w32g_c.Po $(DEPDIR)/w32g_i.Po \ +@AMDEP_TRUE@ $(DEPDIR)/w32g_ini.Po $(DEPDIR)/w32g_playlist.Po \ +@AMDEP_TRUE@ $(DEPDIR)/w32g_pref.Po $(DEPDIR)/w32g_subwin.Po \ +@AMDEP_TRUE@ $(DEPDIR)/w32g_ut2.Po $(DEPDIR)/w32g_utl.Po \ +@AMDEP_TRUE@ $(DEPDIR)/wrdt_dumb.Po $(DEPDIR)/wrdt_mac.Po \ +@AMDEP_TRUE@ $(DEPDIR)/wrdt_tty.Po $(DEPDIR)/wrdt_wcon.Po \ +@AMDEP_TRUE@ $(DEPDIR)/wrdt_x.Po $(DEPDIR)/x_mag.Po \ +@AMDEP_TRUE@ $(DEPDIR)/x_sherry.Po $(DEPDIR)/x_wrdwindow.Po \ +@AMDEP_TRUE@ $(DEPDIR)/xaw_c.Po $(DEPDIR)/xaw_i.Po \ +@AMDEP_TRUE@ $(DEPDIR)/xaw_redef.Po $(DEPDIR)/xskin_c.Po \ +@AMDEP_TRUE@ $(DEPDIR)/xskin_i.Po $(DEPDIR)/xskin_loadBMP.Po \ +@AMDEP_TRUE@ $(DEPDIR)/xskin_spectrum.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +DIST_SOURCES = $(libinterface_a_SOURCES) $(EXTRA_libinterface_a_SOURCES) -TAR = gtar -GZIP_ENV = --best +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive +DIST_COMMON = Makefile.am Makefile.in +DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(libinterface_a_SOURCES) $(EXTRA_libinterface_a_SOURCES) -OBJECTS = $(libinterface_a_OBJECTS) -all: all-redirect -.SUFFIXES: -.SUFFIXES: .@so@ .S .c .o .ptcl .s .tcl -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps interface/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +all: all-recursive +.SUFFIXES: +.SUFFIXES: .ptcl .tcl .@so@ .c .o .obj +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu interface/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status -mostlyclean-noinstLIBRARIES: +AR = ar clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -distclean-noinstLIBRARIES: - -maintainer-clean-noinstLIBRARIES: - -.c.o: - $(COMPILE) -c $< - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - mostlyclean-compile: - -rm -f *.o core *.core + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c -maintainer-clean-compile: +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/VTPrsTbl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/alsaseq_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dumb_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dynamic_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/emacs_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gtk_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gtk_i.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gtk_p.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mac_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mac_mag.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mac_trace.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mac_wrdwindow.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/motif_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/motif_i.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/motif_p.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ncurs_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/server_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/slang_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/soundspec.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tk_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vt100.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vt100_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_i.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_ini.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_playlist.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_pref.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_subwin.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_ut2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_utl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrdt_dumb.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrdt_mac.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrdt_tty.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrdt_wcon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrdt_x.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/x_mag.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/x_sherry.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/x_wrdwindow.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xaw_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xaw_i.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xaw_redef.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xskin_c.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xskin_i.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xskin_loadBMP.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xskin_spectrum.Po@am__quote@ -libinterface.a: $(libinterface_a_OBJECTS) $(libinterface_a_DEPENDENCIES) - -rm -f libinterface.a - $(AR) cru libinterface.a $(libinterface_a_OBJECTS) $(libinterface_a_LIBADD) - $(RANLIB) libinterface.a +distclean-depend: + -rm -rf $(DEPDIR) + +.c.o: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + +.c.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `cygpath -w $<` +CCDEPMODE = @CCDEPMODE@ +uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -252,12 +539,7 @@ # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: +$(RECURSIVE_TARGETS): @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ @@ -280,11 +562,16 @@ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ done; \ - test "$$dot_seen" = "no" && rev="$$rev ."; \ + rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -303,51 +590,60 @@ tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ + fi; \ done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) - -mostlyclean-tags: + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -clean-tags: +GTAGS: + here=`CDPATH=: && cd $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -maintainer-clean-tags: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = interface +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done for subdir in $(SUBDIRS); do \ @@ -355,128 +651,106 @@ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" \ + distdir=../$(distdir)/$$subdir \ + distdir) \ || exit 1; \ fi; \ done -VTPrsTbl.o: VTPrsTbl.c VTparse.h -dumb_c.o: dumb_c.c ../config.h ../timidity/timidity.h ../utils/support.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/output.h ../timidity/controls.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h -ncurs_c.o: ncurs_c.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h ../timidity/miditrace.h ../utils/timer.h \ - ../utils/bitset.h ../libarc/arc.h ../timidity/aq.h \ - ../timidity/mid-j.defs -wrdt_dumb.o: wrdt_dumb.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/controls.h ../timidity/wrd.h -wrdt_tty.o: wrdt_tty.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/controls.h ../timidity/wrd.h -wrdt_x.o: wrdt_x.c ../config.h ../timidity/timidity.h ../utils/support.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ - ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/controls.h ../timidity/wrd.h \ - x_wrdwindow.h x_mag.h x_sherry.h -x_mag.o: x_mag.c ../config.h ../timidity/timidity.h ../utils/support.h \ - ../timidity/common.h ../libarc/url.h ../utils/mblock.h x_mag.h \ - ../timidity/controls.h ../timidity/wrd.h -x_sherry.o: x_sherry.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/controls.h ../timidity/wrd.h \ - ../timidity/aq.h x_sherry.h -x_wrdwindow.o: x_wrdwindow.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h x_mag.h x_wrdwindow.h VTparse.h \ - ../timidity/wrd.h ../timidity/controls.h ../timidity/aq.h - -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive check-am: all-am check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: install-exec-local -install-exec: install-exec-recursive +all-am: Makefile $(LIBRARIES) +installdirs: installdirs-recursive +installdirs-am: -install-data-am: +install: install-recursive +install-exec: install-exec-recursive install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: -uninstall: uninstall-recursive -all-am: Makefile $(LIBRARIES) -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive -mostlyclean: mostlyclean-recursive +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am -clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ - mostlyclean-am +distclean: distclean-recursive -clean: clean-recursive +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-tags -distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-tags distclean-generic clean-am +dvi: dvi-recursive -distclean: distclean-recursive +dvi-am: -maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-recursive + +info-am: + +install-data-am: + +install-exec-am: install-exec-local + +install-info: install-info-recursive + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-recursive -.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ -clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-local install-exec-am install-exec install-data-am \ -install-data install-am install uninstall-am uninstall all-redirect \ -all-am all installdirs-am installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +uninstall-am: uninstall-info-am + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-noinstLIBRARIES clean-recursive distclean \ + distclean-compile distclean-depend distclean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ + install-exec install-exec-am install-exec-local \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-recursive \ + tags tags-recursive uninstall uninstall-am uninstall-info-am \ + uninstall-info-recursive uninstall-recursive include $(top_builddir)/common.makefile +libinterface.a: $(libinterface_a_OBJECTS) $(libinterface_a_DEPENDENCIES) $(libinterface_dep) + -rm -f libinterface.a + $(AR) cru libinterface.a $(libinterface_a_OBJECTS) $(libinterface_a_LIBADD) + $(RANLIB) libinterface.a + .ptcl.tcl: sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@ clean: @@ -561,10 +835,11 @@ clean-compile: -rm -f *.$(so) + -rm -f *.res + -rm -f *.RES install-exec-local: $(install_tk) $(install_xaw) $(install_el) $(install_dynamics) ########## End of Makefile - # 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. .NOEXPORT: diff -ruN TiMidity++-2.10.4/interface/alsaseq_c.c TiMidity++-2.11.0/interface/alsaseq_c.c --- TiMidity++-2.10.4/interface/alsaseq_c.c Tue Mar 13 10:01:18 2001 +++ TiMidity++-2.11.0/interface/alsaseq_c.c Thu Dec 27 19:39:25 2001 @@ -314,8 +314,15 @@ static void seq_play_event(MidiEvent *ev) { - ev->time = event_time_offset; - play_event(ev); + //JAVE make channel -Q channels quiet, modified some code from readmidi.c + int gch; + gch = GLOBAL_CHANNEL_EVENT_TYPE(ev->type); + + if(gch || !IS_SET_CHANNELMASK(quietchannels, ev->channel)){ + //if its a global event or not a masked event + ev->time = event_time_offset; + play_event(ev); + } } static void stop_playing(void) diff -ruN TiMidity++-2.10.4/interface/bitmaps/Makefile.in TiMidity++-2.11.0/interface/bitmaps/Makefile.in --- TiMidity++-2.10.4/interface/bitmaps/Makefile.in Sun Mar 18 15:32:42 2001 +++ TiMidity++-2.11.0/interface/bitmaps/Makefile.in Thu Dec 27 19:56:14 2001 @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen @@ -28,7 +31,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -49,13 +51,9 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,11 +62,11 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -83,136 +81,181 @@ target_triplet = @target@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AWK = @AWK@ CC = @CC@ +DEPDIR = @DEPDIR@ ELFILES = @ELFILES@ EMACS = @EMACS@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ +OBJEXT = @OBJEXT@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SHCFLAGS = @SHCFLAGS@ -SHELL = @SHELL@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ VERSION = @VERSION@ +VORBISENC_LIBS = @VORBISENC_LIBS@ +VORBISFILE_LIBS = @VORBISFILE_LIBS@ +VORBIS_CFLAGS = @VORBIS_CFLAGS@ +VORBIS_LIBS = @VORBIS_LIBS@ WISH = @WISH@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +am__include = @am__include@ +am__quote = @am__quote@ dynamic_targets = @dynamic_targets@ +install_sh = @install_sh@ lispdir = @lispdir@ program_transform_name = @program_transform_name@ so = @so@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ -BITMAPS = back.xbm fwrd.xbm next.xbm pause.xbm play.xbm prev.xbm quit.xbm stop.xbm random.xbm repeat.xbm timidity.xbm +BITMAPS = \ + back.xbm \ + fwrd.xbm \ + next.xbm \ + pause.xbm \ + play.xbm \ + prev.xbm \ + quit.xbm \ + stop.xbm \ + random.xbm \ + repeat.xbm \ + timidity.xbm EXTRA_DIST = $(BITMAPS) +subdir = interface/bitmaps mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h ../../interface.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps interface/bitmaps/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu interface/bitmaps/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = interface/bitmaps +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic mostlyclean-am -clean-am: clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-generic -distclean-am: distclean-generic clean-am +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-info-am include $(top_builddir)/common.makefile @@ -220,7 +263,6 @@ install.bitmaps: $(BITMAPS) test -d $(DESTDIR)$(BITMAP_DIR) || mkdir -p $(DESTDIR)$(BITMAP_DIR) for f in $(BITMAPS) ''; do case ".$$f" in .);; *) $(INSTALL) -m 644 $$f $(DESTDIR)$(BITMAP_DIR);; esac; done - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -ruN TiMidity++-2.10.4/interface/dumb_c.c TiMidity++-2.11.0/interface/dumb_c.c --- TiMidity++-2.10.4/interface/dumb_c.c Tue Mar 13 10:01:18 2001 +++ TiMidity++-2.11.0/interface/dumb_c.c Thu Dec 27 19:39:25 2001 @@ -195,6 +195,7 @@ if(lyric[0] == ME_CHORUS_TEXT || lyric[0] == ME_INSERT_TEXT) fprintf(outfp, "\r"); fputs(lyric + 1, outfp); + fflush(outfp); } } } diff -ruN TiMidity++-2.10.4/interface/motif_bitmaps/Makefile.in TiMidity++-2.11.0/interface/motif_bitmaps/Makefile.in --- TiMidity++-2.10.4/interface/motif_bitmaps/Makefile.in Sun Mar 18 15:32:42 2001 +++ TiMidity++-2.11.0/interface/motif_bitmaps/Makefile.in Thu Dec 27 19:56:13 2001 @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen @@ -28,7 +31,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -49,13 +51,9 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,11 +62,11 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -83,137 +81,178 @@ target_triplet = @target@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AWK = @AWK@ CC = @CC@ +DEPDIR = @DEPDIR@ ELFILES = @ELFILES@ EMACS = @EMACS@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ +OBJEXT = @OBJEXT@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SHCFLAGS = @SHCFLAGS@ -SHELL = @SHELL@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ VERSION = @VERSION@ +VORBISENC_LIBS = @VORBISENC_LIBS@ +VORBISFILE_LIBS = @VORBISFILE_LIBS@ +VORBIS_CFLAGS = @VORBIS_CFLAGS@ +VORBIS_LIBS = @VORBIS_LIBS@ WISH = @WISH@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +am__include = @am__include@ +am__quote = @am__quote@ dynamic_targets = @dynamic_targets@ +install_sh = @install_sh@ lispdir = @lispdir@ program_transform_name = @program_transform_name@ so = @so@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ -BITMAPS = back.xbm fwd.xbm next.xbm pause.xbm prev.xbm quit.xbm restart.xbm timidity.xbm +BITMAPS = \ + back.xbm \ + fwd.xbm \ + next.xbm \ + pause.xbm \ + prev.xbm \ + quit.xbm \ + restart.xbm \ + timidity.xbm EXTRA_DIST = $(BITMAPS) +subdir = interface/motif_bitmaps mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h ../../interface.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps interface/motif_bitmaps/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu interface/motif_bitmaps/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = interface/motif_bitmaps +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic mostlyclean-am -clean-am: clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-generic -distclean-am: distclean-generic clean-am +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -ruN TiMidity++-2.10.4/interface/ncurs_c.c TiMidity++-2.11.0/interface/ncurs_c.c --- TiMidity++-2.10.4/interface/ncurs_c.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.0/interface/ncurs_c.c Thu Dec 27 19:39:25 2001 @@ -786,7 +786,7 @@ helpwin = newwin(LIST_TITLE_LINES, COLS, TITLE_LINE, 0); N_ctl_werase(helpwin); wattron(helpwin, A_BOLD); - waddstr(helpwin, " NEW ncurses interface Help"); + waddstr(helpwin, " ncurses interface Help"); wattroff(helpwin, A_BOLD); for(i = 0; help_message_list[i]; i++) @@ -797,7 +797,7 @@ wmove(helpwin, i+2,0); wattron(helpwin, A_BOLD); waddstr(helpwin, - " Type `h' to go to privious screen"); + " Type `h' to go to previous screen"); wattroff(helpwin, A_BOLD); wrefresh(helpwin); N_ctl_clrtoeol(LINES - 1); @@ -2962,17 +2962,17 @@ return; rate = (int)(((double)(aq_filled() + aq_soft_filled()) / devsiz) * 100 + 0.5); - if(rate > 999) - rate = 1000; + if(rate > 9999) + rate = 10000; if(last_rate != rate) { last_rate = rate; wmove(dftwin, VOICE_LINE + 1, 34); - if(rate > 999) - wprintw(dftwin, " Audio queue:***%% "); + if(rate > 9999) + wprintw(dftwin, " Audio queue:****%% "); else - wprintw(dftwin, " Audio queue:%3d%% ", rate); + wprintw(dftwin, " Audio queue:%4d%% ", rate); scr_modified_flag = 1; } } diff -ruN TiMidity++-2.10.4/interface/pixmaps/Makefile.in TiMidity++-2.11.0/interface/pixmaps/Makefile.in --- TiMidity++-2.10.4/interface/pixmaps/Makefile.in Sun Mar 18 15:32:43 2001 +++ TiMidity++-2.11.0/interface/pixmaps/Makefile.in Thu Dec 27 19:56:14 2001 @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # TiMidity++ -- MIDI to WAVE converter and player # Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen @@ -28,7 +31,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -49,13 +51,9 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -64,11 +62,11 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -83,137 +81,188 @@ target_triplet = @target@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AWK = @AWK@ CC = @CC@ +DEPDIR = @DEPDIR@ ELFILES = @ELFILES@ EMACS = @EMACS@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ NETSRCS = @NETSRCS@ +OBJEXT = @OBJEXT@ +OGG_CFLAGS = @OGG_CFLAGS@ +OGG_LIBS = @OGG_LIBS@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SHCFLAGS = @SHCFLAGS@ -SHELL = @SHELL@ SHLD = @SHLD@ SYSEXTRAS = @SYSEXTRAS@ VERSION = @VERSION@ +VORBISENC_LIBS = @VORBISENC_LIBS@ +VORBISFILE_LIBS = @VORBISFILE_LIBS@ +VORBIS_CFLAGS = @VORBIS_CFLAGS@ +VORBIS_LIBS = @VORBIS_LIBS@ WISH = @WISH@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +am__include = @am__include@ +am__quote = @am__quote@ dynamic_targets = @dynamic_targets@ +install_sh = @install_sh@ lispdir = @lispdir@ program_transform_name = @program_transform_name@ so = @so@ tcltk_dep = @tcltk_dep@ timidity_LDFLAGS = @timidity_LDFLAGS@ -PIXMAPS = ff.xpm loud.xpm nextdisc.xpm nexttrk.xpm playpaus.xpm prevdisc.xpm prevtrk.xpm quiet.xpm quit.xpm rew.xpm stop.xpm open.xpm fast.xpm slow.xpm restart.xpm keyup.xpm keydown.xpm timidity.xpm +PIXMAPS = \ + ff.xpm \ + loud.xpm \ + nextdisc.xpm \ + nexttrk.xpm \ + playpaus.xpm \ + prevdisc.xpm \ + prevtrk.xpm \ + quiet.xpm \ + quit.xpm \ + rew.xpm \ + stop.xpm \ + open.xpm \ + fast.xpm \ + slow.xpm \ + restart.xpm \ + keyup.xpm \ + keydown.xpm \ + timidity.xpm EXTRA_DIST = $(PIXMAPS) +subdir = interface/pixmaps mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h ../../interface.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps interface/pixmaps/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu interface/pixmaps/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = interface/pixmaps +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic mostlyclean-am -clean-am: clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-generic -distclean-am: distclean-generic clean-am +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -ruN TiMidity++-2.10.4/interface/slang_c.c TiMidity++-2.11.0/interface/slang_c.c --- TiMidity++-2.10.4/interface/slang_c.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.0/interface/slang_c.c Thu Dec 27 19:39:25 2001 @@ -962,7 +962,7 @@ } } - SLsmg_printfrc(lyric_row,0,comment_indicator_buffer); + SLsmg_printfrc(lyric_row,0,"%s",comment_indicator_buffer); ctl_refresh(); reuse_mblock(&tmpbuffer); indicator_last_update = get_current_calender_time(); diff -ruN TiMidity++-2.10.4/interface/w32g.h TiMidity++-2.11.0/interface/w32g.h --- TiMidity++-2.10.4/interface/w32g.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.0/interface/w32g.h Thu Dec 27 19:39:25 2001 @@ -22,8 +22,13 @@ #define ___W32G_H_ #include +#ifdef RC_NONE +#undef RC_NONE +#endif #include +#ifdef RC_NONE #undef RC_NONE +#endif #define RC_NONE 0 #define LANGUAGE_JAPANESE 0x0001 @@ -351,7 +356,8 @@ extern char *DocFileExt; extern int w32g_has_ini_file; - +extern char *w32g_output_dir; +extern int w32g_auto_output_mode; // HWND extern HWND hStartWnd; @@ -366,5 +372,9 @@ extern HWND hDebugEditWnd; extern HWND hDocEditWnd; +// gdi_lock +extern int gdi_lock(void); +extern int gdi_unlock(void); +#define GDI_SAFETY(command) (gdi_lock(),(command),gdi_unlock); #endif diff -ruN TiMidity++-2.10.4/interface/w32g_c.c TiMidity++-2.11.0/interface/w32g_c.c --- TiMidity++-2.10.4/interface/w32g_c.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.0/interface/w32g_c.c Thu Dec 27 19:39:25 2001 @@ -48,8 +48,22 @@ #include "w32g.h" #include "w32g_subwin.h" -#include - +extern int CanvasGetMode(void); +extern void CanvasUpdate(int flag); +extern void CanvasReadPanelInfo(int flag); +extern void CanvasPaint(void); +extern void CanvasPaintAll(void); +extern void CanvasReset(void); +extern void CanvasClear(void); +extern void MPanelPaintAll(void); +extern void MPanelReadPanelInfo(int flag); +extern void MPanelReset(void); +extern void MPanelUpdate(void); +extern void MPanelUpdateAll(void); +extern void MPanelPaint(void); +extern int w32g_msg_box(char *message, char *title, int type); +extern int is_directory(char *path); +extern int directory_form(char *buffer); volatile int w32g_play_active; volatile int w32g_restart_gui_flag = 0; @@ -60,6 +74,9 @@ static void CanvasUpdateInterval(void); static void ctl_panel_refresh(void); +char *w32g_output_dir = NULL; +int w32g_auto_output_mode = 0; + //****************************************************************************/ // Control funcitons @@ -76,7 +93,7 @@ { "Win32 GUI interface", 'w', 1,1,0, - CTLF_AUTOSTART | CTLF_LIST_LOOP | CTLF_DRAG_START, + CTLF_AUTOSTART | CTLF_DRAG_START, ctl_open, ctl_close, ctl_pass_playing_list, @@ -352,7 +369,6 @@ static int ctl_save_playlist(char *fileptr) { FILE *fp; - char *filename; int i, nfiles; if((fp = fopen(fileptr, "w")) == NULL) @@ -420,8 +436,6 @@ static int w32g_ext_control(int rc, int32 value) { - int i; - switch(rc) { case RC_EXT_DROP: @@ -528,8 +542,9 @@ w32g_play_active = 0; errcnt = 0; - if(play_mode->fd != -1 && - w32g_nvalid_playlist() && (ctl.flags & CTLF_AUTOSTART)) + if(w32g_nvalid_playlist() && (ctl.flags & CTLF_AUTOSTART)) +// if(play_mode->fd != -1 && +// w32g_nvalid_playlist() && (ctl.flags & CTLF_AUTOSTART)) rc = RC_LOAD_FILE; else rc = RC_NONE; @@ -561,7 +576,6 @@ w32g_play_active = 1; if(play_mode->fd == -1) { - int err; if(play_mode->open_output() == -1) { ctl.cmsg(CMSG_FATAL, VERB_NORMAL, @@ -574,12 +588,15 @@ aq_setup(); timidity_init_aq_buff(); } - w32g_setcur_playlist(); +// w32g_setcur_playlist(); if(play_mode->id_character == 'l') w32g_show_console(); if(!DocWndIndependent){ w32g_setup_doc(selected); - w32g_open_doc(1); + if(DocWndAutoPopup) + w32g_open_doc(1); + else + w32g_open_doc(2); } { char *p = w32g_get_playlist(selected); @@ -608,8 +625,12 @@ case RC_ERROR: case RC_TUNE_END: +#if 0 if(play_mode->id_character != 'd' || (ctl.flags & CTLF_NOT_CONTINUE)) +#else + if(ctl.flags & CTLF_NOT_CONTINUE) +#endif break; /* FALLTHROUGH */ case RC_NEXT: diff -ruN TiMidity++-2.10.4/interface/w32g_i.c TiMidity++-2.11.0/interface/w32g_i.c --- TiMidity++-2.10.4/interface/w32g_i.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.0/interface/w32g_i.c Thu Dec 27 19:39:25 2001 @@ -54,6 +54,7 @@ #else #include #endif +#include #include /* There is no on CYGWIN. * Edit_* and ListBox_* are defined in @@ -232,8 +233,8 @@ #endif } -//int PlayerLanguage = LANGUAGE_ENGLISH; -int PlayerLanguage = LANGUAGE_JAPANESE; +int PlayerLanguage = LANGUAGE_ENGLISH; +//int PlayerLanguage = LANGUAGE_JAPANESE; #define PInfoOK 1 long SetValue(int32 value, int32 min, int32 max) { @@ -257,6 +258,7 @@ { int argc; CHAR **argv = NULL; +puts("#### WINMAIN"); CmdLineToArgv(lpCmdLine,&argc,&argv); #if 0 FirstLoadIniFile(); @@ -337,7 +339,7 @@ void InitStartWnd(int nCmdShow) { WNDCLASS wndclass ; - wndclass.style = CS_HREDRAW | CS_VREDRAW ; + wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_CLASSDC; wndclass.lpfnWndProc = StartWinProc ; wndclass.cbClsExtra = 0 ; wndclass.cbWndExtra = 0 ; @@ -428,7 +430,10 @@ static void InitMainWnd(HWND hParentWnd) { HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON_TIMIDITY)); - hMainWnd = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_MAIN),hParentWnd,MainProc); + if (PlayerLanguage == LANGUAGE_JAPANESE) + hMainWnd = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_MAIN),hParentWnd,MainProc); + else + hMainWnd = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_MAIN_EN),hParentWnd,MainProc); if (hIcon!=NULL) SendMessage(hMainWnd,WM_SETICON,FALSE,(LPARAM)hIcon); { // Set the title of the main window again. char buffer[256]; @@ -1211,7 +1216,7 @@ { WNDCLASS wndclass ; hCanvasWnd = 0; - wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_CLASSDC; wndclass.lpfnWndProc = CanvasWndProc ; wndclass.cbClsExtra = 0 ; wndclass.cbWndExtra = 0 ; @@ -1382,6 +1387,8 @@ static void CanvasInit(HWND hwnd) { RECT rc; + + gdi_lock(); // gdi_lock Canvas.hwnd = hwnd; Canvas.hParentWnd = GetParent(Canvas.hwnd); GetClientRect(Canvas.hParentWnd,&rc); @@ -1408,10 +1415,10 @@ Canvas.MapDelay = 1; Canvas.MapResidual = 0; Canvas.MapMode = CMAP_MODE_16; -// Canvas.MapMode = CMAP_MODE_32; + // Canvas.MapMode = CMAP_MODE_32; Canvas.MapBarMax = 16; -// Canvas.CKNoteFrom = 24; -// Canvas.CKNoteTo = 24 + 96; + // Canvas.CKNoteFrom = 24; + // Canvas.CKNoteTo = 24 + 96; Canvas.CKNoteFrom = 12; Canvas.CKNoteTo = Canvas.CKNoteFrom + 96 + 3; Canvas.CKCh = 16; @@ -1421,6 +1428,7 @@ Canvas.PaintDone = 0; CanvasReset(); CanvasOK = 1; + gdi_unlock(); // gdi_lock } // Canvas Map @@ -1432,6 +1440,7 @@ HGDIOBJ hgdiobj_hpen, hgdiobj_hbrush; if(!CanvasOK) return; + gdi_lock(); // gdi_lock hPen = CreatePen(PS_SOLID,1,CanvasColor(CC_BACK)); hBrush = CreateSolidBrush(CanvasColor(CC_BACK)); hgdiobj_hpen = SelectObject(Canvas.hmdc, hPen); @@ -1443,6 +1452,7 @@ SelectObject(Canvas.hmdc, hgdiobj_hbrush); DeleteObject(hBrush); InvalidateRect(hCanvasWnd, NULL, FALSE); + gdi_unlock(); // gdi_lock } static void CanvasMapReset(void) @@ -1455,7 +1465,7 @@ Canvas.MapCh = 32; #ifdef MAPBAR_LIKE_TIMIDI Canvas.MapBarWidth = 5; - Canvas.MapBarMax = 10; + Canvas.MapBarMax = 10+1; Canvas.rcMapMap.bottom = Canvas.rcMapMap.top + 3*Canvas.MapBarMax*2 + 6 - 1; #else Canvas.MapBarWidth = 2; @@ -1507,25 +1517,17 @@ Canvas.DrumChannel = drumchannels; for(ch=0;chv_flags[ch] == FLAG_NOTE_ON) + if(Panel->v_flags[ch] == FLAG_NOTE_ON){ #if 0 v = Panel->ctotal[ch]/8; #else v = (int) Panel->ctotal[ch] * Canvas.MapBarMax / 128; #endif - else - v = 0; - if(v<0) v = 0; else if(v>Canvas.MapBarMax-1) v = Canvas.MapBarMax-1; -#if 0 // U - if(v == Canvas.MapBar[ch]){ - v = v * (rand()%7 + 7) / 10; - if(v<0) + } else { v = 0; } - { -#else + if(v<0) v = 0; else if(v>Canvas.MapBarMax-1) v = Canvas.MapBarMax-1; if(v != Canvas.MapBar[ch]){ -#endif // x if(Canvas.MapDelay){ int old = Canvas.MapBar[ch]; @@ -1644,7 +1646,8 @@ CanvasMapDrawMapBar(flag); if(Canvas.UpdateAll) flag = 1; - if(PInfoOK && Canvas.MapMode==CMAP_MODE_16) + gdi_lock(); // gdi_lock + if(PInfoOK && Canvas.MapMode==CMAP_MODE_16){ if(flag || Panel->changed){ int ch; for(ch=0;ch=0){ x = rc.left + Canvas.MapPan[ch]; for(y=rc.top;y<=rc.bottom;y++) @@ -1677,14 +1681,16 @@ // SUSTAIN rc.top = rc.bottom + 2; rc.bottom = rc.top + 2 - 1; - if(Canvas.MapSustain[ch]) - for(x=rc.left;x<=rc.right;x++) + if(Canvas.MapSustain[ch]){ + for(x=rc.left;x<=rc.right;x++){ for(y=rc.top;y<=rc.bottom;y++) SetPixelV(Canvas.hmdc,x,y,colorFG); - else - for(x=rc.left;x<=rc.right;x++) + } + } else { + for(x=rc.left;x<=rc.right;x++){ for(y=rc.top;y<=rc.bottom;y++) SetPixelV(Canvas.hmdc,x,y,colorBG); + } // EXPRESSION rc.top = rc.bottom + 2; rc.bottom = rc.top + 2 - 1; @@ -1712,9 +1718,10 @@ // PITCH_BEND rc.top = rc.bottom + 2; rc.bottom = rc.top + 3 - 1; - for(x=rc.left;x<=rc.right;x++) + for(x=rc.left;x<=rc.right;x++){ for(y=rc.top;y<=rc.bottom;y++) SetPixelV(Canvas.hmdc,x,y,colorBG); + } if(Canvas.MapPitchbend[ch]==-2){ y = rc.top + 1; for(x=rc.left;x<=rc.right;x++) @@ -1744,7 +1751,9 @@ SetPixelV(Canvas.hmdc,x,y,colorFG); } } - InvalidateRect(hCanvasWnd,(RECT *)&(Canvas.rcMapSub),FALSE); + } + InvalidateRect(hCanvasWnd,(RECT *)&(Canvas.rcMapSub),FALSE); + } } if(!Canvas.MapResidual && !flag) return; @@ -1767,7 +1776,7 @@ } } #else - if(Canvas.MapMode==CMAP_MODE_16) + if(Canvas.MapMode==CMAP_MODE_16){ for(i=0;i - Copyright (C) 1995 Tuukka Toivonen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - w32g_ini.c: written by Daisuke Aoki - Masanao Izumo -*/ - -#include -#include - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ -#include "timidity.h" -#include "common.h" -#include "output.h" -#include "instrum.h" -#include "playmidi.h" -#include "w32g.h" -#include "w32g_utl.h" - -#if MAX_CHANNELS > 32 /* FIXME */ -#error "MAX_CHANNELS > 32 is not supported Windows GUI version" -#endif - -int w32g_has_ini_file; - -static int32 str2size(char *str) -{ - int len = strlen(str); - if(str[len - 1] == 'k' || str[len - 1] == 'K') - return (int32)(1024.0 * atof(str)); - if(str[len - 1] == 'm' || str[len - 1] == 'M') - return (int32)(1024 * 1024 * atof(str)); - return atoi(str); -} - -void LoadIniFile(SETTING_PLAYER *sp, SETTING_TIMIDITY *st) -{ - char buff[1024]; - - /* [PLAYER] */ - IniGetKeyInt(INI_SEC_PLAYER,"InitMinimizeFlag",&(sp->InitMinimizeFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"DebugWndStartFlag",&(sp->DebugWndStartFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"ConsoleWndStartFlag",&(sp->ConsoleWndStartFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"ListWndStartFlag",&(sp->ListWndStartFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"TracerWndStartFlag",&(sp->TracerWndStartFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"DocWndStartFlag",&(sp->DocWndStartFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"WrdWndStartFlag",&(sp->WrdWndStartFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"DebugWndFlag",&(sp->DebugWndFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"ConsoleWndFlag",&(sp->ConsoleWndFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"ListWndFlag",&(sp->ListWndFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"TracerWndFlag",&(sp->TracerWndFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"DocWndFlag",&(sp->DocWndFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"WrdWndFlag",&(sp->WrdWndFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"SoundSpecWndFlag",&(sp->SoundSpecWndFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"SubWindowMax",&(sp->SubWindowMax)); - IniGetKeyStringN(INI_SEC_PLAYER,"ConfigFile",sp->ConfigFile,MAXPATH + 32); - if(!sp->ConfigFile[0]) - strcpy(sp->ConfigFile, W32G_TIMIDITY_CFG); - IniGetKeyStringN(INI_SEC_PLAYER,"PlaylistFile",sp->PlaylistFile,MAXPATH + 32); - IniGetKeyStringN(INI_SEC_PLAYER,"PlaylistHistoryFile",sp->PlaylistHistoryFile,MAXPATH + 32); - IniGetKeyStringN(INI_SEC_PLAYER,"MidiFileOpenDir",sp->MidiFileOpenDir,MAXPATH + 32); - IniGetKeyStringN(INI_SEC_PLAYER,"ConfigFileOpenDir",sp->ConfigFileOpenDir,MAXPATH + 32); - IniGetKeyStringN(INI_SEC_PLAYER,"PlaylistFileOpenDir",sp->PlaylistFileOpenDir,MAXPATH + 32); - IniGetKeyInt(INI_SEC_PLAYER,"PlayerThreadPriority",&(sp->PlayerThreadPriority)); - IniGetKeyInt(INI_SEC_PLAYER,"GUIThreadPriority",&(sp->GUIThreadPriority)); - IniGetKeyStringN(INI_SEC_PLAYER,"SystemFont",sp->SystemFont,256); - IniGetKeyStringN(INI_SEC_PLAYER,"PlayerFont",sp->PlayerFont,256); - IniGetKeyStringN(INI_SEC_PLAYER,"WrdFont",sp->WrdFont,256); - IniGetKeyStringN(INI_SEC_PLAYER,"DocFont",sp->DocFont,256); - IniGetKeyStringN(INI_SEC_PLAYER,"ListFont",sp->ListFont,256); - IniGetKeyStringN(INI_SEC_PLAYER,"TracerFont",sp->TracerFont,256); - IniGetKeyInt(INI_SEC_PLAYER,"SystemFontSize",&(sp->SystemFontSize)); - IniGetKeyInt(INI_SEC_PLAYER,"PlayerFontSize",&(sp->PlayerFontSize)); - IniGetKeyInt(INI_SEC_PLAYER,"WrdFontSize",&(sp->WrdFontSize)); - IniGetKeyInt(INI_SEC_PLAYER,"DocFontSize",&(sp->DocFontSize)); - IniGetKeyInt(INI_SEC_PLAYER,"ListFontSize",&(sp->ListFontSize)); - IniGetKeyInt(INI_SEC_PLAYER,"TracerFontSize",&(sp->TracerFontSize)); - IniGetKeyInt(INI_SEC_PLAYER,"WrdGraphicFlag",&(sp->WrdGraphicFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"TraceGraphicFlag",&(sp->TraceGraphicFlag)); - IniGetKeyInt(INI_SEC_PLAYER,"DocMaxSize",&(sp->DocMaxSize)); - IniGetKeyStringN(INI_SEC_PLAYER,"DocFileExt",sp->DocFileExt,256); - IniGetKeyInt(INI_SEC_PLAYER,"PlayerLanguage",&(sp->PlayerLanguage)); - IniGetKeyInt(INI_SEC_PLAYER,"DocWndIndependent",&(sp->DocWndIndependent)); - IniGetKeyInt(INI_SEC_PLAYER,"SeachDirRecursive",&(sp->SeachDirRecursive)); - IniGetKeyInt(INI_SEC_PLAYER,"IniFileAutoSave",&(sp->IniFileAutoSave)); - IniGetKeyInt(INI_SEC_PLAYER,"SecondMode",&(sp->SecondMode)); - - /* [TIMIDITY] */ - IniGetKeyInt32(INI_SEC_TIMIDITY,"amplification",&(st->amplification)); - IniGetKeyInt(INI_SEC_TIMIDITY,"antialiasing_allowed",&(st->antialiasing_allowed)); - IniGetKeyInt(INI_SEC_TIMIDITY,"buffer_fragments",&(st->buffer_fragments)); - IniGetKeyInt32(INI_SEC_TIMIDITY,"control_ratio",&(st->control_ratio)); - IniGetKeyInt32(INI_SEC_TIMIDITY,"default_drumchannels",(int32 *)&(st->default_drumchannels)); - IniGetKeyInt32(INI_SEC_TIMIDITY,"default_drumchannel_mask",(int32 *)&(st->default_drumchannel_mask)); - IniGetKeyInt(INI_SEC_TIMIDITY,"opt_modulation_wheel",&(st->opt_modulation_wheel)); - IniGetKeyInt(INI_SEC_TIMIDITY,"opt_portamento",&(st->opt_portamento)); - IniGetKeyInt(INI_SEC_TIMIDITY,"opt_nrpn_vibrato",&(st->opt_nrpn_vibrato)); - IniGetKeyInt(INI_SEC_TIMIDITY,"opt_channel_pressure",&(st->opt_channel_pressure)); - IniGetKeyInt(INI_SEC_TIMIDITY,"opt_trace_text_meta_event",&(st->opt_trace_text_meta_event)); - IniGetKeyInt(INI_SEC_TIMIDITY,"opt_overlap_voice_allow",&(st->opt_overlap_voice_allow)); - IniGetKeyStringN(INI_SEC_TIMIDITY,"opt_default_mid",buff,sizeof(buff)-1); - st->opt_default_mid = str2mID(buff); - IniGetKeyInt(INI_SEC_TIMIDITY,"default_tonebank",&(st->default_tonebank)); - IniGetKeyInt(INI_SEC_TIMIDITY,"special_tonebank",&(st->special_tonebank)); - IniGetKeyInt(INI_SEC_TIMIDITY,"effect_lr_mode",&(st->effect_lr_mode)); - IniGetKeyInt(INI_SEC_TIMIDITY,"effect_lr_delay_msec",&(st->effect_lr_delay_msec)); - IniGetKeyInt(INI_SEC_TIMIDITY,"opt_reverb_control",&(st->opt_reverb_control)); +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + w32g_ini.c: written by Daisuke Aoki + Masanao Izumo +*/ + +#include +#include + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ +#include "timidity.h" +#include "common.h" +#include "output.h" +#include "instrum.h" +#include "playmidi.h" +#include "w32g.h" +#include "w32g_utl.h" + +#if MAX_CHANNELS > 32 /* FIXME */ +#error "MAX_CHANNELS > 32 is not supported Windows GUI version" +#endif + +int w32g_has_ini_file; + +static int32 str2size(char *str) +{ + int len = strlen(str); + if(str[len - 1] == 'k' || str[len - 1] == 'K') + return (int32)(1024.0 * atof(str)); + if(str[len - 1] == 'm' || str[len - 1] == 'M') + return (int32)(1024 * 1024 * atof(str)); + return atoi(str); +} + +void LoadIniFile(SETTING_PLAYER *sp, SETTING_TIMIDITY *st) +{ + char buff[1024]; + + /* [PLAYER] */ + IniGetKeyInt(INI_SEC_PLAYER,"InitMinimizeFlag",&(sp->InitMinimizeFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"DebugWndStartFlag",&(sp->DebugWndStartFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"ConsoleWndStartFlag",&(sp->ConsoleWndStartFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"ListWndStartFlag",&(sp->ListWndStartFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"TracerWndStartFlag",&(sp->TracerWndStartFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"DocWndStartFlag",&(sp->DocWndStartFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"WrdWndStartFlag",&(sp->WrdWndStartFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"DebugWndFlag",&(sp->DebugWndFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"ConsoleWndFlag",&(sp->ConsoleWndFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"ListWndFlag",&(sp->ListWndFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"TracerWndFlag",&(sp->TracerWndFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"DocWndFlag",&(sp->DocWndFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"WrdWndFlag",&(sp->WrdWndFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"SoundSpecWndFlag",&(sp->SoundSpecWndFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"SubWindowMax",&(sp->SubWindowMax)); + IniGetKeyStringN(INI_SEC_PLAYER,"ConfigFile",sp->ConfigFile,MAXPATH + 32); + if(!sp->ConfigFile[0]) + strcpy(sp->ConfigFile, W32G_TIMIDITY_CFG); + IniGetKeyStringN(INI_SEC_PLAYER,"PlaylistFile",sp->PlaylistFile,MAXPATH + 32); + IniGetKeyStringN(INI_SEC_PLAYER,"PlaylistHistoryFile",sp->PlaylistHistoryFile,MAXPATH + 32); + IniGetKeyStringN(INI_SEC_PLAYER,"MidiFileOpenDir",sp->MidiFileOpenDir,MAXPATH + 32); + IniGetKeyStringN(INI_SEC_PLAYER,"ConfigFileOpenDir",sp->ConfigFileOpenDir,MAXPATH + 32); + IniGetKeyStringN(INI_SEC_PLAYER,"PlaylistFileOpenDir",sp->PlaylistFileOpenDir,MAXPATH + 32); + IniGetKeyInt(INI_SEC_PLAYER,"PlayerThreadPriority",&(sp->PlayerThreadPriority)); + IniGetKeyInt(INI_SEC_PLAYER,"GUIThreadPriority",&(sp->GUIThreadPriority)); + IniGetKeyStringN(INI_SEC_PLAYER,"SystemFont",sp->SystemFont,256); + IniGetKeyStringN(INI_SEC_PLAYER,"PlayerFont",sp->PlayerFont,256); + IniGetKeyStringN(INI_SEC_PLAYER,"WrdFont",sp->WrdFont,256); + IniGetKeyStringN(INI_SEC_PLAYER,"DocFont",sp->DocFont,256); + IniGetKeyStringN(INI_SEC_PLAYER,"ListFont",sp->ListFont,256); + IniGetKeyStringN(INI_SEC_PLAYER,"TracerFont",sp->TracerFont,256); + IniGetKeyInt(INI_SEC_PLAYER,"SystemFontSize",&(sp->SystemFontSize)); + IniGetKeyInt(INI_SEC_PLAYER,"PlayerFontSize",&(sp->PlayerFontSize)); + IniGetKeyInt(INI_SEC_PLAYER,"WrdFontSize",&(sp->WrdFontSize)); + IniGetKeyInt(INI_SEC_PLAYER,"DocFontSize",&(sp->DocFontSize)); + IniGetKeyInt(INI_SEC_PLAYER,"ListFontSize",&(sp->ListFontSize)); + IniGetKeyInt(INI_SEC_PLAYER,"TracerFontSize",&(sp->TracerFontSize)); + IniGetKeyInt(INI_SEC_PLAYER,"WrdGraphicFlag",&(sp->WrdGraphicFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"TraceGraphicFlag",&(sp->TraceGraphicFlag)); + IniGetKeyInt(INI_SEC_PLAYER,"DocMaxSize",&(sp->DocMaxSize)); + IniGetKeyStringN(INI_SEC_PLAYER,"DocFileExt",sp->DocFileExt,256); + IniGetKeyInt(INI_SEC_PLAYER,"PlayerLanguage",&(sp->PlayerLanguage)); + IniGetKeyInt(INI_SEC_PLAYER,"DocWndIndependent",&(sp->DocWndIndependent)); + IniGetKeyInt(INI_SEC_PLAYER,"DocWndAutoPopup",&(sp->DocWndAutoPopup)); + IniGetKeyInt(INI_SEC_PLAYER,"SeachDirRecursive",&(sp->SeachDirRecursive)); + IniGetKeyInt(INI_SEC_PLAYER,"IniFileAutoSave",&(sp->IniFileAutoSave)); + IniGetKeyInt(INI_SEC_PLAYER,"SecondMode",&(sp->SecondMode)); + + /* [TIMIDITY] */ + IniGetKeyInt32(INI_SEC_TIMIDITY,"amplification",&(st->amplification)); + IniGetKeyInt(INI_SEC_TIMIDITY,"antialiasing_allowed",&(st->antialiasing_allowed)); + IniGetKeyInt(INI_SEC_TIMIDITY,"buffer_fragments",&(st->buffer_fragments)); + IniGetKeyInt32(INI_SEC_TIMIDITY,"control_ratio",&(st->control_ratio)); + IniGetKeyInt32(INI_SEC_TIMIDITY,"default_drumchannels",(int32 *)&(st->default_drumchannels)); + IniGetKeyInt32(INI_SEC_TIMIDITY,"default_drumchannel_mask",(int32 *)&(st->default_drumchannel_mask)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_modulation_wheel",&(st->opt_modulation_wheel)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_portamento",&(st->opt_portamento)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_nrpn_vibrato",&(st->opt_nrpn_vibrato)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_channel_pressure",&(st->opt_channel_pressure)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_trace_text_meta_event",&(st->opt_trace_text_meta_event)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_overlap_voice_allow",&(st->opt_overlap_voice_allow)); + IniGetKeyStringN(INI_SEC_TIMIDITY,"opt_default_mid",buff,sizeof(buff)-1); +// st->opt_default_mid = str2mID(buff); + st->opt_default_mid = atoi(buff); + IniGetKeyInt(INI_SEC_TIMIDITY,"default_tonebank",&(st->default_tonebank)); + IniGetKeyInt(INI_SEC_TIMIDITY,"special_tonebank",&(st->special_tonebank)); + IniGetKeyInt(INI_SEC_TIMIDITY,"effect_lr_mode",&(st->effect_lr_mode)); + IniGetKeyInt(INI_SEC_TIMIDITY,"effect_lr_delay_msec",&(st->effect_lr_delay_msec)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_reverb_control",&(st->opt_reverb_control)); IniGetKeyInt(INI_SEC_TIMIDITY,"opt_chorus_control",&(st->opt_chorus_control)); - IniGetKeyInt(INI_SEC_TIMIDITY,"noise_sharp_type",&(st->noise_sharp_type)); - IniGetKeyInt(INI_SEC_TIMIDITY,"opt_evil_mode",&(st->opt_evil_mode)); - IniGetKeyInt(INI_SEC_TIMIDITY,"adjust_panning_immediately",&(st->adjust_panning_immediately)); - IniGetKeyInt(INI_SEC_TIMIDITY,"fast_decay",&(st->fast_decay)); -#ifdef SUPPORT_SOUNDSPEC - IniGetKeyInt(INI_SEC_TIMIDITY,"view_soundspec_flag",&(st->view_soundspec_flag)); - IniGetKeyFloat(INI_SEC_TIMIDITY,"spectrogram_update_sec",&v_float); - st->spectrogram_update_sec = v_float; -#endif - IniGetKeyIntArray(INI_SEC_TIMIDITY,"default_program",st->default_program,MAX_CHANNELS); - IniGetKeyStringN(INI_SEC_TIMIDITY,"opt_ctl",st->opt_ctl,sizeof(st->opt_ctl)-1); - IniGetKeyInt(INI_SEC_TIMIDITY,"opt_realtime_playing",&(st->opt_realtime_playing)); - IniGetKeyInt(INI_SEC_TIMIDITY,"reduce_voice_threshold",&(st->reduce_voice_threshold)); - IniGetKeyStringN(INI_SEC_TIMIDITY,"opt_playmode",st->opt_playmode,sizeof(st->opt_playmode)-1); - IniGetKeyStringN(INI_SEC_TIMIDITY,"OutputName",st->OutputName,sizeof(st->OutputName)-1); - IniGetKeyInt(INI_SEC_TIMIDITY,"voices",&(st->voices)); - IniGetKeyInt(INI_SEC_TIMIDITY,"auto_reduce_polyphony",&(st->auto_reduce_polyphony)); - IniGetKeyInt32(INI_SEC_TIMIDITY,"quietchannels",(int32 *)&(st->quietchannels)); - IniGetKeyStringN(INI_SEC_TIMIDITY,"opt_qsize",st->opt_qsize,sizeof(st->opt_qsize)-1); - IniGetKeyInt32(INI_SEC_TIMIDITY,"modify_release",&(st->modify_release)); - IniGetKeyStringN(INI_SEC_TIMIDITY,"allocate_cache_size",buff,sizeof(buff)-1); - st->allocate_cache_size = str2size(buff); - IniGetKeyInt(INI_SEC_TIMIDITY,"output_rate",&(st->output_rate)); - IniGetKeyStringN(INI_SEC_TIMIDITY,"output_text_code",st->output_text_code,sizeof(st->output_text_code)-1); - IniGetKeyInt(INI_SEC_TIMIDITY,"free_instruments_afterwards",&(st->free_instruments_afterwards)); - IniGetKeyStringN(INI_SEC_TIMIDITY,"out_wrd",st->opt_wrd,sizeof(st->opt_wrd)-1); -#if defined(__W32__) && defined(SMFCONV) - IniGetKeyInt(INI_SEC_TIMIDITY,"opt_rcpcv_dll",&(st->opt_rcpcv_dll)); -#endif - IniGetKeyInt(INI_SEC_TIMIDITY,"data_block_bits",&(st->data_block_bits)); - if(st->data_block_bits > AUDIO_BUFFER_BITS) - st->data_block_bits = AUDIO_BUFFER_BITS; - IniGetKeyInt(INI_SEC_TIMIDITY,"data_block_num",&(st->data_block_num)); -} - -void -SaveIniFile(SETTING_PLAYER *sp, SETTING_TIMIDITY *st) -{ - /* [PLAYER] */ - IniPutKeyString(INI_SEC_PLAYER,"IniVersion",IniVersion); - IniPutKeyInt(INI_SEC_PLAYER,"InitMinimizeFlag",&(sp->InitMinimizeFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"DebugWndStartFlag",&(sp->DebugWndStartFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"ConsoleWndStartFlag",&(sp->ConsoleWndStartFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"ListWndStartFlag",&(sp->ListWndStartFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"TracerWndStartFlag",&(sp->TracerWndStartFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"DocWndStartFlag",&(sp->DocWndStartFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"WrdWndStartFlag",&(sp->WrdWndStartFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"DebugWndFlag",&(sp->DebugWndFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"ConsoleWndFlag",&(sp->ConsoleWndFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"ListWndFlag",&(sp->ListWndFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"TracerWndFlag",&(sp->TracerWndFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"DocWndFlag",&(sp->DocWndFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"WrdWndFlag",&(sp->WrdWndFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"SoundSpecWndFlag",&(sp->SoundSpecWndFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"SubWindowMax",&(sp->SubWindowMax)); - IniPutKeyStringN(INI_SEC_PLAYER,"ConfigFile",sp->ConfigFile,MAXPATH + 32); - IniPutKeyStringN(INI_SEC_PLAYER,"PlaylistFile",sp->PlaylistFile,MAXPATH + 32); - IniPutKeyStringN(INI_SEC_PLAYER,"PlaylistHistoryFile",sp->PlaylistHistoryFile,MAXPATH + 32); - IniPutKeyStringN(INI_SEC_PLAYER,"MidiFileOpenDir",sp->MidiFileOpenDir,MAXPATH + 32); - IniPutKeyStringN(INI_SEC_PLAYER,"ConfigFileOpenDir",sp->ConfigFileOpenDir,MAXPATH + 32); - IniPutKeyStringN(INI_SEC_PLAYER,"PlaylistFileOpenDir",sp->PlaylistFileOpenDir,MAXPATH + 32); - IniPutKeyInt(INI_SEC_PLAYER,"PlayerThreadPriority",&(sp->PlayerThreadPriority)); - IniPutKeyInt(INI_SEC_PLAYER,"GUIThreadPriority",&(sp->GUIThreadPriority)); - IniPutKeyStringN(INI_SEC_PLAYER,"SystemFont",sp->SystemFont,256); - IniPutKeyStringN(INI_SEC_PLAYER,"PlayerFont",sp->PlayerFont,256); - IniPutKeyStringN(INI_SEC_PLAYER,"WrdFont",sp->WrdFont,256); - IniPutKeyStringN(INI_SEC_PLAYER,"DocFont",sp->DocFont,256); - IniPutKeyStringN(INI_SEC_PLAYER,"ListFont",sp->ListFont,256); - IniPutKeyStringN(INI_SEC_PLAYER,"TracerFont",sp->TracerFont,256); - IniPutKeyInt(INI_SEC_PLAYER,"SystemFontSize",&(sp->SystemFontSize)); - IniPutKeyInt(INI_SEC_PLAYER,"PlayerFontSize",&(sp->PlayerFontSize)); - IniPutKeyInt(INI_SEC_PLAYER,"WrdFontSize",&(sp->WrdFontSize)); - IniPutKeyInt(INI_SEC_PLAYER,"DocFontSize",&(sp->DocFontSize)); - IniPutKeyInt(INI_SEC_PLAYER,"ListFontSize",&(sp->ListFontSize)); - IniPutKeyInt(INI_SEC_PLAYER,"TracerFontSize",&(sp->TracerFontSize)); - IniPutKeyInt(INI_SEC_PLAYER,"WrdGraphicFlag",&(sp->WrdGraphicFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"TraceGraphicFlag",&(sp->TraceGraphicFlag)); - IniPutKeyInt(INI_SEC_PLAYER,"DocMaxSize",&(sp->DocMaxSize)); - IniPutKeyStringN(INI_SEC_PLAYER,"DocFileExt",sp->DocFileExt,256); - IniPutKeyInt(INI_SEC_PLAYER,"PlayerLanguage",&(sp->PlayerLanguage)); - IniPutKeyInt(INI_SEC_PLAYER,"DocWndIndependent",&(sp->DocWndIndependent)); - IniPutKeyInt(INI_SEC_PLAYER,"SeachDirRecursive",&(sp->SeachDirRecursive)); - IniPutKeyInt(INI_SEC_PLAYER,"IniFileAutoSave",&(sp->IniFileAutoSave)); - IniPutKeyInt(INI_SEC_PLAYER,"SecondMode",&(sp->SecondMode)); - - - /* [TIMIDITY] */ - IniPutKeyInt32(INI_SEC_TIMIDITY,"amplification",&(st->amplification)); - IniPutKeyInt(INI_SEC_TIMIDITY,"antialiasing_allowed",&(st->antialiasing_allowed)); - IniPutKeyInt(INI_SEC_TIMIDITY,"buffer_fragments",&(st->buffer_fragments)); - IniPutKeyInt32(INI_SEC_TIMIDITY,"control_ratio",&(st->control_ratio)); - IniPutKeyInt32(INI_SEC_TIMIDITY,"default_drumchannels",(int32 *)&(st->default_drumchannels)); - IniPutKeyInt32(INI_SEC_TIMIDITY,"default_drumchannel_mask",(int32 *)&(st->default_drumchannel_mask)); - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_modulation_wheel",&(st->opt_modulation_wheel)); - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_portamento",&(st->opt_portamento)); - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_nrpn_vibrato",&(st->opt_nrpn_vibrato)); - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_channel_pressure",&(st->opt_channel_pressure)); - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_trace_text_meta_event",&(st->opt_trace_text_meta_event)); - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_overlap_voice_allow",&(st->opt_overlap_voice_allow)); - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_default_mid",&(st->opt_default_mid)); - IniPutKeyInt(INI_SEC_TIMIDITY,"default_tonebank",&(st->default_tonebank)); - IniPutKeyInt(INI_SEC_TIMIDITY,"special_tonebank",&(st->special_tonebank)); - IniPutKeyInt(INI_SEC_TIMIDITY,"effect_lr_mode",&(st->effect_lr_mode)); - IniPutKeyInt(INI_SEC_TIMIDITY,"effect_lr_delay_msec",&(st->effect_lr_delay_msec)); - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_reverb_control",&(st->opt_reverb_control)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_surround_chorus",&(st->opt_surround_chorus)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_tva_attack",&(st->opt_tva_attack)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_tva_decay",&(st->opt_tva_decay)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_tva_release",&(st->opt_tva_release)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_delay_control",&(st->opt_delay_control)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_resonance",&(st->opt_resonance)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_velocity_table",&(st->opt_velocity_table)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_env_attack",&(st->opt_env_attack)); + IniGetKeyInt(INI_SEC_TIMIDITY,"noise_sharp_type",&(st->noise_sharp_type)); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_evil_mode",&(st->opt_evil_mode)); + IniGetKeyInt(INI_SEC_TIMIDITY,"adjust_panning_immediately",&(st->adjust_panning_immediately)); + IniGetKeyInt(INI_SEC_TIMIDITY,"fast_decay",&(st->fast_decay)); +#ifdef SUPPORT_SOUNDSPEC + IniGetKeyInt(INI_SEC_TIMIDITY,"view_soundspec_flag",&(st->view_soundspec_flag)); + IniGetKeyFloat(INI_SEC_TIMIDITY,"spectrogram_update_sec",&v_float); + st->spectrogram_update_sec = v_float; +#endif + IniGetKeyIntArray(INI_SEC_TIMIDITY,"default_program",st->default_program,MAX_CHANNELS); + IniGetKeyStringN(INI_SEC_TIMIDITY,"opt_ctl",st->opt_ctl,sizeof(st->opt_ctl)-1); + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_realtime_playing",&(st->opt_realtime_playing)); + IniGetKeyInt(INI_SEC_TIMIDITY,"reduce_voice_threshold",&(st->reduce_voice_threshold)); + IniGetKeyStringN(INI_SEC_TIMIDITY,"opt_playmode",st->opt_playmode,sizeof(st->opt_playmode)-1); + IniGetKeyStringN(INI_SEC_TIMIDITY,"OutputName",st->OutputName,sizeof(st->OutputName)-1); + IniGetKeyStringN(INI_SEC_TIMIDITY,"OutputDirName",st->OutputDirName,sizeof(st->OutputDirName)-1); + IniGetKeyInt(INI_SEC_TIMIDITY,"auto_output_mode",&(st->auto_output_mode)); + IniGetKeyInt(INI_SEC_TIMIDITY,"voices",&(st->voices)); + IniGetKeyInt(INI_SEC_TIMIDITY,"auto_reduce_polyphony",&(st->auto_reduce_polyphony)); + IniGetKeyInt32(INI_SEC_TIMIDITY,"quietchannels",(int32 *)&(st->quietchannels)); + IniGetKeyStringN(INI_SEC_TIMIDITY,"opt_qsize",st->opt_qsize,sizeof(st->opt_qsize)-1); + IniGetKeyInt32(INI_SEC_TIMIDITY,"modify_release",&(st->modify_release)); + IniGetKeyStringN(INI_SEC_TIMIDITY,"allocate_cache_size",buff,sizeof(buff)-1); + st->allocate_cache_size = str2size(buff); + IniGetKeyInt(INI_SEC_TIMIDITY,"output_rate",&(st->output_rate)); + IniGetKeyStringN(INI_SEC_TIMIDITY,"output_text_code",st->output_text_code,sizeof(st->output_text_code)-1); + IniGetKeyInt(INI_SEC_TIMIDITY,"free_instruments_afterwards",&(st->free_instruments_afterwards)); + IniGetKeyStringN(INI_SEC_TIMIDITY,"out_wrd",st->opt_wrd,sizeof(st->opt_wrd)-1); +#if defined(__W32__) && defined(SMFCONV) + IniGetKeyInt(INI_SEC_TIMIDITY,"opt_rcpcv_dll",&(st->opt_rcpcv_dll)); +#endif + IniGetKeyInt(INI_SEC_TIMIDITY,"data_block_bits",&(st->data_block_bits)); + if(st->data_block_bits > AUDIO_BUFFER_BITS) + st->data_block_bits = AUDIO_BUFFER_BITS; + IniGetKeyInt(INI_SEC_TIMIDITY,"data_block_num",&(st->data_block_num)); +} + +void +SaveIniFile(SETTING_PLAYER *sp, SETTING_TIMIDITY *st) +{ + /* [PLAYER] */ + IniPutKeyString(INI_SEC_PLAYER,"IniVersion",IniVersion); + IniPutKeyInt(INI_SEC_PLAYER,"InitMinimizeFlag",&(sp->InitMinimizeFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"DebugWndStartFlag",&(sp->DebugWndStartFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"ConsoleWndStartFlag",&(sp->ConsoleWndStartFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"ListWndStartFlag",&(sp->ListWndStartFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"TracerWndStartFlag",&(sp->TracerWndStartFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"DocWndStartFlag",&(sp->DocWndStartFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"WrdWndStartFlag",&(sp->WrdWndStartFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"DebugWndFlag",&(sp->DebugWndFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"ConsoleWndFlag",&(sp->ConsoleWndFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"ListWndFlag",&(sp->ListWndFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"TracerWndFlag",&(sp->TracerWndFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"DocWndFlag",&(sp->DocWndFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"WrdWndFlag",&(sp->WrdWndFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"SoundSpecWndFlag",&(sp->SoundSpecWndFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"SubWindowMax",&(sp->SubWindowMax)); + IniPutKeyStringN(INI_SEC_PLAYER,"ConfigFile",sp->ConfigFile,MAXPATH + 32); + IniPutKeyStringN(INI_SEC_PLAYER,"PlaylistFile",sp->PlaylistFile,MAXPATH + 32); + IniPutKeyStringN(INI_SEC_PLAYER,"PlaylistHistoryFile",sp->PlaylistHistoryFile,MAXPATH + 32); + IniPutKeyStringN(INI_SEC_PLAYER,"MidiFileOpenDir",sp->MidiFileOpenDir,MAXPATH + 32); + IniPutKeyStringN(INI_SEC_PLAYER,"ConfigFileOpenDir",sp->ConfigFileOpenDir,MAXPATH + 32); + IniPutKeyStringN(INI_SEC_PLAYER,"PlaylistFileOpenDir",sp->PlaylistFileOpenDir,MAXPATH + 32); + IniPutKeyInt(INI_SEC_PLAYER,"PlayerThreadPriority",&(sp->PlayerThreadPriority)); + IniPutKeyInt(INI_SEC_PLAYER,"GUIThreadPriority",&(sp->GUIThreadPriority)); + IniPutKeyStringN(INI_SEC_PLAYER,"SystemFont",sp->SystemFont,256); + IniPutKeyStringN(INI_SEC_PLAYER,"PlayerFont",sp->PlayerFont,256); + IniPutKeyStringN(INI_SEC_PLAYER,"WrdFont",sp->WrdFont,256); + IniPutKeyStringN(INI_SEC_PLAYER,"DocFont",sp->DocFont,256); + IniPutKeyStringN(INI_SEC_PLAYER,"ListFont",sp->ListFont,256); + IniPutKeyStringN(INI_SEC_PLAYER,"TracerFont",sp->TracerFont,256); + IniPutKeyInt(INI_SEC_PLAYER,"SystemFontSize",&(sp->SystemFontSize)); + IniPutKeyInt(INI_SEC_PLAYER,"PlayerFontSize",&(sp->PlayerFontSize)); + IniPutKeyInt(INI_SEC_PLAYER,"WrdFontSize",&(sp->WrdFontSize)); + IniPutKeyInt(INI_SEC_PLAYER,"DocFontSize",&(sp->DocFontSize)); + IniPutKeyInt(INI_SEC_PLAYER,"ListFontSize",&(sp->ListFontSize)); + IniPutKeyInt(INI_SEC_PLAYER,"TracerFontSize",&(sp->TracerFontSize)); + IniPutKeyInt(INI_SEC_PLAYER,"WrdGraphicFlag",&(sp->WrdGraphicFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"TraceGraphicFlag",&(sp->TraceGraphicFlag)); + IniPutKeyInt(INI_SEC_PLAYER,"DocMaxSize",&(sp->DocMaxSize)); + IniPutKeyStringN(INI_SEC_PLAYER,"DocFileExt",sp->DocFileExt,256); + IniPutKeyInt(INI_SEC_PLAYER,"PlayerLanguage",&(sp->PlayerLanguage)); + IniPutKeyInt(INI_SEC_PLAYER,"DocWndIndependent",&(sp->DocWndIndependent)); + IniPutKeyInt(INI_SEC_PLAYER,"DocWndAutoPopup",&(sp->DocWndAutoPopup)); + IniPutKeyInt(INI_SEC_PLAYER,"SeachDirRecursive",&(sp->SeachDirRecursive)); + IniPutKeyInt(INI_SEC_PLAYER,"IniFileAutoSave",&(sp->IniFileAutoSave)); + IniPutKeyInt(INI_SEC_PLAYER,"SecondMode",&(sp->SecondMode)); + + + /* [TIMIDITY] */ + IniPutKeyInt32(INI_SEC_TIMIDITY,"amplification",&(st->amplification)); + IniPutKeyInt(INI_SEC_TIMIDITY,"antialiasing_allowed",&(st->antialiasing_allowed)); + IniPutKeyInt(INI_SEC_TIMIDITY,"buffer_fragments",&(st->buffer_fragments)); + IniPutKeyInt32(INI_SEC_TIMIDITY,"control_ratio",&(st->control_ratio)); + IniPutKeyInt32(INI_SEC_TIMIDITY,"default_drumchannels",(int32 *)&(st->default_drumchannels)); + IniPutKeyInt32(INI_SEC_TIMIDITY,"default_drumchannel_mask",(int32 *)&(st->default_drumchannel_mask)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_modulation_wheel",&(st->opt_modulation_wheel)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_portamento",&(st->opt_portamento)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_nrpn_vibrato",&(st->opt_nrpn_vibrato)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_channel_pressure",&(st->opt_channel_pressure)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_trace_text_meta_event",&(st->opt_trace_text_meta_event)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_overlap_voice_allow",&(st->opt_overlap_voice_allow)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_default_mid",&(st->opt_default_mid)); + IniPutKeyInt(INI_SEC_TIMIDITY,"default_tonebank",&(st->default_tonebank)); + IniPutKeyInt(INI_SEC_TIMIDITY,"special_tonebank",&(st->special_tonebank)); + IniPutKeyInt(INI_SEC_TIMIDITY,"effect_lr_mode",&(st->effect_lr_mode)); + IniPutKeyInt(INI_SEC_TIMIDITY,"effect_lr_delay_msec",&(st->effect_lr_delay_msec)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_reverb_control",&(st->opt_reverb_control)); IniPutKeyInt(INI_SEC_TIMIDITY,"opt_chorus_control",&(st->opt_chorus_control)); - IniPutKeyInt(INI_SEC_TIMIDITY,"noise_sharp_type",&(st->noise_sharp_type)); - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_evil_mode",&(st->opt_evil_mode)); - IniPutKeyInt(INI_SEC_TIMIDITY,"adjust_panning_immediately",&(st->adjust_panning_immediately)); - IniPutKeyInt(INI_SEC_TIMIDITY,"fast_decay",&(st->fast_decay)); -#ifdef SUPPORT_SOUNDSPEC - IniPutKeyInt(INI_SEC_TIMIDITY,"view_soundspec_flag",&(st->view_soundspec_flag)); - v_float = st->spectrogram_update_sec; - IniPutKeyFloat(INI_SEC_TIMIDITY,"spectrogram_update_sec",&v_float); -#endif - IniPutKeyIntArray(INI_SEC_TIMIDITY,"default_program",st->default_program,MAX_CHANNELS); - IniPutKeyStringN(INI_SEC_TIMIDITY,"opt_ctl",st->opt_ctl,sizeof(st->opt_ctl)); - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_realtime_playing",&(st->opt_realtime_playing)); - IniPutKeyInt(INI_SEC_TIMIDITY,"reduce_voice_threshold",&(st->reduce_voice_threshold)); - IniPutKeyStringN(INI_SEC_TIMIDITY,"opt_playmode",st->opt_playmode,sizeof(st->opt_playmode)); - IniPutKeyStringN(INI_SEC_TIMIDITY,"OutputName",st->OutputName,sizeof(st->OutputName)); - IniPutKeyInt(INI_SEC_TIMIDITY,"voices",&(st->voices)); - IniPutKeyInt(INI_SEC_TIMIDITY,"auto_reduce_polyphony",&(st->auto_reduce_polyphony)); - IniPutKeyInt32(INI_SEC_TIMIDITY,"quietchannels",(int32 *)&(st->quietchannels)); - IniPutKeyStringN(INI_SEC_TIMIDITY,"opt_qsize",st->opt_qsize,sizeof(st->opt_qsize)); - IniPutKeyInt32(INI_SEC_TIMIDITY,"modify_release",&(st->modify_release)); - IniPutKeyInt32(INI_SEC_TIMIDITY,"allocate_cache_size",&(st->allocate_cache_size)); - IniPutKeyInt(INI_SEC_TIMIDITY,"output_rate",&(st->output_rate)); - if(st->output_rate == 0) - st->output_rate = play_mode->rate; - IniPutKeyStringN(INI_SEC_TIMIDITY,"output_text_code",st->output_text_code,sizeof(st->output_text_code)); - IniPutKeyInt(INI_SEC_TIMIDITY,"free_instruments_afterwards",&(st->free_instruments_afterwards)); - IniPutKeyStringN(INI_SEC_TIMIDITY,"out_wrd",st->opt_wrd,sizeof(st->opt_wrd)); -#if defined(__W32__) && defined(SMFCONV) - IniPutKeyInt(INI_SEC_TIMIDITY,"opt_rcpcv_dll",&(st->opt_rcpcv_dll)); -#endif - IniPutKeyInt(INI_SEC_TIMIDITY,"data_block_bits",&(st->data_block_bits)); - IniPutKeyInt(INI_SEC_TIMIDITY,"data_block_num",&(st->data_block_num)); - w32g_has_ini_file = 1; -} - -// When Start TiMidity in WinMain() -extern int SecondMode; -static char S_IniFile[MAXPATH + 32]; -void FirstLoadIniFile(void) -{ - char buffer[1024]; - char *prevIniFile = IniFile; - char *p; - IniFile = S_IniFile; - if(GetModuleFileName(GetModuleHandle(0), buffer, MAXPATH)) - { - if((p = pathsep_strrchr(buffer)) != NULL) - { - p++; - *p = '\0'; - } - else - { - buffer[0] = '.'; - buffer[1] = PATH_SEP; - buffer[2] = '\0'; - } - } - else - { - buffer[0] = '.'; - buffer[1] = PATH_SEP; - buffer[2] = '\0'; - } - strncpy(IniFile, buffer, MAXPATH); - IniFile[MAXPATH] = '\0'; - strcat(IniFile,"timpp32g.ini"); - IniGetKeyInt(INI_SEC_PLAYER,"SecondMode",&(SecondMode)); - IniFile = prevIniFile; -} + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_surround_chorus",&(st->opt_surround_chorus)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_tva_attack",&(st->opt_tva_attack)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_tva_decay",&(st->opt_tva_decay)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_tva_release",&(st->opt_tva_release)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_delay_control",&(st->opt_delay_control)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_resonance",&(st->opt_resonance)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_velocity_table",&(st->opt_velocity_table)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_env_attack",&(st->opt_env_attack)); + IniPutKeyInt(INI_SEC_TIMIDITY,"noise_sharp_type",&(st->noise_sharp_type)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_evil_mode",&(st->opt_evil_mode)); + IniPutKeyInt(INI_SEC_TIMIDITY,"adjust_panning_immediately",&(st->adjust_panning_immediately)); + IniPutKeyInt(INI_SEC_TIMIDITY,"fast_decay",&(st->fast_decay)); +#ifdef SUPPORT_SOUNDSPEC + IniPutKeyInt(INI_SEC_TIMIDITY,"view_soundspec_flag",&(st->view_soundspec_flag)); + v_float = st->spectrogram_update_sec; + IniPutKeyFloat(INI_SEC_TIMIDITY,"spectrogram_update_sec",&v_float); +#endif + IniPutKeyIntArray(INI_SEC_TIMIDITY,"default_program",st->default_program,MAX_CHANNELS); + IniPutKeyStringN(INI_SEC_TIMIDITY,"opt_ctl",st->opt_ctl,sizeof(st->opt_ctl)); + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_realtime_playing",&(st->opt_realtime_playing)); + IniPutKeyInt(INI_SEC_TIMIDITY,"reduce_voice_threshold",&(st->reduce_voice_threshold)); + IniPutKeyStringN(INI_SEC_TIMIDITY,"opt_playmode",st->opt_playmode,sizeof(st->opt_playmode)); + IniPutKeyStringN(INI_SEC_TIMIDITY,"OutputName",st->OutputName,sizeof(st->OutputName)); + IniPutKeyStringN(INI_SEC_TIMIDITY,"OutputDirName",st->OutputDirName,sizeof(st->OutputDirName)); + IniPutKeyInt(INI_SEC_TIMIDITY,"auto_output_mode",&(st->auto_output_mode)); + IniPutKeyInt(INI_SEC_TIMIDITY,"voices",&(st->voices)); + IniPutKeyInt(INI_SEC_TIMIDITY,"auto_reduce_polyphony",&(st->auto_reduce_polyphony)); + IniPutKeyInt32(INI_SEC_TIMIDITY,"quietchannels",(int32 *)&(st->quietchannels)); + IniPutKeyStringN(INI_SEC_TIMIDITY,"opt_qsize",st->opt_qsize,sizeof(st->opt_qsize)); + IniPutKeyInt32(INI_SEC_TIMIDITY,"modify_release",&(st->modify_release)); + IniPutKeyInt32(INI_SEC_TIMIDITY,"allocate_cache_size",&(st->allocate_cache_size)); + IniPutKeyInt(INI_SEC_TIMIDITY,"output_rate",&(st->output_rate)); + if(st->output_rate == 0) + st->output_rate = play_mode->rate; + IniPutKeyStringN(INI_SEC_TIMIDITY,"output_text_code",st->output_text_code,sizeof(st->output_text_code)); + IniPutKeyInt(INI_SEC_TIMIDITY,"free_instruments_afterwards",&(st->free_instruments_afterwards)); + IniPutKeyStringN(INI_SEC_TIMIDITY,"out_wrd",st->opt_wrd,sizeof(st->opt_wrd)); +#if defined(__W32__) && defined(SMFCONV) + IniPutKeyInt(INI_SEC_TIMIDITY,"opt_rcpcv_dll",&(st->opt_rcpcv_dll)); +#endif + IniPutKeyInt(INI_SEC_TIMIDITY,"data_block_bits",&(st->data_block_bits)); + IniPutKeyInt(INI_SEC_TIMIDITY,"data_block_num",&(st->data_block_num)); + w32g_has_ini_file = 1; +} + +// When Start TiMidity in WinMain() +extern int SecondMode; +static char S_IniFile[MAXPATH + 32]; +void FirstLoadIniFile(void) +{ + char buffer[1024]; + char *prevIniFile = IniFile; + char *p; + IniFile = S_IniFile; + if(GetModuleFileName(GetModuleHandle(0), buffer, MAXPATH)) + { + if((p = pathsep_strrchr(buffer)) != NULL) + { + p++; + *p = '\0'; + } + else + { + buffer[0] = '.'; + buffer[1] = PATH_SEP; + buffer[2] = '\0'; + } + } + else + { + buffer[0] = '.'; + buffer[1] = PATH_SEP; + buffer[2] = '\0'; + } + strncpy(IniFile, buffer, MAXPATH); + IniFile[MAXPATH] = '\0'; + strcat(IniFile,"timpp32g.ini"); + IniGetKeyInt(INI_SEC_PLAYER,"SecondMode",&(SecondMode)); + IniFile = prevIniFile; +} diff -ruN TiMidity++-2.10.4/interface/w32g_pref.c TiMidity++-2.11.0/interface/w32g_pref.c --- TiMidity++-2.10.4/interface/w32g_pref.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.0/interface/w32g_pref.c Thu Dec 27 19:39:25 2001 @@ -30,11 +30,15 @@ #include #undef RC_NONE // #include + #if defined(__CYGWIN32__) || defined(__MINGW32__) #include #else #include #endif /* __CYGWIN32__ */ + + + #include #ifndef NO_STRING_H #include @@ -42,6 +46,9 @@ #include #endif //#include +#ifdef AU_GOGO +#include /* for gogo */ +#endif #include "timidity.h" #include "common.h" @@ -66,9 +73,17 @@ #include "w32g_res.h" #include "w32g_utl.h" #include "w32g_pref.h" +#ifdef AU_GOGO +#include "gogo_a.h" +#endif /* TiMidity Win32GUI preference / PropertySheet */ +extern void w32g_restart(void); +extern void set_gogo_opts_use_commandline_options(char *commandline); + +extern void restore_voices(int save_voices); + volatile int PrefWndDoing = 0; static volatile int PrefWndSetOK = 0; @@ -82,6 +97,9 @@ static int DlgOpenConfigFile(char *Filename, HWND hwnd); static int DlgOpenOutputFile(char *Filename, HWND hwnd); +static int vorbisCofigDialog(void); +static int gogoCofigDialog(void); + //#if defined(__CYGWIN32__) || defined(__MINGW32__) #if 0 /* New version of mingw */ //#define pszTemplate u1.pszTemplate @@ -124,14 +142,31 @@ psp[0].DUMMYUNIONNAME.pszTemplate = MAKEINTRESOURCE(IDD_PREF_PLAYER); psp[0].DUMMYUNIONNAME2.pszIcon = NULL; #else - psp[0].pszTemplate = MAKEINTRESOURCE(IDD_PREF_PLAYER); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psp[0].pszTemplate = MAKEINTRESOURCE(IDD_PREF_PLAYER); + break; + default: + case LANGUAGE_ENGLISH: + psp[0].pszTemplate = MAKEINTRESOURCE(IDD_PREF_PLAYER_EN); + break; + } psp[0].pszIcon = NULL; #endif #endif psp[0].pfnDlgProc = PrefPlayerDialogProc; - psp[0].pszTitle = (LPSTR)TEXT("Player"); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psp[0].pszTitle = (LPSTR)TEXT("vC["); + break; + default: + case LANGUAGE_ENGLISH: + psp[0].pszTitle = (LPSTR)TEXT("Player"); + break; + } psp[0].lParam = 0; psp[0].pfnCallback = NULL; + // TiMidity page1. psp[1].dwSize = sizeof(PROPSHEETPAGE); psp[1].dwFlags = PSP_USETITLE; @@ -144,12 +179,28 @@ psp[1].DUMMYUNIONNAME.pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY1); psp[1].DUMMYUNIONNAME2.pszIcon = NULL; #else - psp[1].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY1); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psp[1].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY1); + break; + default: + case LANGUAGE_ENGLISH: + psp[1].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY1_EN); + break; + } psp[1].pszIcon = NULL; #endif #endif psp[1].pfnDlgProc = PrefTiMidity1DialogProc; - psp[1].pszTitle = (LPSTR)TEXT("Effect"); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psp[1].pszTitle = (LPSTR)TEXT("GtFNg"); + break; + default: + case LANGUAGE_ENGLISH: + psp[1].pszTitle = (LPSTR)TEXT("Effect"); + break; + } psp[1].lParam = 0; psp[1].pfnCallback = NULL; // TiMidity page2. @@ -164,12 +215,28 @@ psp[2].DUMMYUNIONNAME.pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY2); psp[2].DUMMYUNIONNAME2.pszIcon = NULL; #else - psp[2].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY2); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psp[2].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY2); + break; + default: + case LANGUAGE_ENGLISH: + psp[2].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY2_EN); + break; + } psp[2].pszIcon = NULL; #endif #endif psp[2].pfnDlgProc = PrefTiMidity2DialogProc; - psp[2].pszTitle = (LPSTR)TEXT("Misc"); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psp[2].pszTitle = (LPSTR)TEXT(""); + break; + default: + case LANGUAGE_ENGLISH: + psp[2].pszTitle = (LPSTR)TEXT("Misc"); + break; + } psp[2].lParam = 0; psp[2].pfnCallback = NULL; // TiMidity page3. @@ -184,12 +251,28 @@ psp[3].DUMMYUNIONNAME.pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY3); psp[3].DUMMYUNIONNAME2.pszIcon = NULL; #else - psp[3].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY3); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psp[3].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY3); + break; + default: + case LANGUAGE_ENGLISH: + psp[3].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY3_EN); + break; + } psp[3].pszIcon = NULL; #endif #endif psp[3].pfnDlgProc = PrefTiMidity3DialogProc; - psp[3].pszTitle = (LPSTR)TEXT("Output"); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psp[3].pszTitle = (LPSTR)TEXT("o"); + break; + default: + case LANGUAGE_ENGLISH: + psp[3].pszTitle = (LPSTR)TEXT("Output"); + break; + } psp[3].lParam = 0; psp[3].pfnCallback = NULL; // TiMidity page4. @@ -204,12 +287,28 @@ psp[4].DUMMYUNIONNAME.pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY4); psp[4].DUMMYUNIONNAME2.pszIcon = NULL; #else - psp[4].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY4); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psp[4].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY4); + break; + default: + case LANGUAGE_ENGLISH: + psp[4].pszTemplate = MAKEINTRESOURCE(IDD_PREF_TIMIDITY4_EN); + break; + } psp[4].pszIcon = NULL; #endif #endif psp[4].pfnDlgProc = PrefTiMidity4DialogProc; - psp[4].pszTitle = (LPSTR)TEXT("Channel"); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psp[4].pszTitle = (LPSTR)TEXT("`l"); + break; + default: + case LANGUAGE_ENGLISH: + psp[4].pszTitle = (LPSTR)TEXT("Channel"); + break; + } psp[4].lParam = 0; psp[4].pfnCallback = NULL; // Propsheetheader @@ -218,7 +317,15 @@ psh.dwFlags = PSH_USEHICON | PSH_PROPSHEETPAGE | PSH_USECALLBACK; psh.hwndParent = hwnd; psh.hInstance = hInst; - psh.pszCaption = (LPSTR)TEXT("TiMidity Win32GUI Preference"); + switch(PlayerLanguage) { // + case LANGUAGE_JAPANESE: + psh.pszCaption = (LPSTR)TEXT("TiMidity++ Win32GUI - "); + break; + default: + case LANGUAGE_ENGLISH: + psh.pszCaption = (LPSTR)TEXT("TiMidity++ Win32GUI - Preference"); + break; + } psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); #if defined (__cplusplus) psh.nStartPage = 0; @@ -390,17 +497,23 @@ DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_AUTOUNIQ,flag)); SettingCtlFlag(st_temp, 'R', DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_AUTOREFINE,flag)); + SettingCtlFlag(st_temp, 'a', + DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_AUTOSTART,flag)); SettingCtlFlag(st_temp, 'C', DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_NOT_CONTINUE,flag)); SettingCtlFlag(st_temp, 'd', !DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_NOT_DRAG_START,flag)); SettingCtlFlag(st_temp, 'l', !DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_NOT_LOOPING,flag)); + SettingCtlFlag(st_temp, 'r', + DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_RANDOM,flag)); } DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECK_SEACHDIRRECURSIVE, sp_temp->SeachDirRecursive); DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECK_DOCWNDINDEPENDENT, sp_temp->DocWndIndependent); + DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECK_DOCWNDAUTOPOPUP, + sp_temp->DocWndAutoPopup); DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECK_INIFILE_AUTOSAVE, sp_temp->IniFileAutoSave); SetWindowLong(hwnd,DWL_MSGRESULT,FALSE); @@ -432,17 +545,23 @@ strchr(st_temp->opt_ctl + 1, 'u')); DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_AUTOREFINE, strchr(st_temp->opt_ctl + 1, 'R')); + DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_AUTOSTART, + strchr(st_temp->opt_ctl + 1, 'a')); DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_NOT_CONTINUE, strchr(st_temp->opt_ctl + 1, 'C')); DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_NOT_DRAG_START, !strchr(st_temp->opt_ctl + 1, 'd')); DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_NOT_LOOPING, !strchr(st_temp->opt_ctl + 1, 'l')); + DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_RANDOM, + strchr(st_temp->opt_ctl + 1, 'r')); DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECK_SEACHDIRRECURSIVE, sp_temp->SeachDirRecursive); DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECK_DOCWNDINDEPENDENT, sp_temp->DocWndIndependent); + DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECK_DOCWNDAUTOPOPUP, + sp_temp->DocWndAutoPopup); DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECK_INIFILE_AUTOSAVE, sp_temp->IniFileAutoSave); break; @@ -544,7 +663,7 @@ // CHORUS if(SendDlgItemMessage(hwnd,IDC_CHECKBOX_CHORUS,BM_GETCHECK,0,0)){ if(SendDlgItemMessage(hwnd,IDC_CHECKBOX_CHORUS_LEVEL,BM_GETCHECK,0,0)){ - st_temp->opt_chorus_control = -GetDlgItemInt(hwnd,IDC_EDIT_CHORUS,NULL,TRUE); + st_temp->opt_chorus_control = -(int)GetDlgItemInt(hwnd,IDC_EDIT_CHORUS,NULL,TRUE); } else { st_temp->opt_chorus_control = 1; } @@ -556,7 +675,7 @@ if(SendDlgItemMessage(hwnd,IDC_CHECKBOX_GLOBAL_REVERB,BM_GETCHECK,0,0)){ st_temp->opt_reverb_control = 2; } else if(SendDlgItemMessage(hwnd,IDC_CHECKBOX_REVERB_LEVEL,BM_GETCHECK,0,0)){ - st_temp->opt_reverb_control = -GetDlgItemInt(hwnd,IDC_EDIT_REVERB,NULL,TRUE); + st_temp->opt_reverb_control = -(int)GetDlgItemInt(hwnd,IDC_EDIT_REVERB,NULL,TRUE); } else { st_temp->opt_reverb_control = 1; } @@ -578,6 +697,8 @@ } // NOISESHARPING st_temp->noise_sharp_type = GetDlgItemInt(hwnd,IDC_EDIT_NOISESHARPING,NULL,FALSE); + st_temp->opt_env_attack = GetDlgItemInt(hwnd,IDC_EDIT_ENV_ATTACK,NULL,FALSE); + st_temp->opt_velocity_table = GetDlgItemInt(hwnd,IDC_EDIT_VELOCITYTABLE,NULL,FALSE); // Misc DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_MODWHEEL,st_temp->opt_modulation_wheel); DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_PORTAMENTO,st_temp->opt_portamento); @@ -586,6 +707,12 @@ DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_OVOICE,st_temp->opt_overlap_voice_allow); DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_TRACETEXT,st_temp->opt_trace_text_meta_event); st_temp->modify_release = GetDlgItemInt(hwnd,IDC_EDIT_MODIFY_RELEASE,NULL,FALSE); + DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_TVAA,st_temp->opt_tva_attack); + DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_TVAD,st_temp->opt_tva_decay); + DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_TVAR,st_temp->opt_tva_release); + DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_PDELAY,st_temp->opt_delay_control); + DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_RESONANCE,st_temp->opt_resonance); + DLG_CHECKBUTTON_TO_FLAG(hwnd,IDC_CHECKBOX_SRCHORUS,st_temp->opt_surround_chorus); SetWindowLong(hwnd,DWL_MSGRESULT,FALSE); return TRUE; case PSN_RESET: @@ -658,6 +785,8 @@ SendMessage(hwnd,WM_COMMAND,IDC_CHECKBOX_DELAY,0); // NOISESHARPING SetDlgItemInt(hwnd,IDC_EDIT_NOISESHARPING,st_temp->noise_sharp_type,TRUE); + SetDlgItemInt(hwnd,IDC_EDIT_ENV_ATTACK,st_temp->opt_env_attack,TRUE); + SetDlgItemInt(hwnd,IDC_EDIT_VELOCITYTABLE,st_temp->opt_velocity_table,TRUE); // Misc DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_MODWHEEL,st_temp->opt_modulation_wheel); DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_PORTAMENTO,st_temp->opt_portamento); @@ -665,11 +794,18 @@ DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_CHPRESS,st_temp->opt_channel_pressure); DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_OVOICE,st_temp->opt_overlap_voice_allow); DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_TRACETEXT,st_temp->opt_trace_text_meta_event); - SetDlgItemInt(hwnd,IDC_EDIT_MODIFY_RELEASE,st_temp->modify_release,TRUE); + DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_TVAA,st_temp->opt_tva_attack); + DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_TVAD,st_temp->opt_tva_decay); + DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_TVAR,st_temp->opt_tva_release); + DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_PDELAY,st_temp->opt_delay_control); + DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_RESONANCE,st_temp->opt_resonance); + DLG_FLAG_TO_CHECKBUTTON(hwnd,IDC_CHECKBOX_SRCHORUS,st_temp->opt_surround_chorus); + SetDlgItemInt(hwnd,IDC_EDIT_MODIFY_RELEASE,st_temp->modify_release,TRUE); break; default: return FALSE; } + break; case WM_SIZE: return FALSE; case WM_CLOSE: @@ -812,6 +948,7 @@ default: return FALSE; } + break; case WM_SIZE: return FALSE; case WM_CLOSE: @@ -822,13 +959,59 @@ return FALSE; } + +// IDC_COMBO_OUTPUT_MODE +static char *cb_info_IDC_COMBO_OUTPUT_MODE_jp[]= { + "t@Co",(char *)0, +#if defined(__CYGWIN32__) || defined(__MINGW32__) + "t@CｩA\\[XtH_o",(char *)1, +#else + "t@CｩA\[XtH_o",(char *)1, +#endif + + "t@CｩAtH_o",(char *)2, + "t@CｩAtH_o(tH_t)",(char *)3, + NULL +}; +static char *cb_info_IDC_COMBO_OUTPUT_MODE_en[]= { + "next output file",(char *)0, + "auto filename",(char *)1, + "auto filename and output in next dir",(char *)2, + "auto filename and output in next dir",(char *)3, + NULL +}; +static char **cb_info_IDC_COMBO_OUTPUT_MODE; + static BOOL APIENTRY PrefTiMidity3DialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam) { switch (uMess){ case WM_INITDIALOG: - SendDlgItemMessage(hwnd,IDC_EDIT_OUTPUT_FILE, - WM_SETFONT,(WPARAM)hFontPrefWnd,MAKELPARAM(TRUE,0)); + { + int i; + SendDlgItemMessage(hwnd,IDC_EDIT_OUTPUT_FILE,WM_SETFONT,(WPARAM)hFontPrefWnd,MAKELPARAM(TRUE,0)); + SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT,CB_RESETCONTENT,(WPARAM)0,(LPARAM)0); + for(i=0;play_mode_list[i]!=0;i++){ + SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)play_mode_list[i]->id_name); + } + if (PlayerLanguage == LANGUAGE_JAPANESE) + cb_info_IDC_COMBO_OUTPUT_MODE = cb_info_IDC_COMBO_OUTPUT_MODE_jp; + else + cb_info_IDC_COMBO_OUTPUT_MODE = cb_info_IDC_COMBO_OUTPUT_MODE_en; + for(i=0;cb_info_IDC_COMBO_OUTPUT_MODE[i];i+=2){ + SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT_MODE,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)cb_info_IDC_COMBO_OUTPUT_MODE[i]); + } + { + int cb_num; + for(cb_num=0;(int)cb_info_IDC_COMBO_OUTPUT_MODE[cb_num];cb_num+=2){ + SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT_MODE,CB_SETCURSEL,(WPARAM)0,(LPARAM)0); + if(st_temp->auto_output_mode==(int)cb_info_IDC_COMBO_OUTPUT_MODE[cb_num+1]){ + SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT_MODE,CB_SETCURSEL,(WPARAM)cb_num/2,(LPARAM)0); + break; + } + } + } + } break; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -849,6 +1032,9 @@ { char filename[MAXPATH+1]; DWORD res; + if(st_temp->auto_output_mode>0){ + break; + } GetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,filename,(WPARAM)MAX_PATH); res = GetFileAttributes(filename); if(res!=0xFFFFFFFF && !(res & FILE_ATTRIBUTE_DIRECTORY)){ @@ -1020,6 +1206,55 @@ SendDlgItemMessage(hwnd,IDC_RADIO_MONO,BM_SETCHECK,0,0); } break; + case IDC_BUTTON_OUTPUT_OPTIONS: + { + int num; + num = SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT,CB_GETCURSEL,(WPARAM)0,(LPARAM)0); + if(num>=0){ + st_temp->opt_playmode[0]=play_mode_list[num]->id_character; + } else { + st_temp->opt_playmode[0]='d'; + } + if(st_temp->opt_playmode[0]=='v'){ + vorbisConfigDialog(); + } else if(st_temp->opt_playmode[0]=='g'){ + gogoConfigDialog(); + } + } + break; + case IDC_COMBO_OUTPUT_MODE: + { + int cb_num1, cb_num2; + cb_num1 = SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT_MODE,CB_GETCURSEL,(WPARAM)0,(LPARAM)0); + if (PlayerLanguage == LANGUAGE_JAPANESE) + cb_info_IDC_COMBO_OUTPUT_MODE = cb_info_IDC_COMBO_OUTPUT_MODE_jp; + else + cb_info_IDC_COMBO_OUTPUT_MODE = cb_info_IDC_COMBO_OUTPUT_MODE_en; + for(cb_num2=0;(int)cb_info_IDC_COMBO_OUTPUT_MODE[cb_num2];cb_num2+=2){ + if(cb_num1*2==cb_num2){ + st_temp->auto_output_mode = (int)cb_info_IDC_COMBO_OUTPUT_MODE[cb_num2+1]; + break; + } + } + if (PlayerLanguage == LANGUAGE_JAPANESE) { + if(st_temp->auto_output_mode>0){ + SendDlgItemMessage(hwnd,IDC_BUTTON_OUTPUT_FILE,WM_SETTEXT,0,(LPARAM)"o"); + SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputDirName); + } else { + SendDlgItemMessage(hwnd,IDC_BUTTON_OUTPUT_FILE,WM_SETTEXT,0,(LPARAM)"ot@C"); + SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputName); + } + } else { + if(st_temp->auto_output_mode>0){ + SendDlgItemMessage(hwnd,IDC_BUTTON_OUTPUT_FILE,WM_SETTEXT,0,(LPARAM)"Output File"); + SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputDirName); + } else { + SendDlgItemMessage(hwnd,IDC_BUTTON_OUTPUT_FILE,WM_SETTEXT,0,(LPARAM)"Output File"); + SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputName); + } + } + } + break; default: break; } @@ -1030,22 +1265,13 @@ switch (((NMHDR FAR *) lParam)->code){ case PSN_KILLACTIVE: { int i = 0; - if(SendDlgItemMessage(hwnd,IDC_RADIOBUTTON_RIFF_WAVE,BM_GETCHECK,0,0)){ - st_temp->opt_playmode[i] = 'w'; - } else - if(SendDlgItemMessage(hwnd,IDC_RADIOBUTTON_LIST_MIDI_EVENT,BM_GETCHECK,0,0)){ - st_temp->opt_playmode[i] = 'l'; - } else - if(SendDlgItemMessage(hwnd,IDC_RADIOBUTTON_RAW_WAVEFORM,BM_GETCHECK,0,0)){ - st_temp->opt_playmode[i] = 'r'; - } else - if(SendDlgItemMessage(hwnd,IDC_RADIOBUTTON_SUN_AUDIO,BM_GETCHECK,0,0)){ - st_temp->opt_playmode[i] = 'u'; - } else - if(SendDlgItemMessage(hwnd,IDC_RADIOBUTTON_AIFF,BM_GETCHECK,0,0)){ - st_temp->opt_playmode[i] = 'a'; - } else - st_temp->opt_playmode[i] = 'd'; + int num; + num = SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT,CB_GETCURSEL,(WPARAM)0,(LPARAM)0); + if(num>=0){ + st_temp->opt_playmode[i]=play_mode_list[num]->id_character; + } else { + st_temp->opt_playmode[i]='d'; + } i++; if(SendDlgItemMessage(hwnd,IDC_CHECKBOX_ULAW,BM_GETCHECK,0,0)) st_temp->opt_playmode[i++] = 'U'; @@ -1069,7 +1295,11 @@ st_temp->opt_playmode[i++] = 'M'; st_temp->opt_playmode[i] = '\0'; st_temp->output_rate = GetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,NULL,FALSE); - GetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputName,(WPARAM)sizeof(st_temp->OutputName)); + if(st_temp->auto_output_mode==0) + GetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputName,(WPARAM)sizeof(st_temp->OutputName)); + else + GetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputDirName,(WPARAM)sizeof(st_temp->OutputDirName)); + SetWindowLong(hwnd,DWL_MSGRESULT,FALSE); } return TRUE; @@ -1082,37 +1312,22 @@ break; case PSN_SETACTIVE: { char *opt; - switch(st_temp->opt_playmode[0]){ - case 'w': - CheckRadioButton(hwnd,IDC_RADIOBUTTON_WIN32AUDIO,IDC_RADIOBUTTON_AIFF, - IDC_RADIOBUTTON_RIFF_WAVE); - break; - case 'r': - CheckRadioButton(hwnd,IDC_RADIOBUTTON_WIN32AUDIO,IDC_RADIOBUTTON_AIFF, - IDC_RADIOBUTTON_RAW_WAVEFORM); - break; - case 'u': - CheckRadioButton(hwnd,IDC_RADIOBUTTON_WIN32AUDIO,IDC_RADIOBUTTON_AIFF, - IDC_RADIOBUTTON_SUN_AUDIO); - break; - case 'a': - CheckRadioButton(hwnd,IDC_RADIOBUTTON_WIN32AUDIO,IDC_RADIOBUTTON_AIFF, - IDC_RADIOBUTTON_AIFF); - break; - case 'l': - CheckRadioButton(hwnd,IDC_RADIOBUTTON_WIN32AUDIO,IDC_RADIOBUTTON_AIFF, - IDC_RADIOBUTTON_LIST_MIDI_EVENT); - break; - case 'd': - default: - CheckRadioButton(hwnd,IDC_RADIOBUTTON_WIN32AUDIO,IDC_RADIOBUTTON_AIFF, - IDC_RADIOBUTTON_WIN32AUDIO); + int num = 0; + int i; + for(i=0;play_mode_list[i]!=0;i++){ + if(st_temp->opt_playmode[0]==play_mode_list[i]->id_character){ + num = i; break; } + } + SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT,CB_SETCURSEL,(WPARAM)num,(LPARAM)0); + if(st_temp->auto_output_mode==0){ if(st_temp->OutputName[0]=='\0') SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,TEXT("output.wav")); else SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,TEXT(st_temp->OutputName)); + } else + SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputDirName); opt = st_temp->opt_playmode + 1; if(strchr(opt, 'U')){ @@ -1163,6 +1378,7 @@ default: return FALSE; } + break; case WM_SIZE: return FALSE; case WM_CLOSE: @@ -1227,6 +1443,27 @@ SendMessage(hwnd,WM_NOTIFY,0,(LPARAM)&nmhdr); } break; + case IDC_BUTTON_REVERSE: + { + NMHDR nmhdr; + nmhdr.code = PSN_KILLACTIVE; + SendMessage(hwnd,WM_NOTIFY,0,(LPARAM)&nmhdr); + switch(pref_channel_mode){ + case PREF_CHANNEL_MODE_DRUM_CHANNEL_MASK: + st_temp->default_drumchannel_mask = ~st_temp->default_drumchannel_mask; + break; + case PREF_CHANNEL_MODE_QUIET_CHANNEL: + st_temp->quietchannels = ~st_temp->quietchannels; + break; + default: + case PREF_CHANNEL_MODE_DRUM_CHANNEL: + st_temp->default_drumchannels = ~st_temp->default_drumchannels; + break; + } + nmhdr.code = PSN_SETACTIVE; + SendMessage(hwnd,WM_NOTIFY,0,(LPARAM)&nmhdr); + } + break; default: break; } @@ -1357,6 +1594,7 @@ default: return FALSE; } + break; case WM_SIZE: return FALSE; case WM_CLOSE: @@ -1476,3 +1714,1231 @@ return -1; } } + +volatile int w32g_interactive_id3_tag_set = 0; +int w32g_gogo_id3_tag_dialog(void) +{ + return 0; +} + + +#ifdef AU_GOGO +/////////////////////////////////////////////////////////////////////// +// +// gogo ConfigDialog +// +/////////////////////////////////////////////////////////////////////// + +// id R{{bNX` +#define CB_INFO_TYPE1_BEGIN(id) static int cb_info_ ## id [] = { +#define CB_INFO_TYPE1_END }; +#define CB_INFO_TYPE2_BEGIN(id) static char * cb_info_ ## id [] = { +#define CB_INFO_TYPE2_END }; + +// cb_info_type1_hc cb_info_type2_hc B + +// IDC_COMBO_OUTPUT_FORMAT +CB_INFO_TYPE2_BEGIN(IDC_COMBO_OUTPUT_FORMAT) + "MP3+TAG",(char *)MC_OUTPUT_NORMAL, + "RIFF/WAVE",(char *)MC_OUTPUT_RIFF_WAVE, + "RIFF/RMP",(char *)MC_OUTPUT_RIFF_RMP, + NULL +CB_INFO_TYPE2_END + +// IDC_COMBO_MPEG1_AUDIO_BITRATE +CB_INFO_TYPE1_BEGIN(IDC_COMBO_MPEG1_AUDIO_BITRATE) + 32,40,48,56,64,80,96,112,128,160,192,224,256,320,-1 +CB_INFO_TYPE1_END + +// IDC_COMBO_MPEG2_AUDIO_BITRATE +CB_INFO_TYPE1_BEGIN(IDC_COMBO_MPEG2_AUDIO_BITRATE) + 8,16,24,32,40,48,56,64,80,96,112,128,144,160,-1 +CB_INFO_TYPE1_END + +// IDC_COMBO_ENCODE_MODE +CB_INFO_TYPE2_BEGIN(IDC_COMBO_ENCODE_MODE) + "monoral",(char *)MC_MODE_MONO, + "stereo",(char *)MC_MODE_STEREO, + "joint stereo",(char *)MC_MODE_JOINT, + "mid/side stereo",(char *)MC_MODE_MSSTEREO, + "dual channel",(char *)MC_MODE_DUALCHANNEL, + NULL +CB_INFO_TYPE2_END + +// IDC_COMBO_EMPHASIS_TYPE +CB_INFO_TYPE2_BEGIN(IDC_COMBO_EMPHASIS_TYPE) + "NONE",(char *)MC_EMP_NONE, + "50/15ms (normal CD-DA emphasis)",(char *)MC_EMP_5015MS, + "CCITT",(char *)MC_EMP_CCITT, + NULL +CB_INFO_TYPE2_END + +// IDC_COMBO_VBR_BITRATE_LOW +CB_INFO_TYPE1_BEGIN(IDC_COMBO_VBR_BITRATE_LOW) + 32,40,48,56,64,80,96,112,128,160,192,224,256,320,-1 +CB_INFO_TYPE1_END + +// IDC_COMBO_VBR_BITRATE_HIGH +CB_INFO_TYPE1_BEGIN(IDC_COMBO_VBR_BITRATE_HIGH) + 32,40,48,56,64,80,96,112,128,160,192,224,256,320,-1 +CB_INFO_TYPE1_END + +// IDC_COMBO_VBR +CB_INFO_TYPE2_BEGIN(IDC_COMBO_VBR) + "Quality 0 (320 - 32 kbps)",(char *)0, + "Quality 1 (256 - 32 kbps)",(char *)1, + "Quality 2 (256 - 32 kbps)",(char *)2, + "Quality 3 (256 - 32 kbps)",(char *)3, + "Quality 4 (256 - 32 kbps)",(char *)4, + "Quality 5 (224 - 32 kbps)",(char *)5, + "Quality 6 (192 - 32 kbps)",(char *)6, + "Quality 7 (160 - 32 kbps)",(char *)7, + "Quality 8 (128 - 32 kbps)",(char *)8, + "Quality 9 (128 - 32 kbps)",(char *)9, + NULL +CB_INFO_TYPE2_END + +// id R{{bNXIB +#define CB_SETCURSEL_TYPE1(id) \ +{ \ + int cb_num; \ + for(cb_num=0;(int)cb_info_ ## id [cb_num]>=0;cb_num++){ \ + SendDlgItemMessage(hwnd,id,CB_SETCURSEL,(WPARAM)0,(LPARAM)0); \ + if(gogo_ConfigDialogInfo.opt ## id == (int) cb_info_ ## id [cb_num]){ \ + SendDlgItemMessage(hwnd,id,CB_SETCURSEL,(WPARAM)cb_num,(LPARAM)0); \ + break; \ + } \ + } \ +} +#define CB_SETCURSEL_TYPE2(id) \ +{ \ + int cb_num; \ + for(cb_num=0;(int)cb_info_ ## id [cb_num];cb_num+=2){ \ + SendDlgItemMessage(hwnd,id,CB_SETCURSEL,(WPARAM)0,(LPARAM)0); \ + if(gogo_ConfigDialogInfo.opt ## id == (int) cb_info_ ## id [cb_num+1]){ \ + SendDlgItemMessage(hwnd,id,CB_SETCURSEL,(WPARAM)cb_num/2,(LPARAM)0); \ + break; \ + } \ + } \ +} +// id R{{bNXIB +#define CB_GETCURSEL_TYPE1(id) \ +{ \ + int cb_num1, cb_num2; \ + cb_num1 = SendDlgItemMessage(hwnd,id,CB_GETCURSEL,(WPARAM)0,(LPARAM)0); \ + for(cb_num2=0;(int)cb_info_ ## id [cb_num2]>=0;cb_num2++) \ + if(cb_num1==cb_num2){ \ + gogo_ConfigDialogInfo.opt ## id = (int)cb_info_ ## id [cb_num2]; \ + break; \ + } \ +} +#define CB_GETCURSEL_TYPE2(id) \ +{ \ + int cb_num1, cb_num2; \ + cb_num1 = SendDlgItemMessage(hwnd,id,CB_GETCURSEL,(WPARAM)0,(LPARAM)0); \ + for(cb_num2=0;(int)cb_info_ ## id [cb_num2];cb_num2+=2) \ + if(cb_num1*2==cb_num2){ \ + gogo_ConfigDialogInfo.opt ## id = (int)cb_info_ ## id [cb_num2+1]; \ + break; \ + } \ +} +// `FbNB +#define IS_CHECK(id) SendDlgItemMessage(hwnd,id,BM_GETCHECK,0,0) +// `FbNB +#define CHECK(id) SendDlgItemMessage(hwnd,id,BM_SETCHECK,1,0) +// `FbNB +#define UNCHECK(id) SendDlgItemMessage(hwnd,id,BM_SETCHECK,0,0) +// id `FbN{bNXB +#define CHECKBOX_SET(id) \ + if(gogo_ConfigDialogInfo.opt ## id>0) \ + SendDlgItemMessage(hwnd,id,BM_SETCHECK,1,0); \ + else \ + SendDlgItemMessage(hwnd,id,BM_SETCHECK,0,0); \ +// id `FbN{bNXB +#define CHECKBOX_GET(id) \ + if(SendDlgItemMessage(hwnd,id,BM_GETCHECK,0,0)) \ + gogo_ConfigDialogInfo.opt ## id = 1; \ + else \ + gogo_ConfigDialogInfo.opt ## id = 0; \ +// id GfBbgB +#define EDIT_SET(id) SendDlgItemMessage(hwnd,id,WM_SETTEXT,0,(LPARAM)gogo_ConfigDialogInfo.opt ## id); +// id GfBbgB +#define EDIT_GET(id,size) SendDlgItemMessage(hwnd,id,WM_GETTEXT,(WPARAM)size,(LPARAM)gogo_ConfigDialogInfo.opt ## id); +#define EDIT_GET_RANGE(id,size,min,max) \ +{ \ + char tmpbuf[64]; \ + int value; \ + SendDlgItemMessage(hwnd,id,WM_GETTEXT,(WPARAM)size,(LPARAM)gogo_ConfigDialogInfo.opt ## id); \ + value = atoi((char *)gogo_ConfigDialogInfo.opt ## id); \ + if(valuemax) value = max; \ + sprintf(tmpbuf,"%d",value); \ + strncpy((char *)gogo_ConfigDialogInfo.opt ## id,tmpbuf,size); \ + (gogo_ConfigDialogInfo.opt ## id)[size] = '\0'; \ +} +// Rg[L +#define ENABLE_CONTROL(id) EnableWindow(GetDlgItem(hwnd,id),TRUE); +// Rg[ +#define DISABLE_CONTROL(id) EnableWindow(GetDlgItem(hwnd,id),FALSE); + +static void gogoConfigDialogProcControlEnableDisable(HWND hwnd); +static void gogoConfigDialogProcControlApply(HWND hwnd); +static void gogoConfigDialogProcControlReset(HWND hwnd); +static int gogo_ConfigDialogInfoLock(); +static int gogo_ConfigDialogInfoUnLock(); +static HANDLE hgogoConfigDailog = NULL; +static BOOL APIENTRY gogoConfigDialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam) +{ + char buff[1024]; + switch (uMess){ + case WM_INITDIALOG: + { + int i; + // R{{bNX + for(i=0;cb_info_IDC_COMBO_OUTPUT_FORMAT[i];i+=2){ + SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT_FORMAT,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)cb_info_IDC_COMBO_OUTPUT_FORMAT[i]); + } + for(i=0;cb_info_IDC_COMBO_MPEG1_AUDIO_BITRATE[i]>=0;i++){ + sprintf(buff,"%d kbit/sec",cb_info_IDC_COMBO_MPEG1_AUDIO_BITRATE[i]); + SendDlgItemMessage(hwnd,IDC_COMBO_MPEG1_AUDIO_BITRATE,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)buff); + } + for(i=0;cb_info_IDC_COMBO_MPEG2_AUDIO_BITRATE[i]>=0;i++){ + sprintf(buff,"%d kbit/sec",cb_info_IDC_COMBO_MPEG2_AUDIO_BITRATE[i]); + SendDlgItemMessage(hwnd,IDC_COMBO_MPEG2_AUDIO_BITRATE,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)buff); + } + for(i=0;cb_info_IDC_COMBO_ENCODE_MODE[i];i+=2){ + SendDlgItemMessage(hwnd,IDC_COMBO_ENCODE_MODE,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)cb_info_IDC_COMBO_ENCODE_MODE[i]); + } + for(i=0;cb_info_IDC_COMBO_EMPHASIS_TYPE[i];i+=2){ + SendDlgItemMessage(hwnd,IDC_COMBO_EMPHASIS_TYPE,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)cb_info_IDC_COMBO_EMPHASIS_TYPE[i]); + } + for(i=0;cb_info_IDC_COMBO_VBR_BITRATE_LOW[i]>=0;i++){ + sprintf(buff,"%d kbit/sec",cb_info_IDC_COMBO_VBR_BITRATE_LOW[i]); + SendDlgItemMessage(hwnd,IDC_COMBO_VBR_BITRATE_LOW,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)buff); + } + for(i=0;cb_info_IDC_COMBO_VBR_BITRATE_HIGH[i]>=0;i++){ + sprintf(buff,"%d kbit/sec",cb_info_IDC_COMBO_VBR_BITRATE_HIGH[i]); + SendDlgItemMessage(hwnd,IDC_COMBO_VBR_BITRATE_HIGH,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)buff); + } + for(i=0;cb_info_IDC_COMBO_VBR[i];i+=2){ + SendDlgItemMessage(hwnd,IDC_COMBO_VBR,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)cb_info_IDC_COMBO_VBR[i]); + } + // + gogoConfigDialogProcControlReset(hwnd); + } + break; + case WM_COMMAND: + switch (LOWORD(wParam)) { + case IDCLOSE: + SendMessage(hwnd,WM_CLOSE,(WPARAM)0,(LPARAM)0); + break; + case IDOK: + gogoConfigDialogProcControlApply(hwnd); + SendMessage(hwnd,WM_CLOSE,(WPARAM)0,(LPARAM)0); + break; + case IDCANCEL: + SendMessage(hwnd,WM_CLOSE,(WPARAM)0,(LPARAM)0); + break; + case IDC_BUTTON_APPLY: + gogoConfigDialogProcControlApply(hwnd); + break; + case IDC_CHECK_DEFAULT: + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_CHECK_COMMANDLINE_OPTS: + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_EDIT_COMMANDLINE_OPTION: + break; + case IDC_CHECK_OUTPUT_FORMAT: + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_COMBO_OUTPUT_FORMAT: + break; + case IDC_CHECK_MPEG1AUDIOBITRATE: + if(IS_CHECK(IDC_CHECK_MPEG1AUDIOBITRATE)){ + CHECK(IDC_CHECK_MPEG2AUDIOBITRATE); + UNCHECK(IDC_CHECK_VBR); + UNCHECK(IDC_CHECK_VBR_BITRATE); + } else { + UNCHECK(IDC_CHECK_MPEG2AUDIOBITRATE); + } + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_COMBO_MPEG1_AUDIO_BITRATE: + break; + case IDC_CHECK_MPEG2AUDIOBITRATE: + if(IS_CHECK(IDC_CHECK_MPEG2AUDIOBITRATE)){ + CHECK(IDC_CHECK_MPEG1AUDIOBITRATE); + UNCHECK(IDC_CHECK_VBR); + UNCHECK(IDC_CHECK_VBR_BITRATE); + } else { + UNCHECK(IDC_CHECK_MPEG1AUDIOBITRATE); + } + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_COMBO_MPEG2_AUDIO_BITRATE: + break; + case IDC_CHECK_ENHANCED_LOW_PASS_FILTER: + if(IS_CHECK(IDC_CHECK_ENHANCED_LOW_PASS_FILTER)){ + UNCHECK(IDC_CHECK_16KHZ_LOW_PASS_FILTER); + } + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_EDIT_LPF_PARA1: + break; + case IDC_EDIT_LPF_PARA2: + break; + case IDC_CHECK_ENCODE_MODE: + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_COMBO_ENCODE_MODE: + break; + case IDC_CHECK_EMPHASIS_TYPE: + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_COMBO_EMPHASIS_TYPE: + break; + case IDC_CHECK_OUTFREQ: + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_EDIT_OUTFREQ: + break; + case IDC_CHECK_MSTHRESHOLD: + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_EDIT_MSTHRESHOLD_THRESHOLD: + break; + case IDC_EDIT_MSTHRESHOLD_MSPOWER: + break; + case IDC_CHECK_USE_CPU_OPTS: + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_CHECK_CPUMMX: + break; + case IDC_CHECK_CPUSSE: + break; + case IDC_CHECK_CPU3DNOW: + break; + case IDC_CHECK_CPUE3DNOW: + break; + case IDC_CHECK_VBR: + if(IS_CHECK(IDC_CHECK_VBR)){ + UNCHECK(IDC_COMBO_MPEG1_AUDIO_BITRATE); + UNCHECK(IDC_COMBO_MPEG2_AUDIO_BITRATE); + } + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_COMBO_VBR: + break; + case IDC_CHECK_VBR_BITRATE: + if(IS_CHECK(IDC_CHECK_VBR_BITRATE)){ + CHECK(IDC_CHECK_VBR); + UNCHECK(IDC_COMBO_MPEG1_AUDIO_BITRATE); + UNCHECK(IDC_COMBO_MPEG2_AUDIO_BITRATE); + } + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_COMBO_VBR_BITRATE_LOW: + break; + case IDC_COMBO_VBR_BITRATE_HIGH: + break; + case IDC_CHECK_USEPSY: + break; + case IDC_CHECK_VERIFY: + break; + case IDC_CHECK_16KHZ_LOW_PASS_FILTER: + if(IS_CHECK(IDC_CHECK_16KHZ_LOW_PASS_FILTER)){ + UNCHECK(IDC_CHECK_ENHANCED_LOW_PASS_FILTER); + } + gogoConfigDialogProcControlEnableDisable(hwnd); + break; + default: + break; + } + break; + case WM_NOTIFY: + break; + case WM_SIZE: + return FALSE; + case WM_CLOSE: + gogo_ConfigDialogInfoSaveINI(); +//MessageBox(NULL,"CLOSE","CLOSE",MB_OK); + DestroyWindow(hwnd); + break; + case WM_DESTROY: + hgogoConfigDailog = NULL; +//MessageBox(NULL,"DESTROY","DESTROY",MB_OK); + break; + default: + break; + } + return FALSE; +} + +// Rg[L / +static void gogoConfigDialogProcControlEnableDisable(HWND hwnd) +{ + ENABLE_CONTROL(IDC_CHECK_DEFAULT); + if(IS_CHECK(IDC_CHECK_DEFAULT)){ + DISABLE_CONTROL(IDC_CHECK_COMMANDLINE_OPTS); + DISABLE_CONTROL(IDC_EDIT_COMMANDLINE_OPTION); + DISABLE_CONTROL(IDC_CHECK_OUTPUT_FORMAT); + DISABLE_CONTROL(IDC_COMBO_OUTPUT_FORMAT); + DISABLE_CONTROL(IDC_CHECK_MPEG1AUDIOBITRATE); + DISABLE_CONTROL(IDC_COMBO_MPEG1_AUDIO_BITRATE); + DISABLE_CONTROL(IDC_CHECK_MPEG2AUDIOBITRATE); + DISABLE_CONTROL(IDC_COMBO_MPEG2_AUDIO_BITRATE); + DISABLE_CONTROL(IDC_CHECK_ENHANCED_LOW_PASS_FILTER); + DISABLE_CONTROL(IDC_EDIT_LPF_PARA1); + DISABLE_CONTROL(IDC_EDIT_LPF_PARA2); + DISABLE_CONTROL(IDC_CHECK_ENCODE_MODE); + DISABLE_CONTROL(IDC_COMBO_ENCODE_MODE); + DISABLE_CONTROL(IDC_CHECK_EMPHASIS_TYPE); + DISABLE_CONTROL(IDC_COMBO_EMPHASIS_TYPE); + DISABLE_CONTROL(IDC_CHECK_OUTFREQ); + DISABLE_CONTROL(IDC_EDIT_OUTFREQ); + DISABLE_CONTROL(IDC_CHECK_MSTHRESHOLD); + DISABLE_CONTROL(IDC_EDIT_MSTHRESHOLD_THRESHOLD); + DISABLE_CONTROL(IDC_EDIT_MSTHRESHOLD_MSPOWER); + DISABLE_CONTROL(IDC_CHECK_USE_CPU_OPTS); + DISABLE_CONTROL(IDC_CHECK_CPUMMX); + DISABLE_CONTROL(IDC_CHECK_CPUSSE); + DISABLE_CONTROL(IDC_CHECK_CPU3DNOW); + DISABLE_CONTROL(IDC_CHECK_CPUE3DNOW); + DISABLE_CONTROL(IDC_CHECK_VBR); + DISABLE_CONTROL(IDC_COMBO_VBR); + DISABLE_CONTROL(IDC_CHECK_VBR_BITRATE); + DISABLE_CONTROL(IDC_COMBO_VBR_BITRATE_LOW); + DISABLE_CONTROL(IDC_COMBO_VBR_BITRATE_HIGH); + DISABLE_CONTROL(IDC_CHECK_USEPSY); + DISABLE_CONTROL(IDC_CHECK_VERIFY); + DISABLE_CONTROL(IDC_CHECK_16KHZ_LOW_PASS_FILTER); + } else { + ENABLE_CONTROL(IDC_CHECK_COMMANDLINE_OPTS); + if(IS_CHECK(IDC_CHECK_COMMANDLINE_OPTS)){ + ENABLE_CONTROL(IDC_EDIT_COMMANDLINE_OPTION); + DISABLE_CONTROL(IDC_CHECK_OUTPUT_FORMAT); + DISABLE_CONTROL(IDC_COMBO_OUTPUT_FORMAT); + DISABLE_CONTROL(IDC_CHECK_MPEG1AUDIOBITRATE); + DISABLE_CONTROL(IDC_COMBO_MPEG1_AUDIO_BITRATE); + DISABLE_CONTROL(IDC_CHECK_MPEG2AUDIOBITRATE); + DISABLE_CONTROL(IDC_COMBO_MPEG2_AUDIO_BITRATE); + DISABLE_CONTROL(IDC_CHECK_ENHANCED_LOW_PASS_FILTER); + DISABLE_CONTROL(IDC_EDIT_LPF_PARA1); + DISABLE_CONTROL(IDC_EDIT_LPF_PARA2); + DISABLE_CONTROL(IDC_CHECK_ENCODE_MODE); + DISABLE_CONTROL(IDC_COMBO_ENCODE_MODE); + DISABLE_CONTROL(IDC_CHECK_EMPHASIS_TYPE); + DISABLE_CONTROL(IDC_COMBO_EMPHASIS_TYPE); + DISABLE_CONTROL(IDC_CHECK_OUTFREQ); + DISABLE_CONTROL(IDC_EDIT_OUTFREQ); + DISABLE_CONTROL(IDC_CHECK_MSTHRESHOLD); + DISABLE_CONTROL(IDC_EDIT_MSTHRESHOLD_THRESHOLD); + DISABLE_CONTROL(IDC_EDIT_MSTHRESHOLD_MSPOWER); + DISABLE_CONTROL(IDC_CHECK_USE_CPU_OPTS); + DISABLE_CONTROL(IDC_CHECK_CPUMMX); + DISABLE_CONTROL(IDC_CHECK_CPUSSE); + DISABLE_CONTROL(IDC_CHECK_CPU3DNOW); + DISABLE_CONTROL(IDC_CHECK_CPUE3DNOW); + DISABLE_CONTROL(IDC_CHECK_VBR); + DISABLE_CONTROL(IDC_COMBO_VBR); + DISABLE_CONTROL(IDC_CHECK_VBR_BITRATE); + DISABLE_CONTROL(IDC_COMBO_VBR_BITRATE_LOW); + DISABLE_CONTROL(IDC_COMBO_VBR_BITRATE_HIGH); + DISABLE_CONTROL(IDC_CHECK_USEPSY); + DISABLE_CONTROL(IDC_CHECK_VERIFY); + DISABLE_CONTROL(IDC_CHECK_16KHZ_LOW_PASS_FILTER); + } else { + DISABLE_CONTROL(IDC_EDIT_COMMANDLINE_OPTION); + ENABLE_CONTROL(IDC_CHECK_OUTPUT_FORMAT); + if(IS_CHECK(IDC_CHECK_OUTPUT_FORMAT)){ + ENABLE_CONTROL(IDC_COMBO_OUTPUT_FORMAT); + } else { + DISABLE_CONTROL(IDC_COMBO_OUTPUT_FORMAT); + } + ENABLE_CONTROL(IDC_CHECK_16KHZ_LOW_PASS_FILTER); + ENABLE_CONTROL(IDC_CHECK_ENHANCED_LOW_PASS_FILTER); + if(IS_CHECK(IDC_CHECK_16KHZ_LOW_PASS_FILTER)){ + UNCHECK(IDC_CHECK_ENHANCED_LOW_PASS_FILTER); + DISABLE_CONTROL(IDC_EDIT_LPF_PARA1); + DISABLE_CONTROL(IDC_EDIT_LPF_PARA2); + } else { + if(IS_CHECK(IDC_CHECK_ENHANCED_LOW_PASS_FILTER)){ + UNCHECK(IDC_CHECK_16KHZ_LOW_PASS_FILTER); + ENABLE_CONTROL(IDC_EDIT_LPF_PARA1); + ENABLE_CONTROL(IDC_EDIT_LPF_PARA2); + } else { + DISABLE_CONTROL(IDC_EDIT_LPF_PARA1); + DISABLE_CONTROL(IDC_EDIT_LPF_PARA2); + } + } + ENABLE_CONTROL(IDC_CHECK_ENCODE_MODE); + if(IS_CHECK(IDC_CHECK_ENCODE_MODE)){ + ENABLE_CONTROL(IDC_COMBO_ENCODE_MODE); + } else { + DISABLE_CONTROL(IDC_COMBO_ENCODE_MODE); + } + ENABLE_CONTROL(IDC_CHECK_EMPHASIS_TYPE); + if(IS_CHECK(IDC_CHECK_EMPHASIS_TYPE)){ + ENABLE_CONTROL(IDC_COMBO_EMPHASIS_TYPE); + } else { + DISABLE_CONTROL(IDC_COMBO_EMPHASIS_TYPE); + } + ENABLE_CONTROL(IDC_CHECK_OUTFREQ); + if(IS_CHECK(IDC_CHECK_OUTFREQ)){ + ENABLE_CONTROL(IDC_EDIT_OUTFREQ); + } else { + DISABLE_CONTROL(IDC_EDIT_OUTFREQ); + } + ENABLE_CONTROL(IDC_CHECK_MSTHRESHOLD); + if(IS_CHECK(IDC_CHECK_MSTHRESHOLD)){ + ENABLE_CONTROL(IDC_EDIT_MSTHRESHOLD_THRESHOLD); + ENABLE_CONTROL(IDC_EDIT_MSTHRESHOLD_MSPOWER); + } else { + DISABLE_CONTROL(IDC_EDIT_MSTHRESHOLD_THRESHOLD); + DISABLE_CONTROL(IDC_EDIT_MSTHRESHOLD_MSPOWER); + } + ENABLE_CONTROL(IDC_CHECK_USE_CPU_OPTS); + if(IS_CHECK(IDC_CHECK_USE_CPU_OPTS)){ + ENABLE_CONTROL(IDC_CHECK_CPUMMX); + ENABLE_CONTROL(IDC_CHECK_CPUSSE); + ENABLE_CONTROL(IDC_CHECK_CPU3DNOW); + ENABLE_CONTROL(IDC_CHECK_CPUE3DNOW); + } else { + DISABLE_CONTROL(IDC_CHECK_CPUMMX); + DISABLE_CONTROL(IDC_CHECK_CPUSSE); + DISABLE_CONTROL(IDC_CHECK_CPU3DNOW); + DISABLE_CONTROL(IDC_CHECK_CPUE3DNOW); + } + ENABLE_CONTROL(IDC_CHECK_VBR); + ENABLE_CONTROL(IDC_CHECK_MPEG1AUDIOBITRATE); + ENABLE_CONTROL(IDC_CHECK_MPEG2AUDIOBITRATE); + if(IS_CHECK(IDC_CHECK_VBR)){ + ENABLE_CONTROL(IDC_COMBO_VBR); + ENABLE_CONTROL(IDC_CHECK_VBR_BITRATE); + if(IS_CHECK(IDC_CHECK_VBR_BITRATE)){ + ENABLE_CONTROL(IDC_COMBO_VBR_BITRATE_LOW); + ENABLE_CONTROL(IDC_COMBO_VBR_BITRATE_HIGH); + } else { + DISABLE_CONTROL(IDC_COMBO_VBR_BITRATE_LOW); + DISABLE_CONTROL(IDC_COMBO_VBR_BITRATE_HIGH); + } + UNCHECK(IDC_CHECK_MPEG1AUDIOBITRATE); + UNCHECK(IDC_CHECK_MPEG2AUDIOBITRATE); + DISABLE_CONTROL(IDC_COMBO_MPEG1_AUDIO_BITRATE); + DISABLE_CONTROL(IDC_COMBO_MPEG2_AUDIO_BITRATE); + } else { + UNCHECK(IDC_CHECK_VBR_BITRATE); + DISABLE_CONTROL(IDC_COMBO_VBR); + DISABLE_CONTROL(IDC_CHECK_VBR_BITRATE); + DISABLE_CONTROL(IDC_COMBO_VBR_BITRATE_LOW); + DISABLE_CONTROL(IDC_COMBO_VBR_BITRATE_HIGH); + if(IS_CHECK(IDC_CHECK_MPEG1AUDIOBITRATE)){ + ENABLE_CONTROL(IDC_COMBO_MPEG1_AUDIO_BITRATE); + } else { + DISABLE_CONTROL(IDC_COMBO_MPEG1_AUDIO_BITRATE); + } + if(IS_CHECK(IDC_CHECK_MPEG2AUDIOBITRATE)){ + ENABLE_CONTROL(IDC_COMBO_MPEG2_AUDIO_BITRATE); + } else { + DISABLE_CONTROL(IDC_COMBO_MPEG2_AUDIO_BITRATE); + } + } + ENABLE_CONTROL(IDC_CHECK_USEPSY); + ENABLE_CONTROL(IDC_CHECK_VERIFY); + } + } +} + +static void gogoConfigDialogProcControlReset(HWND hwnd) +{ + // R{{bNXI + CB_SETCURSEL_TYPE2(IDC_COMBO_OUTPUT_FORMAT) + CB_SETCURSEL_TYPE1(IDC_COMBO_MPEG1_AUDIO_BITRATE) + CB_SETCURSEL_TYPE1(IDC_COMBO_MPEG2_AUDIO_BITRATE) + CB_SETCURSEL_TYPE2(IDC_COMBO_ENCODE_MODE) + CB_SETCURSEL_TYPE2(IDC_COMBO_EMPHASIS_TYPE) + CB_SETCURSEL_TYPE1(IDC_COMBO_VBR_BITRATE_LOW) + CB_SETCURSEL_TYPE1(IDC_COMBO_VBR_BITRATE_HIGH) + CB_SETCURSEL_TYPE2(IDC_COMBO_VBR) + // `FbN{bNX + CHECKBOX_SET(IDC_CHECK_DEFAULT) + CHECKBOX_SET(IDC_CHECK_COMMANDLINE_OPTS) + CHECKBOX_SET(IDC_CHECK_OUTPUT_FORMAT) + CHECKBOX_SET(IDC_CHECK_MPEG1AUDIOBITRATE) + CHECKBOX_SET(IDC_CHECK_MPEG2AUDIOBITRATE) + CHECKBOX_SET(IDC_CHECK_ENHANCED_LOW_PASS_FILTER) + CHECKBOX_SET(IDC_CHECK_ENCODE_MODE) + CHECKBOX_SET(IDC_CHECK_EMPHASIS_TYPE) + CHECKBOX_SET(IDC_CHECK_OUTFREQ) + CHECKBOX_SET(IDC_CHECK_MSTHRESHOLD) + CHECKBOX_SET(IDC_CHECK_USE_CPU_OPTS) + CHECKBOX_SET(IDC_CHECK_CPUMMX) + CHECKBOX_SET(IDC_CHECK_CPUSSE) + CHECKBOX_SET(IDC_CHECK_CPU3DNOW) + CHECKBOX_SET(IDC_CHECK_CPUE3DNOW) + CHECKBOX_SET(IDC_CHECK_VBR) + CHECKBOX_SET(IDC_CHECK_VBR_BITRATE) + CHECKBOX_SET(IDC_CHECK_USEPSY) + CHECKBOX_SET(IDC_CHECK_VERIFY) + CHECKBOX_SET(IDC_CHECK_16KHZ_LOW_PASS_FILTER) + // GfBbg + EDIT_SET(IDC_EDIT_OUTFREQ) + EDIT_SET(IDC_EDIT_MSTHRESHOLD_THRESHOLD) + EDIT_SET(IDC_EDIT_MSTHRESHOLD_MSPOWER) + EDIT_SET(IDC_EDIT_COMMANDLINE_OPTION) + EDIT_SET(IDC_EDIT_LPF_PARA1) + EDIT_SET(IDC_EDIT_LPF_PARA2) + // Rg[L / + gogoConfigDialogProcControlEnableDisable(hwnd); +} + +static void gogoConfigDialogProcControlApply(HWND hwnd) +{ + // R{{bNXI + CB_GETCURSEL_TYPE2(IDC_COMBO_OUTPUT_FORMAT) + CB_GETCURSEL_TYPE1(IDC_COMBO_MPEG1_AUDIO_BITRATE) + CB_GETCURSEL_TYPE1(IDC_COMBO_MPEG2_AUDIO_BITRATE) + CB_GETCURSEL_TYPE2(IDC_COMBO_ENCODE_MODE) + CB_GETCURSEL_TYPE2(IDC_COMBO_EMPHASIS_TYPE) + CB_GETCURSEL_TYPE1(IDC_COMBO_VBR_BITRATE_LOW) + CB_GETCURSEL_TYPE1(IDC_COMBO_VBR_BITRATE_HIGH) + CB_GETCURSEL_TYPE2(IDC_COMBO_VBR) + // `FbN{bNX + CHECKBOX_GET(IDC_CHECK_DEFAULT) + CHECKBOX_GET(IDC_CHECK_COMMANDLINE_OPTS) + CHECKBOX_GET(IDC_CHECK_OUTPUT_FORMAT) + CHECKBOX_GET(IDC_CHECK_MPEG1AUDIOBITRATE) + CHECKBOX_GET(IDC_CHECK_MPEG2AUDIOBITRATE) + CHECKBOX_GET(IDC_CHECK_ENHANCED_LOW_PASS_FILTER) + CHECKBOX_GET(IDC_CHECK_ENCODE_MODE) + CHECKBOX_GET(IDC_CHECK_EMPHASIS_TYPE) + CHECKBOX_GET(IDC_CHECK_OUTFREQ) + CHECKBOX_GET(IDC_CHECK_MSTHRESHOLD) + CHECKBOX_GET(IDC_CHECK_USE_CPU_OPTS) + CHECKBOX_GET(IDC_CHECK_CPUMMX) + CHECKBOX_GET(IDC_CHECK_CPUSSE) + CHECKBOX_GET(IDC_CHECK_CPU3DNOW) + CHECKBOX_GET(IDC_CHECK_CPUE3DNOW) + CHECKBOX_GET(IDC_CHECK_VBR) + CHECKBOX_GET(IDC_CHECK_VBR_BITRATE) + CHECKBOX_GET(IDC_CHECK_USEPSY) + CHECKBOX_GET(IDC_CHECK_VERIFY) + CHECKBOX_GET(IDC_CHECK_16KHZ_LOW_PASS_FILTER) + // GfBbg + EDIT_GET_RANGE(IDC_EDIT_OUTFREQ,6,4000,65000) + EDIT_GET_RANGE(IDC_EDIT_MSTHRESHOLD_THRESHOLD,4,0,100) + EDIT_GET_RANGE(IDC_EDIT_MSTHRESHOLD_MSPOWER,4,0,100) + EDIT_GET(IDC_EDIT_COMMANDLINE_OPTION,1024) + EDIT_GET_RANGE(IDC_EDIT_LPF_PARA1,4,0,100) + EDIT_GET_RANGE(IDC_EDIT_LPF_PARA2,4,0,100) + // Rg[L / + gogoConfigDialogProcControlEnableDisable(hwnd); + // Zbg + gogoConfigDialogProcControlReset(hwnd); +} + +#undef CB_INFO_TYPE1_BEGIN +#undef CB_INFO_TYPE1_END +#undef CB_INFO_TYPE2_BEGIN +#undef CB_INFO_TYPE2_END +#undef CB_SETCURSEL_TYPE1 +#undef CB_SETCURSEL_TYPE2 +#undef CB_GETCURSEL_TYPE1 +#undef CB_GETCURSEL_TYPE2 +#undef CHECKBOX_SET +#undef CHECKBOX_GET +#undef EDIT_SET +#undef EDIT_GET +#undef EDIT_GET_RANGE + +#endif + +int gogoConfigDialog(void) +{ +#ifdef AU_GOGO + if(!IsWindow(hgogoConfigDailog)) { + if (PlayerLanguage == LANGUAGE_JAPANESE) + hgogoConfigDailog = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_GOGO),(HWND)hPrefWnd,gogoConfigDialogProc); + else + hgogoConfigDailog = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_GOGO_EN),(HWND)hPrefWnd,gogoConfigDialogProc); + } + ShowWindow(hgogoConfigDailog,SW_SHOW); +#endif + return 0; +} + +#ifdef AU_GOGO + +static int gogo_ConfigDialogInfoLock() +{ + return 0; +} +static int gogo_ConfigDialogInfoUnLock() +{ + return 0; +} + +volatile gogo_ConfigDialogInfo_t gogo_ConfigDialogInfo; + +int gogo_ConfigDialogInfoInit(void) +{ + gogo_ConfigDialogInfo.optIDC_CHECK_DEFAULT = 1; + gogo_ConfigDialogInfo.optIDC_CHECK_COMMANDLINE_OPTS = 0; + gogo_ConfigDialogInfo.optIDC_EDIT_COMMANDLINE_OPTION[0] = '\0'; + gogo_ConfigDialogInfo.optIDC_CHECK_OUTPUT_FORMAT = 1; + gogo_ConfigDialogInfo.optIDC_COMBO_OUTPUT_FORMAT = MC_OUTPUT_NORMAL; + gogo_ConfigDialogInfo.optIDC_CHECK_MPEG1AUDIOBITRATE = 1; + gogo_ConfigDialogInfo.optIDC_COMBO_MPEG1_AUDIO_BITRATE = 160; + gogo_ConfigDialogInfo.optIDC_CHECK_MPEG2AUDIOBITRATE = 1; + gogo_ConfigDialogInfo.optIDC_COMBO_MPEG2_AUDIO_BITRATE = 80; + gogo_ConfigDialogInfo.optIDC_CHECK_ENHANCED_LOW_PASS_FILTER = 0; + strcpy((char *)gogo_ConfigDialogInfo.optIDC_EDIT_LPF_PARA1,"55"); + strcpy((char *)gogo_ConfigDialogInfo.optIDC_EDIT_LPF_PARA2,"70"); + gogo_ConfigDialogInfo.optIDC_CHECK_ENCODE_MODE = 1; + gogo_ConfigDialogInfo.optIDC_COMBO_ENCODE_MODE = MC_MODE_STEREO; + gogo_ConfigDialogInfo.optIDC_CHECK_EMPHASIS_TYPE = 1; + gogo_ConfigDialogInfo.optIDC_COMBO_EMPHASIS_TYPE = MC_EMP_NONE; + gogo_ConfigDialogInfo.optIDC_CHECK_OUTFREQ = 0; + strcpy((char *)gogo_ConfigDialogInfo.optIDC_EDIT_OUTFREQ,"44100"); + gogo_ConfigDialogInfo.optIDC_CHECK_MSTHRESHOLD = 0; + strcpy((char *)gogo_ConfigDialogInfo.optIDC_EDIT_MSTHRESHOLD_THRESHOLD,"75"); + strcpy((char *)gogo_ConfigDialogInfo.optIDC_EDIT_MSTHRESHOLD_MSPOWER,"66"); + gogo_ConfigDialogInfo.optIDC_CHECK_USE_CPU_OPTS = 0; + gogo_ConfigDialogInfo.optIDC_CHECK_CPUMMX = 0; + gogo_ConfigDialogInfo.optIDC_CHECK_CPUSSE = 0; + gogo_ConfigDialogInfo.optIDC_CHECK_CPU3DNOW = 0; + gogo_ConfigDialogInfo.optIDC_CHECK_CPUE3DNOW = 0; + gogo_ConfigDialogInfo.optIDC_CHECK_VBR = 0; + gogo_ConfigDialogInfo.optIDC_COMBO_VBR = 0; + gogo_ConfigDialogInfo.optIDC_CHECK_VBR_BITRATE = 0; + gogo_ConfigDialogInfo.optIDC_COMBO_VBR_BITRATE_LOW = 32; + gogo_ConfigDialogInfo.optIDC_COMBO_VBR_BITRATE_HIGH = 320; + gogo_ConfigDialogInfo.optIDC_CHECK_USEPSY = 1; + gogo_ConfigDialogInfo.optIDC_CHECK_VERIFY = 0; + gogo_ConfigDialogInfo.optIDC_CHECK_16KHZ_LOW_PASS_FILTER = 1; + return 0; +} + +int gogo_ConfigDialogInfoApply(void) +{ + gogo_ConfigDialogInfoLock(); + if(gogo_ConfigDialogInfo.optIDC_CHECK_DEFAULT>0){ + gogo_opts_reset(); + gogo_ConfigDialogInfoUnLock(); + return 0; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_COMMANDLINE_OPTS>0){ + gogo_opts_reset(); + set_gogo_opts_use_commandline_options((char *)gogo_ConfigDialogInfo.optIDC_EDIT_COMMANDLINE_OPTION); + gogo_ConfigDialogInfoUnLock(); + return 0; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_OUTPUT_FORMAT>0){ + gogo_opts.optOUTPUT_FORMAT = gogo_ConfigDialogInfo.optIDC_COMBO_OUTPUT_FORMAT; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_MPEG1AUDIOBITRATE>0){ + gogo_opts.optBITRATE1 = gogo_ConfigDialogInfo.optIDC_COMBO_MPEG1_AUDIO_BITRATE; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_MPEG2AUDIOBITRATE>0){ + gogo_opts.optBITRATE2 = gogo_ConfigDialogInfo.optIDC_COMBO_MPEG2_AUDIO_BITRATE; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_ENHANCED_LOW_PASS_FILTER>0){ + gogo_opts.optENHANCEDFILTER_A = atoi((char *)gogo_ConfigDialogInfo.optIDC_EDIT_LPF_PARA1); + gogo_opts.optENHANCEDFILTER_B = atoi((char *)gogo_ConfigDialogInfo.optIDC_EDIT_LPF_PARA2); + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_ENCODE_MODE>0){ + gogo_opts.optENCODEMODE = gogo_ConfigDialogInfo.optIDC_COMBO_ENCODE_MODE; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_EMPHASIS_TYPE>0){ + gogo_opts.optEMPHASIS = gogo_ConfigDialogInfo.optIDC_COMBO_EMPHASIS_TYPE; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_OUTFREQ>0){ + gogo_opts.optOUTFREQ = atoi((char *)gogo_ConfigDialogInfo.optIDC_EDIT_OUTFREQ); + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_MSTHRESHOLD>0){ + gogo_opts.optMSTHRESHOLD_threshold = atoi((char *)gogo_ConfigDialogInfo.optIDC_EDIT_MSTHRESHOLD_THRESHOLD); + gogo_opts.optMSTHRESHOLD_mspower = atoi((char *)gogo_ConfigDialogInfo.optIDC_EDIT_MSTHRESHOLD_MSPOWER); + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_USE_CPU_OPTS>0){ + gogo_opts.optUSEMMX = gogo_ConfigDialogInfo.optIDC_CHECK_CPUMMX; + gogo_opts.optUSEKNI = gogo_ConfigDialogInfo.optIDC_CHECK_CPUSSE; + gogo_opts.optUSE3DNOW = gogo_ConfigDialogInfo.optIDC_CHECK_CPU3DNOW; + gogo_opts.optUSEE3DNOW = gogo_ConfigDialogInfo.optIDC_CHECK_CPUE3DNOW; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_VBR>0){ + gogo_opts.optVBR = gogo_ConfigDialogInfo.optIDC_COMBO_VBR; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_VBR_BITRATE>0){ + gogo_opts.optVBRBITRATE_low = gogo_ConfigDialogInfo.optIDC_COMBO_VBR_BITRATE_LOW; + gogo_opts.optVBRBITRATE_high = gogo_ConfigDialogInfo.optIDC_COMBO_VBR_BITRATE_HIGH; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_USEPSY>0){ + gogo_opts.optUSEPSY = TRUE; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_VERIFY>0){ + gogo_opts.optVERIFY = TRUE; + } + if(gogo_ConfigDialogInfo.optIDC_CHECK_16KHZ_LOW_PASS_FILTER>0){ + gogo_opts.optUSELPF16 = TRUE; + } +// gogo_opts.optINPFREQ; // SYSTEM USE(VXegpw) +// gogo_opts.optSTARTOFFSET; // SYSTEM USE +// gogo_opts.optADDTAGnum; // SYSTEM USE +// gogo_opts.optADDTAG_len[64]; // SYSTEM USE +// gogo_opts.optADDTAG_buf[64]; // SYSTEM USE +// gogo_opts.optCPU; // PREPAIRING() +// gogo_opts.optBYTE_SWAP; // SYSTEM USE +// gogo_opts.opt8BIT_PCM; // SYSTEM USE +// gogo_opts.optMONO_PCM; // SYSTEM USE +// gogo_opts.optTOWNS_SND; // SYSTEM USE +// gogo_opts.optTHREAD_PRIORITY; // PREPARING +// gogo_opts.optREADTHREAD_PRIORITY; // PREPARING +// gogo_opts.optOUTPUTDIR[1024]; // SYSTEM USE +// gogo_opts.output_name[1024]; // SYSTEM USE + gogo_ConfigDialogInfoUnLock(); + return 0; +} + +#define SEC_GOGO "gogo" +int gogo_ConfigDialogInfoSaveINI(void) +{ + char *section = SEC_GOGO; + char *inifile = timidity_output_inifile; + char buffer[1024]; +#define NUMSAVE(name) \ + sprintf(buffer,"%d",gogo_ConfigDialogInfo. ## name ); \ + WritePrivateProfileString(section, #name ,buffer,inifile); +#define STRSAVE(name) \ + WritePrivateProfileString(section,(char *) #name ,(char *)gogo_ConfigDialogInfo. ## name ,inifile); + NUMSAVE(optIDC_CHECK_DEFAULT) + NUMSAVE(optIDC_CHECK_COMMANDLINE_OPTS) + STRSAVE(optIDC_EDIT_COMMANDLINE_OPTION) + NUMSAVE(optIDC_CHECK_OUTPUT_FORMAT) + NUMSAVE(optIDC_COMBO_OUTPUT_FORMAT) + NUMSAVE(optIDC_CHECK_MPEG1AUDIOBITRATE) + NUMSAVE(optIDC_COMBO_MPEG1_AUDIO_BITRATE) + NUMSAVE(optIDC_CHECK_MPEG2AUDIOBITRATE) + NUMSAVE(optIDC_COMBO_MPEG2_AUDIO_BITRATE) + NUMSAVE(optIDC_CHECK_ENHANCED_LOW_PASS_FILTER) + STRSAVE(optIDC_EDIT_LPF_PARA1) + STRSAVE(optIDC_EDIT_LPF_PARA2) + NUMSAVE(optIDC_CHECK_ENCODE_MODE) + NUMSAVE(optIDC_COMBO_ENCODE_MODE) + NUMSAVE(optIDC_CHECK_EMPHASIS_TYPE) + NUMSAVE(optIDC_COMBO_EMPHASIS_TYPE) + NUMSAVE(optIDC_CHECK_OUTFREQ) + STRSAVE(optIDC_EDIT_OUTFREQ) + NUMSAVE(optIDC_CHECK_MSTHRESHOLD) + STRSAVE(optIDC_EDIT_MSTHRESHOLD_THRESHOLD) + STRSAVE(optIDC_EDIT_MSTHRESHOLD_MSPOWER) + NUMSAVE(optIDC_CHECK_USE_CPU_OPTS) + NUMSAVE(optIDC_CHECK_CPUMMX) + NUMSAVE(optIDC_CHECK_CPUSSE) + NUMSAVE(optIDC_CHECK_CPU3DNOW) + NUMSAVE(optIDC_CHECK_CPUE3DNOW) + NUMSAVE(optIDC_CHECK_VBR) + NUMSAVE(optIDC_COMBO_VBR) + NUMSAVE(optIDC_CHECK_VBR_BITRATE) + NUMSAVE(optIDC_COMBO_VBR_BITRATE_LOW) + NUMSAVE(optIDC_COMBO_VBR_BITRATE_HIGH) + NUMSAVE(optIDC_CHECK_USEPSY) + NUMSAVE(optIDC_CHECK_VERIFY) + NUMSAVE(optIDC_CHECK_16KHZ_LOW_PASS_FILTER) + WritePrivateProfileString(NULL,NULL,NULL,inifile); // Write Flush +#undef NUMSAVE +#undef STRSAVE + return 0; +} +int gogo_ConfigDialogInfoLoadINI(void) +{ + char *section = SEC_GOGO; + char *inifile = timidity_output_inifile; + int num; + char buffer[1024]; +#define NUMLOAD(name) \ + num = GetPrivateProfileInt(section, #name ,-1,inifile); \ + if(num!=-1) gogo_ConfigDialogInfo. ## name = num; +#define STRLOAD(name,len) \ + GetPrivateProfileString(section,(char *) #name ,"",buffer,len,inifile); \ + buffer[len-1] = '\0'; \ + if(buffer[0]!=0) \ + strcpy((char *)gogo_ConfigDialogInfo. ## name ,buffer); + gogo_ConfigDialogInfoLock(); + NUMLOAD(optIDC_CHECK_DEFAULT) + NUMLOAD(optIDC_CHECK_COMMANDLINE_OPTS) + STRLOAD(optIDC_EDIT_COMMANDLINE_OPTION,1024) + NUMLOAD(optIDC_CHECK_OUTPUT_FORMAT) + NUMLOAD(optIDC_COMBO_OUTPUT_FORMAT) + NUMLOAD(optIDC_CHECK_MPEG1AUDIOBITRATE) + NUMLOAD(optIDC_COMBO_MPEG1_AUDIO_BITRATE) + NUMLOAD(optIDC_CHECK_MPEG2AUDIOBITRATE) + NUMLOAD(optIDC_COMBO_MPEG2_AUDIO_BITRATE) + NUMLOAD(optIDC_CHECK_ENHANCED_LOW_PASS_FILTER) + STRLOAD(optIDC_EDIT_LPF_PARA1,4) + STRLOAD(optIDC_EDIT_LPF_PARA2,4) + NUMLOAD(optIDC_CHECK_ENCODE_MODE) + NUMLOAD(optIDC_COMBO_ENCODE_MODE) + NUMLOAD(optIDC_CHECK_EMPHASIS_TYPE) + NUMLOAD(optIDC_COMBO_EMPHASIS_TYPE) + NUMLOAD(optIDC_CHECK_OUTFREQ) + STRLOAD(optIDC_EDIT_OUTFREQ,6) + NUMLOAD(optIDC_CHECK_MSTHRESHOLD) + STRLOAD(optIDC_EDIT_MSTHRESHOLD_THRESHOLD,4) + STRLOAD(optIDC_EDIT_MSTHRESHOLD_MSPOWER,4) + NUMLOAD(optIDC_CHECK_USE_CPU_OPTS) + NUMLOAD(optIDC_CHECK_CPUMMX) + NUMLOAD(optIDC_CHECK_CPUSSE) + NUMLOAD(optIDC_CHECK_CPU3DNOW) + NUMLOAD(optIDC_CHECK_CPUE3DNOW) + NUMLOAD(optIDC_CHECK_VBR) + NUMLOAD(optIDC_COMBO_VBR) + NUMLOAD(optIDC_CHECK_VBR_BITRATE) + NUMLOAD(optIDC_COMBO_VBR_BITRATE_LOW) + NUMLOAD(optIDC_COMBO_VBR_BITRATE_HIGH) + NUMLOAD(optIDC_CHECK_USEPSY) + NUMLOAD(optIDC_CHECK_VERIFY) + NUMLOAD(optIDC_CHECK_16KHZ_LOW_PASS_FILTER) +#undef NUMLOAD +#undef STRLOAD + gogo_ConfigDialogInfoUnLock(); + return 0; +} + +#endif // AU_GOGO + + +#ifdef AU_VORBIS +/////////////////////////////////////////////////////////////////////// +// +// vorbis ConfigDialog +// +/////////////////////////////////////////////////////////////////////// + +volatile vorbis_ConfigDialogInfo_t vorbis_ConfigDialogInfo; + +// id R{{bNX` +#define CB_INFO_TYPE1_BEGIN(id) static int cb_info_ ## id [] = { +#define CB_INFO_TYPE1_END }; +#define CB_INFO_TYPE2_BEGIN(id) static char * cb_info_ ## id [] = { +#define CB_INFO_TYPE2_END }; + +// cb_info_type1_hc cb_info_type2_hc B + +// IDC_COMBO_MODE_jp +CB_INFO_TYPE2_BEGIN(IDC_COMBO_MODE_jp) + "ftHg(128kbps VBR)",(char *)0, + "112kbps VBR",(char *)1, + "128kbps VBR",(char *)2, + "160kbps VBR",(char *)3, + "192kbps VBR",(char *)4, + "256kbps VBR",(char *)5, + "350kbps VBR",(char *)6, + NULL +CB_INFO_TYPE2_END + +// IDC_COMBO_MODE_en +CB_INFO_TYPE2_BEGIN(IDC_COMBO_MODE_en) + "Default (About 128kbps VBR)",(char *)0, + "About 112kbps VBR",(char *)1, + "About 128kbps VBR",(char *)2, + "About 160kbps VBR",(char *)3, + "About 192kbps VBR",(char *)4, + "About 256kbps VBR",(char *)5, + "About 350kbps VBR",(char *)6, + NULL +CB_INFO_TYPE2_END + +static char **cb_info_IDC_COMBO_MODE; + +// id R{{bNXIB +#define CB_SETCURSEL_TYPE1(id) \ +{ \ + int cb_num; \ + for(cb_num=0;(int)cb_info_ ## id [cb_num]>=0;cb_num++){ \ + SendDlgItemMessage(hwnd,id,CB_SETCURSEL,(WPARAM)0,(LPARAM)0); \ + if(vorbis_ConfigDialogInfo.opt ## id == (int) cb_info_ ## id [cb_num]){ \ + SendDlgItemMessage(hwnd,id,CB_SETCURSEL,(WPARAM)cb_num,(LPARAM)0); \ + break; \ + } \ + } \ +} +#define CB_SETCURSEL_TYPE2(id) \ +{ \ + int cb_num; \ + for(cb_num=0;(int)cb_info_ ## id [cb_num];cb_num+=2){ \ + SendDlgItemMessage(hwnd,id,CB_SETCURSEL,(WPARAM)0,(LPARAM)0); \ + if(vorbis_ConfigDialogInfo.opt ## id == (int) cb_info_ ## id [cb_num+1]){ \ + SendDlgItemMessage(hwnd,id,CB_SETCURSEL,(WPARAM)cb_num/2,(LPARAM)0); \ + break; \ + } \ + } \ +} +// id R{{bNXIB +#define CB_GETCURSEL_TYPE1(id) \ +{ \ + int cb_num1, cb_num2; \ + cb_num1 = SendDlgItemMessage(hwnd,id,CB_GETCURSEL,(WPARAM)0,(LPARAM)0); \ + for(cb_num2=0;(int)cb_info_ ## id [cb_num2]>=0;cb_num2++) \ + if(cb_num1==cb_num2){ \ + vorbis_ConfigDialogInfo.opt ## id = (int)cb_info_ ## id [cb_num2]; \ + break; \ + } \ +} +#define CB_GETCURSEL_TYPE2(id) \ +{ \ + int cb_num1, cb_num2; \ + cb_num1 = SendDlgItemMessage(hwnd,id,CB_GETCURSEL,(WPARAM)0,(LPARAM)0); \ + for(cb_num2=0;(int)cb_info_ ## id [cb_num2];cb_num2+=2) \ + if(cb_num1*2==cb_num2){ \ + vorbis_ConfigDialogInfo.opt ## id = (int)cb_info_ ## id [cb_num2+1]; \ + break; \ + } \ +} +// `FbNB +#define IS_CHECK(id) SendDlgItemMessage(hwnd,id,BM_GETCHECK,0,0) +// `FbNB +#define CHECK(id) SendDlgItemMessage(hwnd,id,BM_SETCHECK,1,0) +// `FbNB +#define UNCHECK(id) SendDlgItemMessage(hwnd,id,BM_SETCHECK,0,0) +// id `FbN{bNXB +#define CHECKBOX_SET(id) \ + if(vorbis_ConfigDialogInfo.opt ## id>0) \ + SendDlgItemMessage(hwnd,id,BM_SETCHECK,1,0); \ + else \ + SendDlgItemMessage(hwnd,id,BM_SETCHECK,0,0); \ +// id `FbN{bNXB +#define CHECKBOX_GET(id) \ + if(SendDlgItemMessage(hwnd,id,BM_GETCHECK,0,0)) \ + vorbis_ConfigDialogInfo.opt ## id = 1; \ + else \ + vorbis_ConfigDialogInfo.opt ## id = 0; \ +// id GfBbgB +#define EDIT_SET(id) SendDlgItemMessage(hwnd,id,WM_SETTEXT,0,(LPARAM)vorbis_ConfigDialogInfo.opt ## id); +// id GfBbgB +#define EDIT_GET(id,size) SendDlgItemMessage(hwnd,id,WM_GETTEXT,(WPARAM)size,(LPARAM)vorbis_ConfigDialogInfo.opt ## id); +#define EDIT_GET_RANGE(id,size,min,max) \ +{ \ + char tmpbuf[64]; \ + int value; \ + SendDlgItemMessage(hwnd,id,WM_GETTEXT,(WPARAM)size,(LPARAM)vorbis_ConfigDialogInfo.opt ## id); \ + value = atoi((char *)vorbis_ConfigDialogInfo.opt ## id); \ + if(valuemax) value = max; \ + sprintf(tmpbuf,"%d",value); \ + strncpy((char *)vorbis_ConfigDialogInfo.opt ## id,tmpbuf,size); \ + (vorbis_ConfigDialogInfo.opt ## id)[size] = '\0'; \ +} +// Rg[L +#define ENABLE_CONTROL(id) EnableWindow(GetDlgItem(hwnd,id),TRUE); +// Rg[ +#define DISABLE_CONTROL(id) EnableWindow(GetDlgItem(hwnd,id),FALSE); + + +static void vorbisConfigDialogProcControlEnableDisable(HWND hwnd); +static void vorbisConfigDialogProcControlApply(HWND hwnd); +static void vorbisConfigDialogProcControlReset(HWND hwnd); +static int vorbis_ConfigDialogInfoLock(); +static int vorbis_ConfigDialogInfoUnLock(); +static HANDLE hvorbisConfigDailog = NULL; +static BOOL APIENTRY vorbisConfigDialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam) +{ + switch (uMess){ + case WM_INITDIALOG: + { + int i; + // R{{bNX + if (PlayerLanguage == LANGUAGE_JAPANESE) + cb_info_IDC_COMBO_MODE = cb_info_IDC_COMBO_MODE_jp; + else + cb_info_IDC_COMBO_MODE = cb_info_IDC_COMBO_MODE_en; + + for(i=0;cb_info_IDC_COMBO_MODE[i];i+=2){ + SendDlgItemMessage(hwnd,IDC_COMBO_MODE,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)cb_info_IDC_COMBO_MODE[i]); + } + // + vorbisConfigDialogProcControlReset(hwnd); + } + break; + case WM_COMMAND: + switch (LOWORD(wParam)) { + case IDCLOSE: + SendMessage(hwnd,WM_CLOSE,(WPARAM)0,(LPARAM)0); + break; + case IDOK: + vorbisConfigDialogProcControlApply(hwnd); + SendMessage(hwnd,WM_CLOSE,(WPARAM)0,(LPARAM)0); + break; + case IDCANCEL: + SendMessage(hwnd,WM_CLOSE,(WPARAM)0,(LPARAM)0); + break; + case IDC_BUTTON_APPLY: + vorbisConfigDialogProcControlApply(hwnd); + break; + case IDC_CHECK_DEFAULT: + vorbisConfigDialogProcControlEnableDisable(hwnd); + break; + case IDC_COMBO_MODE: + break; + default: + break; + } + break; + case WM_NOTIFY: + break; + case WM_SIZE: + return FALSE; + case WM_CLOSE: + vorbis_ConfigDialogInfoSaveINI(); + DestroyWindow(hwnd); + break; + case WM_DESTROY: + hvorbisConfigDailog = NULL; + break; + default: + break; + } + return FALSE; +} + +// Rg[L / +static void vorbisConfigDialogProcControlEnableDisable(HWND hwnd) +{ + ENABLE_CONTROL(IDC_CHECK_DEFAULT); + if(IS_CHECK(IDC_CHECK_DEFAULT)){ + DISABLE_CONTROL(IDC_COMBO_MODE); + } else { + ENABLE_CONTROL(IDC_COMBO_MODE); + } +} + +static void vorbisConfigDialogProcControlReset(HWND hwnd) +{ + // R{{bNXI + CB_SETCURSEL_TYPE2(IDC_COMBO_MODE) + // `FbN{bNX + CHECKBOX_SET(IDC_CHECK_DEFAULT) + // GfBbg + // Rg[L / + vorbisConfigDialogProcControlEnableDisable(hwnd); +} + +static void vorbisConfigDialogProcControlApply(HWND hwnd) +{ + // R{{bNXI + CB_GETCURSEL_TYPE2(IDC_COMBO_MODE) + // `FbN{bNX + CHECKBOX_GET(IDC_CHECK_DEFAULT) + // GfBbg + // Rg[L / + vorbisConfigDialogProcControlEnableDisable(hwnd); + // Zbg + vorbisConfigDialogProcControlReset(hwnd); +} + +#undef CB_INFO_TYPE1_BEGIN +#undef CB_INFO_TYPE1_END +#undef CB_INFO_TYPE2_BEGIN +#undef CB_INFO_TYPE2_END +#undef CB_SETCURSEL_TYPE1 +#undef CB_SETCURSEL_TYPE2 +#undef CB_GETCURSEL_TYPE1 +#undef CB_GETCURSEL_TYPE2 +#undef CHECKBOX_SET +#undef CHECKBOX_GET +#undef EDIT_SET +#undef EDIT_GET +#undef EDIT_GET_RANGE + +#endif + +int vorbisConfigDialog(void) +{ +#ifdef AU_VORBIS + if(!IsWindow(hvorbisConfigDailog)) { + if (PlayerLanguage == LANGUAGE_JAPANESE) + hvorbisConfigDailog = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_VORBIS),(HWND)hPrefWnd,vorbisConfigDialogProc); + else + hvorbisConfigDailog = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_VORBIS_EN),(HWND)hPrefWnd,vorbisConfigDialogProc); + } + ShowWindow(hvorbisConfigDailog,SW_SHOW); +#endif + return 0; +} + +#ifdef AU_VORBIS + +static int vorbis_ConfigDialogInfoLock() +{ + return 0; +} +static int vorbis_ConfigDialogInfoUnLock() +{ + return 0; +} + +int vorbis_ConfigDialogInfoInit(void) +{ + vorbis_ConfigDialogInfo.optIDC_CHECK_DEFAULT = 1; + vorbis_ConfigDialogInfo.optIDC_COMBO_MODE = 0; + return 0; +} + +extern volatile int ogg_vorbis_mode; +int vorbis_ConfigDialogInfoApply(void) +{ + vorbis_ConfigDialogInfoLock(); + if(vorbis_ConfigDialogInfo.optIDC_CHECK_DEFAULT>0){ +// vorbis_opts_reset(); + vorbis_ConfigDialogInfoUnLock(); + return 0; + } + ogg_vorbis_mode = vorbis_ConfigDialogInfo.optIDC_COMBO_MODE; + vorbis_ConfigDialogInfoUnLock(); + return 0; +} + +#define SEC_VORBIS "vorbis" +int vorbis_ConfigDialogInfoSaveINI(void) +{ + char *section = SEC_VORBIS; + char *inifile = timidity_output_inifile; + char buffer[1024]; +// int len; +#define NUMSAVE(name) \ + sprintf(buffer,"%d",vorbis_ConfigDialogInfo. ## name ); \ + WritePrivateProfileString(section, #name ,buffer,inifile); +//#define STRSAVE(name,len) \ +// WritePrivateProfileString(section,(char *) #name ,(char *)vorbis_ConfigDialogInfo. ## name ,inifile); + NUMSAVE(optIDC_CHECK_DEFAULT) + NUMSAVE(optIDC_COMBO_MODE) + WritePrivateProfileString(NULL,NULL,NULL,inifile); // Write Flush +#undef NUMSAVE +//#undef STRSAVE + return 0; +} +int vorbis_ConfigDialogInfoLoadINI(void) +{ + char *section = SEC_VORBIS; + char *inifile = timidity_output_inifile; + int num; +// char buffer[1024]; +#define NUMLOAD(name) \ + num = GetPrivateProfileInt(section, #name ,-1,inifile); \ + if(num!=-1) vorbis_ConfigDialogInfo. ## name = num; +//#define STRLOAD(name,len) \ +// GetPrivateProfileString(section,(char *) #name ,"",buffer,len,inifile); \ +// buffer[len-1] = '\0'; \ +// if(buffer[0]!=0) \ +// strcpy((char *)vorbis_ConfigDialogInfo. ## name ,buffer); + vorbis_ConfigDialogInfoLock(); + NUMLOAD(optIDC_CHECK_DEFAULT) + NUMLOAD(optIDC_COMBO_MODE) +#undef NUMLOAD +//#undef STRLOAD + vorbis_ConfigDialogInfoUnLock(); + return 0; +} + +#endif // AU_VORBIS diff -ruN TiMidity++-2.10.4/interface/w32g_pref.h TiMidity++-2.11.0/interface/w32g_pref.h --- TiMidity++-2.10.4/interface/w32g_pref.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.0/interface/w32g_pref.h Thu Dec 27 19:39:25 2001 @@ -24,4 +24,73 @@ extern volatile int PrefWndDoing; void PrefWndCreate(HWND hwnd); +#ifdef AU_GOGO + +// _CAOB +// R{{bNX Index lB +typedef struct gogo_ConfigDialogInfo_t_ { + int optIDC_CHECK_DEFAULT; + int optIDC_CHECK_COMMANDLINE_OPTS; + char optIDC_EDIT_COMMANDLINE_OPTION[1024]; + int optIDC_CHECK_OUTPUT_FORMAT; + int optIDC_COMBO_OUTPUT_FORMAT; + int optIDC_CHECK_MPEG1AUDIOBITRATE; + int optIDC_COMBO_MPEG1_AUDIO_BITRATE; + int optIDC_CHECK_MPEG2AUDIOBITRATE; + int optIDC_COMBO_MPEG2_AUDIO_BITRATE; + int optIDC_CHECK_ENHANCED_LOW_PASS_FILTER; + char optIDC_EDIT_LPF_PARA1[4]; + char optIDC_EDIT_LPF_PARA2[4]; + int optIDC_CHECK_ENCODE_MODE; + int optIDC_COMBO_ENCODE_MODE; + int optIDC_CHECK_EMPHASIS_TYPE; + int optIDC_COMBO_EMPHASIS_TYPE; + int optIDC_CHECK_OUTFREQ; + char optIDC_EDIT_OUTFREQ[6]; + int optIDC_CHECK_MSTHRESHOLD; + char optIDC_EDIT_MSTHRESHOLD_THRESHOLD[4]; + char optIDC_EDIT_MSTHRESHOLD_MSPOWER[4]; + int optIDC_CHECK_USE_CPU_OPTS; + int optIDC_CHECK_CPUMMX; + int optIDC_CHECK_CPUSSE; + int optIDC_CHECK_CPU3DNOW; + int optIDC_CHECK_CPUE3DNOW; + int optIDC_CHECK_VBR; + int optIDC_COMBO_VBR; + int optIDC_CHECK_VBR_BITRATE; + int optIDC_COMBO_VBR_BITRATE_LOW; + int optIDC_COMBO_VBR_BITRATE_HIGH; + int optIDC_CHECK_USEPSY; + int optIDC_CHECK_VERIFY; + int optIDC_CHECK_16KHZ_LOW_PASS_FILTER; +} gogo_ConfigDialogInfo_t; + +extern volatile gogo_ConfigDialogInfo_t gogo_ConfigDialogInfo; + +extern int gogo_ConfigDialogInfoInit(void); +extern int gogo_ConfigDialogInfoApply(void); +extern int gogo_ConfigDialogInfoSaveINI(void); +extern int gogo_ConfigDialogInfoLoadINI(void); +extern int gogoConfigDialog(void); + +#endif // AU_GOGO + +#ifdef AU_VORBIS + +typedef struct vorbis_ConfigDialogInfo_t_ { + int optIDC_CHECK_DEFAULT; + int optIDC_COMBO_MODE; +} vorbis_ConfigDialogInfo_t; + + +extern int vorbis_ConfigDialogInfoInit(void); +extern int vorbis_ConfigDialogInfoApply(void); +extern int vorbis_ConfigDialogInfoSaveINI(void); +extern int vorbis_ConfigDialogInfoLoadINI(void); + +extern int vorbisConfigDialog(void); + +#endif // AU_VORBIS + + #endif /* __W32G2_PREF_H__ */ diff -ruN TiMidity++-2.10.4/interface/w32g_res.h TiMidity++-2.11.0/interface/w32g_res.h --- TiMidity++-2.10.4/interface/w32g_res.h Tue Aug 8 12:37:41 2000 +++ TiMidity++-2.11.0/interface/w32g_res.h Thu Dec 27 19:39:25 2001 @@ -3,15 +3,29 @@ // Used by w32g_res.rc // #define IDD_DIALOG_SEARCHBOX 102 +#define IDD_DIALOG_VORBIS 103 +#define IDD_DIALOG_GOGO 104 +#define IDD_PREF_PLAYER_EN 106 +#define IDD_PREF_TIMIDITY1_EN 107 +#define IDD_PREF_TIMIDITY2_EN 108 +#define IDD_PREF_TIMIDITY3_EN 109 +#define IDD_PREF_TIMIDITY4_EN 110 +#define IDD_DIALOG_MAIN_EN 111 +#define IDM_MENU_MAIN_EN 112 +#define IDD_DIALOG_VORBIS_EN 113 +#define IDD_DIALOG_GOGO_EN 114 #define IDC_CHECK_SEACHDIRRECURSIVE 1001 #define IDC_CHECK_DOCWNDINDEPENDENT 1002 #define IDC_CHECK_INIFILE_AUTOSAVE 1003 #define IDD_DIALOG_WAVEFORM 1004 +#define IDC_CHECK_DOCWNDAUTOPOPUP 1004 #define IDC_CHECKBOX_CHORUS_LEVEL 1005 #define IDC_CHECKBOX_GLOBAL_REVERB 1006 #define IDC_CHECKBOX_REVERB_LEVEL 1007 #define IDC_CHECKBOX_CH01 1008 +#define IDC_CHECKBOX_SRCHORUS 1008 #define IDC_CHECKBOX_CH02 1009 +#define IDC_CHECKBOX_RESONANCE 1009 #define IDC_CHECKBOX_CH03 1010 #define IDC_CHECKBOX_CH04 1011 #define IDC_CHECKBOX_CH05 1012 @@ -95,11 +109,16 @@ #define IDC_EDIT_CONTROL_RATIO 1092 #define IDC_EDIT_MODIFY_RELEASE 1093 #define IDC_EDIT_AMPLIFICATION 1094 +#define IDC_EDIT_ENV_ATTACK 1094 #define IDC_EDIT_CACHE_SIZE 1095 +#define IDC_EDIT_AUTOMAXIMIZE 1095 +#define IDC_EDIT_VELOCITYTABLE 1095 #define IDC_EDIT_SPECIAL_TONEBANK 1097 #define IDC_CHECKBOX_NOT_LOOPING 1097 #define IDC_EDIT_DEFAULT_TONEBANK 1098 +#define IDC_CHECKBOX_AUTOSTART 1098 #define IDC_EDIT_REDUCE_VOICE 1099 +#define IDC_CHECKBOX_RANDOM 1099 #define IDC_EDIT_CTL_VEBOSITY 1100 #define IDC_EDIT_DELAY 1101 #define IDC_RADIOBUTTON_DELAY_LEFT 1102 @@ -198,16 +217,63 @@ #define IDC_RADIOBUTTON_GS 1195 #define IDC_RADIOBUTTON_XG 1196 #define IDC_EDIT1 2000 +#define IDC_EDIT2 2001 #define IDC_EDIT_NUM 2002 +#define IDC_EDIT3 2002 +#define IDC_BUTTON_REVERSE 2003 +#define IDC_COMBO_OUTPUT 2004 +#define IDC_BUTTON_OUTPUT_OPTIONS 2005 +#define IDC_CHECK_DEFAULT 2007 +#define IDC_COMBO_MODE 2008 +#define IDC_CHECK_USE_TAG 2009 +#define IDC_COMBO_OUTPUT_FORMAT 2013 +#define IDC_CHECK_COMMANDLINE_OPTS 2015 +#define IDC_EDIT_COMMANDLINE_OPTION 2016 +#define IDC_COMBO_MPEG1_AUDIO_BITRATE 2017 +#define IDC_COMBO_MPEG2_AUDIO_BITRATE 2018 +#define IDC_COMBO_VBR_BITRATE_LOW 2019 +#define IDC_COMBO_VBR_BITRATE_HIGH 2020 +#define IDC_CHECK_16KHZ_LOW_PASS_FILTER 2021 +#define IDC_CHECK_ENHANCED_LOW_PASS_FILTER 2022 +#define IDC_EDIT_LPF_PARA1 2023 +#define IDC_EDIT_LPF_PARA2 2024 +#define IDC_COMBO_ENCODE_MODE 2025 +#define IDC_CHECK_USEPSY 2026 +#define IDC_CHECK_CPUMMX 2027 +#define IDC_CHECK_CPUSSE 2028 +#define IDC_CHECK_CPU3DNOW 2029 +#define IDC_CHECK_CPUE3DNOW 2030 +#define IDC_COMBO_EMPHASIS_TYPE 2031 +#define IDC_COMBO_VBR 2033 +#define IDC_CHECK_VBR 2034 +#define IDC_CHECK_OUTFREQ 2035 +#define IDC_EDIT_OUTFREQ 2036 +#define IDC_CHECK_MSTHRESHOLD 2037 +#define IDC_EDIT_MSTHRESHOLD_THRESHOLD 2038 +#define IDC_EDIT_MSTHRESHOLD_MSPOWER 2039 +#define IDC_CHECK_VERIFY 2040 +#define IDC_BUTTON_APPLY 2041 +#define IDC_COMBO_OUTPUT_MODE 2042 +#define IDC_CHECK_USE_CPU_OPTS 2043 +#define IDC_CHECK_MPEG1AUDIOBITRATE 2045 +#define IDC_CHECK_MPEG2AUDIOBITRATE 2046 +#define IDC_CHECK_VBR_BITRATE 2047 +#define IDC_CHECK_OUTPUT_FORMAT 2048 +#define IDC_CHECK_ENCODE_MODE 2049 +#define IDC_CHECK_EMPHASIS_TYPE 2050 +#define IDC_CHECKBOX_TVAA 2057 +#define IDC_CHECKBOX_TVAD 2058 +#define IDC_CHECKBOX_TVAR 2059 +#define IDC_CHECKBOX_PDELAY 2060 #define IDC_STATIC -1 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 103 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 2003 +#define _APS_NEXT_RESOURCE_VALUE 113 +#define _APS_NEXT_COMMAND_VALUE 40002 +#define _APS_NEXT_CONTROL_VALUE 2061 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff -ruN TiMidity++-2.10.4/interface/w32g_res.rc TiMidity++-2.11.0/interface/w32g_res.rc --- TiMidity++-2.10.4/interface/w32g_res.rc Tue Aug 8 12:37:41 2000 +++ TiMidity++-2.11.0/interface/w32g_res.rc Thu Dec 27 20:47:15 2001 @@ -34,7 +34,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_NOPARENTNOTIFY | WS_EX_ACCEPTFILES | - WS_EX_LEFTSCROLLBAR | WS_EX_APPWINDOW + WS_EX_APPWINDOW CAPTION "TiMidity++ Win32GUI" MENU IDM_MENU_MAIN FONT 8, "MS Sans Serif", 0, 0 @@ -50,6 +50,26 @@ CONTROL "",IDC_RECT_CANVAS,"Static",SS_GRAYFRAME,220,0,68,44 END +IDD_DIALOG_MAIN_EN DIALOGEX 0, 0, 308, 64 +STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_VISIBLE | + WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_NOPARENTNOTIFY | WS_EX_ACCEPTFILES | + WS_EX_APPWINDOW +CAPTION "TiMidity++ Win32GUI" +MENU IDM_MENU_MAIN_EN +FONT 8, "MS Sans Serif", 0, 0 +BEGIN + CONTROL "ToolBarMain",IDC_TOOLBARWINDOW_MAIN,"ToolbarWindow32", + WS_TABSTOP | 0x14c,2,46,112,17 + CONTROL "ToolBarSubWnd",IDC_TOOLBARWINDOW_SUBWND,"ToolbarWindow32", + WS_TABSTOP | 0x44,112,46,80,16 + SCROLLBAR IDC_SCROLLBAR_PROGRESS,190,48,100,12,WS_DISABLED + SCROLLBAR IDC_SCROLLBAR_VOLUME,292,0,12,60,SBS_VERT + CONTROL "",IDC_RECT_PANEL,"Static",SS_GRAYFRAME | SS_SUNKEN,0,0, + 220,44 + CONTROL "",IDC_RECT_CANVAS,"Static",SS_GRAYFRAME,220,0,68,44 +END + #endif // 騰按忸 resources ///////////////////////////////////////////////////////////////////////////// @@ -68,20 +88,20 @@ // Dialog // -IDD_DIALOG_DEBUG DIALOGEX 0, 0, 240, 240 +IDD_DIALOG_DEBUG DIALOG DISCARDABLE 0, 0, 240, 240 STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU CAPTION "Debug Window (TiMidity Win32GUI)" -FONT 9, "Times New Roman", 400, 0 +FONT 9, "Times New Roman" BEGIN PUSHBUTTON "C L E A R",IDCLEAR,72,164,68,16,BS_CENTER CONTROL "VALID",IDC_CHECKBOX_DEBUG_WND_VALID,"Button", BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,20,164,36,16 - CONTROL "Frame_Valid",-1,"Static",SS_ETCHEDFRAME,16,164,44,16 + CONTROL "",-1,"Static",SS_ETCHEDFRAME,16,164,44,16 PUSHBUTTON "E X I T",IDC_BUTTON_EXIT,144,164,48,16,BS_CENTER | WS_DISABLED PUSHBUTTON "ExitProcess",IDC_BUTTON_EXITPROCESS,196,164,40,16, BS_CENTER - CONTROL "Frame2",-1,"Static",SS_ETCHEDFRAME,0,184,240,1 + CONTROL "",-1,"Static",SS_ETCHEDHORZ,0,184,240,1 PUSHBUTTON "Heaps Check",IDC_BUTTON_HEAP_CHECK,4,188,50,16, BS_CENTER PUSHBUTTON "Variables Check",IDC_BUTTON_VARIABLES_CHECK,60,188,50, @@ -93,28 +113,28 @@ IDD_DIALOG_CONSOLE DIALOGEX 0, 0, 243, 184 STYLE DS_MODALFRAME | DS_3DLOOK | WS_CAPTION | WS_SYSMENU -CAPTION "Console Window (TiMidity Win32GUI)" -FONT 9, "lr o", 0, 0 +CAPTION "R\[ (TiMidity++ Win32GUI)" +FONT 9, "lr oSVbN", 0, 0 BEGIN - PUSHBUTTON "C L E A R",IDCLEAR,140,167,96,16,BS_CENTER + PUSHBUTTON "NA",IDCLEAR,140,167,96,16,BS_CENTER EDITTEXT IDC_EDIT_VERBOSITY,44,167,16,16,ES_OEMCONVERT - CONTROL "VALID",IDC_CHECKBOX_VALID,"Button",BS_AUTOCHECKBOX | - BS_LEFTTEXT | WS_TABSTOP,92,167,32,16 + CONTROL "L",IDC_CHECKBOX_VALID,"Button",BS_AUTOCHECKBOX | + BS_LEFTTEXT | WS_TABSTOP,97,167,27,16 CONTROL "",-1,"Static",SS_ETCHEDFRAME,4,167,80,16 EDITTEXT IDC_EDIT,0,0,242,160,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL,WS_EX_STATICEDGE - PUSHBUTTON "VERBOSITY",IDC_BUTTON_VERBOSITY,4,167,40,16,BS_CENTER, + PUSHBUTTON "x",IDC_BUTTON_VERBOSITY,4,167,40,16,BS_CENTER, WS_EX_CLIENTEDGE PUSHBUTTON "<<",IDC_BUTTON_DEC,60,167,12,16,BS_CENTER PUSHBUTTON ">>",IDC_BUTTON_INC,72,167,12,16,BS_CENTER - CONTROL "",-1,"Static",SS_ETCHEDFRAME,88,167,41,16 + CONTROL "",-1,"Static",SS_ETCHEDFRAME,93,167,38,16 END IDD_DIALOG_CONSOLE_EN DIALOGEX 0, 0, 247, 181 STYLE DS_MODALFRAME | DS_3DLOOK | WS_CAPTION | WS_SYSMENU CAPTION "Console Window (TiMidity Win32GUI)" -FONT 8, "Times New Roman" +FONT 8, "Times New Roman", 0, 0 BEGIN PUSHBUTTON "C L E A R",IDCLEAR,150,165,90,15,BS_CENTER EDITTEXT IDC_EDIT_VERBOSITY,50,165,21,15,ES_OEMCONVERT @@ -133,8 +153,8 @@ IDD_DIALOG_DOC DIALOG DISCARDABLE 0, 0, 302, 257 STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Document Window (TiMidity Win32GUI)" -FONT 9, "lr " +CAPTION "hLg (TiMidity++ Win32GUI)" +FONT 9, "lr oSVbN" BEGIN EDITTEXT IDC_EDIT_FILENAME,100,240,150,16,ES_CENTER | ES_READONLY PUSHBUTTON "<<",IDC_BUTTON_PREV,255,240,20,16,BS_CENTER @@ -170,15 +190,15 @@ CONTROL "Frame_Valid",-1,"Static",SS_ETCHEDFRAME,12,200,44,16 END -IDD_DIALOG_SOUNDSPEC DIALOGEX 0, 0, 240, 180 +IDD_DIALOG_SOUNDSPEC DIALOG DISCARDABLE 0, 0, 240, 180 STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU CAPTION "Sound Spec Window (TiMidity Win32GUI)" -FONT 9, "Times New Roman", 400, 0 +FONT 9, "Times New Roman" BEGIN PUSHBUTTON "C L E A R",IDCLEAR,136,164,96,16,BS_CENTER CONTROL "VALID",IDC_CHECKBOX_DEBUG_WND_VALID,"Button", BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,20,164,36,16 - CONTROL "Frame_Valid",-1,"Static",SS_ETCHEDFRAME,16,164,44,16 + CONTROL "",-1,"Static",SS_ETCHEDFRAME,16,164,44,16 END IDD_DIALOG_TRACER DIALOGEX 0, 0, 320, 220 @@ -195,16 +215,16 @@ IDD_DIALOG_SIMPLE_LIST DIALOGEX 0, 0, 242, 187 STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_ACCEPTFILES -CAPTION "List Window (TiMidity Win32GUI)" -FONT 9, "lr o" +CAPTION "vCXg (TiMidity++ Win32GUI)" +FONT 9, "lr oSVbN", 0, 0 BEGIN LISTBOX IDC_LISTBOX_PLAYLIST,0,0,241,172,LBS_HASSTRINGS | LBS_WANTKEYBOARDINPUT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "DOC",IDC_BUTTON_DOC,65,175,40,12,BS_CENTER - PUSHBUTTON "CLEAR",IDC_BUTTON_CLEAR,200,175,42,12,BS_CENTER - PUSHBUTTON "REFINE",IDC_BUTTON_REFINE,155,175,30,12,BS_CENTER - PUSHBUTTON "UNIQ",IDC_BUTTON_UNIQ,125,175,30,12,BS_CENTER + PUSHBUTTON "hLg",IDC_BUTTON_DOC,54,175,43,12,BS_CENTER + PUSHBUTTON "NA",IDC_BUTTON_CLEAR,200,175,42,12,BS_CENTER + PUSHBUTTON "t",IDC_BUTTON_REFINE,154,175,37,12,BS_CENTER + PUSHBUTTON "d",IDC_BUTTON_UNIQ,105,175,38,12,BS_CENTER EDITTEXT IDC_EDIT_NUM,5,175,45,12,ES_READONLY END @@ -212,7 +232,7 @@ STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_ACCEPTFILES CAPTION "List Window (TiMidity Win32GUI)" -FONT 9, "Times New Roman" +FONT 9, "Times New Roman", 0, 0 BEGIN LISTBOX IDC_LISTBOX_PLAYLIST,0,0,241,170,LBS_HASSTRINGS | LBS_WANTKEYBOARDINPUT | LBS_DISABLENOSCROLL | WS_VSCROLL | @@ -224,277 +244,598 @@ EDITTEXT IDC_EDIT_NUM,5,175,45,12,ES_READONLY END -IDD_PREF_PLAYER DIALOG DISCARDABLE 0, 0, 212, 92 -STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | - WS_POPUP | WS_VISIBLE | WS_CAPTION -FONT 9, "Times New Roman" +IDD_PREF_PLAYER DIALOG DISCARDABLE 0, 0, 211, 163 +STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_POPUP | WS_VISIBLE | + WS_CAPTION +FONT 9, "lr oSVbN" BEGIN - PUSHBUTTON "Config File",IDC_BUTTON_CONFIG_FILE,4,4,40,12,BS_CENTER - EDITTEXT IDC_EDIT_CONFIG_FILE,44,4,164,12,ES_MULTILINE | - ES_AUTOHSCROLL | ES_OEMCONVERT - GROUPBOX "Player Mode",IDC_GROUPBOX_PLAYERMODE,4,20,64,64, + PUSHBUTTON "t@C",IDC_BUTTON_CONFIG_FILE,3,11,52,14, + BS_CENTER + EDITTEXT IDC_EDIT_CONFIG_FILE,71,9,140,17,ES_AUTOHSCROLL | + ES_OEMCONVERT + GROUPBOX "vC[",IDC_GROUPBOX_PLAYERMODE,2,32,106,61, WS_GROUP - CONTROL "Auto Quit",IDC_CHECKBOX_AUTOQUIT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,32,44,8 + CONTROL "StI",IDC_CHECKBOX_AUTOQUIT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,117,44,61,8 + CONTROL "do^h~",IDC_CHECKBOX_AUTOUNIQ,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,117,56,59,8 + CONTROL "tt@Co^",IDC_CHECKBOX_AUTOREFINE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,117,68,75,8 + GROUPBOX "",IDC_GROUPBOX_LANGUAGE,160,101,40,38,WS_GROUP + CONTROL "{",IDC_RADIOBUTTON_JAPANESE,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,163,113,30,8 + CONTROL "p",IDC_RADIOBUTTON_ENGLISH,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,163,126,25,8 + CONTROL "t~",IDC_CHECKBOX_NOT_CONTINUE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,44,64,8 + CONTROL "hbO&&hbv", + IDC_CHECKBOX_NOT_DRAG_START,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,56,97,8 + GROUPBOX "tH_",IDC_STATIC,83,101,70,23 + CONTROL "AIT",IDC_CHECK_SEACHDIRRECURSIVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,88,111,51,10 + GROUPBOX "hLg",IDC_STATIC,2,101,75,38 + CONTROL "ｩ\ｦ",IDC_CHECK_DOCWNDINDEPENDENT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,112,56,8 + GROUPBOX "",IDC_STATIC,83,129,70,25 + CONTROL "ｩ",IDC_CHECK_INIFILE_AUTOSAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,88,140,59,10 + CONTROL "s[g",IDC_CHECKBOX_NOT_LOOPING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,68,51,8 + CONTROL "I[gX^[g",IDC_CHECKBOX_AUTOSTART,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,80,56,8 + CONTROL "_",IDC_CHECKBOX_RANDOM,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,117,80,50,8 + CONTROL "|bvAbv",IDC_CHECK_DOCWNDAUTOPOPUP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,124,59,10 + GROUPBOX "vCXg",IDC_STATIC,112,32,88,61 +END + +IDD_PREF_PLAYER_EN DIALOG DISCARDABLE 0, 0, 210, 190 +STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_POPUP | WS_VISIBLE | + WS_CAPTION +FONT 9, "Times New Roman" +BEGIN + PUSHBUTTON "Config File",IDC_BUTTON_CONFIG_FILE,3,11,52,11, + BS_CENTER + EDITTEXT IDC_EDIT_CONFIG_FILE,62,10,137,14,ES_AUTOHSCROLL | + ES_OEMCONVERT + GROUPBOX "Player",IDC_GROUPBOX_PLAYERMODE,2,32,106,61,WS_GROUP + CONTROL "Not Looping",IDC_CHECKBOX_AUTOQUIT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,117,44,77,8 CONTROL "Auto Uniq",IDC_CHECKBOX_AUTOUNIQ,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,40,44,8 + BS_AUTOCHECKBOX | WS_TABSTOP,117,56,76,8 CONTROL "Auto Refine",IDC_CHECKBOX_AUTOREFINE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,48,48,8 - GROUPBOX "Language",IDC_GROUPBOX_LANGUAGE,72,20,60,40,WS_GROUP + BS_AUTOCHECKBOX | WS_TABSTOP,117,68,75,8 + GROUPBOX "Language",IDC_GROUPBOX_LANGUAGE,148,101,50,38,WS_GROUP CONTROL "Japanese",IDC_RADIOBUTTON_JAPANESE,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,76,32,36,8 + BS_AUTORADIOBUTTON | WS_TABSTOP,152,112,42,8 CONTROL "English",IDC_RADIOBUTTON_ENGLISH,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,76,40,36,8 - LTEXT "Require Restart!",IDC_STATIC,76,48,52,8,NOT WS_GROUP - CONTROL "Not Continue",IDC_CHECKBOX_NOT_CONTINUE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,56,52,8 + BS_AUTORADIOBUTTON | WS_TABSTOP,152,124,43,8 + CONTROL "Auto Quit",IDC_CHECKBOX_NOT_CONTINUE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,44,64,8 CONTROL "Not Drag Start",IDC_CHECKBOX_NOT_DRAG_START,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,64,56,8 - GROUPBOX "Directory",IDC_STATIC,136,20,72,20 - CONTROL "Recursive Seach",IDC_CHECK_SEACHDIRRECURSIVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,140,28,60,10 - GROUPBOX "Document Window",IDC_STATIC,136,44,72,20 - CONTROL "Independent Mode",IDC_CHECK_DOCWNDINDEPENDENT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,140,52,64,10 - GROUPBOX "INI File",IDC_STATIC,136,68,72,20 + BS_AUTOCHECKBOX | WS_TABSTOP,7,56,97,8 + GROUPBOX "Directory",IDC_STATIC,77,101,67,23 + CONTROL "Recursive walk",IDC_CHECK_SEACHDIRRECURSIVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,83,110,57,10 + GROUPBOX "Document",IDC_STATIC,3,101,72,38 + CONTROL "Not Auto Display",IDC_CHECK_DOCWNDINDEPENDENT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,112,63,8 + GROUPBOX "INI File",IDC_STATIC,77,125,67,24 CONTROL "Auto Save",IDC_CHECK_INIFILE_AUTOSAVE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,140,76,45,10 - CONTROL "Not Looping",IDC_CHECKBOX_NOT_LOOPING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,72,52,8 + BS_AUTOCHECKBOX | WS_TABSTOP,83,134,53,10 + CONTROL "Not Continue",IDC_CHECKBOX_NOT_LOOPING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,68,51,8 + CONTROL "Auto Start",IDC_CHECKBOX_AUTOSTART,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,80,56,8 + CONTROL "Random Mode",IDC_CHECKBOX_RANDOM,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,117,80,75,8 + CONTROL "Popup",IDC_CHECK_DOCWNDAUTOPOPUP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,124,59,10 + GROUPBOX "PlayList",IDC_STATIC,112,32,85,61 END -IDD_PREF_TIMIDITY1 DIALOG DISCARDABLE 0, 0, 212, 92 +IDD_PREF_TIMIDITY1 DIALOG DISCARDABLE 0, 0, 210, 191 +STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | + WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 9, "lr oSVbN" +BEGIN + CONTROL "R[X",IDC_CHECKBOX_CHORUS,"Button",BS_AUTOCHECKBOX | + BS_LEFT | BS_TOP | WS_TABSTOP,6,17,41,10 + CONTROL "R[Xxw",IDC_CHECKBOX_CHORUS_LEVEL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,101,17,73,10 + CONTROL "o[u",IDC_CHECKBOX_REVERB,"Button",BS_AUTOCHECKBOX | + BS_LEFT | BS_TOP | WS_TABSTOP,6,31,41,10 + CONTROL "O[oo[u",IDC_CHECKBOX_GLOBAL_REVERB,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,101,46,74,10 + CONTROL "o[uxw",IDC_CHECKBOX_REVERB_LEVEL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,101,31,74,10 + EDITTEXT IDC_EDIT_REVERB,177,31,24,10,ES_NUMBER + CONTROL "L&&R fBC",IDC_CHECKBOX_DELAY,"Button", + BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,101,61, + 57,10 + CONTROL "",IDC_RADIOBUTTON_DELAY_LEFT,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,109,76,23,10 + CONTROL "E",IDC_RADIOBUTTON_DELAY_RIGHT,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,135,76,23,10 + CONTROL "]",IDC_RADIOBUTTON_DELAY_CENTER,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,161,76,30,10 + LTEXT "x(msec)",IDC_STATIC,113,91,35,8,NOT WS_GROUP | + WS_TABSTOP + EDITTEXT IDC_EDIT_DELAY,151,89,32,10,ES_NUMBER + LTEXT "mCYVFCsO (0..4)",IDC_STATIC,101,117,74,8,NOT + WS_GROUP | WS_TABSTOP + EDITTEXT IDC_EDIT_NOISESHARPING,178,115,16,10,ES_NUMBER + CONTROL "W[V",IDC_CHECKBOX_MODWHEEL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,45,63,10 + CONTROL "|^g",IDC_CHECKBOX_PORTAMENTO,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,59,50,10 + CONTROL "NRPN ru[g",IDC_CHECKBOX_NRPNVIB,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,73,65,10 + CONTROL "`lvbV[",IDC_CHECKBOX_CHPRESS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,87,80,10 + CONTROL "d",IDC_CHECKBOX_OVOICE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,115,77,10 + CONTROL "eLXg^Cxg",IDC_CHECKBOX_TRACETEXT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,101,73,10 + LTEXT "c(0..1000)",IDC_STATIC,101,105,52,8,NOT WS_GROUP | + WS_TABSTOP + EDITTEXT IDC_EDIT_MODIFY_RELEASE,155,103,28,10 + GROUPBOX "GM/GS/XG",IDC_STATIC,1,3,91,182 + GROUPBOX "",IDC_STATIC,97,3,113,187 + CONTROL "A^bNE^C",IDC_CHECKBOX_TVAA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,129,59,10 + CONTROL "fBPCE^C",IDC_CHECKBOX_TVAD,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,143,61,10 + CONTROL "[XE^C",IDC_CHECKBOX_TVAR,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,157,61,10 + EDITTEXT IDC_EDIT_CHORUS,177,16,24,10,ES_NUMBER + CONTROL "fBC",IDC_CHECKBOX_PDELAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,6,171,39,10 + CONTROL "TEhR[X",IDC_CHECKBOX_SRCHORUS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,101,130,70,10 + CONTROL "U]iX",IDC_CHECKBOX_RESONANCE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,101,146,53,10 + EDITTEXT IDC_EDIT_ENV_ATTACK,161,160,28,10 + EDITTEXT IDC_EDIT_VELOCITYTABLE,178,174,28,10 + LTEXT "A^bN^Cv (0..3)",IDC_STATIC,101,162,56,8,NOT + WS_GROUP | WS_TABSTOP + LTEXT "xVeBe[u (0..2)",IDC_STATIC,101,175,72,8,NOT + WS_GROUP | WS_TABSTOP +END + +IDD_PREF_TIMIDITY1_EN DIALOG DISCARDABLE 0, 0, 210, 190 STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 9, "Times New Roman" BEGIN - CONTROL "Enable Chorus Control Effect",IDC_CHECKBOX_CHORUS, - "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP, - 8,4,97,8 - CONTROL "Chorus Level",IDC_CHECKBOX_CHORUS_LEVEL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,12,52,8 - EDITTEXT IDC_EDIT_CHORUS,68,12,24,10,ES_NUMBER - CONTROL "Enable Reverb Control Effect",IDC_CHECKBOX_REVERB, - "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP, - 8,24,96,8 + CONTROL "Chorus Control",IDC_CHECKBOX_CHORUS,"Button", + BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,6,12,59, + 10 + CONTROL "Static Chorus Level",IDC_CHECKBOX_CHORUS_LEVEL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,101,12,70,10 CONTROL "Global Reverb",IDC_CHECKBOX_GLOBAL_REVERB,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,32,52,8 - CONTROL "Reverb Level",IDC_CHECKBOX_REVERB_LEVEL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,40,52,8 - EDITTEXT IDC_EDIT_REVERB,68,38,24,10,ES_NUMBER - CONTROL "L&&R Delay Rotate Effect",IDC_CHECKBOX_DELAY,"Button", - BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,8,52,91, - 8 + BS_AUTOCHECKBOX | WS_TABSTOP,101,34,57,10 + CONTROL "Reverb Control",IDC_CHECKBOX_REVERB,"Button", + BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,6,23,58, + 10 + CONTROL "Static Reverb Level",IDC_CHECKBOX_REVERB_LEVEL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,101,23,69,10 + EDITTEXT IDC_EDIT_REVERB,177,23,24,12,ES_NUMBER + CONTROL "L&&R Delay",IDC_CHECKBOX_DELAY,"Button",BS_AUTOCHECKBOX | + BS_LEFT | BS_TOP | WS_TABSTOP,101,44,57,10 CONTROL "Left",IDC_RADIOBUTTON_DELAY_LEFT,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,8,60,28,8 + BS_AUTORADIOBUTTON | WS_TABSTOP,106,53,26,10 CONTROL "Right",IDC_RADIOBUTTON_DELAY_RIGHT,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,36,60,28,8 + BS_AUTORADIOBUTTON | WS_TABSTOP,135,53,30,10 CONTROL "Rotate",IDC_RADIOBUTTON_DELAY_CENTER,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,64,60,32,8 - LTEXT "Delay(msec)",IDC_STATIC,12,68,40,8,NOT WS_GROUP | + BS_AUTORADIOBUTTON | WS_TABSTOP,167,53,35,10 + LTEXT "Delay(msec)",IDC_STATIC,113,64,38,8,NOT WS_GROUP | WS_TABSTOP - EDITTEXT IDC_EDIT_DELAY,52,68,44,10,ES_NUMBER - LTEXT "Noise Sharping Level (0..4)",IDC_STATIC,8,80,76,8,NOT + EDITTEXT IDC_EDIT_DELAY,151,63,32,12,ES_NUMBER + LTEXT "Noise Sharping Level (0..4)",IDC_STATIC,101,89,63,8,NOT + WS_GROUP | WS_TABSTOP + EDITTEXT IDC_EDIT_NOISESHARPING,177,89,28,12,ES_NUMBER + LTEXT "Feedback Level(0..1000)",IDC_STATIC,101,78,71,8,NOT WS_GROUP | WS_TABSTOP - EDITTEXT IDC_EDIT_NOISESHARPING,84,78,16,10,ES_NUMBER - CONTROL "Enable Modulation Wheel",IDC_CHECKBOX_MODWHEEL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,112,4,87,10 - CONTROL "Enable Portamento",IDC_CHECKBOX_PORTAMENTO,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,112,16,68,10 - CONTROL "Enable NRPN Vibrato",IDC_CHECKBOX_NRPNVIB,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,112,28,77,10 - CONTROL "Enable GM Channel pressure",IDC_CHECKBOX_CHPRESS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,112,40,97,10 - CONTROL "Enable Overlapped same voice",IDC_CHECKBOX_OVOICE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,52,100,10 - CONTROL "Enable Trace Text Meta Event",IDC_CHECKBOX_TRACETEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,64,100,10 - LTEXT "Modify Release(0..1000)",IDC_STATIC,108,76,72,8,NOT + EDITTEXT IDC_EDIT_MODIFY_RELEASE,177,76,28,12 + CONTROL "Modulation Wheel",IDC_CHECKBOX_MODWHEEL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,34,67,10 + GROUPBOX "GM/GS/XG",IDC_STATIC,1,3,91,143 + CONTROL "Portament",IDC_CHECKBOX_PORTAMENTO,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,45,46,10 + GROUPBOX "Special",IDC_STATIC,98,3,113,143 + CONTROL "NRPN Vibrato",IDC_CHECKBOX_NRPNVIB,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,56,57,10 + EDITTEXT IDC_EDIT_CHORUS,177,12,24,12,ES_NUMBER + CONTROL "GM Channel pressure",IDC_CHECKBOX_CHPRESS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,67,80,10 + CONTROL "Surround Chorus",IDC_CHECKBOX_SRCHORUS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,101,98,65,10 + CONTROL "Overlapped same voce",IDC_CHECKBOX_OVOICE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,89,82,10 + CONTROL "Trace Text Meta Event",IDC_CHECKBOX_TRACETEXT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,78,83,10 + CONTROL "Pseudo Resonance",IDC_CHECKBOX_RESONANCE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,101,107,71,10 + EDITTEXT IDC_EDIT_ENV_ATTACK,162,119,28,12 + EDITTEXT IDC_EDIT_VELOCITYTABLE,162,131,28,12 + LTEXT "Attack Type (0..3)",IDC_STATIC,101,120,53,8,NOT WS_GROUP | WS_TABSTOP - EDITTEXT IDC_EDIT_MODIFY_RELEASE,180,76,28,10 + LTEXT "Verocity Table (0..2)",IDC_STATIC,101,133,60,8,NOT + WS_GROUP | WS_TABSTOP + CONTROL "Delay Control",IDC_CHECKBOX_PDELAY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,133,56,10 + CONTROL "Attack Time Control",IDC_CHECKBOX_TVAA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,100,75,10 + CONTROL "Release Time Control",IDC_CHECKBOX_TVAR,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,122,79,10 + CONTROL "Decay Time Control",IDC_CHECKBOX_TVAD,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,111,74,10 END -IDD_PREF_TIMIDITY2 DIALOG DISCARDABLE 0, 0, 212, 92 +IDD_PREF_TIMIDITY2_EN DIALOG DISCARDABLE 0, 0, 210, 190 STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 9, "Times New Roman" BEGIN - LTEXT "Maximum voices",IDC_STATIC,4,4,52,8,NOT WS_GROUP - EDITTEXT IDC_EDIT_VOICES,56,4,24,10,ES_NUMBER - LTEXT "Amplification (%)",IDC_STATIC,4,16,52,8,NOT WS_GROUP - EDITTEXT IDC_EDIT_AMPLIFICATION,56,16,24,10 + LTEXT "Maxmum Voices",IDC_STATIC,6,19,71,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_VOICES,78,19,24,12,ES_NUMBER + LTEXT "Amplification(%)",IDC_STATIC,6,34,47,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_AMPLIFICATION,78,32,24,12 CONTROL "Unload Instruments between files", IDC_CHECKBOX_FREE_INST,"Button",BS_AUTOCHECKBOX | - BS_LEFT | BS_TOP | WS_TABSTOP,4,52,108,10 + BS_LEFT | BS_TOP | WS_TABSTOP,6,75,92,10 CONTROL "Antialiasing instrument",IDC_CHECKBOX_ANTIALIAS,"Button", - BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,4,28,80, + BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,6,49,97, 10 - CONTROL "Load Instruments while playing", + CONTROL "Load Instruments While Playing", IDC_CHECKBOX_LOADINST_PLAYING,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,41,103,10 - LTEXT "Allocate Cache Size",IDC_STATIC,120,4,56,8,NOT WS_GROUP - EDITTEXT IDC_EDIT_CACHE_SIZE,176,4,32,10 - CONTROL "Auto Reduce Voice",IDC_CHECKBOX_REDUCE_VOICE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,120,17,72,8 - LTEXT "Default tonebank",IDC_STATIC,120,28,52,8,NOT WS_GROUP - EDITTEXT IDC_EDIT_DEFAULT_TONEBANK,172,28,24,10 - CONTROL "Special Tonebank",IDC_CHECKBOX_SPECIAL_TONEBANK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,120,41,60,8 - EDITTEXT IDC_EDIT_SPECIAL_TONEBANK,184,41,20,10 - GROUPBOX "Default Midi Type",IDC_GROUPBOX_DEFAULT_MIDI_TYPE,120, - 65,88,20 + WS_TABSTOP,6,63,99,10 + LTEXT "Resample Cache",IDC_STATIC,117,19,50,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_CACHE_SIZE,169,17,36,12 + CONTROL "Auto Reduction Voice",IDC_CHECKBOX_REDUCE_VOICE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,89,98,8 + LTEXT "Default tonebank",IDC_STATIC,117,37,50,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_DEFAULT_TONEBANK,173,35,24,12 + CONTROL "All tonebank",IDC_CHECKBOX_SPECIAL_TONEBANK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,117,54,54,8 + EDITTEXT IDC_EDIT_SPECIAL_TONEBANK,173,52,24,12 + CONTROL "GM",IDC_RADIOBUTTON_GM,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,14,117,22,8 + CONTROL "GS",IDC_RADIOBUTTON_GS,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,39,117,20,8 + CONTROL "XG",IDC_RADIOBUTTON_XG,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,63,117,20,8 + CONTROL "Trace Playing",IDC_CHECKBOX_CTL_TRACE_PLAYING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,117,88,86,8 + LTEXT "Console Verbosity",IDC_STATIC,117,105,55,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_CTL_VEBOSITY,175,103,20,12 + LTEXT "Control Ratio",IDC_STATIC,117,72,40,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_CONTROL_RATIO,173,70,24,12 + GROUPBOX "Default MIDI Type",IDC_GROUPBOX_DEFAULT_MIDI_TYPE,6,105, + 87,27 + GROUPBOX "Others",IDC_STATIC,111,3,100,119 + GROUPBOX "Play",IDC_STATIC,1,3,107,133 +END + +IDD_PREF_TIMIDITY2 DIALOG DISCARDABLE 0, 0, 210, 141 +STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | + WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 9, "lr oSVbN" +BEGIN + LTEXT "({CX)",IDC_STATIC,6,19,71,8,NOT + WS_GROUP + EDITTEXT IDC_EDIT_VOICES,78,19,24,12,ES_NUMBER + LTEXT "{[(%)",IDC_STATIC,6,33,40,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_AMPLIFICATION,47,31,24,12 + CONTROL "pb`A[h",IDC_CHECKBOX_FREE_INST, + "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP, + 6,75,92,10 + CONTROL "A`GCAX",IDC_CHECKBOX_ANTIALIAS,"Button", + BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,6,49,62, + 10 + CONTROL "tpb`[h",IDC_CHECKBOX_LOADINST_PLAYING, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,63,83,10 + LTEXT "LbVe",IDC_STATIC,117,19,44,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_CACHE_SIZE,162,17,39,12 + CONTROL "ｩ",IDC_CHECKBOX_REDUCE_VOICE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,89,67,8 + LTEXT "WoN",IDC_STATIC,117,37,41,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_DEFAULT_TONEBANK,158,35,24,12 + CONTROL "oN",IDC_CHECKBOX_SPECIAL_TONEBANK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,117,54,43,8 + EDITTEXT IDC_EDIT_SPECIAL_TONEBANK,161,52,24,12 CONTROL "GM",IDC_RADIOBUTTON_GM,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,128,73,24,8 + WS_TABSTOP,14,117,22,8 CONTROL "GS",IDC_RADIOBUTTON_GS,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,156,73,20,8 + WS_TABSTOP,39,117,20,8 CONTROL "XG",IDC_RADIOBUTTON_XG,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,180,73,20,8 - CONTROL "Ctl Trace Playing",IDC_CHECKBOX_CTL_TRACE_PLAYING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,65,64,8 - LTEXT "Console Verbosity",IDC_STATIC,4,76,56,8,NOT WS_GROUP - EDITTEXT IDC_EDIT_CTL_VEBOSITY,60,76,20,10 - LTEXT "Control Ratio",IDC_STATIC,120,52,40,8,NOT WS_GROUP - EDITTEXT IDC_EDIT_CONTROL_RATIO,160,52,24,10 + WS_TABSTOP,63,117,20,8 + CONTROL "g[X[h",IDC_CHECKBOX_CTL_TRACE_PLAYING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,117,88,54,8 + LTEXT "R\[x",IDC_STATIC,117,105,51,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_CTL_VEBOSITY,170,103,20,12 + LTEXT "[g",IDC_STATIC,117,72,32,8,NOT WS_GROUP + EDITTEXT IDC_EDIT_CONTROL_RATIO,149,70,24,12 + GROUPBOX "WpKi",IDC_GROUPBOX_DEFAULT_MIDI_TYPE,6, + 105,87,27 + GROUPBOX "x",IDC_STATIC,111,3,100,119 + GROUPBOX "",IDC_STATIC,1,3,107,133 END -IDD_PREF_TIMIDITY3 DIALOG DISCARDABLE 0, 0, 212, 92 +IDD_PREF_TIMIDITY3 DIALOG DISCARDABLE 0, 0, 210, 181 +STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | + WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 9, "lr oSVbN" +BEGIN + GROUPBOX "o",IDC_STATIC,1,0,203,180,WS_GROUP | WS_TABSTOP + GROUPBOX "o[h",IDC_STATIC,4,14,171,33,WS_GROUP | + WS_TABSTOP + CONTROL "8rbg",IDC_CHECKBOX_8BITS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,23,29,8 + CONTROL "16rbg",IDC_CHECKBOX_16BITS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,35,32,8 + CONTROL "U-Law",IDC_CHECKBOX_ULAW,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,23,31,8 + CONTROL "A-Law",IDC_CHECKBOX_ALAW,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,35,31,8 + CONTROL "t",IDC_CHECKBOX_SIGNED,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,77,23,37,8 + CONTROL "",IDC_CHECKBOX_UNSIGNED,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,77,35,37,8 + CONTROL "oCg]",IDC_CHECKBOX_BYTESWAP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,119,23,43,8 + CONTROL "Linear PCM",IDC_CHECKBOX_LINEAR,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,119,35,45,8 + GROUPBOX "`l",IDC_STATIC,4,55,45,33,WS_GROUP | WS_TABSTOP + CONTROL "XeI",IDC_RADIO_STEREO,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,8,65,36,10 + CONTROL "m",IDC_RADIO_MONO,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,8,77,35,8 + LTEXT "Tv[g(Hz)",IDC_STATIC,65,60,56,8,WS_TABSTOP + EDITTEXT IDC_EDIT_SAMPLE_RATE,122,58,32,10,ES_NUMBER | WS_GROUP + PUSHBUTTON "L",IDC_BUTTON_LOW,65,73,8,14,BS_CENTER + PUSHBUTTON "M",IDC_BUTTON_MIDDLE,73,73,10,14,BS_CENTER + PUSHBUTTON "H",IDC_BUTTON_HIGH,84,73,10,14,BS_CENTER + PUSHBUTTON "4",IDC_BUTTON_4,95,73,8,14,BS_CENTER + PUSHBUTTON "8",IDC_BUTTON_8,103,73,8,14,BS_CENTER + PUSHBUTTON "16",IDC_BUTTON_16,111,73,12,14,BS_CENTER + PUSHBUTTON "24",IDC_BUTTON_24,123,73,12,14,BS_CENTER + PUSHBUTTON "32",IDC_BUTTON_32,135,73,12,14,BS_CENTER + PUSHBUTTON "40",IDC_BUTTON_40,147,73,12,14,BS_CENTER + PUSHBUTTON "48",IDC_BUTTON_48,159,73,12,14,BS_CENTER + GROUPBOX "o@",IDC_GROUPBOX_OUTPUT,4,102,193,49,WS_GROUP | + WS_TABSTOP + PUSHBUTTON "ot@C",IDC_BUTTON_OUTPUT_FILE,4,156,42,14, + BS_CENTER | WS_GROUP + EDITTEXT IDC_EDIT_OUTPUT_FILE,47,156,130,15,ES_AUTOHSCROLL | + ES_OEMCONVERT | WS_GROUP + PUSHBUTTON "",IDC_BUTTON_OUTPUT_FILE_DEL,178,156,19,14, + BS_CENTER + COMBOBOX IDC_COMBO_OUTPUT,8,116,151,64,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "IvV",IDC_BUTTON_OUTPUT_OPTIONS,160,115,34,14 + COMBOBOX IDC_COMBO_OUTPUT_MODE,8,134,186,72,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_PREF_TIMIDITY3_EN DIALOG DISCARDABLE 0, 0, 210, 190 STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 9, "Times New Roman" BEGIN - GROUPBOX "Output Encoding",IDC_STATIC,4,0,204,88,WS_GROUP | + GROUPBOX "Output Encoding",IDC_STATIC,0,0,203,140,WS_GROUP | WS_TABSTOP - GROUPBOX "Precision",IDC_STATIC,8,8,152,28,WS_GROUP | WS_TABSTOP + GROUPBOX "Precision",IDC_STATIC,4,7,171,30,WS_GROUP | WS_TABSTOP CONTROL "8bits",IDC_CHECKBOX_8BITS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,12,16,28,8 + WS_TABSTOP,8,15,29,8 CONTROL "16bits",IDC_CHECKBOX_16BITS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,12,24,28,8 + WS_TABSTOP,8,25,32,8 CONTROL "uLaw",IDC_CHECKBOX_ULAW,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,48,16,28,8 - CONTROL "aLaw",IDC_CHECKBOX_ALAW,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,48,24,28,8 + WS_TABSTOP,41,15,31,8 + CONTROL "ALaw",IDC_CHECKBOX_ALAW,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,25,31,8 CONTROL "Signed",IDC_CHECKBOX_SIGNED,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,84,16,28,8 - CONTROL "Unsignd",IDC_CHECKBOX_UNSIGNED,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,84,24,36,8 + WS_TABSTOP,77,15,37,8 + CONTROL "Unsigned",IDC_CHECKBOX_UNSIGNED,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,77,25,37,8 CONTROL "Byteswap",IDC_CHECKBOX_BYTESWAP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,120,16,40,8 - CONTROL "Linear",IDC_CHECKBOX_LINEAR,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,120,24,32,8 - GROUPBOX "Channels",IDC_STATIC,164,8,40,28,WS_GROUP | WS_TABSTOP + BS_AUTOCHECKBOX | WS_TABSTOP,119,15,43,8 + CONTROL "Linear PCM",IDC_CHECKBOX_LINEAR,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,119,25,45,8 + GROUPBOX "Channels",IDC_STATIC,4,41,45,33,WS_GROUP | WS_TABSTOP CONTROL "Stereo",IDC_RADIO_STEREO,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,168,16,33,10 + WS_TABSTOP,8,51,36,10 CONTROL "Mono",IDC_RADIO_MONO,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,168,24,33,10 - LTEXT "Sample rate",IDC_STATIC,8,36,36,12,WS_TABSTOP - EDITTEXT IDC_EDIT_SAMPLE_RATE,44,36,32,10,ES_NUMBER | WS_GROUP - PUSHBUTTON "L",IDC_BUTTON_LOW,80,36,12,8,BS_CENTER - PUSHBUTTON "M",IDC_BUTTON_MIDDLE,92,36,12,8,BS_CENTER - PUSHBUTTON "H",IDC_BUTTON_HIGH,104,36,12,8,BS_CENTER - PUSHBUTTON "4",IDC_BUTTON_4,120,36,12,8,BS_CENTER - PUSHBUTTON "8",IDC_BUTTON_8,132,36,12,8,BS_CENTER - PUSHBUTTON "16",IDC_BUTTON_16,144,36,12,8,BS_CENTER - PUSHBUTTON "24",IDC_BUTTON_24,156,36,12,8,BS_CENTER - PUSHBUTTON "32",IDC_BUTTON_32,168,36,12,8,BS_CENTER - PUSHBUTTON "40",IDC_BUTTON_40,180,36,12,8,BS_CENTER - PUSHBUTTON "48",IDC_BUTTON_48,192,36,12,8,BS_CENTER - GROUPBOX "Output",IDC_GROUPBOX_OUTPUT,8,44,196,28,WS_GROUP | + WS_TABSTOP,8,63,35,8 + LTEXT "Sample rate (Hz)",IDC_STATIC,65,46,50,8,WS_TABSTOP + EDITTEXT IDC_EDIT_SAMPLE_RATE,122,44,32,12,ES_NUMBER | WS_GROUP + PUSHBUTTON "L",IDC_BUTTON_LOW,65,59,8,14,BS_CENTER + PUSHBUTTON "M",IDC_BUTTON_MIDDLE,73,59,10,14,BS_CENTER + PUSHBUTTON "H",IDC_BUTTON_HIGH,84,59,10,14,BS_CENTER + PUSHBUTTON "4",IDC_BUTTON_4,95,59,8,14,BS_CENTER + PUSHBUTTON "8",IDC_BUTTON_8,103,59,8,14,BS_CENTER + PUSHBUTTON "16",IDC_BUTTON_16,111,59,12,14,BS_CENTER + PUSHBUTTON "24",IDC_BUTTON_24,123,59,12,14,BS_CENTER + PUSHBUTTON "32",IDC_BUTTON_32,135,59,12,14,BS_CENTER + PUSHBUTTON "40",IDC_BUTTON_40,147,59,12,14,BS_CENTER + PUSHBUTTON "48",IDC_BUTTON_48,159,59,12,14,BS_CENTER + GROUPBOX "Output",IDC_GROUPBOX_OUTPUT,4,80,193,41,WS_GROUP | WS_TABSTOP - CONTROL "Win32 Audio",IDC_RADIOBUTTON_WIN32AUDIO,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,12,52,52,8 - CONTROL "List Midi Event",IDC_RADIOBUTTON_LIST_MIDI_EVENT,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,12,60,56,8 - CONTROL "Riff Wave File",IDC_RADIOBUTTON_RIFF_WAVE,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,72,52,56,8 - CONTROL "Raw Waveform File",IDC_RADIOBUTTON_RAW_WAVEFORM,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,72,60,72,8 - CONTROL "Sun Audio File",IDC_RADIOBUTTON_SUN_AUDIO,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,144,52,56,8 - CONTROL "Aiff File",IDC_RADIOBUTTON_AIFF,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,144,60,36,8 - PUSHBUTTON "Output File",IDC_BUTTON_OUTPUT_FILE,8,72,36,12, + PUSHBUTTON "Output File",IDC_BUTTON_OUTPUT_FILE,4,123,42,14, BS_CENTER | WS_GROUP - EDITTEXT IDC_EDIT_OUTPUT_FILE,44,72,144,12,ES_AUTOHSCROLL | + EDITTEXT IDC_EDIT_OUTPUT_FILE,47,123,130,15,ES_AUTOHSCROLL | ES_OEMCONVERT | WS_GROUP - PUSHBUTTON "DEL",IDC_BUTTON_OUTPUT_FILE_DEL,188,72,16,12,BS_CENTER + PUSHBUTTON "DEL",IDC_BUTTON_OUTPUT_FILE_DEL,178,123,19,14,BS_CENTER + COMBOBOX IDC_COMBO_OUTPUT,8,89,151,64,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Option",IDC_BUTTON_OUTPUT_OPTIONS,160,88,34,14 + COMBOBOX IDC_COMBO_OUTPUT_MODE,8,105,186,72,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_PREF_TIMIDITY4 DIALOGEX 0, 0, 212, 92 +IDD_PREF_TIMIDITY4 DIALOG DISCARDABLE 0, 0, 210, 143 STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION -FONT 9, "Times New Roman", 0, 0 +FONT 9, "lr oSVbN" +BEGIN + CONTROL "Ch01",IDC_CHECKBOX_CH01,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,16,28,8 + CONTROL "Ch02",IDC_CHECKBOX_CH02,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,24,28,8 + CONTROL "Ch03",IDC_CHECKBOX_CH03,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,32,28,8 + CONTROL "Ch04",IDC_CHECKBOX_CH04,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,40,28,8 + CONTROL "Ch05",IDC_CHECKBOX_CH05,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,48,28,8 + CONTROL "Ch06",IDC_CHECKBOX_CH06,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,56,28,8 + CONTROL "Ch07",IDC_CHECKBOX_CH07,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,64,28,8 + CONTROL "Ch08",IDC_CHECKBOX_CH08,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,72,28,8 + CONTROL "Ch09",IDC_CHECKBOX_CH09,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,16,28,8 + CONTROL "Ch10",IDC_CHECKBOX_CH10,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,24,28,8 + CONTROL "Ch11",IDC_CHECKBOX_CH11,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,32,28,8 + CONTROL "Ch12",IDC_CHECKBOX_CH12,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,40,28,8 + CONTROL "Ch13",IDC_CHECKBOX_CH13,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,48,28,8 + CONTROL "Ch14",IDC_CHECKBOX_CH14,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,56,28,8 + CONTROL "Ch15",IDC_CHECKBOX_CH15,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,64,28,8 + CONTROL "Ch16",IDC_CHECKBOX_CH16,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,41,72,28,8 + CONTROL "Ch17",IDC_CHECKBOX_CH17,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,73,16,28,8 + CONTROL "Ch18",IDC_CHECKBOX_CH18,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,73,24,28,8 + CONTROL "Ch19",IDC_CHECKBOX_CH19,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,73,32,28,8 + CONTROL "Ch20",IDC_CHECKBOX_CH20,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,73,40,28,8 + CONTROL "Ch21",IDC_CHECKBOX_CH21,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,73,48,28,8 + CONTROL "Ch22",IDC_CHECKBOX_CH22,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,73,56,28,8 + CONTROL "Ch23",IDC_CHECKBOX_CH23,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,73,64,28,8 + CONTROL "Ch24",IDC_CHECKBOX_CH24,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,73,72,28,8 + CONTROL "Ch25",IDC_CHECKBOX_CH25,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,106,16,28,8 + CONTROL "Ch26",IDC_CHECKBOX_CH26,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,106,24,28,8 + CONTROL "Ch27",IDC_CHECKBOX_CH27,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,106,32,28,8 + CONTROL "Ch28",IDC_CHECKBOX_CH28,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,106,40,28,8 + CONTROL "Ch29",IDC_CHECKBOX_CH29,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,106,48,28,8 + CONTROL "Ch30",IDC_CHECKBOX_CH30,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,106,56,28,8 + CONTROL "Ch31",IDC_CHECKBOX_CH31,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,106,64,28,8 + CONTROL "Ch32",IDC_CHECKBOX_CH32,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,106,72,28,8 + CONTROL "ftHgh`l",IDC_CHECKBOX_DRUM_CHANNEL, + "Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9,87, + 95,13 + CONTROL "hp[gｩFｯ`l", + IDC_CHECKBOX_DRUM_CHANNEL_MASK,"Button",BS_AUTOCHECKBOX | + BS_PUSHLIKE | WS_TABSTOP,9,105,137,14 + CONTROL "~[g`l",IDC_CHECKBOX_QUIET_CHANNEL, + "Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9, + 124,76,13 + PUSHBUTTON "S]",IDC_BUTTON_REVERSE,141,18,31,61 + GROUPBOX "`l",IDC_STATIC,1,3,179,138 +END + +IDD_PREF_TIMIDITY4_EN DIALOG DISCARDABLE 0, 0, 210, 190 +STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | + WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 9, "Times New Roman" BEGIN CONTROL "Ch01",IDC_CHECKBOX_CH01,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,8,12,28,8 + WS_TABSTOP,10,16,28,8 CONTROL "Ch02",IDC_CHECKBOX_CH02,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,8,20,28,8 + WS_TABSTOP,10,24,28,8 CONTROL "Ch03",IDC_CHECKBOX_CH03,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,8,28,28,8 + WS_TABSTOP,10,32,28,8 CONTROL "Ch04",IDC_CHECKBOX_CH04,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,8,36,28,8 + WS_TABSTOP,10,40,28,8 CONTROL "Ch05",IDC_CHECKBOX_CH05,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,8,44,28,8 + WS_TABSTOP,10,48,28,8 CONTROL "Ch06",IDC_CHECKBOX_CH06,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,8,52,28,8 + WS_TABSTOP,10,56,28,8 CONTROL "Ch07",IDC_CHECKBOX_CH07,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,8,60,28,8 + WS_TABSTOP,10,64,28,8 CONTROL "Ch08",IDC_CHECKBOX_CH08,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,8,68,28,8 + WS_TABSTOP,10,72,28,8 CONTROL "Ch09",IDC_CHECKBOX_CH09,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,36,12,28,8 + WS_TABSTOP,41,16,28,8 CONTROL "Ch10",IDC_CHECKBOX_CH10,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,36,20,28,8 + WS_TABSTOP,41,24,28,8 CONTROL "Ch11",IDC_CHECKBOX_CH11,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,36,28,28,8 + WS_TABSTOP,41,32,28,8 CONTROL "Ch12",IDC_CHECKBOX_CH12,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,36,36,28,8 + WS_TABSTOP,41,40,28,8 CONTROL "Ch13",IDC_CHECKBOX_CH13,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,36,44,28,8 + WS_TABSTOP,41,48,28,8 CONTROL "Ch14",IDC_CHECKBOX_CH14,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,36,52,28,8 + WS_TABSTOP,41,56,28,8 CONTROL "Ch15",IDC_CHECKBOX_CH15,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,36,60,28,8 + WS_TABSTOP,41,64,28,8 CONTROL "Ch16",IDC_CHECKBOX_CH16,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,36,68,28,8 + WS_TABSTOP,41,72,28,8 CONTROL "Ch17",IDC_CHECKBOX_CH17,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,64,12,28,8 + WS_TABSTOP,73,16,28,8 CONTROL "Ch18",IDC_CHECKBOX_CH18,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,64,20,28,8 + WS_TABSTOP,73,24,28,8 CONTROL "Ch19",IDC_CHECKBOX_CH19,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,64,28,28,8 + WS_TABSTOP,73,32,28,8 CONTROL "Ch20",IDC_CHECKBOX_CH20,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,64,36,28,8 + WS_TABSTOP,73,40,28,8 CONTROL "Ch21",IDC_CHECKBOX_CH21,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,64,44,28,8 + WS_TABSTOP,73,48,28,8 CONTROL "Ch22",IDC_CHECKBOX_CH22,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,64,52,28,8 + WS_TABSTOP,73,56,28,8 CONTROL "Ch23",IDC_CHECKBOX_CH23,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,64,60,28,8 + WS_TABSTOP,73,64,28,8 CONTROL "Ch24",IDC_CHECKBOX_CH24,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,64,68,28,8 + WS_TABSTOP,73,72,28,8 CONTROL "Ch25",IDC_CHECKBOX_CH25,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,92,12,28,8 + WS_TABSTOP,106,16,28,8 CONTROL "Ch26",IDC_CHECKBOX_CH26,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,92,20,28,8 + WS_TABSTOP,106,24,28,8 CONTROL "Ch27",IDC_CHECKBOX_CH27,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,92,28,28,8 + WS_TABSTOP,106,32,28,8 CONTROL "Ch28",IDC_CHECKBOX_CH28,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,92,36,28,8 + WS_TABSTOP,106,40,28,8 CONTROL "Ch29",IDC_CHECKBOX_CH29,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,92,44,28,8 + WS_TABSTOP,106,48,28,8 CONTROL "Ch30",IDC_CHECKBOX_CH30,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,92,52,28,8 + WS_TABSTOP,106,56,28,8 CONTROL "Ch31",IDC_CHECKBOX_CH31,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,92,60,28,8 + WS_TABSTOP,106,64,28,8 CONTROL "Ch32",IDC_CHECKBOX_CH32,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,92,68,28,8 - CONTROL "Drum Channel",IDC_CHECKBOX_DRUM_CHANNEL,"Button", - BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,136,20,64,16 - CONTROL "Drum Channel Mask",IDC_CHECKBOX_DRUM_CHANNEL_MASK, - "Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,136, - 40,64,16 - CONTROL "Quiet Channel",IDC_CHECKBOX_QUIET_CHANNEL,"Button", - BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,136,60,64,16 + WS_TABSTOP,106,72,28,8 + CONTROL "Default Drum Channel",IDC_CHECKBOX_DRUM_CHANNEL,"Button", + BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9,87,95,13 + CONTROL "Ignore Auto Detect Channel", + IDC_CHECKBOX_DRUM_CHANNEL_MASK,"Button",BS_AUTOCHECKBOX | + BS_PUSHLIKE | WS_TABSTOP,9,105,95,14 + CONTROL "Mute Channel",IDC_CHECKBOX_QUIET_CHANNEL,"Button", + BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9,124,95,13 + PUSHBUTTON "Reverse",IDC_BUTTON_REVERSE,141,18,31,61 + GROUPBOX "Channel",IDC_STATIC,1,3,179,138 END IDD_DIALOG_WAVEFORM DIALOGEX 0, 0, 240, 120 @@ -507,13 +848,219 @@ IDD_DIALOG_SEARCHBOX DIALOG DISCARDABLE 0, 0, 183, 54 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seach" -FONT 9, "lr oSVbN" +FONT 9, "Times New Roman" BEGIN DEFPUSHBUTTON "OK",IDOK,70,33,50,14 PUSHBUTTON "Cancel",IDCANCEL,126,33,50,14 EDITTEXT IDC_EDIT1,7,7,169,24,ES_AUTOHSCROLL | ES_OEMCONVERT END +IDD_DIALOG_VORBIS DIALOG DISCARDABLE 0, 0, 197, 93 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ogg Vorbis _CAO" +FONT 9, "lr oSVbN" +BEGIN + CONTROL "ftHg",IDC_CHECK_DEFAULT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,4,0,56,10 + COMBOBOX IDC_COMBO_MODE,25,13,123,56,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "^Cg",IDC_STATIC,4,49,23,8 + EDITTEXT IDC_EDIT1,41,48,152,14,ES_AUTOHSCROLL | WS_DISABLED + LTEXT "A[eBXg",IDC_STATIC,4,63,36,8 + EDITTEXT IDC_EDIT2,41,76,152,14,ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Ao",IDC_STATIC,4,77,27,8 + EDITTEXT IDC_EDIT3,41,62,152,14,ES_AUTOHSCROLL | WS_DISABLED + CONTROL "",IDC_CHECK_USE_TAG,"Button", + BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,4,32,73,10 + LTEXT "[h",IDC_STATIC,4,16,18,8 + PUSHBUTTON "OK",IDOK,152,2,40,12 + PUSHBUTTON "LZ",IDCANCEL,152,30,40,12 + PUSHBUTTON "Kp",IDC_BUTTON_APPLY,152,14,40,11 +END + +IDD_DIALOG_VORBIS_EN DIALOG DISCARDABLE 0, 0, 197, 93 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ogg Vorbis Configurations" +FONT 9, "Times New Roman" +BEGIN + CONTROL "Default",IDC_CHECK_DEFAULT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,4,0,56,10 + COMBOBOX IDC_COMBO_MODE,25,13,123,56,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Title",IDC_STATIC,4,49,14,8 + EDITTEXT IDC_EDIT1,41,48,152,14,ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Artist",IDC_STATIC,4,63,18,8 + EDITTEXT IDC_EDIT2,41,76,152,14,ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Arbum",IDC_STATIC,4,77,27,8 + EDITTEXT IDC_EDIT3,41,62,152,14,ES_AUTOHSCROLL | WS_DISABLED + CONTROL "Store follows information",IDC_CHECK_USE_TAG,"Button", + BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,4,32,73,10 + LTEXT "Mode",IDC_STATIC,4,16,18,8 + PUSHBUTTON "OK",IDOK,152,2,40,12 + PUSHBUTTON "Cancel",IDCANCEL,152,30,40,12 + PUSHBUTTON "Apply",IDC_BUTTON_APPLY,152,14,40,11 +END + +IDD_DIALOG_GOGO DIALOG DISCARDABLE 0, 0, 346, 196 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "MP3(`) _CAO" +FONT 8, "lr oSVbN" +BEGIN + DEFPUSHBUTTON "OK",IDOK,173,179,50,14 + PUSHBUTTON "LZ",IDCANCEL,285,179,50,14 + COMBOBOX IDC_COMBO_OUTPUT_FORMAT,4,36,72,64,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "ftHg",IDC_CHECK_DEFAULT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,4,0,80,10 + CONTROL "R}hCIvV",IDC_CHECK_COMMANDLINE_OPTS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,12,86,10 + EDITTEXT IDC_EDIT_COMMANDLINE_OPTION,91,10,232,14,ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_MPEG1_AUDIO_BITRATE,6,72,76,76, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_MPEG2_AUDIO_BITRATE,87,72,76,76, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_VBR_BITRATE_LOW,6,119,76,64,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "VBR - ",IDC_STATIC,86,110,55,8 + COMBOBOX IDC_COMBO_VBR_BITRATE_HIGH,86,119,76,64,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "16KHz [pXtB^",IDC_CHECK_16KHZ_LOW_PASS_FILTER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,57,89,8 + CONTROL "GnXg[pXtB^", + IDC_CHECK_ENHANCED_LOW_PASS_FILTER,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,176,68,104,8 + EDITTEXT IDC_EDIT_LPF_PARA1,200,77,28,12 + EDITTEXT IDC_EDIT_LPF_PARA2,251,77,28,12 + LTEXT "para1",IDC_STATIC,183,79,16,8 + LTEXT "para2",IDC_STATIC,233,79,16,8 + COMBOBOX IDC_COMBO_ENCODE_MODE,172,36,84,60,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "S",IDC_CHECK_USEPSY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,176,90,42,10 + CONTROL "MMX",IDC_CHECK_CPUMMX,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,193,151,29,10 + CONTROL "SSE",IDC_CHECK_CPUSSE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,193,163,27,10 + CONTROL "3DNOW",IDC_CHECK_CPU3DNOW,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,227,151,39,10 + CONTROL "E3DNOW",IDC_CHECK_CPUE3DNOW,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,227,163,40,10 + COMBOBOX IDC_COMBO_EMPHASIS_TYPE,268,36,76,64,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_VBR,37,92,124,72,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + CONTROL "VBR",IDC_CHECK_VBR,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,6,94,29,10 + CONTROL "g",IDC_CHECK_OUTFREQ,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,88,28,35,8 + EDITTEXT IDC_EDIT_OUTFREQ,88,36,72,12 + CONTROL "J-Stereo Stereo/MS-Stereo ", + IDC_CHECK_MSTHRESHOLD,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,176,103,167,8 + EDITTEXT IDC_EDIT_MSTHRESHOLD_THRESHOLD,200,112,28,12 + EDITTEXT IDC_EDIT_MSTHRESHOLD_MSPOWER,252,112,28,12 + LTEXT "para1",IDC_STATIC,183,114,16,8 + LTEXT "para2",IDC_STATIC,233,114,16,8 + CONTROL "xt@C",IDC_CHECK_VERIFY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,176,127,45,10 + PUSHBUTTON "Kp",IDC_BUTTON_APPLY,229,179,50,14 + CONTROL "g",IDC_CHECK_USE_CPU_OPTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,176,140,68,8 + CONTROL "MPEG1Audio",IDC_CHECK_MPEG1AUDIOBITRATE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,64,80,8 + CONTROL "MPEG2Audio",IDC_CHECK_MPEG2AUDIOBITRATE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,87,64,80,8 + CONTROL "VBR - ",IDC_CHECK_VBR_BITRATE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,110,67,8 + CONTROL "otH[}bg",IDC_CHECK_OUTPUT_FORMAT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,4,28,64,8 + CONTROL "[h",IDC_CHECK_ENCODE_MODE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,172,28,34,8 + CONTROL "Gt@VX",IDC_CHECK_EMPHASIS_TYPE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,268,28,62,8 + GROUPBOX "rbg[g",IDC_STATIC,2,55,167,86 +END + +IDD_DIALOG_GOGO_EN DIALOG DISCARDABLE 0, 0, 346, 196 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "MP3 (gogo) Configuration" +FONT 8, "Times New Roman" +BEGIN + DEFPUSHBUTTON "OK",IDOK,173,179,50,14 + PUSHBUTTON "Cancel",IDCANCEL,285,179,50,14 + COMBOBOX IDC_COMBO_OUTPUT_FORMAT,4,36,72,64,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "Default",IDC_CHECK_DEFAULT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,4,0,80,10 + CONTROL "Command line option",IDC_CHECK_COMMANDLINE_OPTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,4,12,86,10 + EDITTEXT IDC_EDIT_COMMANDLINE_OPTION,91,10,232,14,ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_MPEG1_AUDIO_BITRATE,6,72,76,76, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_MPEG2_AUDIO_BITRATE,87,72,76,76, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_VBR_BITRATE_LOW,6,119,76,64,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "VBR - Maximum",IDC_STATIC,86,110,55,8 + COMBOBOX IDC_COMBO_VBR_BITRATE_HIGH,86,119,76,64,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "16KHz Lowpath filter",IDC_CHECK_16KHZ_LOW_PASS_FILTER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,57,89,8 + CONTROL "Enhanced Lowpath Filter", + IDC_CHECK_ENHANCED_LOW_PASS_FILTER,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,176,68,104,8 + EDITTEXT IDC_EDIT_LPF_PARA1,200,77,28,12 + EDITTEXT IDC_EDIT_LPF_PARA2,251,77,28,12 + LTEXT "para1",IDC_STATIC,183,79,16,8 + LTEXT "para2",IDC_STATIC,233,79,16,8 + COMBOBOX IDC_COMBO_ENCODE_MODE,172,36,84,60,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "Use Psy",IDC_CHECK_USEPSY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,176,90,42,10 + CONTROL "MMX",IDC_CHECK_CPUMMX,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,193,151,29,10 + CONTROL "SSE",IDC_CHECK_CPUSSE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,193,163,27,10 + CONTROL "3DNOW",IDC_CHECK_CPU3DNOW,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,227,151,39,10 + CONTROL "E3DNOW",IDC_CHECK_CPUE3DNOW,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,227,163,40,10 + COMBOBOX IDC_COMBO_EMPHASIS_TYPE,268,36,76,64,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_VBR,37,92,124,72,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + CONTROL "VBR",IDC_CHECK_VBR,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,6,94,29,10 + CONTROL "Output Frequency",IDC_CHECK_OUTFREQ,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,88,28,75,8 + EDITTEXT IDC_EDIT_OUTFREQ,88,36,72,12 + CONTROL "J-Stereo Stereo/MS-Stereo Control", + IDC_CHECK_MSTHRESHOLD,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,176,103,167,8 + EDITTEXT IDC_EDIT_MSTHRESHOLD_THRESHOLD,200,112,28,12 + EDITTEXT IDC_EDIT_MSTHRESHOLD_MSPOWER,252,112,28,12 + LTEXT "para1",IDC_STATIC,183,114,16,8 + LTEXT "para2",IDC_STATIC,233,114,16,8 + CONTROL "Verify",IDC_CHECK_VERIFY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,176,127,34,10 + PUSHBUTTON "Apply",IDC_BUTTON_APPLY,229,179,50,14 + CONTROL "Use follow options",IDC_CHECK_USE_CPU_OPTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,176,140,68,8 + CONTROL "MPEG1Audio",IDC_CHECK_MPEG1AUDIOBITRATE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,64,80,8 + CONTROL "MPEG2Audio",IDC_CHECK_MPEG2AUDIOBITRATE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,87,64,80,8 + CONTROL "VBR - Minimum",IDC_CHECK_VBR_BITRATE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,6,110,67,8 + CONTROL "Output format",IDC_CHECK_OUTPUT_FORMAT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,4,28,64,8 + CONTROL "Encode Mode",IDC_CHECK_ENCODE_MODE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,172,28,63,8 + CONTROL "Emphasis type",IDC_CHECK_EMPHASIS_TYPE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,268,28,62,8 + GROUPBOX "Bitrate",IDC_STATIC,2,55,167,86 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -529,7 +1076,7 @@ // Menu // -IDM_MENU_MAIN MENU DISCARDABLE +IDM_MENU_MAIN_EN MENU DISCARDABLE BEGIN POPUP "File(&F)" BEGIN @@ -551,24 +1098,64 @@ POPUP "Window(&W)" BEGIN MENUITEM "play List(&L)", IDM_MWPLAYLIST - MENUITEM "Tracer(&T)", IDM_MWTRACER + MENUITEM "Tracer(&T)", IDM_MWTRACER, GRAYED MENUITEM "Document(&D)", IDM_MWDOCUMENT - MENUITEM "Wrd tracer(&W)", IDM_MWWRDTRACER - MENUITEM "sound Spectogram(&S)", IDM_MWSOUNDSPEC + MENUITEM "Wrd tracer(&W)", IDM_MWWRDTRACER, GRAYED + MENUITEM "sound Spectogram(&S)", IDM_MWSOUNDSPEC, GRAYED MENUITEM "Console(&C)", IDM_MWCONSOLE MENUITEM SEPARATOR MENUITEM "deBug(&B)", IDM_MWDEBUG END POPUP "Help(&H)" BEGIN - MENUITEM "Topic(&T)", IDM_MHTOPIC - MENUITEM "Help(&H)", IDM_MHHELP + MENUITEM "Topic(&T)", IDM_MHTOPIC, GRAYED + MENUITEM "Help(&H)", IDM_MHHELP, GRAYED MENUITEM SEPARATOR MENUITEM "TiMidity(&T)", IDM_MHTIMIDITY MENUITEM "Version(&V)", IDM_MHVERSION END END +IDM_MENU_MAIN MENU DISCARDABLE +BEGIN + POPUP "t@C(&F)" + BEGIN + MENUITEM "t@CJ(&F)", IDM_MFOPENFILE + MENUITEM "tH_J(&D)", IDM_MFOPENDIR + MENUITEM SEPARATOR + MENUITEM "vCXgJ(&P)", IDM_MFLOADPLAYLIST + MENUITEM "vCXg(&S)", IDM_MFSAVEPLAYLISTAS + MENUITEM SEPARATOR + MENUITEM "I(&X)", IDM_MFEXIT + END + POPUP "(&C)" + BEGIN + MENUITEM "(&P)", IDM_SETTING + MENUITEM SEPARATOR + MENUITEM "(&L)", IDM_MCLOADINIFILE + MENUITEM "(&S)", IDM_MCSAVEINIFILE + END + POPUP "EBhE(&W)" + BEGIN + MENUITEM "vCXg(&L)", IDM_MWPLAYLIST + MENUITEM "g[T(&T)", IDM_MWTRACER, GRAYED + MENUITEM "hLg(&D)", IDM_MWDOCUMENT + MENUITEM "WRD(&W)", IDM_MWWRDTRACER, GRAYED + MENUITEM "Sound Spectogram(&S)", IDM_MWSOUNDSPEC, GRAYED + MENUITEM "R\[(&C)", IDM_MWCONSOLE + MENUITEM SEPARATOR + MENUITEM "fobO(&B)", IDM_MWDEBUG + END + POPUP "wv(&H)" + BEGIN + MENUITEM "gsbN(&T)", IDM_MHTOPIC, GRAYED + MENUITEM "wv(&H)", IDM_MHHELP, GRAYED + MENUITEM SEPARATOR + MENUITEM "TiMidity(&T)", IDM_MHTIMIDITY + MENUITEM "o[W(&V)", IDM_MHVERSION + END +END + ///////////////////////////////////////////////////////////////////////////// // @@ -641,6 +1228,30 @@ BOTTOMMARGIN, 179 END + IDD_PREF_TIMIDITY1, DIALOG + BEGIN + RIGHTMARGIN, 145 + BOTTOMMARGIN, 148 + END + + IDD_PREF_TIMIDITY2, DIALOG + BEGIN + RIGHTMARGIN, 209 + BOTTOMMARGIN, 122 + END + + IDD_PREF_TIMIDITY3, DIALOG + BEGIN + RIGHTMARGIN, 190 + BOTTOMMARGIN, 138 + END + + IDD_PREF_TIMIDITY4, DIALOG + BEGIN + RIGHTMARGIN, 168 + BOTTOMMARGIN, 125 + END + IDD_DIALOG_SEARCHBOX, DIALOG BEGIN LEFTMARGIN, 7 @@ -648,8 +1259,70 @@ TOPMARGIN, 7 BOTTOMMARGIN, 47 END + + IDD_DIALOG_VORBIS, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 190 + TOPMARGIN, 7 + BOTTOMMARGIN, 86 + END + + IDD_DIALOG_GOGO, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 339 + TOPMARGIN, 7 + BOTTOMMARGIN, 189 + END END #endif // APSTUDIO_INVOKED + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,11,0,0 + PRODUCTVERSION 2,11,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004e4" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "\0" + VALUE "FileDescription", "timw32g\0" + VALUE "FileVersion", "2, 11, 0, 0\0" + VALUE "InternalName", "timw32g\0" + VALUE "LegalCopyright", "Copyright (C) 1999,2001 Masanao Izumo \r\nCopyright (C) 1995 Tuukka Toivonen \0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "timw32g.exe\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "TiMidity++ Win32GUI Version\0" + VALUE "ProductVersion", "2, 11, 0, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1252 + END +END + +#endif // !_MAC ///////////////////////////////////////////////////////////////////////////// diff -ruN TiMidity++-2.10.4/interface/w32g_subwin.c TiMidity++-2.11.0/interface/w32g_subwin.c --- TiMidity++-2.10.4/interface/w32g_subwin.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.0/interface/w32g_subwin.c Thu Dec 27 19:39:25 2001 @@ -88,6 +88,8 @@ extern void PutsEditCtlWnd(HWND hwnd, char *str); extern void ClearEditCtlWnd(HWND hwnd); +extern char *nkf_convert(char *si,char *so,int maxsize,char *in_mode,char *out_mode); + // *************************************************************************** // // Console Window @@ -343,6 +345,7 @@ ListWndInfo.hPopupMenu = CreatePopupMenu(); AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDM_LISTWND_PLAY,"Play"); + AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDC_BUTTON_DOC,"Doc"); AppendMenu(ListWndInfo.hPopupMenu,MF_SEPARATOR,0,0); AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDM_LISTWND_REMOVE,"Remove"); AppendMenu(ListWndInfo.hPopupMenu,MF_SEPARATOR,0,0); @@ -360,6 +363,7 @@ void SetNumListWnd(int cursel, int nfiles); +#define WM_CHOOSEFONT_DIAG (WM_APP+100) static BOOL CALLBACK ListWndProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam) { @@ -376,18 +380,33 @@ case WM_SETCURSOR: switch(HIWORD(lParam)){ case WM_RBUTTONDOWN: - { + if(LOWORD(lParam)!=HTCAPTION){ // ^Cgo[ POINT point; + int res; GetCursorPos(&point); - TrackPopupMenu(ListWndInfo.hPopupMenu,TPM_TOPALIGN|TPM_LEFTALIGN, + res = TrackPopupMenu(ListWndInfo.hPopupMenu,TPM_TOPALIGN|TPM_LEFTALIGN, point.x,point.y,0,hwnd,NULL); + return TRUE; } break; default: break; } break; - case WM_COMMAND: + case WM_CHOOSEFONT_DIAG: + { + char fontName[64]; + int fontHeight; + int fontWidth; + strcpy(fontName,ListWndInfo.fontName); + fontHeight = ListWndInfo.fontHeight; + fontWidth = ListWndInfo.fontWidth; + if(DlgChooseFont(hwnd,fontName,&fontHeight,&fontWidth)==0){ + ListWndSetFontListBox(fontName,fontWidth,fontHeight); + } + } + break; + case WM_COMMAND: switch (HIWORD(wParam)) { case IDCLOSE: ShowWindow(hwnd, SW_HIDE); @@ -444,15 +463,7 @@ return FALSE; case IDM_LISTWND_CHOOSEFONT: { - char fontName[64]; - int fontHeight; - int fontWidth; - strcpy(fontName,ListWndInfo.fontName); - fontHeight = ListWndInfo.fontHeight; - fontWidth = ListWndInfo.fontWidth; - if(DlgChooseFont(hwnd,fontName,&fontHeight,&fontWidth)==0){ - ListWndSetFontListBox(fontName,fontWidth,fontHeight); - } + SendMessage(hwnd,WM_CHOOSEFONT_DIAG,0,0); } return FALSE; default: @@ -818,6 +829,7 @@ #define IDM_DOCWND_CHOOSEFONT 4232 int DocWndIndependent = 0; /* Independent document viewer mode.(hLgr[[h) */ +int DocWndAutoPopup = 0; DOCWNDINFO DocWndInfo; static BOOL CALLBACK DocWndProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam); @@ -1507,12 +1519,13 @@ void w32g_open_doc(int close_if_no_doc) { - if(close_if_no_doc && DocWndInfo.DocFileMax <= 0) + if(close_if_no_doc==1 && DocWndInfo.DocFileMax <= 0) ShowSubWindow(hDocWnd, 0); else { DocWndReadDoc(1); - ShowSubWindow(hDocWnd, 1); + if(close_if_no_doc!=2) + ShowSubWindow(hDocWnd, 1); } } diff -ruN TiMidity++-2.10.4/interface/w32g_subwin.h TiMidity++-2.11.0/interface/w32g_subwin.h --- TiMidity++-2.10.4/interface/w32g_subwin.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.0/interface/w32g_subwin.h Thu Dec 27 19:39:25 2001 @@ -35,6 +35,7 @@ // Doc Window extern int DocWndIndependent; +extern int DocWndAutoPopup; void InitDocWnd(HWND hParentWnd); void DocWndInfoReset(void); void DocWndAddDocFile(char *filename); diff -ruN TiMidity++-2.10.4/interface/w32g_ut2.c TiMidity++-2.11.0/interface/w32g_ut2.c --- TiMidity++-2.10.4/interface/w32g_ut2.c Tue Aug 8 12:37:41 2000 +++ TiMidity++-2.11.0/interface/w32g_ut2.c Thu Dec 27 19:39:25 2001 @@ -519,12 +519,15 @@ // TiMidity int ExistOldTiMidity(void) { - HANDLE hMutex = OpenMutex(0,TRUE,TIMIDTY_MUTEX_NAME); - if(hMutex==NULL){ - return FALSE; - } + HANDLE hMutex = CreateMutex(NULL,TRUE,TIMIDTY_MUTEX_NAME); + if(GetLastError()==ERROR_ALREADY_EXISTS){ + if(hMutex!=NULL) CloseHandle(hMutex); return TRUE; + } + if(hMutex!=NULL) + CloseHandle(hMutex); + return FALSE; } // B TiMidity @@ -707,4 +710,4 @@ } else { return FALSE; } -} \ No newline at end of file +} diff -ruN TiMidity++-2.10.4/interface/w32g_utl.c TiMidity++-2.11.0/interface/w32g_utl.c --- TiMidity++-2.10.4/interface/w32g_utl.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.0/interface/w32g_utl.c Thu Dec 27 19:39:25 2001 @@ -1,1066 +1,1149 @@ -/* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - w32g_utl.c: written by Daisuke Aoki - Masanao Izumo -*/ - - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#include -#include -#ifndef NO_STRING_H -#include -#else -#include -#endif -#include - -#include "timidity.h" -#include "common.h" -#include "instrum.h" -#include "playmidi.h" -#include "readmidi.h" -#include "output.h" -#include "controls.h" +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + w32g_utl.c: written by Daisuke Aoki + Masanao Izumo +*/ + + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ + +#include +#include +#ifndef NO_STRING_H +#include +#else +#include +#endif +#include + +#include "timidity.h" +#include "common.h" +#include "instrum.h" +#include "playmidi.h" +#include "readmidi.h" +#include "output.h" +#include "controls.h" #include "recache.h" -#ifdef SUPPORT_SOUNDSPEC -#include "soundspec.h" -#endif /* SUPPORT_SOUNDSPEC */ -#include "wrd.h" -#include "w32g.h" -#include "w32g_utl.h" -#include -#include "strtab.h" -#include "url.h" - -extern int opt_default_mid; -extern int effect_lr_mode; -extern int effect_lr_delay_msec; -extern char def_instr_name[]; -extern int opt_control_ratio; -extern char *opt_aq_max_buff; -extern char *opt_aq_fill_buff; -extern int opt_evil_mode; -extern int opt_buffer_fragments; -extern int32 opt_output_rate; -extern int PlayerLanguage; -extern volatile int data_block_bits; -extern volatile int data_block_num; -extern int DocWndIndependent; -extern int SeachDirRecursive; -extern int IniFileAutoSave; -extern int SecondMode; - -//*****************************************************************************/ -// ini - -// INI file -CHAR *INI_INVALID = "INVALID PARAMETER"; -CHAR *INI_SEC_PLAYER = "PLAYER"; -CHAR *INI_SEC_TIMIDITY = "TIMIDITY"; -#define INI_MAXLEN 1024 - -int -IniGetKeyInt32(char *section, char *key,int32 *n) -{ - CHAR buffer[INI_MAXLEN]; - GetPrivateProfileString - (section,key,INI_INVALID,buffer,INI_MAXLEN-1,IniFile); - if(strcasecmp(buffer,INI_INVALID)){ - *n =atol(buffer); - return 0; - } else - return 1; -} - -int -IniGetKeyInt32Array(char *section, char *key, int32 *n, int arraysize) -{ - int i; - int ret = 0; - CHAR buffer[INI_MAXLEN]; - char keybuffer[INI_MAXLEN]; - for(i=0;i max) v = max; - return v; -} - -void -ApplySettingPlayer(SETTING_PLAYER *sp) -{ - InitMinimizeFlag = SetFlag(sp->InitMinimizeFlag); - DebugWndStartFlag = SetFlag(sp->DebugWndStartFlag); - ConsoleWndStartFlag = SetFlag(sp->ConsoleWndStartFlag); - ListWndStartFlag = SetFlag(sp->ListWndStartFlag); - TracerWndStartFlag = SetFlag(sp->TracerWndStartFlag); - DocWndStartFlag = SetFlag(sp->DocWndStartFlag); - WrdWndStartFlag = SetFlag(sp->WrdWndStartFlag); - DebugWndFlag = SetFlag(sp->DebugWndFlag); - ConsoleWndFlag = SetFlag(sp->ConsoleWndFlag); - ListWndFlag = SetFlag(sp->ListWndFlag); - TracerWndFlag = SetFlag(sp->TracerWndFlag); - DocWndFlag = SetFlag(sp->DocWndFlag); - WrdWndFlag = SetFlag(sp->WrdWndFlag); - SoundSpecWndFlag = SetFlag(sp->SoundSpecWndFlag); - SubWindowMax = SetValue(sp->SubWindowMax,1,10); - strncpy(ConfigFile,sp->ConfigFile,MAXPATH + 31); - ConfigFile[MAXPATH + 31] = '\0'; - strncpy(PlaylistFile,sp->PlaylistFile,MAXPATH + 31); - PlaylistFile[MAXPATH + 31] = '\0'; - strncpy(PlaylistHistoryFile,sp->PlaylistHistoryFile,MAXPATH + 31); - PlaylistHistoryFile[MAXPATH + 31] = '\0'; - strncpy(MidiFileOpenDir,sp->MidiFileOpenDir,MAXPATH + 31); - MidiFileOpenDir[MAXPATH + 31] = '\0'; - strncpy(ConfigFileOpenDir,sp->ConfigFileOpenDir,MAXPATH + 31); - ConfigFileOpenDir[MAXPATH + 31] = '\0'; - strncpy(PlaylistFileOpenDir,sp->PlaylistFileOpenDir,MAXPATH + 31); - PlaylistFileOpenDir[MAXPATH + 31] = '\0'; - PlayerThreadPriority = sp->PlayerThreadPriority; - GUIThreadPriority = sp->GUIThreadPriority; - TraceGraphicFlag = SetFlag(sp->TraceGraphicFlag); - // fonts ... - SystemFontSize = sp->SystemFontSize; - PlayerFontSize = sp->PlayerFontSize; - WrdFontSize = sp->WrdFontSize; - DocFontSize = sp->DocFontSize; - ListFontSize = sp->ListFontSize; - TracerFontSize = sp->TracerFontSize; - strncpy(SystemFont,sp->SystemFont,255); - SystemFont[255] = '\0'; - strncpy(PlayerFont,sp->PlayerFont,255); - PlayerFont[255] = '\0'; - strncpy(WrdFont,sp->WrdFont,255); - WrdFont[255] = '\0'; - strncpy(DocFont,sp->DocFont,255); - DocFont[255] = '\0'; - strncpy(ListFont,sp->ListFont,255); - ListFont[255] = '\0'; - strncpy(TracerFont,sp->TracerFont,255); - TracerFont[255] = '\0'; - // Apply font functions ... - - PlayerLanguage = sp->PlayerLanguage; - DocWndIndependent = sp->DocWndIndependent; - SeachDirRecursive = sp->SeachDirRecursive; - IniFileAutoSave = sp->IniFileAutoSave; - SecondMode = sp->SecondMode; -} - -void -SaveSettingPlayer(SETTING_PLAYER *sp) -{ - sp->InitMinimizeFlag = SetFlag(InitMinimizeFlag); - sp->DebugWndStartFlag = SetFlag(DebugWndStartFlag); - sp->ConsoleWndStartFlag = SetFlag(ConsoleWndStartFlag); - sp->ListWndStartFlag = SetFlag(ListWndStartFlag); - sp->TracerWndStartFlag = SetFlag(TracerWndStartFlag); - sp->DocWndStartFlag = SetFlag(DocWndStartFlag); - sp->WrdWndStartFlag = SetFlag(WrdWndStartFlag); - sp->DebugWndFlag = SetFlag(DebugWndFlag); - sp->ConsoleWndFlag = SetFlag(ConsoleWndFlag); - sp->ListWndFlag = SetFlag(ListWndFlag); - sp->TracerWndFlag = SetFlag(TracerWndFlag); - sp->DocWndFlag = SetFlag(DocWndFlag); - sp->WrdWndFlag = SetFlag(WrdWndFlag); - sp->SoundSpecWndFlag = SetFlag(SoundSpecWndFlag); - sp->SubWindowMax = SetValue(SubWindowMax,1,10); - strncpy(sp->ConfigFile,ConfigFile,MAXPATH + 31); - (sp->ConfigFile)[MAXPATH + 31] = '\0'; - strncpy(sp->PlaylistFile,PlaylistFile,MAXPATH + 31); - (sp->PlaylistFile)[MAXPATH + 31] = '\0'; - strncpy(sp->PlaylistHistoryFile,PlaylistHistoryFile,MAXPATH + 31); - (sp->PlaylistHistoryFile)[MAXPATH + 31] = '\0'; - strncpy(sp->MidiFileOpenDir,MidiFileOpenDir,MAXPATH + 31); - (sp->MidiFileOpenDir)[MAXPATH + 31] = '\0'; - strncpy(sp->ConfigFileOpenDir,ConfigFileOpenDir,MAXPATH + 31); - (sp->ConfigFileOpenDir)[MAXPATH + 31] = '\0'; - strncpy(sp->PlaylistFileOpenDir,PlaylistFileOpenDir,MAXPATH + 31); - (sp->PlaylistFileOpenDir)[MAXPATH + 31] = '\0'; - sp->PlayerThreadPriority = PlayerThreadPriority; - sp->GUIThreadPriority = GUIThreadPriority; - sp->WrdGraphicFlag = SetFlag(WrdGraphicFlag); - sp->TraceGraphicFlag = SetFlag(TraceGraphicFlag); - // fonts ... - sp->SystemFontSize = SystemFontSize; - sp->PlayerFontSize = PlayerFontSize; - sp->WrdFontSize = WrdFontSize; - sp->DocFontSize = DocFontSize; - sp->ListFontSize = ListFontSize; - sp->TracerFontSize = TracerFontSize; - strncpy(sp->SystemFont,SystemFont,255); - sp->SystemFont[255] = '\0'; - strncpy(sp->PlayerFont,PlayerFont,255); - sp->PlayerFont[255] = '\0'; - strncpy(sp->WrdFont,WrdFont,255); - sp->WrdFont[255] = '\0'; - strncpy(sp->DocFont,DocFont,255); - DocFont[255] = '\0'; - strncpy(sp->ListFont,ListFont,255); - sp->ListFont[255] = '\0'; - strncpy(sp->TracerFont,TracerFont,255); - sp->TracerFont[255] = '\0'; - sp->PlayerLanguage = PlayerLanguage; - sp->DocWndIndependent = DocWndIndependent; - sp->SeachDirRecursive = SeachDirRecursive; - sp->IniFileAutoSave = IniFileAutoSave; - sp->SecondMode = SecondMode; -} - -extern int set_play_mode(char *cp); -extern int set_tim_opt(int c, char *optarg); -extern int set_ctl(char *cp); -extern int set_wrd(char *w); - -#if defined(__W32__) && defined(SMFCONV) -extern int opt_rcpcv_dll; -#endif /* SMFCONV */ -extern char *wrdt_open_opts; - -static int is_device_output_ID(int id) -{ - return id == 'd' || id == 'n' || id == 'e'; -} - -void -ApplySettingTiMidity(SETTING_TIMIDITY *st) -{ - int i; - char buffer[INI_MAXLEN]; - - /* Player must be stopped. - * DANGER to apply settings while playing. - */ - amplification = SetValue(st->amplification, 0, MAX_AMPLIFICATION); - antialiasing_allowed = SetFlag(st->antialiasing_allowed); - if(st->buffer_fragments == -1) - opt_buffer_fragments = -1; - else - opt_buffer_fragments = SetValue(st->buffer_fragments, 3, 1000); - default_drumchannels = st->default_drumchannels; - default_drumchannel_mask = st->default_drumchannel_mask; - opt_modulation_wheel = SetFlag(st->opt_modulation_wheel); - opt_portamento = SetFlag(st->opt_portamento); - opt_nrpn_vibrato = SetFlag(st->opt_nrpn_vibrato); - opt_channel_pressure = SetFlag(st->opt_channel_pressure); - opt_trace_text_meta_event = SetFlag(st->opt_trace_text_meta_event); - opt_overlap_voice_allow = SetFlag(st->opt_overlap_voice_allow); - opt_default_mid = st->opt_default_mid; - default_tonebank = st->default_tonebank; - special_tonebank = st->special_tonebank; - effect_lr_mode = st->effect_lr_mode; - effect_lr_delay_msec = st->effect_lr_delay_msec; - opt_reverb_control = st->opt_reverb_control; +#include "tables.h" +#ifdef SUPPORT_SOUNDSPEC +#include "soundspec.h" +#endif /* SUPPORT_SOUNDSPEC */ +#include "wrd.h" +#include "w32g.h" +#include "w32g_utl.h" +#include +#include "strtab.h" +#include "url.h" + +extern int opt_default_mid; +extern int effect_lr_mode; +extern int effect_lr_delay_msec; +extern char def_instr_name[]; +extern int opt_control_ratio; +extern char *opt_aq_max_buff; +extern char *opt_aq_fill_buff; +extern int opt_evil_mode; +extern int opt_buffer_fragments; +extern int32 opt_output_rate; +extern int PlayerLanguage; +extern volatile int data_block_bits; +extern volatile int data_block_num; +extern int DocWndIndependent; +extern int DocWndAutoPopup; +extern int SeachDirRecursive; +extern int IniFileAutoSave; +extern int SecondMode; + +//*****************************************************************************/ +// ini + +// INI file +CHAR *INI_INVALID = "INVALID PARAMETER"; +CHAR *INI_SEC_PLAYER = "PLAYER"; +CHAR *INI_SEC_TIMIDITY = "TIMIDITY"; +#define INI_MAXLEN 1024 + +int +IniGetKeyInt32(char *section, char *key,int32 *n) +{ + CHAR buffer[INI_MAXLEN]; + GetPrivateProfileString + (section,key,INI_INVALID,buffer,INI_MAXLEN-1,IniFile); + if(strcasecmp(buffer,INI_INVALID)){ + *n =atol(buffer); + return 0; + } else + return 1; +} + +int +IniGetKeyInt32Array(char *section, char *key, int32 *n, int arraysize) +{ + int i; + int ret = 0; + CHAR buffer[INI_MAXLEN]; + char keybuffer[INI_MAXLEN]; + for(i=0;i max) v = max; + return v; +} + +void +ApplySettingPlayer(SETTING_PLAYER *sp) +{ + InitMinimizeFlag = SetFlag(sp->InitMinimizeFlag); + DebugWndStartFlag = SetFlag(sp->DebugWndStartFlag); + ConsoleWndStartFlag = SetFlag(sp->ConsoleWndStartFlag); + ListWndStartFlag = SetFlag(sp->ListWndStartFlag); + TracerWndStartFlag = SetFlag(sp->TracerWndStartFlag); + DocWndStartFlag = SetFlag(sp->DocWndStartFlag); + WrdWndStartFlag = SetFlag(sp->WrdWndStartFlag); + DebugWndFlag = SetFlag(sp->DebugWndFlag); + ConsoleWndFlag = SetFlag(sp->ConsoleWndFlag); + ListWndFlag = SetFlag(sp->ListWndFlag); + TracerWndFlag = SetFlag(sp->TracerWndFlag); + DocWndFlag = SetFlag(sp->DocWndFlag); + WrdWndFlag = SetFlag(sp->WrdWndFlag); + SoundSpecWndFlag = SetFlag(sp->SoundSpecWndFlag); + SubWindowMax = SetValue(sp->SubWindowMax,1,10); + strncpy(ConfigFile,sp->ConfigFile,MAXPATH + 31); + ConfigFile[MAXPATH + 31] = '\0'; + strncpy(PlaylistFile,sp->PlaylistFile,MAXPATH + 31); + PlaylistFile[MAXPATH + 31] = '\0'; + strncpy(PlaylistHistoryFile,sp->PlaylistHistoryFile,MAXPATH + 31); + PlaylistHistoryFile[MAXPATH + 31] = '\0'; + strncpy(MidiFileOpenDir,sp->MidiFileOpenDir,MAXPATH + 31); + MidiFileOpenDir[MAXPATH + 31] = '\0'; + strncpy(ConfigFileOpenDir,sp->ConfigFileOpenDir,MAXPATH + 31); + ConfigFileOpenDir[MAXPATH + 31] = '\0'; + strncpy(PlaylistFileOpenDir,sp->PlaylistFileOpenDir,MAXPATH + 31); + PlaylistFileOpenDir[MAXPATH + 31] = '\0'; + PlayerThreadPriority = sp->PlayerThreadPriority; + GUIThreadPriority = sp->GUIThreadPriority; + TraceGraphicFlag = SetFlag(sp->TraceGraphicFlag); + // fonts ... + SystemFontSize = sp->SystemFontSize; + PlayerFontSize = sp->PlayerFontSize; + WrdFontSize = sp->WrdFontSize; + DocFontSize = sp->DocFontSize; + ListFontSize = sp->ListFontSize; + TracerFontSize = sp->TracerFontSize; + strncpy(SystemFont,sp->SystemFont,255); + SystemFont[255] = '\0'; + strncpy(PlayerFont,sp->PlayerFont,255); + PlayerFont[255] = '\0'; + strncpy(WrdFont,sp->WrdFont,255); + WrdFont[255] = '\0'; + strncpy(DocFont,sp->DocFont,255); + DocFont[255] = '\0'; + strncpy(ListFont,sp->ListFont,255); + ListFont[255] = '\0'; + strncpy(TracerFont,sp->TracerFont,255); + TracerFont[255] = '\0'; + // Apply font functions ... + + DocMaxSize = sp->DocMaxSize; + strncpy(DocFileExt,sp->DocFileExt,255); + DocFileExt[255] = '\0'; + PlayerLanguage = sp->PlayerLanguage; + DocWndIndependent = sp->DocWndIndependent; + DocWndAutoPopup = sp->DocWndAutoPopup; + SeachDirRecursive = sp->SeachDirRecursive; + IniFileAutoSave = sp->IniFileAutoSave; + SecondMode = sp->SecondMode; +} + +void +SaveSettingPlayer(SETTING_PLAYER *sp) +{ + sp->InitMinimizeFlag = SetFlag(InitMinimizeFlag); + sp->DebugWndStartFlag = SetFlag(DebugWndStartFlag); + sp->ConsoleWndStartFlag = SetFlag(ConsoleWndStartFlag); + sp->ListWndStartFlag = SetFlag(ListWndStartFlag); + sp->TracerWndStartFlag = SetFlag(TracerWndStartFlag); + sp->DocWndStartFlag = SetFlag(DocWndStartFlag); + sp->WrdWndStartFlag = SetFlag(WrdWndStartFlag); + sp->DebugWndFlag = SetFlag(DebugWndFlag); + sp->ConsoleWndFlag = SetFlag(ConsoleWndFlag); + sp->ListWndFlag = SetFlag(ListWndFlag); + sp->TracerWndFlag = SetFlag(TracerWndFlag); + sp->DocWndFlag = SetFlag(DocWndFlag); + sp->WrdWndFlag = SetFlag(WrdWndFlag); + sp->SoundSpecWndFlag = SetFlag(SoundSpecWndFlag); + sp->SubWindowMax = SetValue(SubWindowMax,1,10); + strncpy(sp->ConfigFile,ConfigFile,MAXPATH + 31); + (sp->ConfigFile)[MAXPATH + 31] = '\0'; + strncpy(sp->PlaylistFile,PlaylistFile,MAXPATH + 31); + (sp->PlaylistFile)[MAXPATH + 31] = '\0'; + strncpy(sp->PlaylistHistoryFile,PlaylistHistoryFile,MAXPATH + 31); + (sp->PlaylistHistoryFile)[MAXPATH + 31] = '\0'; + strncpy(sp->MidiFileOpenDir,MidiFileOpenDir,MAXPATH + 31); + (sp->MidiFileOpenDir)[MAXPATH + 31] = '\0'; + strncpy(sp->ConfigFileOpenDir,ConfigFileOpenDir,MAXPATH + 31); + (sp->ConfigFileOpenDir)[MAXPATH + 31] = '\0'; + strncpy(sp->PlaylistFileOpenDir,PlaylistFileOpenDir,MAXPATH + 31); + (sp->PlaylistFileOpenDir)[MAXPATH + 31] = '\0'; + sp->PlayerThreadPriority = PlayerThreadPriority; + sp->GUIThreadPriority = GUIThreadPriority; + sp->WrdGraphicFlag = SetFlag(WrdGraphicFlag); + sp->TraceGraphicFlag = SetFlag(TraceGraphicFlag); + // fonts ... + sp->SystemFontSize = SystemFontSize; + sp->PlayerFontSize = PlayerFontSize; + sp->WrdFontSize = WrdFontSize; + sp->DocFontSize = DocFontSize; + sp->ListFontSize = ListFontSize; + sp->TracerFontSize = TracerFontSize; + strncpy(sp->SystemFont,SystemFont,255); + sp->SystemFont[255] = '\0'; + strncpy(sp->PlayerFont,PlayerFont,255); + sp->PlayerFont[255] = '\0'; + strncpy(sp->WrdFont,WrdFont,255); + sp->WrdFont[255] = '\0'; + strncpy(sp->DocFont,DocFont,255); + DocFont[255] = '\0'; + strncpy(sp->ListFont,ListFont,255); + sp->ListFont[255] = '\0'; + strncpy(sp->TracerFont,TracerFont,255); + sp->TracerFont[255] = '\0'; + sp->DocMaxSize = DocMaxSize; + strncpy(sp->DocFileExt,DocFileExt,255); + sp->DocFileExt[255] = '\0'; + sp->PlayerLanguage = PlayerLanguage; + sp->DocWndIndependent = DocWndIndependent; + sp->DocWndAutoPopup = DocWndAutoPopup; + sp->SeachDirRecursive = SeachDirRecursive; + sp->IniFileAutoSave = IniFileAutoSave; + sp->SecondMode = SecondMode; +} + +extern int set_play_mode(char *cp); +extern int set_tim_opt(int c, char *optarg); +extern int set_ctl(char *cp); +extern int set_wrd(char *w); + +#if defined(__W32__) && defined(SMFCONV) +extern int opt_rcpcv_dll; +#endif /* SMFCONV */ +extern char *wrdt_open_opts; + +static int is_device_output_ID(int id) +{ + return id == 'd' || id == 'n' || id == 'e'; +} + +void +ApplySettingTiMidity(SETTING_TIMIDITY *st) +{ + int i; + char buffer[INI_MAXLEN]; + + /* Player must be stopped. + * DANGER to apply settings while playing. + */ + amplification = SetValue(st->amplification, 0, MAX_AMPLIFICATION); + antialiasing_allowed = SetFlag(st->antialiasing_allowed); + if(st->buffer_fragments == -1) + opt_buffer_fragments = -1; + else + opt_buffer_fragments = SetValue(st->buffer_fragments, 3, 1000); + default_drumchannels = st->default_drumchannels; + default_drumchannel_mask = st->default_drumchannel_mask; + opt_modulation_wheel = SetFlag(st->opt_modulation_wheel); + opt_portamento = SetFlag(st->opt_portamento); + opt_nrpn_vibrato = SetFlag(st->opt_nrpn_vibrato); + opt_channel_pressure = SetFlag(st->opt_channel_pressure); + opt_trace_text_meta_event = SetFlag(st->opt_trace_text_meta_event); + opt_overlap_voice_allow = SetFlag(st->opt_overlap_voice_allow); + opt_default_mid = st->opt_default_mid; + default_tonebank = st->default_tonebank; + special_tonebank = st->special_tonebank; + effect_lr_mode = st->effect_lr_mode; + effect_lr_delay_msec = st->effect_lr_delay_msec; + opt_reverb_control = st->opt_reverb_control; opt_chorus_control = st->opt_chorus_control; - noise_sharp_type = st->noise_sharp_type; + opt_surround_chorus = st->opt_surround_chorus; + noise_sharp_type = st->noise_sharp_type; opt_evil_mode = st->opt_evil_mode; - adjust_panning_immediately = SetFlag(st->adjust_panning_immediately); - fast_decay = SetFlag(st->fast_decay); -#ifdef SUPPORT_SOUNDSPEC - view_soundspec_flag = SetFlag(st->view_soundspec_flag); - spectrigram_update_sec = st->spectrigram_update_sec; -#endif - for(i = 0; i < MAX_CHANNELS; i++) - default_program[i] = st->default_program[i]; - set_ctl(st->opt_ctl); - opt_realtime_playing = SetFlag(st->opt_realtime_playing); - reduce_voice_threshold = st->reduce_voice_threshold; - set_play_mode(st->opt_playmode); - strncpy(OutputName,st->OutputName,MAXPATH); - if(OutputName[0] && !is_device_output_ID(play_mode->id_character)) - play_mode->name = OutputName; - opt_output_rate = st->output_rate; - if(st->output_rate) - play_mode->rate = SetValue(st->output_rate, - MIN_OUTPUT_RATE, MAX_OUTPUT_RATE); - else if(play_mode->rate == 0) - play_mode->rate = DEFAULT_RATE; - voices = SetValue(st->voices, 1, MAX_VOICES); - auto_reduce_polyphony = st->auto_reduce_polyphony; - quietchannels = st->quietchannels; - if(opt_aq_max_buff) - free(opt_aq_max_buff); - if(opt_aq_fill_buff) - free(opt_aq_fill_buff); - strcpy(buffer, st->opt_qsize); - opt_aq_max_buff = buffer; - opt_aq_fill_buff = strchr(opt_aq_max_buff, '/'); - *opt_aq_fill_buff++ = '\0'; - opt_aq_max_buff = safe_strdup(opt_aq_max_buff); - opt_aq_fill_buff = safe_strdup(opt_aq_fill_buff); - modify_release = SetValue(st->modify_release, 0, MAX_MREL); - allocate_cache_size = st->allocate_cache_size; - if(output_text_code) - free(output_text_code); - output_text_code = safe_strdup(st->output_text_code); - free_instruments_afterwards = st->free_instruments_afterwards; - set_wrd(st->opt_wrd); -#if defined(__W32__) && defined(SMFCONV) - opt_rcpcv_dll = st->opt_rcpcv_dll; -#endif /* SMFCONV */ - - opt_control_ratio = st->control_ratio; - if(opt_control_ratio) - control_ratio = SetValue(opt_control_ratio, 1, MAX_CONTROL_RATIO); - else - { - control_ratio = play_mode->rate / CONTROLS_PER_SECOND; - control_ratio = SetValue(control_ratio, 1, MAX_CONTROL_RATIO); - } - data_block_bits = st->data_block_bits; - data_block_num = st->data_block_num; -} - -void -SaveSettingTiMidity(SETTING_TIMIDITY *st) -{ - int i, j; - - st->amplification = SetValue(amplification, 0, MAX_AMPLIFICATION); - st->antialiasing_allowed = SetFlag(antialiasing_allowed); - st->buffer_fragments = opt_buffer_fragments; - st->control_ratio = SetValue(opt_control_ratio, 0, MAX_CONTROL_RATIO); - st->default_drumchannels = default_drumchannels; - st->default_drumchannel_mask = default_drumchannel_mask; - st->opt_modulation_wheel = SetFlag(opt_modulation_wheel); - st->opt_portamento = SetFlag(opt_portamento); - st->opt_nrpn_vibrato = SetFlag(opt_nrpn_vibrato); - st->opt_channel_pressure = SetFlag(opt_channel_pressure); - st->opt_trace_text_meta_event = SetFlag(opt_trace_text_meta_event); - st->opt_overlap_voice_allow = SetFlag(opt_overlap_voice_allow); - st->opt_default_mid = opt_default_mid; - st->default_tonebank = default_tonebank; - st->special_tonebank = special_tonebank; - st->effect_lr_mode = effect_lr_mode; - st->effect_lr_delay_msec = effect_lr_delay_msec; - st->opt_reverb_control = opt_reverb_control; + opt_tva_attack = st->opt_tva_attack; + opt_tva_decay = st->opt_tva_decay; + opt_tva_release = st->opt_tva_release; + opt_delay_control = st->opt_delay_control; + opt_resonance = st->opt_resonance; + opt_env_attack = st->opt_env_attack; + opt_velocity_table = st->opt_velocity_table; + adjust_panning_immediately = SetFlag(st->adjust_panning_immediately); + fast_decay = SetFlag(st->fast_decay); +#ifdef SUPPORT_SOUNDSPEC + view_soundspec_flag = SetFlag(st->view_soundspec_flag); + spectrigram_update_sec = st->spectrigram_update_sec; +#endif + for(i = 0; i < MAX_CHANNELS; i++) + default_program[i] = st->default_program[i]; + set_ctl(st->opt_ctl); + opt_realtime_playing = SetFlag(st->opt_realtime_playing); + reduce_voice_threshold = st->reduce_voice_threshold; + set_play_mode(st->opt_playmode); + strncpy(OutputName,st->OutputName,MAXPATH); + if(OutputName[0] && !is_device_output_ID(play_mode->id_character)) + play_mode->name = strdup(OutputName); // [NH B + strncpy(w32g_output_dir,st->OutputDirName,MAXPATH); + w32g_output_dir[MAXPATH-1] = '\0'; + w32g_auto_output_mode = st->auto_output_mode; + opt_output_rate = st->output_rate; + if(st->output_rate) + play_mode->rate = SetValue(st->output_rate, + MIN_OUTPUT_RATE, MAX_OUTPUT_RATE); + else if(play_mode->rate == 0) + play_mode->rate = DEFAULT_RATE; + voices = SetValue(st->voices, 1, MAX_VOICES); + auto_reduce_polyphony = st->auto_reduce_polyphony; + quietchannels = st->quietchannels; + if(opt_aq_max_buff) + free(opt_aq_max_buff); + if(opt_aq_fill_buff) + free(opt_aq_fill_buff); + strcpy(buffer, st->opt_qsize); + opt_aq_max_buff = buffer; + opt_aq_fill_buff = strchr(opt_aq_max_buff, '/'); + *opt_aq_fill_buff++ = '\0'; + opt_aq_max_buff = safe_strdup(opt_aq_max_buff); + opt_aq_fill_buff = safe_strdup(opt_aq_fill_buff); + modify_release = SetValue(st->modify_release, 0, MAX_MREL); + allocate_cache_size = st->allocate_cache_size; + if(output_text_code) + free(output_text_code); + output_text_code = safe_strdup(st->output_text_code); + free_instruments_afterwards = st->free_instruments_afterwards; + set_wrd(st->opt_wrd); +#if defined(__W32__) && defined(SMFCONV) + opt_rcpcv_dll = st->opt_rcpcv_dll; +#endif /* SMFCONV */ + + opt_control_ratio = st->control_ratio; + if(opt_control_ratio) + control_ratio = SetValue(opt_control_ratio, 1, MAX_CONTROL_RATIO); + else + { + control_ratio = play_mode->rate / CONTROLS_PER_SECOND; + control_ratio = SetValue(control_ratio, 1, MAX_CONTROL_RATIO); + } + data_block_bits = st->data_block_bits; + data_block_num = st->data_block_num; +} + +void +SaveSettingTiMidity(SETTING_TIMIDITY *st) +{ + int i, j; + + st->amplification = SetValue(amplification, 0, MAX_AMPLIFICATION); + st->antialiasing_allowed = SetFlag(antialiasing_allowed); + st->buffer_fragments = opt_buffer_fragments; + st->control_ratio = SetValue(opt_control_ratio, 0, MAX_CONTROL_RATIO); + st->default_drumchannels = default_drumchannels; + st->default_drumchannel_mask = default_drumchannel_mask; + st->opt_modulation_wheel = SetFlag(opt_modulation_wheel); + st->opt_portamento = SetFlag(opt_portamento); + st->opt_nrpn_vibrato = SetFlag(opt_nrpn_vibrato); + st->opt_channel_pressure = SetFlag(opt_channel_pressure); + st->opt_trace_text_meta_event = SetFlag(opt_trace_text_meta_event); + st->opt_overlap_voice_allow = SetFlag(opt_overlap_voice_allow); + st->opt_defaul