lilypond-0.1.57

diff --git a/config.hh.in b/config.hh.in
index 5f455e0ff775e7c95140f914ab836c0ca9899615..31b8f322c746f92bb94d882755850dc042145145 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -1,25 +1,11 @@
-/* config.hh.in.  Generated automatically from configure.in by autoheader.  */
+/* @configure_input@ */
 
-/* Define if lex declares yytext as a char * by default, not a char[].  */
-#undef YYTEXT_POINTER
-
-/* autoheader really wants this */
-#define PACKAGE
-
-/* undef to get lots of debugging stuff (see .dstream) */
-#define NPRINT
-
-/* undef to do checking */
-#undef NDEBUG
-
-/* define to inline string funcs */
-#undef STRINGS_UTILS_INLINED
 
 /* default lilypond init and input dir */
-#define  DIR_DATADIR "/home/fred/lelie/current"
+#define  DIR_DATADIR "@DIR_DATADIR@"
 
-/* the toplevel version string */
-#define TOPLEVEL_VERSION "0"
+/* define if you have memmem */
+#define HAVE_MEMMEM 0
 
-/* the version string of the flower lib */
-#define FLOWER_VERSION "0"
+/* define if you have snprintf */
+#define HAVE_SNPRINTF 0

diff --git a/config.make.in b/config.make.in
new file mode 100644 (file)
index 0000000..57fdbc3
--- /dev/null
+++ b/config.make.in
@@ -0,0 +1,40 @@
+# -*-Makefile-*-
+
+# @configure_input@
+
+INSTALL = @INSTALL@
+USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
+USER_LDFLAGS =
+
+CXX = @CXX@
+POD2HTML= @POD2HTML@
+POD2MAN = @POD2MAN@
+ICFLAGS = @ICFLAGS@
+ILDFLAGS = @ILDFLAGS@
+libdir = @libdir@
+prefix = @prefix@
+TEXPREFIX = @TEXPREFIX@
+TEXDIR = @TEXDIR@
+TAR= @TAR@
+MFDIR = @MFDIR@
+mandir  =  @mandir@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+includedir = @includedir@
+datadir = @datadir@
+EXTRA_LIBES = @EXTRA_LIBES@
+RANLIB = @RANLIB@
+DEFS = @DEFS@
+#SET_MAKE = @SET_MAKE@
+DEFINES = @DEFS@ @DEFINES@
+FIND = @FIND@
+COMPILEINFO = @COMPILEINFO@
+BISON = @BISON@
+FLEX = @FLEX@
+LN = @LN@
+ZIP = @ZIP@
+PERL = @PERL@
+PYTHON = @PYTHON@
+OUTDIR_NAME = @OUTDIR_NAME@
+
+

diff --git a/flower/flower-version.cc b/flower/flower-version.cc
index 344474cd1bd2610a9d4e2d74629f3bbd15ef0907..746deacb9342c0824624786681c9c9cfc5705009 100644 (file)
--- a/flower/flower-version.cc
+++ b/flower/flower-version.cc
@@ -1,9 +1,9 @@
 #include <stdio.h>
 
-#include "config.hh"
+#include "version.hh"
 
-// static char *s = "FlowerLib " MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL " #%d";
-static char *s = "FlowerLib " FLOWER_VERSION ;
+static char *s = "FlowerLib " MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL "." MY_PATCH_LEVEL;
+//static char *s = "FlowerLib " FLOWER_VERSION ;
 
 
 char const * 

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index a18ff61b47fa30b127ce5140d1367912dd421bdd..f44b468e8520d502752ff5bc0408496a4cc5f31a 100644 (file)
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -7,6 +7,7 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 #include <stdarg.h>
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include "libc-extension.hh"
@@ -34,6 +35,7 @@ strnupr (char* start_l, int n)
   return start_l;
 }
 
+
 #if !HAVE_MEMMEM
 
 /** locate a substring. #memmem# finds the first occurrence of