(assert_version): Add.

diff --git a/ChangeLog b/ChangeLog
index e095b51bf8292b4b9a2eefe36acf63d7dbaa1034..99cbda764143014ac5d1e95628e7f05bd5237d14 100644 (file)
--- 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 058e11f0883b0b839edd9fff4079a328fc6b19aa..ec3cc86da4caa9bd2058ab68676a430310f901ec 100644 (file)
--- 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',],