From: janneke <janneke>
Date: Wed, 7 Jul 2004 23:27:18 +0000 (+0000)
Subject: (assert_version): Add.
X-Git-Tag: release/2.3.9^2~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3a404e37972646d37721beeac7ab92b43c9b92ab;p=lilypond.git

(assert_version): Add.
---

diff --git a/ChangeLog b/ChangeLog
index e095b51bf8..99cbda7641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-07-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* lily/includable-lexer.cc: Use #if iso #ifdef for HAVE_ tests.
+
 	* mf/SConscript: Update multiple target rules.
 
 	* SConstruct (assert_version): Add.
diff --git a/SConstruct b/SConstruct
index 058e11f088..ec3cc86da4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -83,6 +83,7 @@ if env['optimising']:
 if env['warnings']:
 	env.Append (CFLAGS = '-W ')
 	env.Append (CFLAGS = '-Wall')
+	# what about = ['-W', '-Wall', ...]?
 	env.Append (CXXFLAGS = '-W')
 	env.Append (CXXFLAGS = '-Wall')
 	env.Append (CXXFLAGS = '-Wconversion')
@@ -126,7 +127,7 @@ for i in functions:
 
 
 key = 'zHAVE_FLEXLEXER_YY_CURRENT_BUFFER'
-defines[key] = conf.TryCompile("""using namespace std;
+defines[key] = conf.TryCompile ("""using namespace std;
 #include <FlexLexer.h>
 class yy_flex_lexer: public yyFlexLexer
 {
@@ -141,7 +142,7 @@ if conf.CheckLib ('dl'):
 	pass
 
 if conf.CheckLib ('kpathsea'):
-	defines['KPATHSEA'] = '1'
+	defines['zKPATHSEA'] = '1'
 
 # huh? 
 if conf.CheckLib ('kpathsea', 'kpse_find_file'):
@@ -171,7 +172,7 @@ config.close ()
 
 os.system (sys.executable \
 	   + ' ./stepmake/bin/make-version.py VERSION > '\
-	   + os.path.join (build, 'version.hh'))
+	   + os.path.join (outdir, 'version.hh'))
 
 if os.path.exists ('parser'):
 	env.Append (LIBPATH = ['#/flower', '#/lily', '#/parser', '#/gui',],