Check in a generated config.h file for SDCH on Linux

sdch/SConscript

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 
 Import('env')
 
 env = env.Clone(OPEN_VCDIFF_DIR='open-vcdiff')
 
 cpppath = [
     '$OPEN_VCDIFF_DIR/src',
 ]
 
 if env.Bit('windows'):
   cpppath.append('$OPEN_VCDIFF_DIR/vsprojects')
 
+if env.Bit('linux'):
+  cpppath.append('linux')
+
 env.Prepend(CPPPATH = cpppath)
 
 input_files = ChromeFileList([
   # TODO(sgk):  violate standard indentation so we don't have to
   # reindent too much when we remove the explicit MSVSFilter() calls
   # in favor of generating the hierarchy to reflect the file system.
   MSVSFilter('Header Files', [
     'open-vcdiff/src/blockhash.h',
     'open-vcdiff/src/checksum.h',
     'open-vcdiff/src/codetable.h',
@@ skipping 109 matching lines @@
         contents = re.sub(undef, definition, contents)
 
     undef_re = re.compile(r'^(#undef .*)$', re.M)
     contents = undef_re.sub(r'/* \1 */', contents)
 
     header = '/* src/config.h.  Generated by SCons.  */\n'
     open(str(target[0]), 'w').write(header + contents)
 
   # varlist['DEFINES'] below makes the target config.h file depend
   # on the list of definitions in the passed-in $DEFINES variable.
-  env.Command('$OPEN_VCDIFF_DIR/src/config.h',
-              '$OPEN_VCDIFF_DIR/src/config.h.in',
-              Action(AutoConfig, varlist=['DEFINES']),
-              DEFINES=defines)
+  #
+  # Comment this out so we use the checked-in config.h in the
+  # linux subdirectory, but leave it here in case we need
+  # to ressurect this.
+  #env.Command('$OPEN_VCDIFF_DIR/src/config.h',
+  #            '$OPEN_VCDIFF_DIR/src/config.h.in',
+  #            Action(AutoConfig, varlist=['DEFINES']),
+  #            DEFINES=defines)
 
 
 p = env.ChromeMSVSProject('sdch.vcproj',
                           dest='$CHROME_SRC_DIR/sdch/sdch.vcproj',
                           guid='{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}',
                           keyword='Win32Proj',
                           # TODO(sgk):  when we can intuit the hierarchy
                           # from the built targets.
                           #buildtargets=TODO,
                           files=input_files,
@@ skipping 27 matching lines @@
             InheritedPropertySheets=[
                 '$(SolutionDir)../build/debug.vsprops',
                 '$(SolutionDir)../sdch/using_sdch.vsprops',
             ])
 
 p.AddConfig('Release|Win32',
             InheritedPropertySheets=[
                 '$(SolutionDir)../build/release.vsprops',
                 '$(SolutionDir)../sdch/using_sdch.vsprops',
             ])