+2003-02-25 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * lily/lexer.ll:
+ * lily/include/my-lily-lexer.hh:
+ * lily/include/includable-lexer.hh: Add flex kludge.
+
+ * config.hh.in:
+ * config.make.in:
+ * stepmake/aclocal.m4 (STEPMAKE_DATADIR, STEPMAKE_LIBDIR): Junk
+ cruft.
+
+ * stepmake/aclocal.m4 (STEPMAKE_LIBDIR): Fix casual cut and paste
+ code.
+
2003-02-24 Jan Nieuwenhuizen <janneke@gnu.org>
* ly/spanners-init.ly (cresc, dim): Update to new markup text.
dnl aclocal.m4 -*-shell-script-*-
-dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from /home/hanwen/usr/src/lilypond/stepmake/aclocal.m4
-dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
presome=${ac_default_prefix}
fi
- package_datadir=$datadir/$package
- local_package_datadir=$package_datadir/$FULL_VERSION
build_package_datadir=$ugh_ugh_autoconf250_builddir/share/$package
DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
- PACKAGE_DATADIR=`echo ${package_datadir} | sed "s!\\\${prefix}!$presome!"`
- LOCAL_PACKAGE_DATADIR=`echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!"`
BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
AC_SUBST(datadir)
- AC_SUBST(package_datadir)
- AC_SUBST(local_package_datadir)
AC_SUBST(build_package_datadir)
AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"])
- AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, ["${PACKAGE_DATADIR}"])
- AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_DATADIR, ["${LOCAL_PACKAGE_DATADIR}"])
AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
])
## ugh: cut & paste programming from datadir.
AC_DEFUN(STEPMAKE_LIBDIR, [
+
if test "$libdir" = "\${exec_prefix}/lib"; then
- libdir='${exec_prefix}/lib'
+ libdir='${exec_prefix}/lib'
fi
- presome=${exec_prefix}
- if test "$exec_prefix" = "NONE"; then
- presome=${ac_default_prefix}
- fi
-
- package_libdir=$libdir/$package
- local_package_libdir=$package_libdir/$FULL_VERSION
+ presome=$exec_prefix
build_package_libdir=$ugh_ugh_autoconf250_builddir/lib/$package
- DATADIR=`echo ${libdir} | sed "s!\\\${prefix}!$presome!"`
- PACKAGE_LIBDIR=`echo ${package_libdir} | sed "s!\\\${prefix}!$presome!"`
- LOCAL_PACKAGE_LIBDIR=`echo ${local_package_libdir} | sed "s!\\\${prefix}!$presome!"`
- BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${prefix}!$presome!"`
+ LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"`
+ BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_prefix}!$presome!"`
AC_SUBST(libdir)
- AC_SUBST(package_libdir)
- AC_SUBST(local_package_libdir)
AC_SUBST(build_package_libdir)
AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"])
- AC_DEFINE_UNQUOTED(PACKAGE_LIBDIR, ["${PACKAGE_LIBDIR}"])
- AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_LIBDIR, ["${LOCAL_PACKAGE_LIBDIR}"])
AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"])
])
AC_SUBST(package)
AC_SUBST(PACKAGE)
AC_SUBST(PACKAGE_NAME)
- AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE_NAME}"])
+ # We don't need the upper case variant,
+ # so stick to macros are uppercase convention.
+ # AC_DEFINE_UNQUOTED(package, ["${package}"])
+ # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"])
+ AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"])
+ AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"])
AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"])
if test -z "$package_depth"; then
#define PACKAGE "@package@"
+#define TOPLEVEL_VERSION "@TOPLEVEL_VERSION@"
+
/* datadir */
#define DATADIR "@DATADIR@"
/* LilyPond init and input base directory */
-#define PACKAGE_DATADIR "@PACKAGE_DATADIR@"
+#define PACKAGE_DATADIR DATADIR "/" PACKAGE
#define LILYPOND_DATADIR PACKAGE_DATADIR
/* LilyPond specific init and input directory */
-#define LOCAL_PACKAGE_DATADIR "@LOCAL_PACKAGE_DATADIR@"
+#define LOCAL_PACKAGE_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION
#define LOCAL_LILYPOND_DATADIR LOCAL_PACKAGE_DATADIR
/* default lilypond locale dir */
includedir = @includedir@
infodir = @infodir@
libdir = @libdir@
-lilypond_datadir = @package_datadir@
-lilypond_libdir = @package_libdir@
-local_lilypond_datadir = @local_package_datadir@
-local_lilypond_libdir = @local_package_libdir@
localedir = @localedir@
mandir = @mandir@
program_prefix = @program_prefix@
srcdir = @srcdir@
stepmake = @stepmake@
+# move out of config.make.in?
+package_datadir = $(datadir)/$(package)
+package_libdir = $(libdir)/$(package)
+local_package_datadir = $(lilypond_datadir)/$(TOPLEVEL_VERSION)
+local_package_libdir = $(lilypond_libdir)/$(TOPLEVEL_VERSION)
+
+lilypond_datadir = $(package_datadir)
+lilypond_libdir = $(package_libdir)
+local_lilypond_datadir = $(local_package_datadir)
+local_lilypond_libdir = $(local_package_libdir)
+
CC = @CC@
GCC = @GCC@
CROSS = @cross_compiling@
#ifndef INCLUDABLE_LEXER_HH
#define INCLUDABLE_LEXER_HH
+using namespace std;
#include <FlexLexer.h>
#include "string.hh"
#ifndef LEXER_HH
#define LEXER_HH
+using namespace std;
#include <FlexLexer.h>
#include "input.hh"
#include <errno.h>
#include <iostream>
+using namespace std;
#include "parse-scm.hh"
#include "lily-guile.hh"
presome=${ac_default_prefix}
fi
- package_datadir=$datadir/$package
- local_package_datadir=$package_datadir/$FULL_VERSION
build_package_datadir=$ugh_ugh_autoconf250_builddir/share/$package
DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
- PACKAGE_DATADIR=`echo ${package_datadir} | sed "s!\\\${prefix}!$presome!"`
- LOCAL_PACKAGE_DATADIR=`echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!"`
BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
AC_SUBST(datadir)
- AC_SUBST(package_datadir)
- AC_SUBST(local_package_datadir)
AC_SUBST(build_package_datadir)
AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"])
- AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, ["${PACKAGE_DATADIR}"])
- AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_DATADIR, ["${LOCAL_PACKAGE_DATADIR}"])
AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
])
## ugh: cut & paste programming from datadir.
AC_DEFUN(STEPMAKE_LIBDIR, [
+
if test "$libdir" = "\${exec_prefix}/lib"; then
- libdir='${exec_prefix}/lib'
- fi
- presome=${exec_prefix}
- if test "$exec_prefix" = "NONE"; then
- presome=${ac_default_prefix}
+ libdir='${exec_prefix}/lib'
fi
-
- package_libdir=$libdir/$package
- local_package_libdir=$package_libdir/$FULL_VERSION
+ presome=$exec_prefix
build_package_libdir=$ugh_ugh_autoconf250_builddir/lib/$package
- DATADIR=`echo ${libdir} | sed "s!\\\${prefix}!$presome!"`
- PACKAGE_LIBDIR=`echo ${package_libdir} | sed "s!\\\${prefix}!$presome!"`
- LOCAL_PACKAGE_LIBDIR=`echo ${local_package_libdir} | sed "s!\\\${prefix}!$presome!"`
- BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${prefix}!$presome!"`
+ LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"`
+ BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_prefix}!$presome!"`
AC_SUBST(libdir)
- AC_SUBST(package_libdir)
- AC_SUBST(local_package_libdir)
AC_SUBST(build_package_libdir)
AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"])
- AC_DEFINE_UNQUOTED(PACKAGE_LIBDIR, ["${PACKAGE_LIBDIR}"])
- AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_LIBDIR, ["${LOCAL_PACKAGE_LIBDIR}"])
AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"])
])
AC_SUBST(package)
AC_SUBST(PACKAGE)
AC_SUBST(PACKAGE_NAME)
- AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE_NAME}"])
+ # We don't need the upper case variant,
+ # so stick to macros are uppercase convention.
+ # AC_DEFINE_UNQUOTED(package, ["${package}"])
+ # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"])
+ AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"])
+ AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"])
AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"])
if test -z "$package_depth"; then