From: fred Date: Tue, 26 Mar 2002 23:10:05 +0000 (+0000) Subject: lilypond-1.3.39 X-Git-Tag: release/1.5.59~1723 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a888253fff67a6ba8d6c840427c4f4d64882fca8;p=lilypond.git lilypond-1.3.39 --- diff --git a/Documentation/hacking.texi b/Documentation/hacking.texi index da36f2f0ef..5a73183f20 100644 --- a/Documentation/hacking.texi +++ b/Documentation/hacking.texi @@ -193,7 +193,7 @@ In a lot of other formats this would be called an 'Event' Each dynamic is bound to one note (a crescendo spanning multiple notes is thought to be made of two "dynamics": a start and a stop). Dynamic changes can occur in a smaller time than the length of its - note, therefore fore each @code{Dynamic} request carries a time, measured + note, therefore each @code{Dynamic} request carries a time, measured from the start of its note. @end table @@ -327,7 +327,7 @@ union of its children. Besides relative positions there are lots of other relations between elements. Lilypond does not contain other specialized relation -management (Like the relative positioning code). In stead, objects can +management (Like the relative positioning code). Instead, objects can be connected through dependencies, which sets the order in which objects are to be processed. @@ -366,7 +366,7 @@ An item has one horizontal position. A spanner hangs on two items. An item is a score element that is associated with only one -Paper_column. Examples are note heads, clefs, sup and superscripts, etc. +Paper_column. Examples are note heads, clefs, super and superscripts, etc. Item is a derived class of Score_element. The shape of an item is known before the break calculations, and line diff --git a/Documentation/ntweb/guile-1.3.4-gnu-windows.patch b/Documentation/ntweb/guile-1.3.4-gnu-windows.patch new file mode 100644 index 0000000000..97cf37ed8c --- /dev/null +++ b/Documentation/ntweb/guile-1.3.4-gnu-windows.patch @@ -0,0 +1,3570 @@ +diff -urN ../guile-1.3.4/ChangeLog ./ChangeLog +--- ../guile-1.3.4/ChangeLog Sat Sep 25 19:26:50 1999 ++++ ./ChangeLog Fri Mar 24 10:47:12 2000 +@@ -1,3 +1,18 @@ ++2000-03-24 ++ ++ * guile-config/cross-guile-config.in: Simple shell script to ++ take over guile-config's functionality for cross-compilation. ++ It will be installed as ${build}-guile-config. ++ ++ * guile-config/Makefile.am: Provide for cross-guile-config.in ++ and its targets. ++ ++2000-03-23 ++ ++ * configure.in: Added options to enable cross-compilation: ++ --enable-sizeof-int, --enable-sizeof-long, ++ --enable-restartable-syscalls. ++ + 1999-09-25 Jim Blandy + + * Guile 1.3.4 released. +diff -urN ../guile-1.3.4/Makefile.in ./Makefile.in +--- ../guile-1.3.4/Makefile.in Sat Sep 25 19:37:14 1999 ++++ ./Makefile.in Fri Mar 24 10:47:25 2000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4 from Makefile.am ++# Makefile.in generated automatically by automake 1.4a from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -46,9 +46,10 @@ + 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_STRIP_FLAG = + transform = @program_transform_name@ + + NORMAL_INSTALL = : +@@ -104,22 +105,21 @@ + DATA = $(aclocal_DATA) + + DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ +-Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 aclocal.m4 \ +-config.guess config.sub configure configure.in install-sh \ +-libguile/scmconfig.h.in libguile/stamp-h.in ltconfig ltmain.sh mdate-sh \ +-missing mkinstalldirs ++Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 config.guess \ ++config.sub configure configure.in install-sh ltconfig ltmain.sh \ ++mdate-sh missing mkinstalldirs + + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = tar ++TAR = gtar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile ++ cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -131,34 +131,6 @@ + $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) + +-libguile/scmconfig.h: libguile/stamp-h +- @if test ! -f $@; then \ +- rm -f libguile/stamp-h; \ +- $(MAKE) libguile/stamp-h; \ +- else :; fi +-libguile/stamp-h: $(srcdir)/libguile/scmconfig.h.in $(top_builddir)/config.status +- cd $(top_builddir) \ +- && CONFIG_FILES= CONFIG_HEADERS=libguile/scmconfig.h \ +- $(SHELL) ./config.status +- @echo timestamp > libguile/stamp-h 2> /dev/null +-$(srcdir)/libguile/scmconfig.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/libguile/stamp-h.in +- @if test ! -f $@; then \ +- rm -f $(srcdir)/libguile/stamp-h.in; \ +- $(MAKE) $(srcdir)/libguile/stamp-h.in; \ +- else :; fi +-$(srcdir)/libguile/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h +- cd $(top_srcdir) && $(AUTOHEADER) +- @echo timestamp > $(srcdir)/libguile/stamp-h.in 2> /dev/null +- +-mostlyclean-hdr: +- +-clean-hdr: +- +-distclean-hdr: +- -rm -f libguile/scmconfig.h +- +-maintainer-clean-hdr: +- + install-aclocalDATA: $(aclocal_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(aclocaldir) +@@ -305,10 +277,15 @@ + -rm -rf $(distdir) + mkdir $(distdir) + -chmod 777 $(distdir) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +@@ -347,7 +324,7 @@ + all-am: Makefile $(DATA) + all-redirect: all-recursive + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + installdirs: installdirs-recursive + installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(aclocaldir) +@@ -362,30 +339,29 @@ + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + + maintainer-clean-generic: +-mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic ++mostlyclean-am: mostlyclean-tags mostlyclean-generic + + mostlyclean: mostlyclean-recursive + +-clean-am: clean-hdr clean-tags clean-generic mostlyclean-am ++clean-am: clean-tags clean-generic mostlyclean-am + + clean: clean-recursive + +-distclean-am: distclean-hdr distclean-tags distclean-generic clean-am ++distclean-am: distclean-tags distclean-generic clean-am + -rm -f libtool + + distclean: distclean-recursive + -rm -f config.status + +-maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ +- maintainer-clean-generic distclean-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." + + maintainer-clean: maintainer-clean-recursive + -rm -f config.status + +-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +-uninstall-aclocalDATA install-aclocalDATA install-data-recursive \ ++.PHONY: uninstall-aclocalDATA install-aclocalDATA install-data-recursive \ + uninstall-data-recursive install-exec-recursive \ + uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ + all-recursive check-recursive installcheck-recursive info-recursive \ +diff -urN ../guile-1.3.4/configure ./configure +--- ../guile-1.3.4/configure Sat Sep 25 16:50:16 1999 ++++ ./configure Fri Mar 24 10:47:28 2000 +@@ -19,6 +19,12 @@ + ac_help="$ac_help + --enable-guile-debug Include internal debugging functions" + ac_help="$ac_help ++ --enable-sizeof-int Set size of int (for cross compilation)" ++ac_help="$ac_help ++ --enable-sizeof-long Set size of long (for cross compilation)" ++ac_help="$ac_help ++ --enable-restartable syscalls Are interrupted syscalls restarted (for cross compilation)" ++ac_help="$ac_help + --enable-shared[=PKGS] build shared libraries [default=yes]" + ac_help="$ac_help + --enable-static[=PKGS] build static libraries [default=yes]" +@@ -572,7 +578,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:576: checking for a BSD compatible install" >&5 ++echo "configure:582: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -625,7 +631,7 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 +-echo "configure:629: checking whether build environment is sane" >&5 ++echo "configure:635: checking whether build environment is sane" >&5 + # Just in case + sleep 1 + echo timestamp > conftestfile +@@ -682,7 +688,7 @@ + test "$program_transform_name" = "" && program_transform_name="s,x,x," + + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-echo "configure:686: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "configure:692: 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 +@@ -721,7 +727,7 @@ + + missing_dir=`cd $ac_aux_dir && pwd` + echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 +-echo "configure:725: checking for working aclocal" >&5 ++echo "configure:731: 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. +@@ -734,7 +740,7 @@ + fi + + echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 +-echo "configure:738: checking for working autoconf" >&5 ++echo "configure:744: 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. +@@ -747,7 +753,7 @@ + fi + + echo $ac_n "checking for working automake""... $ac_c" 1>&6 +-echo "configure:751: checking for working automake" >&5 ++echo "configure:757: 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. +@@ -760,7 +766,7 @@ + fi + + echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 +-echo "configure:764: checking for working autoheader" >&5 ++echo "configure:770: 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. +@@ -773,7 +779,7 @@ + fi + + echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 +-echo "configure:777: checking for working makeinfo" >&5 ++echo "configure:783: 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. +@@ -787,7 +793,7 @@ + + + echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +-echo "configure:791: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++echo "configure:797: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. + if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" +@@ -849,6 +855,30 @@ + fi + + ++sizeof_int=0 ++# Check whether --enable-sizeof-int or --disable-sizeof-int was given. ++if test "${enable_sizeof_int+set}" = set; then ++ enableval="$enable_sizeof_int" ++ sizeof_int=$enableval ++fi ++ ++ ++sizeof_long=0 ++# Check whether --enable-sizeof-long or --disable-sizeof-long was given. ++if test "${enable_sizeof_long+set}" = set; then ++ enableval="$enable_sizeof_long" ++ sizeof_long=$enableval ++fi ++ ++ ++restartable_syscalls=test ++# Check whether --enable-restartable-syscalls or --disable-restartable-syscalls was given. ++if test "${enable_restartable_syscalls+set}" = set; then ++ enableval="$enable_restartable_syscalls" ++ restartable_syscalls=$enableval ++fi ++ ++ + cat >> confdefs.h <<\EOF + #define DEBUG_EXTENSIONS 1 + EOF +@@ -863,7 +893,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:867: checking for $ac_word" >&5 ++echo "configure:897: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -893,7 +923,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:897: checking for $ac_word" >&5 ++echo "configure:927: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -944,7 +974,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:948: checking for $ac_word" >&5 ++echo "configure:978: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -976,7 +1006,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:980: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:1010: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -987,12 +1017,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 991 "configure" ++#line 1021 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1026: \"$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 +@@ -1018,12 +1048,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1022: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1052: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:1027: checking whether we are using GNU C" >&5 ++echo "configure:1057: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1032,7 +1062,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -1051,7 +1081,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:1055: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:1085: 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 +@@ -1083,7 +1113,7 @@ + fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:1087: checking how to run the C preprocessor" >&5 ++echo "configure:1117: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -1098,13 +1128,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1138: \"$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 + : +@@ -1115,13 +1145,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1155: \"$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 + : +@@ -1132,13 +1162,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1172: \"$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 + : +@@ -1164,9 +1194,9 @@ + + + echo $ac_n "checking for AIX""... $ac_c" 1>&6 +-echo "configure:1168: checking for AIX" >&5 ++echo "configure:1198: checking for AIX" >&5 + cat > conftest.$ac_ext <&6 +-echo "configure:1192: checking for POSIXized ISC" >&5 ++echo "configure:1222: checking for POSIXized ISC" >&5 + if test -d /etc/conf/kconfig.d && + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 + then +@@ -1210,17 +1240,17 @@ + + ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 +-echo "configure:1214: checking for minix/config.h" >&5 ++echo "configure:1244: checking for minix/config.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1254: \"$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* +@@ -1262,7 +1292,7 @@ + + + echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 +-echo "configure:1266: checking for ${CC-cc} option to accept ANSI C" >&5 ++echo "configure:1296: checking for ${CC-cc} option to accept ANSI C" >&5 + if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1278,7 +1308,7 @@ + do + CC="$ac_save_CC $ac_arg" + cat > conftest.$ac_ext < + #include +@@ -1315,7 +1345,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + am_cv_prog_cc_stdc="$ac_arg"; break + else +@@ -1414,7 +1444,7 @@ + fi + + echo $ac_n "checking host system type""... $ac_c" 1>&6 +-echo "configure:1418: checking host system type" >&5 ++echo "configure:1448: checking host system type" >&5 + + host_alias=$host + case "$host_alias" in +@@ -1435,7 +1465,7 @@ + echo "$ac_t""$host" 1>&6 + + echo $ac_n "checking build system type""... $ac_c" 1>&6 +-echo "configure:1439: checking build system type" >&5 ++echo "configure:1469: checking build system type" >&5 + + build_alias=$build + case "$build_alias" in +@@ -1455,7 +1485,7 @@ + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1459: checking for $ac_word" >&5 ++echo "configure:1489: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1494,7 +1524,7 @@ + if test "$ac_cv_prog_gcc" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 +-echo "configure:1498: checking for ld used by GCC" >&5 ++echo "configure:1528: checking for ld used by GCC" >&5 + ac_prog=`($CC -print-prog-name=ld) 2>&5` + case "$ac_prog" in + # Accept absolute paths. +@@ -1518,10 +1548,10 @@ + esac + elif test "$with_gnu_ld" = yes; then + echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 +-echo "configure:1522: checking for GNU ld" >&5 ++echo "configure:1552: checking for GNU ld" >&5 + else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +-echo "configure:1525: checking for non-GNU ld" >&5 ++echo "configure:1555: checking for non-GNU ld" >&5 + fi + if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1557,7 +1587,7 @@ + test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } + + echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 +-echo "configure:1561: checking if the linker ($LD) is GNU ld" >&5 ++echo "configure:1591: checking if the linker ($LD) is GNU ld" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1573,7 +1603,7 @@ + + + echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 +-echo "configure:1577: checking for BSD-compatible nm" >&5 ++echo "configure:1607: checking for BSD-compatible nm" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1610,7 +1640,7 @@ + + + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +-echo "configure:1614: checking whether ln -s works" >&5 ++echo "configure:1644: 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 +@@ -1654,8 +1684,8 @@ + case "$host" in + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 1658 "configure"' > conftest.$ac_ext +- if { (eval echo configure:1659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ echo '#line 1688 "configure"' > conftest.$ac_ext ++ if { (eval echo configure:1689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case "`/usr/bin/file conftest.o`" in + *32-bit*) + LD="${LD-ld} -32" +@@ -1676,19 +1706,19 @@ + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 +-echo "configure:1680: checking whether the C compiler needs -belf" >&5 ++echo "configure:1710: checking whether the C compiler needs -belf" >&5 + if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + lt_cv_cc_needs_belf=yes + else +@@ -1791,12 +1821,12 @@ + + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:1795: checking for working const" >&5 ++echo "configure:1825: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -1866,21 +1896,21 @@ + fi + + echo $ac_n "checking for inline""... $ac_c" 1>&6 +-echo "configure:1870: checking for inline" >&5 ++echo "configure:1900: checking for inline" >&5 + if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_inline=$ac_kw; break + else +@@ -1906,15 +1936,15 @@ + esac + + echo $ac_n "checking size of int""... $ac_c" 1>&6 +-echo "configure:1910: checking size of int" >&5 ++echo "configure:1940: checking size of int" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ ac_cv_sizeof_int=$sizeof_int + else + cat > conftest.$ac_ext < + main() +@@ -1925,7 +1955,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_int=`cat conftestval` + else +@@ -1945,15 +1975,15 @@ + + + echo $ac_n "checking size of long""... $ac_c" 1>&6 +-echo "configure:1949: checking size of long" >&5 ++echo "configure:1979: checking size of long" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ ac_cv_sizeof_long=$sizeof_long + else + cat > conftest.$ac_ext < + main() +@@ -1964,7 +1994,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:1968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_long=`cat conftestval` + else +@@ -1984,19 +2014,19 @@ + + + echo $ac_n "checking for long longs""... $ac_c" 1>&6 +-echo "configure:1988: checking for long longs" >&5 ++echo "configure:2018: checking for long longs" >&5 + if eval "test \"`echo '$''{'scm_cv_long_longs'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + scm_cv_long_longs=yes + else +@@ -2017,12 +2047,12 @@ + fi + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:2021: checking for ANSI C header files" >&5 ++echo "configure:2051: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -2030,7 +2060,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2064: \"$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* +@@ -2047,7 +2077,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -2065,7 +2095,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -2086,7 +2116,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -2097,7 +2127,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:2101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -2125,12 +2155,12 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:2129: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:2159: checking for $ac_hdr that defines DIR" >&5 + if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include <$ac_hdr> +@@ -2138,7 +2168,7 @@ + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:2142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else +@@ -2163,7 +2193,7 @@ + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then + echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:2167: checking for opendir in -ldir" >&5 ++echo "configure:2197: 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 +@@ -2171,7 +2201,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldir $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2216: \"$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 +@@ -2204,7 +2234,7 @@ + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:2208: checking for opendir in -lx" >&5 ++echo "configure:2238: 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 +@@ -2212,7 +2242,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lx $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2257: \"$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 +@@ -2246,12 +2276,12 @@ + fi + + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:2250: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:2280: checking whether time.h and sys/time.h may both be included" >&5 + if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -2260,7 +2290,7 @@ + struct tm *tp; + ; return 0; } + EOF +-if { (eval echo configure:2264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes + else +@@ -2281,12 +2311,12 @@ + fi + + echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 +-echo "configure:2285: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++echo "configure:2315: checking for sys/wait.h that is POSIX.1 compatible" >&5 + if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -2302,7 +2332,7 @@ + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; return 0; } + EOF +-if { (eval echo configure:2306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_sys_wait_h=yes + else +@@ -2326,17 +2356,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2330: checking for $ac_hdr" >&5 ++echo "configure:2360: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2370: \"$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* +@@ -2367,17 +2397,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2371: checking for $ac_hdr" >&5 ++echo "configure:2401: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2411: \"$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* +@@ -2404,7 +2434,7 @@ + done + + echo $ac_n "checking "whether libc.h and unistd.h can be included together"""... $ac_c" 1>&6 +-echo "configure:2408: checking "whether libc.h and unistd.h can be included together"" >&5 ++echo "configure:2438: checking "whether libc.h and unistd.h can be included together"" >&5 + if eval "test \"`echo '$''{'guile_cv_header_libc_with_unistd'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2415,7 +2445,7 @@ + guile_cv_header_libc_with_unistd="yes" + else + cat > conftest.$ac_ext < +@@ -2425,7 +2455,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + guile_cv_header_libc_with_unistd=yes + else +@@ -2452,12 +2482,12 @@ + + + echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +-echo "configure:2456: checking for uid_t in sys/types.h" >&5 ++echo "configure:2486: checking for uid_t in sys/types.h" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF +@@ -2486,7 +2516,7 @@ + fi + + echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 +-echo "configure:2490: checking type of array argument to getgroups" >&5 ++echo "configure:2520: checking type of array argument to getgroups" >&5 + if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2494,7 +2524,7 @@ + ac_cv_type_getgroups=cross + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_type_getgroups=gid_t + else +@@ -2533,7 +2563,7 @@ + + if test $ac_cv_type_getgroups = cross; then + cat > conftest.$ac_ext < + EOF +@@ -2557,12 +2587,12 @@ + + + echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +-echo "configure:2561: checking return type of signal handlers" >&5 ++echo "configure:2591: checking return type of signal handlers" >&5 + if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -2579,7 +2609,7 @@ + int i; + ; return 0; } + EOF +-if { (eval echo configure:2583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_signal=void + else +@@ -2598,12 +2628,12 @@ + + + echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:2602: checking for mode_t" >&5 ++echo "configure:2632: checking for mode_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -2632,7 +2662,7 @@ + + + echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 +-echo "configure:2636: checking for main in -lm" >&5 ++echo "configure:2666: checking for main in -lm" >&5 + ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2640,14 +2670,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lm $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2681: \"$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 +@@ -2677,12 +2707,12 @@ + for ac_func in gethostbyname + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2681: checking for $ac_func" >&5 ++echo "configure:2711: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2731,7 +2761,7 @@ + + if test $ac_cv_func_gethostbyname = no; then + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +-echo "configure:2735: checking for gethostbyname in -lnsl" >&5 ++echo "configure:2765: 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 +@@ -2739,7 +2769,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2784: \"$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 +@@ -2781,12 +2811,12 @@ + for ac_func in connect + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2785: checking for $ac_func" >&5 ++echo "configure:2815: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2835,7 +2865,7 @@ + + if test $ac_cv_func_connect = no; then + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +-echo "configure:2839: checking for connect in -lsocket" >&5 ++echo "configure:2869: 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 +@@ -2843,7 +2873,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2888,7 +2918,7 @@ + if test "$enable_dynamic_linking" = "yes"; then + + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:2892: checking for dlopen in -ldl" >&5 ++echo "configure:2922: 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 +@@ -2896,7 +2926,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2941: \"$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 +@@ -2938,12 +2968,12 @@ + for ac_func in dlopen + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2942: checking for $ac_func" >&5 ++echo "configure:2972: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2996,7 +3026,7 @@ + + else + echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 +-echo "configure:3000: checking for dld_link in -ldld" >&5 ++echo "configure:3030: checking for dld_link in -ldld" >&5 + ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3004,7 +3034,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3049: \"$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 +@@ -3051,12 +3081,12 @@ + for ac_func in shl_load + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:3055: checking for $ac_func" >&5 ++echo "configure:3085: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -3112,12 +3142,12 @@ + for ac_func in dlopen + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:3116: checking for $ac_func" >&5 ++echo "configure:3146: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -3178,7 +3208,7 @@ + + + echo $ac_n "checking for underscore before symbols""... $ac_c" 1>&6 +-echo "configure:3182: checking for underscore before symbols" >&5 ++echo "configure:3212: checking for underscore before symbols" >&5 + if eval "test \"`echo '$''{'guile_cv_uscore'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3204,7 +3234,7 @@ + + if test $ac_cv_func_dlopen = yes -o $ac_cv_lib_dl_dlopen = yes ; then + echo $ac_n "checking whether dlsym always adds an underscore for us""... $ac_c" 1>&6 +-echo "configure:3208: checking whether dlsym always adds an underscore for us" >&5 ++echo "configure:3238: checking whether dlsym always adds an underscore for us" >&5 + if eval "test \"`echo '$''{'guile_cv_dlsym_adds_uscore'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3212,7 +3242,7 @@ + guile_cv_dlsym_adds_uscore=no + else + cat > conftest.$ac_ext < +@@ -3223,7 +3253,7 @@ + if(ptr1 && !ptr2) exit(0); } exit(1); } + + EOF +-if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + guile_cv_dlsym_adds_uscore=yes + cat >> confdefs.h <<\EOF +@@ -3250,12 +3280,12 @@ + for ac_func in ctermid ftime getcwd geteuid gettimeofday lstat mkdir mknod nice readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid bzero strdup system usleep atexit on_exit + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:3254: checking for $ac_func" >&5 ++echo "configure:3284: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -3314,12 +3344,12 @@ + + + echo $ac_n "checking for strptime declaration""... $ac_c" 1>&6 +-echo "configure:3318: checking for strptime declaration" >&5 ++echo "configure:3348: checking for strptime declaration" >&5 + if eval "test \"`echo '$''{'guile_cv_func_strptime_declared'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF +@@ -3345,12 +3375,12 @@ + + + echo $ac_n "checking for bzero declaration""... $ac_c" 1>&6 +-echo "configure:3349: checking for bzero declaration" >&5 ++echo "configure:3379: checking for bzero declaration" >&5 + if eval "test \"`echo '$''{'guile_cv_func_bzero_declared'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF +@@ -3376,12 +3406,12 @@ + + + echo $ac_n "checking for sleep declaration""... $ac_c" 1>&6 +-echo "configure:3380: checking for sleep declaration" >&5 ++echo "configure:3410: checking for sleep declaration" >&5 + if eval "test \"`echo '$''{'guile_cv_func_sleep_declared'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF +@@ -3407,12 +3437,12 @@ + + + echo $ac_n "checking for usleep declaration""... $ac_c" 1>&6 +-echo "configure:3411: checking for usleep declaration" >&5 ++echo "configure:3441: checking for usleep declaration" >&5 + if eval "test \"`echo '$''{'guile_cv_func_usleep_declared'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF +@@ -3440,12 +3470,12 @@ + ### On some systems usleep has no return value. If it does have one, + ### we'd like to return it; otherwise, we'll fake it. + echo $ac_n "checking return type of usleep""... $ac_c" 1>&6 +-echo "configure:3444: checking return type of usleep" >&5 ++echo "configure:3474: checking return type of usleep" >&5 + if eval "test \"`echo '$''{'guile_cv_func_usleep_return_type'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF +@@ -3474,17 +3504,17 @@ + + ac_safe=`echo "sys/un.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for sys/un.h""... $ac_c" 1>&6 +-echo "configure:3478: checking for sys/un.h" >&5 ++echo "configure:3508: checking for sys/un.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3518: \"$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* +@@ -3515,12 +3545,12 @@ + for ac_func in socketpair getgroups setpwent pause tzset + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:3519: checking for $ac_func" >&5 ++echo "configure:3549: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -3574,12 +3604,12 @@ + for ac_func in sethostent gethostent endhostent setnetent getnetent endnetent setprotoent getprotoent endprotoent setservent getservent endservent getnetbyaddr getnetbyname inet_lnaof inet_makeaddr inet_netof + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:3578: checking for $ac_func" >&5 ++echo "configure:3608: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -3629,8 +3659,18 @@ + + + +-echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6 +-echo "configure:3634: checking for restartable system calls" >&5 ++if test "$restartable_syscalls" = yes || ++ test "$restartable_syscalls" = y; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_RESTARTABLE_SYSCALLS 1 ++EOF ++ ++elif test "$restartable_syscalls" = no || ++ test "$restartable_syscalls" = n; then ++ true ++else ++ echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6 ++echo "configure:3674: checking for restartable system calls" >&5 + if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3638,7 +3678,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sys_restartable_syscalls=yes + else +@@ -3678,17 +3718,18 @@ + + fi + ++fi + + if test "$ac_cv_header_regex_h" = yes || + test "$ac_cv_header_rxposix_h" = yes || + test "$ac_cv_header_rx_rxposix_h" = yes; then + echo $ac_n "checking for regcomp""... $ac_c" 1>&6 +-echo "configure:3687: checking for regcomp" >&5 ++echo "configure:3728: checking for regcomp" >&5 + if eval "test \"`echo '$''{'ac_cv_func_regcomp_norx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_regcomp_norx=yes" + else +@@ -3729,7 +3770,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for main in -lrx""... $ac_c" 1>&6 +-echo "configure:3733: checking for main in -lrx" >&5 ++echo "configure:3774: checking for main in -lrx" >&5 + ac_lib_var=`echo rx'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3737,14 +3778,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lrx $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3789: \"$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 +@@ -3772,12 +3813,12 @@ + fi + + echo $ac_n "checking for regcomp""... $ac_c" 1>&6 +-echo "configure:3776: checking for regcomp" >&5 ++echo "configure:3817: checking for regcomp" >&5 + if eval "test \"`echo '$''{'ac_cv_func_regcomp_rx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_regcomp_rx=yes" + else +@@ -3834,12 +3875,12 @@ + for ac_func in inet_aton putenv strerror memmove + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:3838: checking for $ac_func" >&5 ++echo "configure:3879: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -3895,19 +3936,19 @@ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +-echo "configure:3899: checking for working alloca.h" >&5 ++echo "configure:3940: checking for working alloca.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + char *p = alloca(2 * sizeof(int)); + ; return 0; } + EOF +-if { (eval echo configure:3911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_header_alloca_h=yes + else +@@ -3928,12 +3969,12 @@ + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:3932: checking for alloca" >&5 ++echo "configure:3973: checking for alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_alloca_works=yes + else +@@ -3993,12 +4034,12 @@ + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:3997: checking whether alloca needs Cray hooks" >&5 ++echo "configure:4038: checking whether alloca needs Cray hooks" >&5 + if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&6 +-echo "configure:4027: checking for $ac_func" >&5 ++echo "configure:4068: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -4078,7 +4119,7 @@ + fi + + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:4082: checking stack direction for C alloca" >&5 ++echo "configure:4123: checking stack direction for C alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4086,7 +4127,7 @@ + ac_cv_c_stack_direction=0 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_stack_direction=1 + else +@@ -4129,12 +4170,12 @@ + if test "$ALLOCA" = "alloca.o"; then LIBOBJS="alloca.o $LIBOBJS"; fi + + echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 +-echo "configure:4133: checking for st_rdev in struct stat" >&5 ++echo "configure:4174: checking for st_rdev in struct stat" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -4142,7 +4183,7 @@ + struct stat s; s.st_rdev; + ; return 0; } + EOF +-if { (eval echo configure:4146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_rdev=yes + else +@@ -4163,12 +4204,12 @@ + fi + + echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +-echo "configure:4167: checking for st_blksize in struct stat" >&5 ++echo "configure:4208: checking for st_blksize in struct stat" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -4176,7 +4217,7 @@ + struct stat s; s.st_blksize; + ; return 0; } + EOF +-if { (eval echo configure:4180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_blksize=yes + else +@@ -4200,12 +4241,12 @@ + # We could use AC_STRUCT_ST_BLOCKS here, but that adds fileblocks.o to + # LIBOBJS, which we don't need. This seems more direct. + echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 +-echo "configure:4204: checking for st_blocks in struct stat" >&5 ++echo "configure:4245: checking for st_blocks in struct stat" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -4213,7 +4254,7 @@ + struct stat s; s.st_blocks; + ; return 0; } + EOF +-if { (eval echo configure:4217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_blocks=yes + else +@@ -4234,12 +4275,12 @@ + fi + + echo $ac_n "checking for S_ISLNK in sys/stat.h""... $ac_c" 1>&6 +-echo "configure:4238: checking for S_ISLNK in sys/stat.h" >&5 ++echo "configure:4279: checking for S_ISLNK in sys/stat.h" >&5 + if eval "test \"`echo '$''{'ac_cv_macro_S_ISLNK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #ifndef S_ISLNK +@@ -4247,7 +4288,7 @@ + #endif + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4292: \"$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* +@@ -4271,12 +4312,12 @@ + fi + + echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 +-echo "configure:4275: checking whether struct tm is in sys/time.h or time.h" >&5 ++echo "configure:4316: checking whether struct tm is in sys/time.h or time.h" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -4284,7 +4325,7 @@ + struct tm *tp; tp->tm_sec; + ; return 0; } + EOF +-if { (eval echo configure:4288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_tm=time.h + else +@@ -4305,12 +4346,12 @@ + fi + + echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 +-echo "configure:4309: checking for tm_zone in struct tm" >&5 ++echo "configure:4350: checking for tm_zone in struct tm" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include <$ac_cv_struct_tm> +@@ -4318,7 +4359,7 @@ + struct tm tm; tm.tm_zone; + ; return 0; } + EOF +-if { (eval echo configure:4322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_tm_zone=yes + else +@@ -4338,12 +4379,12 @@ + + else + echo $ac_n "checking for tzname""... $ac_c" 1>&6 +-echo "configure:4342: checking for tzname" >&5 ++echo "configure:4383: checking for tzname" >&5 + if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #ifndef tzname /* For SGI. */ +@@ -4353,7 +4394,7 @@ + atoi(*tzname); + ; return 0; } + EOF +-if { (eval echo configure:4357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_var_tzname=yes + else +@@ -4376,12 +4417,12 @@ + + + echo $ac_n "checking whether we need POSIX to get struct utimbuf""... $ac_c" 1>&6 +-echo "configure:4380: checking whether we need POSIX to get struct utimbuf" >&5 ++echo "configure:4421: checking whether we need POSIX to get struct utimbuf" >&5 + if eval "test \"`echo '$''{'guile_cv_struct_utimbuf_needs_posix'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4438: \"$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* +@@ -4426,13 +4467,13 @@ + echo "configure: warning: Guessing that stack grows down -- see scmconfig.h.in" 1>&2 + else + cat > conftest.$ac_ext <= ((unsigned long)&x)); } + main () { int q; aux((unsigned long)&q); } + EOF +-if { (eval echo configure:4436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + cat >> confdefs.h <<\EOF + #define SCM_STACK_GROWS_UP 1 +@@ -4447,7 +4488,7 @@ + + + echo $ac_n "checking whether floats fit in longs""... $ac_c" 1>&6 +-echo "configure:4451: checking whether floats fit in longs" >&5 ++echo "configure:4492: checking whether floats fit in longs" >&5 + if eval "test \"`echo '$''{'guile_cv_type_float_fits_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4455,11 +4496,11 @@ + guile_cv_type_float_fits_long=guess-yes + else + cat > conftest.$ac_ext < sizeof(long)); } + EOF +-if { (eval echo configure:4463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + guile_cv_type_float_fits_long=yes + else +@@ -4493,12 +4534,12 @@ + + + echo $ac_n "checking for struct linger""... $ac_c" 1>&6 +-echo "configure:4497: checking for struct linger" >&5 ++echo "configure:4538: checking for struct linger" >&5 + if eval "test \"`echo '$''{'scm_cv_struct_linger'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -4507,7 +4548,7 @@ + struct linger lgr; lgr.l_linger = 100 + ; return 0; } + EOF +-if { (eval echo configure:4511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + scm_cv_struct_linger="yes" + else +@@ -4567,7 +4608,7 @@ + ### Turn $with_threads into either the name of a threads package, like + ### `qt', or `no', meaning that threads should not be supported. + echo $ac_n "checking whether to support threads""... $ac_c" 1>&6 +-echo "configure:4571: checking whether to support threads" >&5 ++echo "configure:4612: checking whether to support threads" >&5 + case "$with_threads" in + "yes" | "qt" | "coop" | "") + with_threads=qt +@@ -4591,7 +4632,7 @@ + + + echo $ac_n "checking QuickThreads configuration""... $ac_c" 1>&6 +-echo "configure:4595: checking QuickThreads configuration" >&5 ++echo "configure:4636: checking QuickThreads configuration" >&5 + # How can we refer to the qt source directory from within the qt build + # directory? For headers, we can rely on the fact that the qt src + # directory appears in the #include path. +@@ -4731,12 +4772,12 @@ + CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wmissing-prototypes" ;; + esac + +-for ac_prog in mawk gawk nawk awk ++for ac_prog in gawk mawk 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4740: checking for $ac_word" >&5 ++echo "configure:4781: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +diff -urN ../guile-1.3.4/configure.in ./configure.in +--- ../guile-1.3.4/configure.in Wed Sep 22 21:58:39 1999 ++++ ./configure.in Fri Mar 24 01:48:26 2000 +@@ -50,6 +50,21 @@ + AC_DEFINE(GUILE_DEBUG) + fi) + ++sizeof_int=0 ++AC_ARG_ENABLE(sizeof-int, ++ [ --enable-sizeof-int Set size of int (for cross compilation)], ++ [sizeof_int=$enableval]) ++ ++sizeof_long=0 ++AC_ARG_ENABLE(sizeof-long, ++ [ --enable-sizeof-long Set size of long (for cross compilation)], ++ [sizeof_long=$enableval]) ++ ++restartable_syscalls=test ++AC_ARG_ENABLE(restartable-syscalls, ++ [ --enable-restartable syscalls Are interrupted syscalls restarted (for cross compilation)], ++ [restartable_syscalls=$enableval]) ++ + dnl The --disable-debug used to control these two. But now they are + dnl a required part of the distribution. + AC_DEFINE(DEBUG_EXTENSIONS) +@@ -69,8 +84,8 @@ + + AC_C_CONST + AC_C_INLINE +-AC_CHECK_SIZEOF(int) +-AC_CHECK_SIZEOF(long) ++AC_CHECK_SIZEOF(int, $sizeof_int) ++AC_CHECK_SIZEOF(long, $sizeof_long) + AC_CACHE_CHECK([for long longs], scm_cv_long_longs, + AC_TRY_COMPILE(, + [long long a], +@@ -218,7 +233,15 @@ + dnl behaviour for some reason: e.g., different versions of linux seem + dnl to behave differently.) + +-AC_SYS_RESTARTABLE_SYSCALLS ++if test "$restartable_syscalls" = yes || ++ test "$restartable_syscalls" = y; then ++ AC_DEFINE(HAVE_RESTARTABLE_SYSCALLS) ++elif test "$restartable_syscalls" = no || ++ test "$restartable_syscalls" = n; then ++ true ++else ++ AC_SYS_RESTARTABLE_SYSCALLS ++fi + + if test "$ac_cv_header_regex_h" = yes || + test "$ac_cv_header_rxposix_h" = yes || +@@ -279,7 +302,7 @@ + AC_TRY_RUN(aux (l) unsigned long l; + { int x; exit (l >= ((unsigned long)&x)); } + main () { int q; aux((unsigned long)&q); }, +- AC_DEFINE(SCM_STACK_GROWS_UP),,AC_MSG_WARN(Guessing that stack grows down -- see scmconfig.h.in)) ++ AC_DEFINE(SCM_STACK_GROWS_UP),,AC_MSG_WARN(Guessing that stack grows down -- see scmconfig.h.in), AC_DEFINE(SCM_STACK_GROWS_DOWN)) + + AC_CACHE_CHECK([whether floats fit in longs], guile_cv_type_float_fits_long, + [AC_TRY_RUN([main () { exit (sizeof(float) > sizeof(long)); }], +diff -urN ../guile-1.3.4/doc/Makefile.in ./doc/Makefile.in +--- ../guile-1.3.4/doc/Makefile.in Sat Sep 25 19:37:35 1999 ++++ ./doc/Makefile.in Fri Mar 24 10:47:26 2000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4 from Makefile.am ++# Makefile.in generated automatically by automake 1.4a from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -46,9 +46,10 @@ + 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_STRIP_FLAG = + transform = @program_transform_name@ + + NORMAL_INSTALL = : +@@ -108,15 +109,15 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = tar ++TAR = gtar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: + .SUFFIXES: .dvi .info .ps .texi .texinfo .txi + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile ++ cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -270,10 +271,15 @@ + subdir = doc + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +@@ -304,7 +310,7 @@ + all-am: Makefile $(INFO_DEPS) + all-redirect: all-am + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + installdirs: + $(mkinstalldirs) $(DESTDIR)$(infodir) + +diff -urN ../guile-1.3.4/guile-compile ./guile-compile +--- ../guile-1.3.4/guile-compile Thu Jan 1 01:00:00 1970 ++++ ./guile-compile Fri Mar 24 01:48:27 2000 +@@ -0,0 +1,13 @@ ++##automake --cygnus ++ ++ROOT=/usr/src/gnu-windows ++PREFIX=$ROOT/usr ++ ++ARCH=i686-pc-cygwin ++ ++export PATH=$PREFIX/$ARCH/bin:$PREFIX/bin:$PATH ++ ++VERSION=1.3.31 ++ ++./configure --prefix=$PREFIX --target=$ARCH --build=$ARCH --host=ppc-redhat-linux --oldincludedir=$PREFIX/include --enable-sizeof-int=4 --enable-sizeof-long=4 --enable-restartable-syscalls=yes && make oldincludedir=$PREFIX/include ++make oldincludedir=$PREFIX/include install +diff -urN ../guile-1.3.4/guile-config/Makefile.am ./guile-config/Makefile.am +--- ../guile-1.3.4/guile-config/Makefile.am Mon Oct 19 17:24:31 1998 ++++ ./guile-config/Makefile.am Fri Mar 24 10:46:01 2000 +@@ -20,9 +20,9 @@ + ## to the Free Software Foundation, Inc., 59 Temple Place, Suite + ## 330, Boston, MA 02111-1307 USA + +-bin_SCRIPTS=guile-config +-CLEANFILES=guile-config +-EXTRA_DIST=guile-config.in ++bin_SCRIPTS=guile-config @build@-guile-config ++CLEANFILES=guile-config @build@-guile-config ++EXTRA_DIST=guile-config.in cross-guile-config.in + + ## We use @-...-@ as the substitution brackets here, instead of the + ## usual @...@, so autoconf doesn't go and substitute the values +@@ -34,6 +34,15 @@ + -e s:@-GUILE_VERSION-@:${GUILE_VERSION}: + chmod +x guile-config.tmp + mv guile-config.tmp guile-config ++ ++@build@-guile-config: cross-guile-config.in ++ rm -f $<.tmp ++ sed < ${srcdir}/$< > $<.tmp \ ++ -e s:@-SHELL-@:${SHELL}: \ ++ -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:\ ++ -e s:@-PREFIX-@:${prefix}: ++ chmod +x $<.tmp ++ mv $<.tmp $@ + + ## Get rid of any copies of the configuration script under the old + ## name, so people don't end up running ancient copies of it. +diff -urN ../guile-1.3.4/guile-config/Makefile.in ./guile-config/Makefile.in +--- ../guile-1.3.4/guile-config/Makefile.in Sat Sep 25 19:37:32 1999 ++++ ./guile-config/Makefile.in Fri Mar 24 10:47:26 2000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4 from Makefile.am ++# Makefile.in generated automatically by automake 1.4a from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -46,9 +46,10 @@ + 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_STRIP_FLAG = + transform = @program_transform_name@ + + NORMAL_INSTALL = : +@@ -90,9 +91,9 @@ + qtmdc_c = @qtmdc_c@ + qtmds_s = @qtmds_s@ + +-bin_SCRIPTS = guile-config +-CLEANFILES = guile-config +-EXTRA_DIST = guile-config.in ++bin_SCRIPTS = guile-config @build@-guile-config ++CLEANFILES = guile-config @build@-guile-config ++EXTRA_DIST = guile-config.in cross-guile-config.in + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../libguile/scmconfig.h + CONFIG_CLEAN_FILES = +@@ -103,14 +104,14 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = tar ++TAR = gtar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps guile-config/Makefile ++ cd $(top_srcdir) && $(AUTOMAKE) --gnu guile-config/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -142,10 +143,15 @@ + subdir = guile-config + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu guile-config/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +@@ -174,7 +180,7 @@ + all-am: Makefile $(SCRIPTS) + all-redirect: all-am + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + installdirs: + $(mkinstalldirs) $(DESTDIR)$(bindir) + +@@ -224,6 +230,15 @@ + -e s:@-GUILE_VERSION-@:${GUILE_VERSION}: + chmod +x guile-config.tmp + mv guile-config.tmp guile-config ++ ++@build@-guile-config: cross-guile-config.in ++ rm -f $<.tmp ++ sed < ${srcdir}/$< > $<.tmp \ ++ -e s:@-SHELL-@:${SHELL}: \ ++ -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:\ ++ -e s:@-PREFIX-@:${prefix}: ++ chmod +x $<.tmp ++ mv $<.tmp $@ + + install-exec-local: + rm -f ${bindir}/build-guile +diff -urN ../guile-1.3.4/guile-config/cross-guile-config.in ./guile-config/cross-guile-config.in +--- ../guile-1.3.4/guile-config/cross-guile-config.in Thu Jan 1 01:00:00 1970 ++++ ./guile-config/cross-guile-config.in Fri Mar 24 11:15:19 2000 +@@ -0,0 +1,16 @@ ++#!@-SHELL-@ ++# build-guile-config.in ++case $1 in ++ --version) ++ echo "@-GUILE_VERSION-@" ++ exit 0 ++ ;; ++ compile) ++ echo "-I @-PREFIX-@/include/guile" ++ exit 0 ++ ;; ++ link) ++ echo "-L @-PREFIX-@/lib -lguile" ++ exit 0 ++ ;; ++esac +diff -urN ../guile-1.3.4/ice-9/Makefile.in ./ice-9/Makefile.in +--- ../guile-1.3.4/ice-9/Makefile.in Sat Sep 25 19:37:16 1999 ++++ ./ice-9/Makefile.in Fri Mar 24 10:47:25 2000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4 from Makefile.am ++# Makefile.in generated automatically by automake 1.4a from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -46,9 +46,10 @@ + 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_STRIP_FLAG = + transform = @program_transform_name@ + + NORMAL_INSTALL = : +@@ -111,14 +112,14 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = tar ++TAR = gtar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ice-9/Makefile ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign ice-9/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -176,10 +177,15 @@ + subdir = ice-9 + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign ice-9/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +@@ -208,7 +214,7 @@ + all-am: Makefile $(DATA) + all-redirect: all-am + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + installdirs: + $(mkinstalldirs) $(DESTDIR)$(subpkgdatadir) + +diff -urN ../guile-1.3.4/libguile/Makefile.in ./libguile/Makefile.in +--- ../guile-1.3.4/libguile/Makefile.in Sat Sep 25 19:37:27 1999 ++++ ./libguile/Makefile.in Fri Mar 24 10:47:25 2000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4 from Makefile.am ++# Makefile.in generated automatically by automake 1.4a from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -46,9 +46,10 @@ + 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_STRIP_FLAG = + transform = @program_transform_name@ + + NORMAL_INSTALL = : +@@ -202,8 +203,31 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = tar ++TAR = gtar + GZIP_ENV = --best ++DEP_FILES = .deps/alist.P .deps/alloca.P .deps/arbiters.P .deps/async.P \ ++.deps/backtrace.P .deps/boolean.P .deps/chars.P .deps/continuations.P \ ++.deps/cpp_err_symbols.P .deps/cpp_sig_symbols.P .deps/debug.P \ ++.deps/dynl.P .deps/dynwind.P .deps/eq.P .deps/error.P .deps/eval.P \ ++.deps/evalext.P .deps/feature.P .deps/filesys.P .deps/fluids.P \ ++.deps/fports.P .deps/gc.P .deps/gdbint.P .deps/gh_data.P \ ++.deps/gh_eval.P .deps/gh_funcs.P .deps/gh_init.P .deps/gh_io.P \ ++.deps/gh_list.P .deps/gh_predicates.P .deps/gh_test_c.P \ ++.deps/gh_test_repl.P .deps/gsubr.P .deps/guardians.P .deps/guile.P \ ++.deps/hash.P .deps/hashtab.P .deps/inet_aton.P .deps/init.P \ ++.deps/ioext.P .deps/iselect.P .deps/keywords.P .deps/lang.P \ ++.deps/list.P .deps/load.P .deps/macros.P .deps/mallocs.P \ ++.deps/memmove.P .deps/modules.P .deps/net_db.P .deps/numbers.P \ ++.deps/objects.P .deps/objprop.P .deps/options.P .deps/pairs.P \ ++.deps/ports.P .deps/posix.P .deps/print.P .deps/procprop.P \ ++.deps/procs.P .deps/putenv.P .deps/ramap.P .deps/random.P .deps/read.P \ ++.deps/regex-posix.P .deps/root.P .deps/scmsigs.P .deps/script.P \ ++.deps/simpos.P .deps/smob.P .deps/socket.P .deps/sort.P .deps/srcprop.P \ ++.deps/stackchk.P .deps/stacks.P .deps/stime.P .deps/strerror.P \ ++.deps/strings.P .deps/strop.P .deps/strorder.P .deps/strports.P \ ++.deps/struct.P .deps/symbols.P .deps/tag.P .deps/threads.P \ ++.deps/throw.P .deps/unif.P .deps/variable.P .deps/vectors.P \ ++.deps/version.P .deps/vports.P .deps/weaks.P + SOURCES = $(libguile_la_SOURCES) $(EXTRA_libguile_la_SOURCES) $(guile_SOURCES) $(gh_test_c_SOURCES) $(gh_test_repl_SOURCES) + OBJECTS = $(libguile_la_OBJECTS) $(guile_OBJECTS) $(gh_test_c_OBJECTS) $(gh_test_repl_OBJECTS) + +@@ -211,9 +235,9 @@ + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s .x + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps libguile/Makefile ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign libguile/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -275,9 +299,6 @@ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -294,9 +315,6 @@ + + maintainer-clean-compile: + +-.c.lo: +- $(LIBTOOL) --mode=compile $(COMPILE) -c $< +- + .s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +@@ -330,8 +348,8 @@ + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + if test -f $$p; then \ +- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ +- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ ++ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + else :; fi; \ + done + +@@ -479,590 +497,53 @@ + subdir = libguile + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign libguile/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done +-alist.lo alist.o : alist.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h eq.h alist.h alist.x +-arbiters.lo arbiters.o : arbiters.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h smob.h genio.h \ +- arbiters.h arbiters.x +-async.lo async.o : async.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h eval.h throw.h smob.h \ +- async.x +-backtrace.lo backtrace.o : backtrace.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h stacks.h \ +- srcprop.h genio.h struct.h strports.h throw.h fluids.h root.h \ +- vectors.h backtrace.h backtrace.x +-boolean.lo boolean.o : boolean.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h boolean.x +-chars.lo chars.o : chars.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h chars.h chars.x +-continuations.lo continuations.o : continuations.c _scm.h __scm.h \ +- scmconfig.h tags.h error.h __scm.h print.h options.h pairs.h \ +- list.h gc.h gsubr.h procs.h numbers.h print.h symbols.h \ +- boolean.h strings.h vectors.h root.h debug.h throw.h ports.h \ +- struct.h async.h threads.h procs.h coop-defs.h iselect.h \ +- snarf.h stackchk.h continuations.h debug.h dynwind.h \ +- continuations.h continuations.x +-debug.lo debug.o : debug.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h eval.h stackchk.h \ +- continuations.h throw.h genio.h macros.h smob.h procprop.h \ +- srcprop.h alist.h continuations.h strports.h read.h feature.h \ +- dynwind.h modules.h debug.h debug.x +-dynl.lo dynl.o : dynl.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h dynl.h genio.h smob.h \ +- keywords.h dynl-dl.c dynl.x +-dynwind.lo dynwind.o : dynwind.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h eval.h alist.h \ +- fluids.h root.h vectors.h genio.h smob.h dynwind.h dynwind.x +-eq.lo eq.o : eq.c _scm.h __scm.h scmconfig.h tags.h error.h __scm.h \ +- print.h options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ +- print.h symbols.h boolean.h strings.h vectors.h root.h debug.h \ +- throw.h ports.h struct.h async.h threads.h procs.h coop-defs.h \ +- iselect.h snarf.h ramap.h stackchk.h continuations.h strorder.h \ +- smob.h unif.h eq.h eq.x +-error.lo error.o : error.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h genio.h throw.h \ +- cpp_err_symbols.c error.x +-eval.lo eval.o : eval.c scmconfig.h _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h debug.h alist.h \ +- eq.h continuations.h throw.h smob.h macros.h procprop.h \ +- hashtab.h hash.h srcprop.h stackchk.h continuations.h objects.h \ +- feature.h modules.h eval.h eval.c eval.x +-evalext.lo evalext.o : evalext.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h eval.h macros.h \ +- modules.h evalext.h evalext.x +-feature.lo feature.o : feature.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h eval.h \ +- procprop.h smob.h feature.h feature.x +-filesys.lo filesys.o : filesys.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h genio.h smob.h \ +- feature.h fports.h ports.h iselect.h filesys.h filesys.x +-fluids.lo fluids.o : fluids.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h smob.h genio.h dynwind.h \ +- fluids.h root.h vectors.h alist.h eval.h fluids.x +-fports.lo fports.o : fports.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h fports.h ports.h \ +- iselect.h fports.x +-gc.lo gc.o : gc.c _scm.h __scm.h scmconfig.h tags.h error.h __scm.h \ +- print.h options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ +- print.h symbols.h boolean.h strings.h vectors.h root.h debug.h \ +- throw.h ports.h struct.h async.h threads.h procs.h coop-defs.h \ +- iselect.h snarf.h stime.h stackchk.h continuations.h struct.h \ +- genio.h weaks.h guardians.h smob.h unif.h gc.x +-gdbint.lo gdbint.o : gdbint.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h tag.h strports.h read.h \ +- eval.h chars.h modules.h gdbint.h gdb_interface.h +-gh_data.lo gh_data.o : gh_data.c gh.h libguile.h __scm.h scmconfig.h \ +- tags.h print.h options.h smob.h pairs.h alist.h arbiters.h \ +- async.h boolean.h chars.h continuations.h backtrace.h debug.h \ +- stacks.h dynl.h dynwind.h eq.h error.h eval.h evalext.h \ +- feature.h filesys.h fluids.h root.h throw.h vectors.h fports.h \ +- ports.h struct.h gc.h gdbint.h genio.h gsubr.h guardians.h \ +- hash.h hashtab.h init.h ioext.h keywords.h kw.h list.h load.h \ +- macros.h mallocs.h modules.h net_db.h numbers.h objects.h \ +- objprop.h posix.h procprop.h procs.h ramap.h random.h read.h \ +- scmsigs.h script.h simpos.h snarf.h socket.h sort.h srcprop.h \ +- stackchk.h stime.h strings.h strop.h strorder.h strports.h \ +- symbols.h tag.h unif.h variable.h version.h vports.h weaks.h \ +- threads.h coop-defs.h iselect.h +-gh_eval.lo gh_eval.o : gh_eval.c gh.h libguile.h __scm.h scmconfig.h \ +- tags.h print.h options.h smob.h pairs.h alist.h arbiters.h \ +- async.h boolean.h chars.h continuations.h backtrace.h debug.h \ +- stacks.h dynl.h dynwind.h eq.h error.h eval.h evalext.h \ +- feature.h filesys.h fluids.h root.h throw.h vectors.h fports.h \ +- ports.h struct.h gc.h gdbint.h genio.h gsubr.h guardians.h \ +- hash.h hashtab.h init.h ioext.h keywords.h kw.h list.h load.h \ +- macros.h mallocs.h modules.h net_db.h numbers.h objects.h \ +- objprop.h posix.h procprop.h procs.h ramap.h random.h read.h \ +- scmsigs.h script.h simpos.h snarf.h socket.h sort.h srcprop.h \ +- stackchk.h stime.h strings.h strop.h strorder.h strports.h \ +- symbols.h tag.h unif.h variable.h version.h vports.h weaks.h \ +- threads.h coop-defs.h iselect.h +-gh_funcs.lo gh_funcs.o : gh_funcs.c gh.h libguile.h __scm.h scmconfig.h \ +- tags.h print.h options.h smob.h pairs.h alist.h arbiters.h \ +- async.h boolean.h chars.h continuations.h backtrace.h debug.h \ +- stacks.h dynl.h dynwind.h eq.h error.h eval.h evalext.h \ +- feature.h filesys.h fluids.h root.h throw.h vectors.h fports.h \ +- ports.h struct.h gc.h gdbint.h genio.h gsubr.h guardians.h \ +- hash.h hashtab.h init.h ioext.h keywords.h kw.h list.h load.h \ +- macros.h mallocs.h modules.h net_db.h numbers.h objects.h \ +- objprop.h posix.h procprop.h procs.h ramap.h random.h read.h \ +- scmsigs.h script.h simpos.h snarf.h socket.h sort.h srcprop.h \ +- stackchk.h stime.h strings.h strop.h strorder.h strports.h \ +- symbols.h tag.h unif.h variable.h version.h vports.h weaks.h \ +- threads.h coop-defs.h iselect.h +-gh_init.lo gh_init.o : gh_init.c gh.h libguile.h __scm.h scmconfig.h \ +- tags.h print.h options.h smob.h pairs.h alist.h arbiters.h \ +- async.h boolean.h chars.h continuations.h backtrace.h debug.h \ +- stacks.h dynl.h dynwind.h eq.h error.h eval.h evalext.h \ +- feature.h filesys.h fluids.h root.h throw.h vectors.h fports.h \ +- ports.h struct.h gc.h gdbint.h genio.h gsubr.h guardians.h \ +- hash.h hashtab.h init.h ioext.h keywords.h kw.h list.h load.h \ +- macros.h mallocs.h modules.h net_db.h numbers.h objects.h \ +- objprop.h posix.h procprop.h procs.h ramap.h random.h read.h \ +- scmsigs.h script.h simpos.h snarf.h socket.h sort.h srcprop.h \ +- stackchk.h stime.h strings.h strop.h strorder.h strports.h \ +- symbols.h tag.h unif.h variable.h version.h vports.h weaks.h \ +- threads.h coop-defs.h iselect.h +-gh_io.lo gh_io.o : gh_io.c gh.h libguile.h __scm.h scmconfig.h tags.h \ +- print.h options.h smob.h pairs.h alist.h arbiters.h async.h \ +- boolean.h chars.h continuations.h backtrace.h debug.h stacks.h \ +- dynl.h dynwind.h eq.h error.h eval.h evalext.h feature.h \ +- filesys.h fluids.h root.h throw.h vectors.h fports.h ports.h \ +- struct.h gc.h gdbint.h genio.h gsubr.h guardians.h hash.h \ +- hashtab.h init.h ioext.h keywords.h kw.h list.h load.h macros.h \ +- mallocs.h modules.h net_db.h numbers.h objects.h objprop.h \ +- posix.h procprop.h procs.h ramap.h random.h read.h scmsigs.h \ +- script.h simpos.h snarf.h socket.h sort.h srcprop.h stackchk.h \ +- stime.h strings.h strop.h strorder.h strports.h symbols.h tag.h \ +- unif.h variable.h version.h vports.h weaks.h threads.h \ +- coop-defs.h iselect.h +-gh_list.lo gh_list.o : gh_list.c gh.h libguile.h __scm.h scmconfig.h \ +- tags.h print.h options.h smob.h pairs.h alist.h arbiters.h \ +- async.h boolean.h chars.h continuations.h backtrace.h debug.h \ +- stacks.h dynl.h dynwind.h eq.h error.h eval.h evalext.h \ +- feature.h filesys.h fluids.h root.h throw.h vectors.h fports.h \ +- ports.h struct.h gc.h gdbint.h genio.h gsubr.h guardians.h \ +- hash.h hashtab.h init.h ioext.h keywords.h kw.h list.h load.h \ +- macros.h mallocs.h modules.h net_db.h numbers.h objects.h \ +- objprop.h posix.h procprop.h procs.h ramap.h random.h read.h \ +- scmsigs.h script.h simpos.h snarf.h socket.h sort.h srcprop.h \ +- stackchk.h stime.h strings.h strop.h strorder.h strports.h \ +- symbols.h tag.h unif.h variable.h version.h vports.h weaks.h \ +- threads.h coop-defs.h iselect.h +-gh_predicates.lo gh_predicates.o : gh_predicates.c gh.h libguile.h \ +- __scm.h scmconfig.h tags.h print.h options.h smob.h pairs.h \ +- alist.h arbiters.h async.h boolean.h chars.h continuations.h \ +- backtrace.h debug.h stacks.h dynl.h dynwind.h eq.h error.h \ +- eval.h evalext.h feature.h filesys.h fluids.h root.h throw.h \ +- vectors.h fports.h ports.h struct.h gc.h gdbint.h genio.h \ +- gsubr.h guardians.h hash.h hashtab.h init.h ioext.h keywords.h \ +- kw.h list.h load.h macros.h mallocs.h modules.h net_db.h \ +- numbers.h objects.h objprop.h posix.h procprop.h procs.h \ +- ramap.h random.h read.h scmsigs.h script.h simpos.h snarf.h \ +- socket.h sort.h srcprop.h stackchk.h stime.h strings.h strop.h \ +- strorder.h strports.h symbols.h tag.h unif.h variable.h \ +- version.h vports.h weaks.h threads.h coop-defs.h iselect.h +-gsubr.lo gsubr.o : gsubr.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h genio.h procprop.h +-guardians.lo guardians.o : guardians.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h smob.h genio.h \ +- guardians.h guardians.x +-guile.o: guile.c libguile.h __scm.h scmconfig.h tags.h print.h options.h \ +- smob.h pairs.h alist.h arbiters.h async.h boolean.h chars.h \ +- continuations.h backtrace.h debug.h stacks.h dynl.h dynwind.h \ +- eq.h error.h eval.h evalext.h feature.h filesys.h fluids.h \ +- root.h throw.h vectors.h fports.h ports.h struct.h gc.h \ +- gdbint.h genio.h gsubr.h guardians.h hash.h hashtab.h init.h \ +- ioext.h keywords.h kw.h list.h load.h macros.h mallocs.h \ +- modules.h net_db.h numbers.h objects.h objprop.h posix.h \ +- procprop.h procs.h ramap.h random.h read.h scmsigs.h script.h \ +- simpos.h snarf.h socket.h sort.h srcprop.h stackchk.h stime.h \ +- strings.h strop.h strorder.h strports.h symbols.h tag.h unif.h \ +- variable.h version.h vports.h weaks.h threads.h coop-defs.h \ +- iselect.h gdb_interface.h +-hash.lo hash.o : hash.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h chars.h hash.h hash.x +-hashtab.lo hashtab.o : hashtab.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h alist.h hash.h \ +- eval.h hashtab.h hashtab.x +-init.lo init.o : init.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h alist.h arbiters.h \ +- backtrace.h chars.h continuations.h debug.h dynl.h dynwind.h \ +- eq.h eval.h evalext.h feature.h filesys.h fluids.h root.h \ +- vectors.h fports.h ports.h gdbint.h hash.h hashtab.h iselect.h \ +- ioext.h keywords.h lang.h load.h macros.h mallocs.h modules.h \ +- net_db.h objects.h objprop.h options.h posix.h regex-posix.h \ +- procprop.h ramap.h random.h read.h scmsigs.h script.h simpos.h \ +- smob.h socket.h sort.h srcprop.h stackchk.h continuations.h \ +- stacks.h stime.h strop.h strorder.h strports.h struct.h tag.h \ +- throw.h unif.h variable.h version.h vports.h weaks.h \ +- guardians.h init.h +-ioext.lo ioext.o : ioext.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h read.h fports.h ports.h \ +- unif.h chars.h ioext.h ioext.x +-iselect.lo iselect.o : iselect.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h iselect.h \ +- coop-threads.h coop-defs.h ../qt/qt.h iselect.x +-keywords.lo keywords.o : keywords.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h genio.h smob.h \ +- keywords.h keywords.x +-lang.lo lang.o : lang.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h eval.h macros.h lang.h \ +- lang.x +-list.lo list.o : list.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h eq.h list.x +-load.lo load.o : load.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h libpath.h fports.h \ +- ports.h read.h eval.h throw.h alist.h dynwind.h load.h load.x +-macros.lo macros.o : macros.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h smob.h macros.h macros.x +-mallocs.lo mallocs.o : mallocs.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h genio.h smob.h \ +- mallocs.h +-modules.lo modules.o : modules.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h eval.h \ +- procprop.h modules.h modules.x +-net_db.lo net_db.o : net_db.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h feature.h net_db.h \ +- net_db.x +-numbers.lo numbers.o : numbers.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h genio.h unif.h \ +- feature.h smob.h numbers.x +-objects.lo objects.o : objects.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h struct.h \ +- procprop.h chars.h keywords.h smob.h eval.h alist.h objects.h \ +- objects.x +-objprop.lo objprop.o : objprop.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h hashtab.h \ +- alist.h weaks.h objprop.h objprop.x +-options.lo options.o : options.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h options.h \ +- options.x +-pairs.lo pairs.o : pairs.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h pairs.x +-ports.lo ports.o : ports.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h objects.h smob.h chars.h \ +- keywords.h ports.x +-posix.lo posix.o : posix.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h fports.h ports.h \ +- scmsigs.h feature.h posix.h cpp_sig_symbols.c posix.x +-print.lo print.o : print.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h chars.h genio.h smob.h \ +- eval.h macros.h procprop.h read.h weaks.h unif.h alist.h \ +- struct.h objects.h print.x +-procprop.lo procprop.o : procprop.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h alist.h eval.h \ +- objects.h procprop.h procprop.x +-procs.lo procs.o : procs.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h objects.h procs.x +-ramap.lo ramap.o : ramap.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h unif.h smob.h chars.h \ +- eq.h eval.h feature.h ramap.h ramap.x +-random.lo random.o : random.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h genio.h smob.h feature.h \ +- random.h random.x +-read.lo read.o : read.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h chars.h genio.h eval.h \ +- unif.h keywords.h alist.h srcprop.h hashtab.h hash.h read.h \ +- read.x +-regex-posix.lo regex-posix.o : regex-posix.c _scm.h __scm.h scmconfig.h \ +- tags.h error.h __scm.h print.h options.h pairs.h list.h gc.h \ +- gsubr.h procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h smob.h \ +- strports.h feature.h regex-posix.h regex-posix.x +-root.lo root.o : root.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h stackchk.h \ +- continuations.h dynwind.h eval.h genio.h smob.h throw.h \ +- fluids.h root.h vectors.h root.x +-scmsigs.lo scmsigs.o : scmsigs.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h eval.h \ +- scmsigs.h scmsigs.x +-script.lo script.o : script.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h gh.h libguile.h smob.h \ +- pairs.h alist.h arbiters.h async.h boolean.h chars.h \ +- continuations.h backtrace.h stacks.h dynl.h dynwind.h eq.h \ +- error.h eval.h evalext.h feature.h filesys.h fluids.h root.h \ +- vectors.h fports.h ports.h gc.h gdbint.h genio.h gsubr.h \ +- guardians.h hash.h hashtab.h init.h ioext.h keywords.h kw.h \ +- list.h load.h macros.h mallocs.h modules.h net_db.h numbers.h \ +- objects.h objprop.h posix.h procprop.h ramap.h random.h read.h \ +- scmsigs.h script.h simpos.h snarf.h socket.h sort.h srcprop.h \ +- stackchk.h stime.h strings.h strop.h strorder.h strports.h \ +- symbols.h tag.h unif.h variable.h version.h vports.h weaks.h \ +- threads.h load.h version.h script.h script.x +-simpos.lo simpos.o : simpos.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h scmsigs.h simpos.h \ +- simpos.x +-smob.lo smob.o : smob.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h objects.h smob.h +-socket.lo socket.o : socket.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h unif.h feature.h fports.h \ +- ports.h socket.h socket.x +-sort.lo sort.o : sort.c scmconfig.h _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h eval.h unif.h \ +- ramap.h alist.h feature.h sort.h sort.x +-srcprop.lo srcprop.o : srcprop.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h smob.h genio.h \ +- alist.h debug.h hashtab.h hash.h weaks.h srcprop.h srcprop.x +-stackchk.lo stackchk.o : stackchk.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h genio.h \ +- stackchk.h continuations.h stackchk.x +-stacks.lo stacks.o : stacks.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h eval.h debug.h \ +- continuations.h struct.h macros.h procprop.h modules.h stacks.h \ +- stacks.x +-stime.lo stime.o : stime.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h feature.h stime.h stime.x +-strings.lo strings.o : strings.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h chars.h \ +- strings.x +-strop.lo strop.o : strop.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h chars.h strop.h read.h \ +- strop.x +-strorder.lo strorder.o : strorder.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h chars.h \ +- strorder.h strorder.x +-strports.lo strports.o : strports.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h unif.h eval.h \ +- read.h strports.h strports.x +-struct.lo struct.o : struct.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h chars.h genio.h eval.h \ +- alist.h weaks.h hashtab.h struct.h struct.x +-symbols.lo symbols.o : symbols.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h chars.h eval.h \ +- variable.h alist.h weaks.h symbols.x +-tag.lo tag.o : tag.c _scm.h __scm.h scmconfig.h tags.h error.h __scm.h \ +- print.h options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ +- print.h symbols.h boolean.h strings.h vectors.h root.h debug.h \ +- throw.h ports.h struct.h async.h threads.h procs.h coop-defs.h \ +- iselect.h snarf.h chars.h struct.h tag.h tag.x +-threads.lo threads.o : threads.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h dynwind.h \ +- smob.h genio.h coop-threads.c coop-threads.h coop-defs.h \ +- ../qt/qt.h coop.c eval.h threads.x +-throw.lo throw.o : throw.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h genio.h smob.h alist.h \ +- eval.h eq.h dynwind.h backtrace.h debug.h continuations.h \ +- stackchk.h continuations.h stacks.h fluids.h root.h vectors.h \ +- throw.h throw.x +-unif.lo unif.o : unif.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h chars.h eval.h fports.h \ +- ports.h smob.h strop.h feature.h unif.h ramap.h unif.x +-variable.lo variable.o : variable.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h eq.h genio.h \ +- smob.h variable.h variable.x +-vectors.lo vectors.o : vectors.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h eq.h vectors.x +-version.lo version.o : version.c _scm.h __scm.h scmconfig.h tags.h \ +- error.h __scm.h print.h options.h pairs.h list.h gc.h gsubr.h \ +- procs.h numbers.h print.h symbols.h boolean.h strings.h \ +- vectors.h root.h debug.h throw.h ports.h struct.h async.h \ +- threads.h procs.h coop-defs.h iselect.h snarf.h versiondat.h \ +- version.h version.x +-vports.lo vports.o : vports.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h eval.h chars.h fports.h \ +- ports.h vports.h vports.x +-weaks.lo weaks.o : weaks.c _scm.h __scm.h scmconfig.h tags.h error.h \ +- __scm.h print.h options.h pairs.h list.h gc.h gsubr.h procs.h \ +- numbers.h print.h symbols.h boolean.h strings.h vectors.h \ +- root.h debug.h throw.h ports.h struct.h async.h threads.h \ +- procs.h coop-defs.h iselect.h snarf.h weaks.h weaks.x + ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ++ ++-include $(DEP_FILES) ++ ++mostlyclean-depend: ++ ++clean-depend: ++ ++distclean-depend: ++ -rm -rf .deps ++ ++maintainer-clean-depend: ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp + info-am: + info: info-am + dvi-am: +@@ -1096,7 +577,7 @@ + $(HEADERS) scmconfig.h + all-redirect: all-am + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + installdirs: + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ + $(DESTDIR)$(bindir) $(DESTDIR)$(modincludedir) \ +@@ -1120,19 +601,19 @@ + mostlyclean-am: mostlyclean-hdr mostlyclean-libLTLIBRARIES \ + mostlyclean-compile mostlyclean-libtool \ + mostlyclean-binPROGRAMS mostlyclean-checkPROGRAMS \ +- mostlyclean-tags mostlyclean-generic ++ mostlyclean-tags mostlyclean-depend mostlyclean-generic + + mostlyclean: mostlyclean-am + + clean-am: clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \ + clean-binPROGRAMS clean-checkPROGRAMS clean-tags \ +- clean-generic mostlyclean-am ++ clean-depend clean-generic mostlyclean-am + + clean: clean-am + + distclean-am: distclean-hdr distclean-libLTLIBRARIES distclean-compile \ + distclean-libtool distclean-binPROGRAMS \ +- distclean-checkPROGRAMS distclean-tags \ ++ distclean-checkPROGRAMS distclean-tags distclean-depend \ + distclean-generic clean-am + -rm -f libtool + +@@ -1143,7 +624,8 @@ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-binPROGRAMS \ + maintainer-clean-checkPROGRAMS maintainer-clean-tags \ +- maintainer-clean-generic distclean-am ++ maintainer-clean-depend 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." + +@@ -1164,8 +646,9 @@ + uninstall-modincludeHEADERS install-modincludeHEADERS \ + uninstall-pkgincludeHEADERS install-pkgincludeHEADERS tags \ + mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ +-distdir info-am info dvi-am dvi check-local check check-am \ +-installcheck-am installcheck all-recursive-am install-exec-am \ ++distdir mostlyclean-depend distclean-depend clean-depend \ ++maintainer-clean-depend info-am info dvi-am dvi check-local 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 \ + mostlyclean-generic distclean-generic clean-generic \ +diff -urN ../guile-1.3.4/libguile/dynl-dl.c ./libguile/dynl-dl.c +--- ../guile-1.3.4/libguile/dynl-dl.c Sun Aug 29 20:03:26 1999 ++++ ./libguile/dynl-dl.c Fri Mar 24 01:48:27 2000 +@@ -45,7 +45,9 @@ + Author: Aubrey Jaffer + Modified for libguile by Marius Vollmer */ + ++#ifndef __CYGWIN__ + #include ++#endif + + #ifdef RTLD_LAZY /* Solaris 2. */ + # define DLOPEN_MODE RTLD_LAZY +diff -urN ../guile-1.3.4/libguile/filesys.c ./libguile/filesys.c +--- ../guile-1.3.4/libguile/filesys.c Sun Sep 12 05:47:39 1999 ++++ ./libguile/filesys.c Fri Mar 24 01:48:27 2000 +@@ -138,7 +138,9 @@ + fdes = SCM_INUM (object); + else + fdes = SCM_FPORT_FDES (object); ++#ifndef __CYGWIN__ + SCM_SYSCALL (rv = fchown (fdes, SCM_INUM (owner), SCM_INUM (group))); ++#endif + } + else + { +diff -urN ../guile-1.3.4/qt/Makefile.in ./qt/Makefile.in +--- ../guile-1.3.4/qt/Makefile.in Sat Sep 25 19:37:18 1999 ++++ ./qt/Makefile.in Fri Mar 24 10:47:26 2000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4 from Makefile.am ++# Makefile.in generated automatically by automake 1.4a from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -46,9 +46,10 @@ + 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_STRIP_FLAG = + transform = @program_transform_name@ + + NORMAL_INSTALL = : +@@ -125,8 +126,9 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = tar ++TAR = gtar + GZIP_ENV = --best ++DEP_FILES = .deps/qt.P + SOURCES = $(libqthreads_la_SOURCES) + OBJECTS = $(libqthreads_la_OBJECTS) + +@@ -134,9 +136,9 @@ + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps qt/Makefile ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign qt/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -168,9 +170,6 @@ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -187,9 +186,6 @@ + + maintainer-clean-compile: + +-.c.lo: +- $(LIBTOOL) --mode=compile $(COMPILE) -c $< +- + .S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +@@ -300,10 +296,15 @@ + subdir = qt + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign qt/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +@@ -320,9 +321,38 @@ + || exit 1; \ + fi; \ + done +-qt.lo qt.o : qt.c copyright.h qt.h md/i386.h +-qtmdc.lo qtmdc.o : qtmdc.c + ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ++ ++-include $(DEP_FILES) ++ ++mostlyclean-depend: ++ ++clean-depend: ++ ++distclean-depend: ++ -rm -rf .deps ++ ++maintainer-clean-depend: ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-cp .deps/$(*F).pp .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm .deps/$(*F).pp ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ++ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ++ < .deps/$(*F).pp > .deps/$(*F).P; \ ++ tr ' ' '\012' < .deps/$(*F).pp \ ++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ++ >> .deps/$(*F).P; \ ++ rm -f .deps/$(*F).pp + info-am: + info: info-recursive + dvi-am: +@@ -345,7 +375,7 @@ + all-am: Makefile $(LTLIBRARIES) + all-redirect: all-recursive + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + installdirs: installdirs-recursive + installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(libdir) +@@ -361,27 +391,27 @@ + + maintainer-clean-generic: + mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ +- mostlyclean-libtool mostlyclean-tags \ ++ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + + mostlyclean: mostlyclean-recursive + + clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ +- clean-generic mostlyclean-am ++ clean-depend clean-generic mostlyclean-am + + clean: clean-recursive + + distclean-am: distclean-libLTLIBRARIES distclean-compile \ +- distclean-libtool distclean-tags distclean-generic \ +- clean-am ++ distclean-libtool distclean-tags distclean-depend \ ++ distclean-generic clean-am + -rm -f libtool + + distclean: distclean-recursive + + maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ +- maintainer-clean-tags maintainer-clean-generic \ +- distclean-am ++ maintainer-clean-tags maintainer-clean-depend \ ++ 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." + +@@ -398,12 +428,14 @@ + 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 ++distclean-tags clean-tags maintainer-clean-tags distdir \ ++mostlyclean-depend distclean-depend clean-depend \ ++maintainer-clean-depend 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 + + + .s.lo: +diff -urN ../guile-1.3.4/qt/md/Makefile.in ./qt/md/Makefile.in +--- ../guile-1.3.4/qt/md/Makefile.in Sat Sep 25 19:37:20 1999 ++++ ./qt/md/Makefile.in Fri Mar 24 10:47:26 2000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4 from Makefile.am ++# Makefile.in generated automatically by automake 1.4a from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -46,9 +46,10 @@ + 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_STRIP_FLAG = + transform = @program_transform_name@ + + NORMAL_INSTALL = : +@@ -102,14 +103,14 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = tar ++TAR = gtar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps qt/md/Makefile ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign qt/md/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -122,10 +123,15 @@ + subdir = qt/md + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign qt/md/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +@@ -154,7 +160,7 @@ + all-am: Makefile + all-redirect: all-am + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + installdirs: + + +diff -urN ../guile-1.3.4/qt/time/Makefile.in ./qt/time/Makefile.in +--- ../guile-1.3.4/qt/time/Makefile.in Sat Sep 25 19:37:22 1999 ++++ ./qt/time/Makefile.in Fri Mar 24 10:47:26 2000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4 from Makefile.am ++# Makefile.in generated automatically by automake 1.4a from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -46,9 +46,10 @@ + 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_STRIP_FLAG = + transform = @program_transform_name@ + + NORMAL_INSTALL = : +@@ -101,14 +102,14 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = tar ++TAR = gtar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps qt/time/Makefile ++ cd $(top_srcdir) && $(AUTOMAKE) --foreign qt/time/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -121,10 +122,15 @@ + subdir = qt/time + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign qt/time/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +@@ -153,7 +159,7 @@ + all-am: Makefile + all-redirect: all-am + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + installdirs: + + diff --git a/aclocal.m4 b/aclocal.m4 index 53d9704aed..34ff2c2dc8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,3 +1,7 @@ +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -157,10 +161,26 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ ]) AC_DEFUN(AC_STEPMAKE_GUILE, [ - GUILE_FLAGS - if guile-config --version 2>&1 | grep -q 'version 1\.[012]'; then - AC_STEPMAKE_WARN(Guile version 1.3 or better needed) + ## First, let's just see if we can find Guile at all. + AC_MSG_CHECKING("for guile-config") + for guile_config in guile-config $build-guile-config; do + AC_MSG_RESULT("$guile_config") + if ! $guile_config --version > /dev/null 2>&1 ; then + AC_MSG_WARN("cannot execute $guile_config") + AC_MSG_CHECKING("if we are cross compiling") + guile_config=error + else + break + fi + done + if test "$guile_config" = "error"; then + AC_MSG_ERROR("cannot find guile-config; is Guile installed?") + exit 1 fi + if $guile_config --version 2>&1 | grep -q 'version 1\.[012]'; then + AC_STEPMAKE_WARN(Guile version 1.3 or better needed) + fi + GUILE_FLAGS AC_PATH_PROG(GUILE, guile, error) AC_SUBST(GUILE) ]) @@ -761,12 +781,12 @@ dnl find the libraries. AC_DEFUN([GUILE_FLAGS],[ ## The GUILE_FLAGS macro. - ## First, let's just see if we can find Guile at all. AC_MSG_CHECKING(for Guile) - guile-config link > /dev/null || { - echo "configure: cannot find guile-config; is Guile installed?" 1>&2 - exit 1 - } + if ! $guile_config link > /dev/null ; then + AC_MSG_RESULT("cannot execute $guile_config") + AC_MSG_ERROR("cannot find guile-config; is Guile installed?") + exit 1 + fi GUILE_CFLAGS="`guile-config compile`" GUILE_LDFLAGS="`guile-config link`" AC_SUBST(GUILE_CFLAGS) diff --git a/buildscripts/make-cygwin-cross.sh b/buildscripts/make-cygwin-cross.sh new file mode 100644 index 0000000000..ad1b50ba0d --- /dev/null +++ b/buildscripts/make-cygwin-cross.sh @@ -0,0 +1,392 @@ +#!@BASH@ +# make-cygwin-cross +# +# Build and install cross-development tools for cygwin package +# (binutils, compiler, flex, bison). +# Using this cross-development enviroment, build and install +# native cygwin packages (guile, lilypond). +# +# Besides being a handy script for me, currently this mainly serves +# as documentation for cross-building lilypond. +# +# To use this script, you need +# +# * all development tools to build a native LilyPond, see INSTALL.txt +# +# * pre-release cygnus sources (and a binary) from: +# +# ftp://sourceware.cygnus.com/pub/cygwin/private/cygwin-net-485/ +# +# binutils/binutils-19990818-1-src.tar.gz +# bison/bison-src.tar.gz +# cygwin/cygwin-20000301.tar.gz +# flex/flex-src.tar.gz +# gcc/gcc-2.95.2-1-src.tar.gz +# +# ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/runtime/ +# +# bin-crtdll-2000-02-03.tar.gz (mingw only) +# +# * guile-1.3.4.tar.gz +# +# * lilypond-1.3.38.jcn1.tar.gz +# +# * lots of disk space, ca 353MB +# + +################ +# config section +################ + +target=cygwin +#target=mingw + +if [ $target = cygwin ]; then + ROOT=/usr/src/cygwin-net-485 + TARGET_ARCH=i686-pc-cygwin +else + ROOT=/usr/src/mingw-net-485 + TARGET_ARCH=i386-pc-mingw32 +fi +PREFIX=$ROOT/usr +NATIVE_PREFIX=/Cygnus/usr + +# urg +DEVEL=/home/fred +WWW=$DEVEL/WWW/lilypond/gnu-windows +#WWW=/tmp + +CYGWIN_SOURCE=$DEVEL/sourceware.cygnus.com/pub/cygwin/private/cygwin-net-485 +MINGW_SOURCE=$DEVEL/ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/runtime +SOURCE_PATH=$DEVEL/usr/src/releases:$DEVEL/usr/src/patches:$DEVEL/usr/src/lilypond/Documentation/ntweb:$MINGW_SOURCE + +HOST=`uname -m`-gnu-`uname -s | tr '[A-Z]' '[a-z]'` + +cygwin_binary=cygwin-20000301.tar.gz +mingw_binary=bin-crtdll-2000-02-03.tar.gz + +#CYGWIN_DLL=cygwin1-net-485.dll +CYGWIN_DLL=cygwin1.dll +MINWG_DLL=mingwc10-net-485.dll + + +################ +# cross packages +################ + +cross_packages=" +binutils-19990818 +gcc-2.95.2 +flex +bison +" +not_yet_needed=" +cygwin-2000301 +" + +cross_configure='--prefix=$PREFIX --target=$TARGET_ARCH' +gcc_make='LANGUAGES="c++"' +cygwin_make='-k || true' + + +################# +# native packages +################# + +# Typically, we install native packages under +# +# /Cygnus/usr/package-x.y.z +# +# so that's how we configure them. +# +native_configure='--target=$TARGET_ARCH --build=$TARGET_ARCH --host=$HOST --oldincludedir=$PREFIX/include --prefix=$NATIVE_PREFIX/$package --program-suffix=' + +guile_patch='guile-1.3.4-gnu-windows.patch' +if [ $target = mingw ]; then + guile_patch1='guile-1.3.4-mingw.patch' + guile_cflags='-I $PREFIX/$TARGET_ARCH/include -I $PREFIX/i686-pc-cygwin/include' +fi +guile_ldflags='-L$PREFIX/lib $PREFIX/bin/$CYGWIN_DLL' +guile_configure='--enable-sizeof-int=4 --enable-sizeof-long=4 --enable-restartable-syscalls=yes' +guile_make='oldincludedir=$PREFIX/include' + +# We need to get guile properly installed for cross-development, ie +# at our prefix: $PREFIX. When packaging, the prefix we configured +# for, will be used. +# +guile_install='prefix=$PREFIX' + +lilypond_version=@TOPLEVEL_VERSION@ +if [ $target = mingw ]; then + lilypond_cflags='-I $PREFIX/$TARGET_ARCH/include -I $PREFIX/i686-pc-cygwin/include' +fi +lilypond_ldflags='-L$PREFIX/lib -lguile $PREFIX/bin/$CYGWIN_DLL' +#lilypond_configure='--prefix=$lilypond_prefix' +## URG, help2man: doesn't know about cross-compilation. +#lilypond_make='-k || make -k || true' +lilypond_patch=lilypond-manpages.patch +# Don't install lilypond +lilypond_install='--just-print' + +native_packages=" +guile-1.3.4 +lilypond-$lilypond_version +" + +####################### +# end of config section +####################### + +cygwin_dirs=`/bin/ls -d1 $CYGWIN_SOURCE/*` +cygwin_source_path=`echo $CYGWIN_SOURCE $cygwin_dirs` +source_path=`echo $SOURCE_PATH:$cygwin_source_path | sed 's/:/ /g'` + +########### +# functions +########### + +untar () +{( + set -x + tarball=$1 + dest_dir=$2 + + first_dir=`tar tzf $tarball | head -1` + src_dir=`dirname $first_dir` + + if [ "$src_dir" = "src" -o "$src_dir" = "./src" \ + -o "$src_dir" = "." ]; then + src_dir=$first_dir + fi + + tar xzf $tarball + + if [ "$src_dir" != "$dest_dir" -a "$src_dir" != "$dest_dir/" ]; then + mv $src_dir $dest_dir + rm -rf ./$first_dir + fi +) +} + +expand () +{( + + set - + string=`eval echo $\`eval echo ${1}${2}\`` + eval echo $string +) +} + +find_path () +{( + set - + expr=$1 + found= + for i in $source_path; do + found=`/bin/ls -d1 $i/$expr 2>/dev/null | head -1` + if [ -e "$found" ]; then + break + fi + done + echo $found +) +} + +fix_extension () +{ + file=$1 + ext=$2 + expr="$3" + base=`basename $file $ext` + if [ $base$ext != $i ]; then + type="`file $file`" + if expr "$type" : "$expr"; then + mv -f $file $base$ext + fi + fi +} + +build () +{( + package=$1 + set - + if [ -d $package ]; then + echo "$package: directory exists" + echo "$package: skipping" + exit 0 + fi + + name=`echo $package | sed 's/-.*//'` + name_cflags=`expand $name _cflags` + name_ldflags=`expand $name _ldflags` + name_configure=`expand $name _configure` + type_configure=`expand $type _configure` + name_make=`expand $name _make` + name_install=`expand $name _install` + + found=`find_path $package*src.tar.gz` + if [ "$found" = "" ]; then + found=`find_path $package.tar.gz` + fi + if [ "$found" = "" ]; then + found=`find_path $name*tar.gz` + fi + if [ "$found" = "" ]; then + echo "$package: no such tarball" + exit 1 + fi + + untar $found $package + patch=`expand $name _patch` + count=0 + while [ "x$patch" != "x" ]; do + ( + cd $package + found=`find_path $patch` + if [ "$found" = "" ]; then + echo "$patch: no such file" + exit 1 + fi + patch -p1 -E < $found + ) + count=`expr $count + 1` + patch=`expand $name _patch$count` + done + set -x + mkdir $type-$package + cd $type-$package + + rm -f config.cache + CFLAGS="$name_cflags" LDFLAGS="$name_ldflags" ../$package/configure $type_configure $name_configure || exit 1 + make $name_make || exit 1 + make install $name_install || exit 1 +) +} + +## urg, let's hope Cygnus uses rpm for packaging its next release +pack () +{( + set - + package=$1 + + zip=$WWW/$package.zip + if [ -e $zip ]; then + echo "$zip: package exists" + echo "$zip: skipping" + exit 0 + fi + + name=`echo $package | sed 's/-.*//'` + name_pack_install=`expand $name _pack_install` + install_root=/tmp/$package-install + install_prefix=$install_root/$NATIVE_PREFIX/$package + + set -x + rm -rf $install_root + mkdir -p $install_prefix + + cd $PREFIX/src/$type-$package || exit 1 + make install prefix=$install_prefix $name_pack_install + + ## duh, rename executables, + ## for people that use a dumb shell instead of bash + cd $install_prefix/bin && + for i in `/bin/ls -d1 *`; do + fix_extension $i .exe '.*Windows.*\(executable\).*' + fix_extension $i .py '.*\(python\).*' + done + + rm -f $zip + cd $install_root && zip -r $zip .$NATIVE_PREFIX +) +} +################## +# end of functions +################## + +# +# setup +# + +set -x +mkdir -p $ROOT +if [ ! -d $PREFIX ]; then + cd $ROOT + found=`find_path $cygwin_binary` + if [ "$found" = "" ]; then + echo "$cygwin_binary: no such tarball" + exit 1 + fi + tar xzf $found + # urg, bug in gcc's cross-make configuration + mkdir -p $PREFIX/lib/gcc-lib/$TARGET_ARCH/2.95.2 + + cd $PREFIX + + # urg, bug in gcc's cross-make configuration + rm -f include + ln -s $PREFIX/$TARGET_ARCH/include . +else + echo "$PREFIX: already exists" + echo "$cygwin_binary: skipping" +fi + +# mingw +if [ ! -d $PREFIX/$TARGET_ARCH ]; then + cd $PREFIX + found=`find_path $mingw_binary` + if [ "$found" = "" ]; then + echo "$mingw_binary: no such tarball" + exit 1 + fi + tar xzf $found + + mkdir -p $PREFIX/lib/gcc-lib/$TARGET_ARCH/2.95.2 + rm -f include + mkdir -p $PREFIX/i386-mingw32/include + ln -s $PREFIX/i386-mingw32 $TARGET_ARCH + ln -s $PREFIX/$TARGET_ARCH/include . +fi + +if [ ! -e $NATIVE_PREFIX ]; then + ln -s $ROOT /Cygnus || exit 1 +fi + +mkdir -p $PREFIX/src +cd $PREFIX/src +PATH=$PATH:$PREFIX/bin + +type=cross +for i in $cross_packages; do + if build $i; then + true + else + echo "$i: build failed" + exit 1 + fi +done + +# urg, bug in gcc's cross-make install +mv $PREFIX/bin/cygwin1.dll $PREFIX/bin/$CYGWIN_DLL +mv $PREFIX/bin/mingwc10.dll $PREFIX/bin/$MINGW_DLL +ln -f $PREFIX/bin/$TARGET_ARCH-gcc $PREFIX/$TARGET_ARCH/bin/cc +ln -f $PREFIX/bin/$TARGET_ARCH-c++ $PREFIX/$TARGET_ARCH/bin/c++ +ln -f $PREFIX/bin/$TARGET_ARCH-g++ $PREFIX/$TARGET_ARCH/bin/g++ + +PATH=$PREFIX/$TARGET_ARCH/bin:$PREFIX/bin:$PATH + +mkdir -p $PREFIX/src +cd $PREFIX/src + +set -x +type=native +for i in $native_packages; do + if build $i; then + pack $i + continue + fi + exit 1 +done + +rm -f $WWW/$CYGWIN_DLL.zip +cd $PREFIX/bin && zip $WWW/$CYGWIN_DLL.zip $CYGWIN_DLL diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly index b6752444ce..455a2c6e42 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -11,8 +11,9 @@ \context Staff = bass { \property Staff.instrument = "Left " \clef bass; c4 }> \paper { +linewidth=-1.0; \translator { \ScoreContext - textVerticalAlignment = #0 + %textVerticalAlignment = #0 } \translator { \StaffContext \consists "Staff_margin_engraver"; } \translator { \PianoStaffContext \consists "Staff_margin_engraver"; } diff --git a/input/trip.ly b/input/trip.ly index 9b4e534c6e..89d41edeeb 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -167,7 +167,7 @@ fugaIIPedal = \notes \relative c { \context Staff = pedal \relative c < { \time 4/4; - \key E; + \key e; \clef bass; %13 diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index cf9208793a..69ea5fee61 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -53,6 +53,7 @@ Axis_group_engraver::process_acknowledged () for (int i=0; i < elts_.size (); i++) { Score_element *par = elts_[i]->parent_l (Y_AXIS); + if (!par || !Axis_group_interface (par).has_interface_b ()) Axis_group_interface (staffline_p_).add_element (elts_[i]); } diff --git a/lily/beam.cc b/lily/beam.cc index dfc960c3a4..39edb511db 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -770,8 +770,6 @@ Beam::forced_stem_count () const return f; } - - /* TODO: Fix this class. This is wildly inefficient. And it sux. Yet another array/list 'interface'. @@ -795,8 +793,6 @@ Beam::stem_top () const SCM s = get_elt_property ("stems"); return gh_pair_p (s) ? dynamic_cast (unsmob_element (gh_car (s))) : 0; - - //Group_interface__extract_elements ((Beam*) this, (Stem*) 0, "stems")[stem_count () - 1]; } /* burp */ diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc new file mode 100644 index 0000000000..c74c8be464 --- /dev/null +++ b/lily/chord-tremolo-iterator.cc @@ -0,0 +1,76 @@ +/* + chord-tremolo-iterator.cc -- implement Chord_tremolo_iterator + + source file of the GNU LilyPond music typesetter + + (c) 2000 Han-Wen Nienhuys + + */ + + +/* + this is culled from various other iterators, but sharing code by subclassing proved to be too difficult. + */ + +#include "chord-tremolo-iterator.hh" +#include "repeated-music.hh" + +void +Chord_tremolo_iterator::construct_children () +{ + Repeated_music const* rep = dynamic_cast (music_l_); + factor_ = Moment (1, rep->repeats_i_); + child_iter_p_ = get_iterator_p (rep->repeat_body_p_); +} + +Chord_tremolo_iterator::Chord_tremolo_iterator() +{ + factor_ = 1; + child_iter_p_ = 0; +} + +void +Chord_tremolo_iterator::do_process_and_next (Moment m) +{ + if (!m) + { + Music_iterator *yeah = try_music (music_l_); + if (yeah) + set_translator (yeah->report_to_l ()); + else + music_l_->warning ( _("no one to print a tremolos")); + } + + child_iter_p_->process_and_next (factor_ * m); +} + + +Moment +Chord_tremolo_iterator::next_moment () const +{ + return child_iter_p_->next_moment () / factor_; +} + +bool +Chord_tremolo_iterator::ok () const +{ + return child_iter_p_ && child_iter_p_->ok(); +} + +Chord_tremolo_iterator::~Chord_tremolo_iterator () +{ + delete child_iter_p_; +} + +Music_iterator* +Chord_tremolo_iterator::try_music_in_children (Music const *m) const +{ + return child_iter_p_->try_music (m); +} + + +void +Chord_tremolo_iterator::do_print () const +{ + child_iter_p_->print (); +} diff --git a/lily/identifier.cc b/lily/identifier.cc index 8cf65fae49..964b33ceeb 100644 --- a/lily/identifier.cc +++ b/lily/identifier.cc @@ -6,6 +6,9 @@ (c) 1997--2000 Han-Wen Nienhuys */ +/* + JUNKTHIS! + */ #include #include "midi-def.hh" @@ -16,13 +19,12 @@ #include "debug.hh" #include "request.hh" #include "translator-group.hh" -#include "notename-table.hh" + Identifier::Identifier (int code) { token_code_i_ = code; accessed_b_ = 0; - init_b_ = 0; } Identifier::Identifier (Identifier const&s) @@ -30,7 +32,6 @@ Identifier::Identifier (Identifier const&s) { token_code_i_ = s.token_code_i_; accessed_b_ = s.accessed_b_; - init_b_ = s.init_b_; } Identifier::~Identifier() @@ -91,7 +92,6 @@ Class ## _identifier::do_str () const { \ } -DUMMY_STR(Notename_table); DUMMY_STR(Translator_group); DUMMY_STR(Music); DUMMY_STR(Request); @@ -112,7 +112,6 @@ STRING_PRINT(Duration); STRING_PRINT(Real); STRING_PRINT(int); STRING_PRINT(String); -STRING_PRINT(Notename_table); #define DEFAULT_STR(Class) \ String \ @@ -168,11 +167,9 @@ IMPLEMENT_ID_CLASS(Score); IMPLEMENT_ID_CLASS(Request); IMPLEMENT_ID_CLASS(Midi_def); IMPLEMENT_ID_CLASS(Paper_def); -IMPLEMENT_ID_CLASS(Notename_table); VIRTUAL_ACCESSOR(Music); VIRTUAL_ACCESSOR(Request); VIRTUAL_ACCESSOR(Translator_group); -DEFAULT_ACCESSOR(Notename_table); DEFAULT_ACCESSOR(Duration); DEFAULT_ACCESSOR(int); DEFAULT_ACCESSOR(Real); diff --git a/lily/include/chord-tremolo-iterator.hh b/lily/include/chord-tremolo-iterator.hh new file mode 100644 index 0000000000..9100bce319 --- /dev/null +++ b/lily/include/chord-tremolo-iterator.hh @@ -0,0 +1,35 @@ +/* + chord-tremolo-iterator.hh -- declare Chord_tremolo_iterator + + source file of the GNU LilyPond music typesetter + + (c) 2000 Han-Wen Nienhuys + + */ + +#ifndef CHORD_TREMOLO_ITERATOR_HH +#define CHORD_TREMOLO_ITERATOR_HH + +#include "music-iterator.hh" + +class Chord_tremolo_iterator : public Music_iterator +{ + Moment factor_; + Music_iterator * child_iter_p_; + +public: + Chord_tremolo_iterator (); + +protected: + virtual ~Chord_tremolo_iterator (); + virtual Moment next_moment () const; + virtual void construct_children () ; + virtual bool ok () const; + virtual void do_print () const; + virtual void do_process_and_next (Moment) ; + virtual Music_iterator *try_music_in_children (Music const *) const; +}; + + +#endif /* CHORD_TREMOLO_ITERATOR_HH */ + diff --git a/lily/include/duration.hh b/lily/include/duration.hh index c00fc2fcaa..da85a46239 100644 --- a/lily/include/duration.hh +++ b/lily/include/duration.hh @@ -29,6 +29,10 @@ struct Duration { /// Logarithm of the base duration. int durlog_i_; int dots_i_; + + /* + JUNKME. + */ int tuplet_iso_i_; // 2/3; 2 is not duration, maar of count! int tuplet_type_i_; diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index 5cb3eb0124..fc00a1465c 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -19,6 +19,7 @@ #include "includable-lexer.hh" #include "duration.hh" #include "musical-pitch.hh" +#include "protected-scm.hh" bool busy_parsing(); void kill_lexer(); @@ -33,8 +34,12 @@ public: Scope * toplevel_scope_p_; bool main_input_b_; - Notename_table *chordmodifier_tab_p_; - Notename_table *note_tab_p_; + /* + Scheme hash tables with (oct name acc) values, and symbol keys + */ + Protected_scm chordmodifier_tab_; + Protected_scm pitchname_tab_; + Link_array scope_l_arr_; Keyword_table * keytable_p_; int errorlevel_i_; @@ -49,15 +54,12 @@ public: void set_chordmodifier_table (Notename_table*tab_p); void set_notename_table (Notename_table*tab_p); Identifier*lookup_identifier (String s); - Musical_pitch lookup_notename (String s); - Musical_pitch lookup_chordmodifier (String s); void push_note_state(); void push_chord_state(); void push_lyric_state(); void pop_state(); void LexerError (char const *); void set_identifier (String str, Identifier* i, bool unique_b = true); - void print_declarations (bool init_b) const; bool note_state_b() const; bool chord_state_b() const; bool lyric_state_b() const; diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh index 907aa962b4..7c93a9a15b 100644 --- a/lily/include/my-lily-parser.hh +++ b/lily/include/my-lily-parser.hh @@ -23,8 +23,10 @@ /** State for the parser. Do not ever add any variables to parse musical content here. We still have to remove default_duration_. - - */ + + TODO: interface is too complicated + +*/ class My_lily_parser { public: @@ -37,14 +39,17 @@ public: public: Duration default_duration_; - Musical_pitch default_pitch_; + Scope *default_header_p_; + + + // JUNKME int chord_tremolo_type_i_; - bool first_b_; + int fatal_error_i_; Sources * source_l_; int error_level_i_; - bool init_parse_b_; + My_lily_lexer * lexer_p_; bool ignore_version_b_; @@ -54,23 +59,18 @@ public: void remember_spot(); Input pop_spot(); - Paper_def*default_paper_p(); - Midi_def*default_midi_p(); void do_yyparse(); void parser_error (String); - void set_debug(); void set_yydebug (bool); private: - char const* here_ch_C() const; + Array define_spot_array_; - String init_str_; - Simultaneous_music * get_note_element (Note_req * ,Duration *); + char const* here_ch_C() const; + Simultaneous_music * get_chord (Musical_pitch tonic, Array* add_arr_p, Array* sub_arr_p, Musical_pitch* inversion_p, Musical_pitch* bass_p, Duration d); - Simultaneous_music* get_rest_element (String, Duration *); - Simultaneous_music* get_word_element (String, Duration*); - String notename_str (Melodic_req* melodic); + void set_chord_tremolo (int type_i); void set_last_duration (Duration const *); void set_last_pitch (Musical_pitch const *); diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh index 89384b9af7..7d572eb766 100644 --- a/lily/include/repeated-music.hh +++ b/lily/include/repeated-music.hh @@ -50,6 +50,8 @@ class Repeated_music : public Music { public: + String type_; + bool fold_b_; /// if FOLD_B_ is false, semifold this. bool volta_fold_b_; diff --git a/lily/include/scope.hh b/lily/include/scope.hh index fb3f140535..19f5313536 100644 --- a/lily/include/scope.hh +++ b/lily/include/scope.hh @@ -17,7 +17,6 @@ class Protected_scm; class Scope { Hash_table *id_dict_; public: - void print () const; bool elem_b (String ) const; bool elem_b (SCM s) const; Identifier *&elem (String); diff --git a/lily/lexer.ll b/lily/lexer.ll index 4cf958de48..b567746c36 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -340,7 +340,7 @@ HYPHEN -- return STRING; } . { - return yylval.c = YYText ()[0]; + return YYText ()[0]; } } { @@ -370,7 +370,7 @@ HYPHEN -- return CHORD_CARET; } . { - return yylval.c = YYText ()[0]; + return YYText ()[0]; } } @@ -415,12 +415,12 @@ HYPHEN -- } . { - return yylval.c = YYText ()[0]; + return YYText ()[0]; } \\. { char c= YYText ()[1]; - yylval.c = c; + switch (c) { case '>': return E_BIGGER; @@ -468,6 +468,10 @@ My_lily_lexer::pop_state () int My_lily_lexer::scan_escaped_word (String str) { + // use more SCM for this. + + SCM sym = ly_symbol2scm (str.ch_C()); + int l = lookup_keyword (str); if (l != -1) { return l; @@ -478,16 +482,16 @@ My_lily_lexer::scan_escaped_word (String str) return id->token_code_i_; } if ((YYSTATE != notes) && (YYSTATE != chords)) { - if (note_tab_p_->elem_b (str)) + SCM pitch = scm_hashq_ref (pitchname_tab_, sym, SCM_BOOL_F); + + if (pitch != SCM_BOOL_F) { - yylval.pitch = new Musical_pitch (lookup_notename (str)); + yylval.pitch = new Musical_pitch (pitch); yylval.pitch->set_spot (Input (source_file_l (), here_ch_C ())); return NOTENAME_PITCH; } } - if (flower_dstream) - print_declarations (true); String msg (_f ("unknown escaped string: `\\%s'", str)); LexerError (msg.ch_C ()); @@ -499,15 +503,17 @@ My_lily_lexer::scan_escaped_word (String str) int My_lily_lexer::scan_bare_word (String str) { + SCM sym = ly_symbol2scm (str.ch_C ()); if ((YYSTATE == notes) || (YYSTATE == chords)) { - if (note_tab_p_->elem_b (str)) { - yylval.pitch = new Musical_pitch (lookup_notename (str)); + SCM pitch = scm_hashq_ref (pitchname_tab_, sym, SCM_BOOL_F); + if (pitch != SCM_BOOL_F) { + yylval.pitch = new Musical_pitch (pitch); yylval.pitch->set_spot (Input (source_file_l (), here_ch_C ())); return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH; - } else if (chordmodifier_tab_p_->elem_b (str)) + } else if ((pitch = scm_hashq_ref (pitchname_tab_, sym, SCM_BOOL_F))!= SCM_BOOL_F) { - yylval.pitch = new Musical_pitch (lookup_chordmodifier (str)); + yylval.pitch = new Musical_pitch (pitch); yylval.pitch->set_spot (Input (source_file_l (), here_ch_C ())); return CHORDMODIFIER_PITCH; diff --git a/lily/main.cc b/lily/main.cc index cd2ee91d95..d0f568c836 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -69,7 +69,7 @@ String distill_inname_str (String name_str, String& ext_r); */ Long_option_init theopts[] = { {0, "debug", 'd', _i ("enable debugging output")}, - {_i ("EXT"), "output-format", 'f', _i ("use output format EXT")}, + {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, {0, "help", 'h', _i ("this help")}, {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index edbb722e24..1ad45da523 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -37,6 +37,7 @@ #include "request.hh" #include "request-iterator.hh" #include "output-property.hh" +#include "chord-tremolo-iterator.hh" void Music_iterator::do_print() const @@ -149,7 +150,9 @@ Music_iterator::static_get_iterator_p (Music const *m) p = new Music_wrapper_iterator; else if (Repeated_music const * n = dynamic_cast (m)) { - if (n->fold_b_) + if (n->type_ == "tremolo") + p = new Chord_tremolo_iterator; + else if (n->fold_b_) p = new Folded_repeat_iterator; else p = new Unfolded_repeat_iterator; diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index fec85bba0f..4330d1733a 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -92,12 +92,6 @@ Music_output_def::get_global_translator_p () void Music_output_def::print () const { -#ifndef NPRINT - DEBUG_OUT << "Translators: \n"; - translator_p_dict_p_->print (); - DEBUG_OUT << "Other definitions.\n"; - scope_p_->print( ); -#endif } String diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 0e74531f07..ab0bd3f3a8 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -8,7 +8,7 @@ #include #include -#include "notename-table.hh" + #include "interval.hh" #include "identifier.hh" #include "lily-guile.hh" @@ -85,8 +85,6 @@ My_lily_lexer::My_lily_lexer() toplevel_scope_p_ = new Scope; scope_l_arr_.push (toplevel_scope_p_); errorlevel_i_ = 0; - note_tab_p_ = new Notename_table; - chordmodifier_tab_p_ = new Notename_table; main_input_b_ = false; } @@ -110,17 +108,8 @@ My_lily_lexer::lookup_identifier (String s) void My_lily_lexer::start_main_input () { - if (flower_dstream && !flower_dstream->silent_b ("InitDeclarations") && flower_dstream) - print_declarations (true); - if (flower_dstream && !flower_dstream->silent_b ("InitLexer") && flower_dstream) - set_debug (1); - - new_input (main_input_str_, source_global_l); allow_includes_b_ = allow_includes_b_ && !(safe_global_b); - - - print_declarations(true); } void @@ -133,10 +122,6 @@ My_lily_lexer::set_identifier (String name_str, Identifier* i, bool ) if (old) { -#if 0 - if (unique_b) - old->warning(_f ("redeclaration of `\\%s'", name_str)); -#endif delete old; } if (lookup_keyword (name_str) >= 0) @@ -149,21 +134,11 @@ My_lily_lexer::set_identifier (String name_str, Identifier* i, bool ) My_lily_lexer::~My_lily_lexer() { - delete chordmodifier_tab_p_; delete keytable_p_; delete toplevel_scope_p_ ; - delete note_tab_p_; } -void -My_lily_lexer::print_declarations (bool ) const -{ - for (int i=scope_l_arr_.size (); i--; ) - { - DEBUG_OUT << "Scope no. " << i << '\n'; - scope_l_arr_[i]->print (); - } -} + void My_lily_lexer::LexerError (char const *s) @@ -180,35 +155,6 @@ My_lily_lexer::LexerError (char const *s) } } -Musical_pitch -My_lily_lexer::lookup_notename (String s) -{ - return note_tab_p_->get_pitch (s); -} - -Musical_pitch -My_lily_lexer::lookup_chordmodifier (String s) -{ - return chordmodifier_tab_p_->get_pitch (s); -} - - -void -My_lily_lexer::set_notename_table (Notename_table *p) -{ - delete note_tab_p_; - note_tab_p_ = p; -} - - - -void -My_lily_lexer::set_chordmodifier_table (Notename_table *p) -{ - delete chordmodifier_tab_p_; - chordmodifier_tab_p_ = p; -} - char My_lily_lexer::escaped_char(char c) const { diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index b081bcf6eb..0991ef79fc 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -25,7 +25,6 @@ My_lily_parser::My_lily_parser (Sources * source_l) { - first_b_ = true; source_l_ = source_l; lexer_p_ = 0; chord_tremolo_type_i_ = 0; @@ -52,12 +51,11 @@ void My_lily_parser::parse_file (String init, String s) { lexer_p_ = new My_lily_lexer; - init_str_ = init; + lexer_p_->main_input_str_ = s; progress_indication (_("Parsing...")); - init_parse_b_ = false; set_yydebug (flower_dstream &&!flower_dstream->silent_b ("Parser")); lexer_p_->new_input (init, source_l_); do_yyparse (); @@ -112,7 +110,12 @@ My_lily_parser::set_chord_tremolo (int type_i) // junk me Simultaneous_music * -My_lily_parser::get_chord (Musical_pitch tonic, Array* add_arr_p, Array* sub_arr_p, Musical_pitch* inversion_p, Musical_pitch* bass_p, Duration d) +My_lily_parser::get_chord (Musical_pitch tonic, + Array* add_arr_p, + Array* sub_arr_p, + Musical_pitch* inversion_p, + Musical_pitch* bass_p, + Duration d) { Simultaneous_music*v = new Request_chord; v->set_spot (here_input ()); @@ -171,17 +174,5 @@ My_lily_parser::here_input() const return lexer_p_->here_input (); } -Paper_def* -My_lily_parser::default_paper_p () -{ - Identifier *id = lexer_p_->lookup_identifier ("$defaultpaper"); - return id ? id->access_content_Paper_def (true) : new Paper_def ; -} -Midi_def* -My_lily_parser::default_midi_p () -{ - Identifier *id = lexer_p_->lookup_identifier ("$defaultmidi"); - return id ? id->access_content_Midi_def (true) : new Midi_def ; -} diff --git a/lily/new-chord-tremolo-engraver.cc b/lily/new-chord-tremolo-engraver.cc new file mode 100644 index 0000000000..3be0740ffe --- /dev/null +++ b/lily/new-chord-tremolo-engraver.cc @@ -0,0 +1,37 @@ +#if 0 +/* + new-chord-tremolo-engraver.cc -- implement New_chord_tremolo_engraver + + source file of the GNU LilyPond music typesetter + + (c) 2000 Han-Wen Nienhuys + + */ + + + +class New_chord_tremolo_engraver : public Engraver +{ +public: + VIRTUAL_COPY_CONS(Translator); + New_chord_tremolo_engraver(); +protected: + + virtual bool do_try_music (Music *); + virtual void do_process_music (); +}; + +New_chord_tremolo_engraver::New_chord_tremolo_engraver() +{ +} + +bool +New_chord_tremolo_engraver::do_try_music (Music * m) +{ + if (dynamic_cast (m)) + { + + } +} + +#endif diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc index 6f0b6cf88f..78227b5f60 100644 --- a/lily/output-property-engraver.cc +++ b/lily/output-property-engraver.cc @@ -43,6 +43,7 @@ Output_property_engraver::acknowledge_element (Score_element_info inf) { Output_property * o = props_[i]; SCM pred = gh_car (o->pred_sym_val_list_); + /* should typecheck pred. */ diff --git a/lily/parser.yy b/lily/parser.yy index 3b9df13d04..dab130bfa0 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -11,7 +11,6 @@ #include #include "lily-guile.hh" -#include "notename-table.hh" #include "translation-property.hh" #include "lookup.hh" #include "misc.hh" @@ -52,15 +51,13 @@ is_duration_b (int t) return t == 1 << intlog2(t); } - - - void print_mudela_versions (ostream &os) { os << _f ("Oldest supported input version: %s", oldest_version.str ()) << endl; } + // needed for bison.simple's malloc() and free() #include @@ -84,7 +81,6 @@ print_mudela_versions (ostream &os) Array *pitch_arr; Link_array *reqvec; Array *intvec; - Notename_table *chordmodifiertab; Duration *duration; Identifier *id; String * string; @@ -98,7 +94,6 @@ print_mudela_versions (ostream &os) Musical_pitch * pitch; Midi_def* midi; Moment *moment; - Notename_table *notenametab; Paper_def *paper; Real real; Request * request; @@ -110,7 +105,6 @@ of the parse stack onto the heap. */ Tempo_req *tempo; Translator_group* trans; - char c; int i; } %{ @@ -201,7 +195,6 @@ yylex (YYSTYPE *s, void * v_l) %token CHORDMODIFIER_PITCH %token DURATION_IDENTIFIER %token IDENTIFIER -%token NOTENAME_TABLE_IDENTIFIER %token MUSIC_IDENTIFIER %token REQUEST_IDENTIFIER %token REAL_IDENTIFIER @@ -235,12 +228,11 @@ yylex (YYSTYPE *s, void * v_l) %type int_list %type pre_requests post_requests %type gen_text_def -%type explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch +%type steno_musical_pitch musical_pitch absolute_musical_pitch %type steno_tonic_pitch -%type pitch_list +%type pitch_list chord_additions chord_subtractions chord_notes chord_step %type chord -%type chord_additions chord_subtractions chord_notes chord_step %type chord_note chord_inversion chord_bass %type midi_block midi_body %type duration_length @@ -260,10 +252,10 @@ yylex (YYSTYPE *s, void * v_l) %type string %type score_block score_body -%type script_abbreviation %type translator_spec_block translator_spec_body %type tempo_request -%type notenames_body notenames_block chordmodifiers_block +%type notenames_body notenames_block chordmodifiers_block +%type script_abbreviation @@ -284,10 +276,10 @@ mudela: /* empty */ toplevel_expression: notenames_block { - THIS->lexer_p_->set_notename_table ($1); + THIS->lexer_p_->pitchname_tab_ = $1; } | chordmodifiers_block { - THIS->lexer_p_->set_chordmodifier_table ($1); + THIS->lexer_p_->chordmodifier_tab_ = $1; } | mudela_header { delete header_global_p; @@ -317,26 +309,29 @@ embedded_scm: chordmodifiers_block: - CHORDMODIFIERS '{' notenames_body '}' { $$ = $3; } + CHORDMODIFIERS notenames_body { $$ = $2; } ; notenames_block: - NOTENAMES '{' notenames_body '}' { $$ = $3; } + NOTENAMES notenames_body { $$ = $2; } ; notenames_body: - /**/ { - $$ = new Notename_table; - } - | NOTENAME_TABLE_IDENTIFIER { - $$ = $1-> access_content_Notename_table(true); - } - | notenames_body STRING '=' explicit_musical_pitch { - $$->add_note_name (ly_scm2string ($2), $4); - delete $4; + embedded_scm { + int i = scm_ilength ($1); + + SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL); + for (SCM s = $1; s != SCM_EOL; s = gh_cdr (s)) { + SCM pt = gh_cdar (s); + if (scm_ilength (pt) != 3) + THIS->parser_error ("Need three args"); + scm_hashq_set_x (tab, gh_caar(s), pt); + } + + $$ = tab; } ; @@ -367,7 +362,7 @@ assignment: } /* cont */ '=' identifier_init { THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4); - $4->init_b_ = THIS->init_parse_b_; + $4->set_spot (THIS->pop_spot ()); } ; @@ -379,12 +374,6 @@ identifier_init: $$ = new Score_identifier ($1, SCORE_IDENTIFIER); } - | chordmodifiers_block { - $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER); - } - | notenames_block { - $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER); - } | paper_block { $$ = new Paper_def_identifier ($1, PAPER_IDENTIFIER); } @@ -488,7 +477,11 @@ score_block: /*cont*/ '{' score_body '}' { $$ = $4; if (!$$->def_p_arr_.size ()) - $$->add_output (THIS->default_paper_p ()); + { + Identifier *id = + THIS->lexer_p_->lookup_identifier ("$defaultpaper"); + $$->add_output (id ? id->access_content_Paper_def (true) : new Paper_def ); + } } ; @@ -538,7 +531,8 @@ paper_block: paper_def_body: /* empty */ { - Paper_def *p = THIS->default_paper_p (); + Identifier *id = THIS->lexer_p_->lookup_identifier ("$defaultpaper"); + Paper_def *p = id ? id->access_content_Paper_def (true) : new Paper_def; THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_); $$ = p; } @@ -635,9 +629,12 @@ midi_block: ; midi_body: /* empty */ { - Midi_def * p =THIS->default_midi_p (); - $$ = p; - THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); + Identifier *id = THIS->lexer_p_->lookup_identifier ("$defaultmidi"); + Midi_def* p = id + ? id->access_content_Midi_def (true) : new Midi_def ; + + $$ = p; + THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); } | MIDI_IDENTIFIER { Midi_def * p =$1-> access_content_Midi_def (true); @@ -651,6 +648,10 @@ midi_body: /* empty */ { $$-> assign_translator ($2); } | midi_body tempo_request semicolon { + /* + junk this ? there already is tempo stuff in + music. + */ $$->set_tempo ($2->dur_.length_mom (), $2->metronome_i_); delete $2; } @@ -707,8 +708,9 @@ Repeated_music: Repeated_music * r = new Repeated_music ($4, $3 >? 1, m); $$ = r; - r->fold_b_ = (ly_scm2string ($2) == "fold"); - r->volta_fold_b_ = (ly_scm2string ($2) == "volta"); + r->type_ = ly_scm2string ($2); + r->fold_b_ = (r->type_ == "fold"); + r->volta_fold_b_ = (r->type_ == "volta"); r->set_spot ($4->spot ()); } ; @@ -950,6 +952,7 @@ shorthand_command_req: $$ =b; } | '[' ':' unsigned { + // JUNKME if (!is_duration_b ($3)) THIS->parser_error (_f ("not a duration: %d", $3)); else @@ -976,6 +979,8 @@ shorthand_command_req: Chord_tremolo_req* a = new Chord_tremolo_req; a->span_dir_ = STOP; a->type_i_ = THIS->chord_tremolo_type_i_; + + // JUNKME. THIS->set_chord_tremolo (0); $$ = a; } @@ -1197,24 +1202,17 @@ steno_tonic_pitch: } ; -explicit_musical_pitch: - MUSICAL_PITCH '{' int_list '}' {/* ugh */ - Array &a = *$3; - ARRAY_SIZE(a,3); - $$ = new Musical_pitch; - $$->octave_i_ = a[0]; - $$->notename_i_ = a[1]; - $$->accidental_i_ = a[2]; - delete &a; - } - ; - musical_pitch: steno_musical_pitch { $$ = $1; } - | explicit_musical_pitch { - $$ = $1; + | MUSICAL_PITCH embedded_scm { + int sz = scm_ilength ($2); + if (sz != 3) { + THIS->parser_error (_f ("Expecting %d arguments", 3)); + $2 = gh_list (gh_int2scm (0), gh_int2scm (0), gh_int2scm (0), SCM_UNDEFINED); + } + $$ = new Musical_pitch ($2); } ; @@ -1420,7 +1418,7 @@ simple_element: n->pitch_ = *$1; n->duration_ = *$4; /* - URG + URG, JUNKTHIS! */ if (THIS->chord_tremolo_type_i_) { diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc index dcf545cf3f..67fa3e661e 100644 --- a/lily/repeat-engraver.cc +++ b/lily/repeat-engraver.cc @@ -40,7 +40,8 @@ Repeat_engraver::do_try_music (Music* m) We acknowledge other types of unfolded music as well, to get auto context selection right. */ - return true; + if (r->type_ == "volta" || r->type_ == "unfolded") + return true; } return false; diff --git a/lily/scope.cc b/lily/scope.cc index e2923fcb80..917f97344a 100644 --- a/lily/scope.cc +++ b/lily/scope.cc @@ -14,29 +14,11 @@ #include "dictionary.hh" #include "protected-scm.hh" -void -Scope::print () const -{ -#ifndef NPRINT - bool init_b = false; // ugh - for (Scope_iter ai (*this); ai.ok(); ai++) - { - if (ai.val()->init_b_ == init_b) - { - DEBUG_OUT << ai.key() << "="; - ai.val()->print (); - } - } -#endif -} Scope::~Scope () { for (Scope_iter ai (*this); ai.ok(); ai++) - { - DEBUG_OUT << "deleting: " << ai.key() << '\n'; - delete ai.val (); - } + delete ai.val (); delete id_dict_; } diff --git a/lily/staff-margin-engraver.cc b/lily/staff-margin-engraver.cc index 3e3a435856..f0887d650a 100644 --- a/lily/staff-margin-engraver.cc +++ b/lily/staff-margin-engraver.cc @@ -9,6 +9,7 @@ #include "translator.hh" #include "engraver.hh" #include "bar.hh" +#include "span-bar.hh" #include "dimension-cache.hh" #include "directional-element-interface.hh" #include "timing-translator.hh" @@ -73,10 +74,18 @@ Staff_margin_engraver::acknowledge_element (Score_element_info info) if (now_mom () > Moment (0)) s = get_property ("instr"); - //s = ly_str02scm ("HALLO"); - - if (dynamic_cast (info.elem_l_) && gh_string_p (s)) - create_text (s); + if (gh_string_p (s)) + { + if (Bar* b= dynamic_cast (info.elem_l_)) + { + create_text (s); + if (Span_bar* s= dynamic_cast (b)) + { + assert (text_p_); + text_p_->set_parent (s, Y_AXIS); + } + } + } } void diff --git a/scm/lily.scm b/scm/lily.scm index 17b7c45794..ecca25e01e 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -17,6 +17,9 @@ (use-modules (ice-9 regex)) +(define use-regex + (not (string-match ".*windows.*" (string-downcase (vector-ref (uname) 0))))) + ;; do nothing in .scm output (define (comment s) "") @@ -307,11 +310,13 @@ (define (header-end) (string-append "\\special{! " - ; fixed in 1.3.4 - ;(ly-gulp-file "lily.ps") - ;; URG: now we can't use scm output without Lily - (regexp-substitute/global #f "\n" (ly-gulp-file "lily.ps") 'pre " %\n" 'post) + ;; URG: ly-gulp-file: now we can't use scm output without Lily + (if use-regex + ;; fixed in 1.3.4 for powerpc -- broken on Windows + (regexp-substitute/global #f "\n" + (ly-gulp-file "lily.ps") 'pre " %\n" 'post) + (ly-gulp-file "lily.ps")) "}" "\\input lilyponddefs \\turnOnPostScript")) @@ -334,15 +339,19 @@ ;; (define (output-tex-string s) (if security-paranoia - (regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post) + (if use-regex + (regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post) + (begin (display "warning: not paranoid") (newline) s)) s)) (define (lily-def key val) (string-append "\\def\\" - ; fixed in 1.3.4 - (regexp-substitute/global #f "_" (output-tex-string key) 'pre "X" 'post) - ;(output-tex-string key) + (if use-regex + ;; fixed in 1.3.4 for powerpc -- broken on Windows + (regexp-substitute/global #f "_" + (output-tex-string key) 'pre "X" 'post) + (output-tex-string key)) "{" (output-tex-string val) "}\n")) (define (number->dim x) diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 53d9704aed..25279e1728 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,3 +1,5 @@ +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -157,10 +159,26 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ ]) AC_DEFUN(AC_STEPMAKE_GUILE, [ - GUILE_FLAGS - if guile-config --version 2>&1 | grep -q 'version 1\.[012]'; then - AC_STEPMAKE_WARN(Guile version 1.3 or better needed) + ## First, let's just see if we can find Guile at all. + AC_MSG_CHECKING("for guile-config") + for guile_config in guile-config $build-guile-config; do + AC_MSG_RESULT("$guile_config") + if ! $guile_config --version > /dev/null 2>&1 ; then + AC_MSG_WARN("cannot execute $guile_config") + AC_MSG_CHECKING("if we are cross compiling") + guile_config=error + else + break + fi + done + if test "$guile_config" = "error"; then + AC_MSG_ERROR("cannot find guile-config; is Guile installed?") + exit 1 fi + if $guile_config --version 2>&1 | grep -q 'version 1\.[012]'; then + AC_STEPMAKE_WARN(Guile version 1.3 or better needed) + fi + GUILE_FLAGS AC_PATH_PROG(GUILE, guile, error) AC_SUBST(GUILE) ]) @@ -761,12 +779,12 @@ dnl find the libraries. AC_DEFUN([GUILE_FLAGS],[ ## The GUILE_FLAGS macro. - ## First, let's just see if we can find Guile at all. AC_MSG_CHECKING(for Guile) - guile-config link > /dev/null || { - echo "configure: cannot find guile-config; is Guile installed?" 1>&2 - exit 1 - } + if ! $guile_config link > /dev/null ; then + AC_MSG_RESULT("cannot execute $guile_config") + AC_MSG_ERROR("cannot find guile-config; is Guile installed?") + exit 1 + fi GUILE_CFLAGS="`guile-config compile`" GUILE_LDFLAGS="`guile-config link`" AC_SUBST(GUILE_CFLAGS) diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index 98e0724d1a..0e08464814 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -7,6 +7,8 @@ all: default $(LOOP) +man: + $(LOOP) # be careful about deletion. clean: localclean @@ -120,13 +122,13 @@ TAGS: # ugh . -> $(outdir) $(outdir)/VERSION: $(depth)/VERSION - cp $< $@ + cp -p $< $@ $(outdir)/version.hh: $(outdir)/VERSION $(PYTHON) $(step-bindir)/make-version.py $< > $@ $(outdir)/config.h: $(config_h) - cp $< $@ + cp -p $< $@ # should this be in Rules? configure: configure.in aclocal.m4 diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make index b6bdb5af21..493d7acff5 100644 --- a/stepmake/stepmake/help2man-rules.make +++ b/stepmake/stepmake/help2man-rules.make @@ -5,10 +5,14 @@ # interpreter. This is slightly bizarre, but it helps # Indeed it is. Perl sucks. # + +ifneq ($(outdir),./out) +$(outdir)/%.1: out/%.1 + cp $< $@ +endif + $(outdir)/%.1: $(outdir)/% - $(PERL) $(depth)/buildscripts/$(outdir)/help2man $< > $@ || \ + $(PERL) $(depth)/$(builddir)/buildscripts/$(outbase)/help2man $< > $@ || \ (echo ""; echo "Apparently the man pages failed to build. This is";\ echo "no problem, since they don't contain any information anyway.";\ echo "Please run make again, and be prepared for NO manual pages.") - -