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

(as was done for mac) and add the include directory
to the .gyp file.
Review URL: http://codereview.chromium.org/40101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10897 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 125 insertions, 4 deletions

diff --git a/sdch/SConscript b/sdch/SConscript
index 2c5f9ec..38455e0 100644
--- a/sdch/SConscript
+++ b/sdch/SConscript
@@ -15,6 +15,9 @@ cpppath = [
 if env.Bit('windows'):
   cpppath.append('$OPEN_VCDIFF_DIR/vsprojects')
 
+if env.Bit('linux'):
+  cpppath.append('linux')
+
 env.Prepend(CPPPATH = cpppath)
 
 input_files = ChromeFileList([
@@ -144,10 +147,14 @@ if env.Bit('posix'):
 
   # 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',
diff --git a/sdch/linux/config.h b/sdch/linux/config.h
new file mode 100644
index 0000000..44417b4
--- /dev/null
+++ b/sdch/linux/config.h
@@ -0,0 +1,113 @@
+/* src/config.h.  Generated by SCons.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define to 1 if you have the <ext/rope> header file. */
+/* #undef HAVE_EXT_ROPE */
+
+/* Define to 1 if you have the <fnmatch.h> header file. */
+/* #undef HAVE_FNMATCH_H */
+
+/* Define to 1 if you have the <getopt.h> header file. */
+/* #undef HAVE_GETOPT_H */
+
+/* Define to 1 if you have the `gettimeofday' function. */
+/* #undef HAVE_GETTIMEOFDAY */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef HAVE_MALLOC_H */
+
+/* Define to 1 if you have the `memalign' function. */
+/* #undef HAVE_MEMALIGN */
+
+/* Define to 1 if you have the <memory.h> header file. */
+/* #undef HAVE_MEMORY_H */
+
+/* Define to 1 if you have the `mprotect' function. */
+/* #undef HAVE_MPROTECT */
+
+/* Define to 1 if you have the `posix_memalign' function. */
+/* #undef HAVE_POSIX_MEMALIGN */
+
+/* Define to 1 if you have the `QueryPerformanceCounter' function. */
+/* #undef HAVE_QUERYPERFORMANCECOUNTER */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+/* #undef HAVE_STDLIB_H */
+
+/* Define to 1 if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
+
+/* Define to 1 if you have the <string.h> header file. */
+/* #undef HAVE_STRING_H */
+
+/* Define to 1 if you have the `strtoll' function. */
+/* #undef HAVE_STRTOLL */
+
+/* Define to 1 if you have the `strtoq' function. */
+/* #undef HAVE_STRTOQ */
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+/* #undef HAVE_SYS_MMAN_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+/* #undef HAVE_SYS_STAT_H */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+/* #undef HAVE_SYS_TIME_H */
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+/* #undef HAVE_SYS_TYPES_H */
+
+/* Define to 1 if the system has the type `uint16_t'. */
+/* #undef HAVE_UINT16_T */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #undef HAVE_UNISTD_H */
+
+/* Define to 1 if the system has the type `u_int16_t'. */
+/* #undef HAVE_U_INT16_T */
+
+/* Define to 1 if you have the <windows.h> header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* define if your compiler has __attribute__ */
+/* #undef HAVE___ATTRIBUTE__ */
+
+/* Define to 1 if the system has the type `__int16'. */
+/* #undef HAVE___INT16 */
+
+/* Name of package */
+/* #undef PACKAGE */
+
+/* Define to the address where bug reports for this package should be sent. */
+/* #undef PACKAGE_BUGREPORT */
+
+/* Define to the full name of this package. */
+/* #undef PACKAGE_NAME */
+
+/* Define to the full name and version of this package. */
+/* #undef PACKAGE_STRING */
+
+/* Define to the one symbol short name of this package. */
+/* #undef PACKAGE_TARNAME */
+
+/* Define to the version of this package. */
+/* #undef PACKAGE_VERSION */
+
+/* Define to 1 if you have the ANSI C header files. */
+/* #undef STDC_HEADERS */
+
+/* Use custom compare function instead of memcmp */
+/* #undef VCDIFF_USE_BLOCK_COMPARE_WORDS */
+
+/* Version number of package */
+/* #undef VERSION */
diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp
index 2c5d9b7..f44353b 100644
--- a/sdch/sdch.gyp
+++ b/sdch/sdch.gyp
@@ -56,6 +56,7 @@
         ],
       },
       'conditions': [
+        [ 'OS == "linux"', { 'include_dirs': [ 'linux' ] } ],
         [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ],
         [ 'OS == "win"', { 'include_dirs': [ 'open-vcdiff/vsprojects' ] } ],
       ],