[AD] trouble with scons build system

[Peter Wang <tjaden@xxxxxxxxxx>]

I'm having trouble with the caching abilities of the scons build system.
It's probably because I don't have esd nor arts installed anymore.
How does the attached patch look?

tjaden@xxxxxxxxxx ~/ahack/allegro-svk % scons
scons: Reading SConscript files ...
Re-using old settings
KeyError: 'ALLEGRO_WITH_ESDDIGI':
  File "SConstruct", line 103:
    env, libDir = getLibraryVariables()
  File "SConstruct", line 97:
    return tuple([SConscript('scons/linux.scons', exports = [ 'addFiles', 'addExtra' ]),"lib/unix/"])
  File "/usr/lib/scons-0.96.91/SCons/Script/SConscript.py", line 559:
    return apply(method, args, kw)
  File "/usr/lib/scons-0.96.91/SCons/Script/SConscript.py", line 496:
    return apply(_SConscript, [self.fs,] + files, {'exports' : exports})
  File "/usr/lib/scons-0.96.91/SCons/Script/SConscript.py", line 227:
    exec _file_ in call_stack[-1].globals
  File "scons/linux.scons", line 5:
    env = SConscript('unix.scons', exports = [ 'addFiles', 'addExtra' ])
  File "/usr/lib/scons-0.96.91/SCons/Script/SConscript.py", line 559:
    return apply(method, args, kw)
  File "/usr/lib/scons-0.96.91/SCons/Script/SConscript.py", line 496:
    return apply(_SConscript, [self.fs,] + files, {'exports' : exports})
  File "/usr/lib/scons-0.96.91/SCons/Script/SConscript.py", line 227:
    exec _file_ in call_stack[-1].globals
  File "scons/unix.scons", line 287:
    if platform["ALLEGRO_WITH_ESDDIGI"]:
zsh: exit 2     scons

Peter

--- scons/unix.scons	(revision 5800)
+++ scons/unix.scons	(local)
@@ -284,7 +284,7 @@ utimernu.c
 uxthread.c
 """));
 
-if platform["ALLEGRO_WITH_ESDDIGI"]:
+if "ALLEGRO_WITH_ESDDIGI" in platform:
     def buildESD(menv,appendDir,buildDir,libDir):
         esdEnv = menv.Copy()
         esdEnv.ParseConfig('esd-config --libs')
@@ -292,7 +292,7 @@ if platform["ALLEGRO_WITH_ESDDIGI"]:
         return esdEnv.SharedLibrary(libDir + "alleg-esddigi",appendDir(buildDir + "/unix/", sources))
     addExtra(buildESD)
 
-if platform["ALLEGRO_WITH_ALSADIGI"]:
+if "ALLEGRO_WITH_ALSADIGI" in platform:
     def buildAlsa(menv,appendDir,buildDir,libDir):
         alsaEnv = menv.Copy()
         alsaEnv.Append(LIBS = "asound")
@@ -300,7 +300,7 @@ if platform["ALLEGRO_WITH_ALSADIGI"]:
         return alsaEnv.SharedLibrary(libDir + "alleg-alsadigi",appendDir(buildDir + "/unix/", sources))
     addExtra(buildAlsa)
 
-if platform["ALLEGRO_WITH_ALSAMIDI"]:
+if "ALLEGRO_WITH_ALSAMIDI" in platform:
     def buildAlsa(menv,appendDir,buildDir,libDir):
         alsaEnv = menv.Copy()
         alsaEnv.Append(LIBS = "asound")
@@ -308,7 +308,7 @@ if platform["ALLEGRO_WITH_ALSAMIDI"]:
         return alsaEnv.SharedLibrary(libDir + "alleg-alsamidi",appendDir(buildDir + "/unix/", sources))
     addExtra(buildAlsa)
 
-if platform["ALLEGRO_WITH_ARTSDIGI"]:
+if "ALLEGRO_WITH_ARTSDIGI" in platform:
     def buildAlsa(menv,appendDir,buildDir,libDir):
         artsEnv = menv.Copy()
         artsEnv.ParseConfig("artsc-config --libs")
@@ -316,13 +316,13 @@ if platform["ALLEGRO_WITH_ARTSDIGI"]:
         return artsEnv.SharedLibrary(libDir + "alleg-artsdigi",appendDir(buildDir + "/unix/", sources))
     addExtra(buildAlsa)
 
-if platform["ALLEGRO_LINUX_FBCON"]:
+if "ALLEGRO_LINUX_FBCON" in platform:
     def buildFBCon(menv,appendDir,buildDir,libDir):
         sources = ["fbcon.c"]
         return menv.SharedLibrary(libDir + "alleg-fbcon",appendDir(buildDir + "/linux/", sources))
     addExtra(buildFBCon)
 
-if platform["ALLEGRO_WITH_XWINDOWS"]:
+if "ALLEGRO_WITH_XWINDOWS" in platform:
     addFiles("x/", Split("""
     xgfxdrv.c
     xkeyboard.c