* src/support/gzstream,cpp:

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index b95dc0ed27fbd3e950cc5c5b5b8b858ece7a3c1f..18e8617c4cd6775bb0d60d0eff7ffd17b8f6cd78 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -14,6 +14,23 @@
 
 import os, sys, copy, cPickle, glob, time
 
+# determine where I am ...
+#
+from SCons.Node.FS import default_fs
+# default_fs.SConstruct_dir is where SConstruct file is located.
+scons_dir = default_fs.SConstruct_dir.path
+scons_absdir = default_fs.SConstruct_dir.abspath
+
+# if SConstruct is copied to the top source directory
+if os.path.exists(os.path.join(scons_dir, 'development', 'scons', 'scons_manifest.py')):
+    scons_dir = os.path.join(scons_dir, 'development', 'scons')
+    scons_absdir = os.path.join(scons_absdir, 'development', 'scons')
+# get the ../.. of scons_dir
+top_src_dir = os.path.split(os.path.split(scons_absdir)[0])[0]
+
+sys.path.extend([scons_absdir, os.path.join(top_src_dir, 'lib', 'doc')])
+import depend
+
 # scons_utils.py defines a few utility function
 import scons_utils as utils
 # import all file lists
@@ -34,15 +51,6 @@ if version[0] == 0 and version[1] == 96 and version[2] < 92:
     print "Scons >= 0.96.92 is required."
     Exit(1)
 
-# determine where I am ...
-#
-from SCons.Node.FS import default_fs
-# default_fs.SConstruct_dir is where SConstruct file is located.
-scons_dir = default_fs.SConstruct_dir.path
-# get the ../.. of scons_dir
-top_src_dir = os.path.split(os.path.split(default_fs.SConstruct_dir.abspath)[0])[0]
-sys.path.append(os.path.join(top_src_dir, 'lib', 'doc'))
-import depend
 
 #----------------------------------------------------------
 # Global definitions
@@ -607,6 +615,11 @@ conf = Configure(env,
     }
 )
 
+# When using msvc, windows.h is required
+if use_vc and not conf.CheckCHeader('windows.h'):
+    print 'Windows.h is not found. Please install Windows Platform SDK.'
+    Exit(1)
+
 # pkg-config? (if not, we use hard-coded options)
 if conf.CheckPkgConfig('0.15.0'):
     env['HAS_PKG_CONFIG'] = True
@@ -824,7 +837,7 @@ utils.createConfigFile(conf,
  * implements this with the help of libc, or whether it has own code
  * does not matter for us, because we don't use libc directly (Georg)
 */
-#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && ! defined(__FREEBSD__)
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
 #  define USE_WCHAR_T
 #endif