+1.3.81.jcn1
+===========
+
+* Activated regex for windows.
+
+* New guile-1.4 patch for cross windows build.
+
+* Added configure messages for metapost checking.
+
1.3.80.gp1
==========
-diff -urN ../guile-1.3.4/ChangeLog ./ChangeLog
---- ../guile-1.3.4/ChangeLog Sat Sep 25 19:26:50 1999
-+++ ./ChangeLog Mon Mar 27 15:46:54 2000
-@@ -1,3 +1,12 @@
-+2000-03-24 <janneke@gnu.org>
-+
-+ * guile-config/cross-guile-config.in: Simple shell script to
-+ take over guile-config's functionality for cross-compilation.
-+ It will be installed as ${target}-guile-config.
-+
-+ * guile-config/Makefile.am: Provide for cross-guile-config.in
-+ and its targets.
-+
- 1999-09-25 Jim Blandy <jimb@savonarola.red-bean.com>
-
- * Guile 1.3.4 released.
-diff -urN ../guile-1.3.4/configure.in ./configure.in
---- ../guile-1.3.4/configure.in Sat Sep 25 19:26:50 1999
-+++ ./configure.in Wed Mar 29 15:49:56 2000
-@@ -21,6 +21,7 @@
- dnl Boston, MA 02111-1307, USA.
-
- AC_INIT(Makefile.in)
-+AC_CANONICAL_SYSTEM
- . $srcdir/GUILE-VERSION
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
- AM_MAINTAINER_MODE
-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 Mon Mar 27 15:47:43 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 @target@-guile-config
-+CLEANFILES=guile-config @target@-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
-+
-+@target@-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/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 Mon Mar 27 15:46:36 2000
-@@ -0,0 +1,16 @@
-+#!@-SHELL-@
-+# target-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/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 Mon Mar 27 15:57:24 2000
-@@ -45,7 +45,9 @@
- Author: Aubrey Jaffer
- Modified for libguile by Marius Vollmer */
-
-+#ifndef __CYGWIN__
- #include <dlfcn.h>
-+#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 Mon Mar 27 15:57:24 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
- {
--- /dev/null
+diff -urN ../guile-1.4/ChangeLog ./ChangeLog
+--- ../guile-1.4/ChangeLog Fri Jun 2 15:17:01 2000
++++ ./ChangeLog Mon Jun 5 15:18:32 2000
+@@ -1,3 +1,12 @@
++2000-06-05 <janneke@gnu.org>
++
++ * guile-config/cross-guile-config.in: Simple shell script to
++ take over guile-config's functionality for cross-compilation.
++ It will be installed as ${target}-guile-config.
++
++ * guile-config/Makefile.am: Provide for cross-guile-config.in
++ and its targets.
++
+ 2000-06-21 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
+
+ * Guile 1.4 released.
+diff -urN ../guile-1.4/configure.in ./configure.in
+--- ../guile-1.4/configure.in Fri Jun 2 08:44:27 2000
++++ ./configure.in Mon Jun 5 15:13:58 2000
+@@ -21,6 +21,7 @@
+ dnl Boston, MA 02111-1307, USA.
+
+ AC_INIT(Makefile.in)
++AC_CANONICAL_SYSTEM
+ . $srcdir/GUILE-VERSION
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+ AM_MAINTAINER_MODE
+diff -urN ../guile-1.4/guile-config/Makefile.am ./guile-config/Makefile.am
+--- ../guile-1.4/guile-config/Makefile.am Wed Jan 12 22:42:41 2000
++++ ./guile-config/Makefile.am Mon Jun 5 15:17:37 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 guile.m4
++bin_SCRIPTS=guile-config @target@-guile-config
++CLEANFILES=guile-config @target@-guile-config
++EXTRA_DIST=guile-config.in guile.m4 cross-guile-config.in
+
+ ## FIXME: in the future there will be direct automake support for
+ ## doing this. When that happens, switch over.
+@@ -39,6 +39,21 @@
+ -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:
+ chmod +x guile-config.tmp
+ mv guile-config.tmp guile-config
++
++LDFLAGS=@LDFLAGS@
++CFLAGS=@CFLAGS@
++CPPFLAGS=@CPPFLAGS@
++
++@target@-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}: \
++ -e "s:@-CPPFLAGS-@:${CPPFLAGS}:" \
++ -e "s:@-LDFLAGS-@:${LDFLAGS}:"
++ 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.4/guile-config/cross-guile-config.in ./guile-config/cross-guile-config.in
+--- ../guile-1.4/guile-config/cross-guile-config.in Thu Jan 1 01:00:00 1970
++++ ./guile-config/cross-guile-config.in Mon Jun 5 15:13:58 2000
+@@ -0,0 +1,16 @@
++#!@-SHELL-@
++# target-guile-config.in
++case $1 in
++ --version)
++ echo "@-GUILE_VERSION-@"
++ exit 0
++ ;;
++ compile)
++ echo "@-CPPFLAGS-@ -I @-PREFIX-@/include/guile"
++ exit 0
++ ;;
++ link)
++ echo "-L @-PREFIX-@/lib -lguile @-LDFLAGS-@"
++ exit 0
++ ;;
++esac
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=81
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
break;
fi
done
+ AC_MSG_RESULT($MFMODE)
+ AC_MSG_CHECKING(for mfplain.mp)
#
# For now let people define these in their environments
#
: ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`}
+ AC_MSG_RESULT($MFPLAIN_MP)
+ AC_MSG_CHECKING(for inimetapost flags)
if test ${INIMETAPOST} = "inimp" ; then
: ${INIMETAPOST_FLAGS=''}
else
: ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
fi
+ AC_MSG_RESULT($INIMETAPOST_FLAGS)
rm -f mfput.*
- AC_MSG_RESULT($MFMODE)
AC_SUBST(METAFONT)
AC_SUBST(METAPOST)
--- /dev/null
+\score{
+ \notes\relative c''{
+ \time 2/4;
+ [f8 e d f, (] | \break
+ [) a'8. gis16 fis8. cis16] |
+ }
+ \paper{linewidth = 3.0\cm;indent = .0;}
+}
+
)
;; The regex module may not be available, or may be broken.
-(define use-regex
+(define chord-use-regex
(let ((os (string-downcase (vector-ref (uname) 0))))
(not (equal? "cygwin" (substring os 0 (min 6 (string-length os)))))))
+;; If you have trouble with regex, define #f
+(define chord-use-regex #t)
+;;(define chord-use-regex #f)
+
;;
;; (octave notename accidental)
;;
(apply append (pitch->text-banter tonic)
(if user-name user-name '())
;; why does list->string not work, format seems only hope...
- (if (and use-regex
+ (if (and chord-use-regex
(string-match "super" (format "~s" user-name))
(or (pair? additions)
(pair? subtractions)))
(use-modules (ice-9 regex))
;; The regex module may not be available, or may be broken.
-;; If you have trouble with regex, define #f
-;;(define use-regex #t)
-;;(define use-regex #f)
-
(define use-regex
(let ((os (string-downcase (vector-ref (uname) 0))))
(not (equal? "cygwin" (substring os 0 (min 6 (string-length os)))))))
+;; If you have trouble with regex, define #f
+(define use-regex #t)
+;;(define use-regex #f)
+
;; do nothing in .scm output
(define (comment s) "")
+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
break;
fi
done
+ AC_MSG_RESULT($MFMODE)
+ AC_MSG_CHECKING(for mfplain.mp)
#
# For now let people define these in their environments
#
: ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`}
+ AC_MSG_RESULT($MFPLAIN_MP)
+ AC_MSG_CHECKING(for inimetapost flags)
if test ${INIMETAPOST} = "inimp" ; then
: ${INIMETAPOST_FLAGS=''}
else
: ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
fi
+ AC_MSG_RESULT($INIMETAPOST_FLAGS)
rm -f mfput.*
- AC_MSG_RESULT($MFMODE)
AC_SUBST(METAFONT)
AC_SUBST(METAPOST)
projects / lilypond.git / commitdiff