compile fix

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 49edb08738e901d2e472c05a53d45a206f4653a9..2e2fab77c91632cb3c671f7e5f11cc44d2bd3631 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -653,6 +653,7 @@ conf = Configure(env,
         'CheckCXXGlobalCstd' : utils.checkCXXGlobalCstd,
         'CheckLC_MESSAGES' : utils.checkLC_MESSAGES,
         'CheckIconvConst' : utils.checkIconvConst,
+        'CheckSizeOfWChar' : utils.checkSizeOfWChar,
     }
 )
 
@@ -673,12 +674,12 @@ if not fast_start:
         or (use_vc and not conf.CheckLibWithHeader('zdll', 'zlib.h', 'C')):
         print 'Did not find zdll.lib or zlib.h, exiting!'
         Exit(1)
-    has_iconv = conf.CheckLib('iconv')
-    has_libiconv = conf.CheckLib('libiconv')
-    if has_iconv:
-        env['ICONV_LIB'] = 'iconv'
-    elif has_libiconv:
-        env['ICONV_LIB'] = 'libiconv'
+    if conf.CheckLib('iconv'):
+        env['ICONV_LIB'] = ['iconv']
+    elif conf.CheckLib('libiconv'):
+        env['ICONV_LIB'] = ['libiconv']
+    elif conf.CheckFunc('iconv_open'):
+        env['ICONV_LIB'] = []
     else:
         print 'Did not find iconv or libiconv, exiting!'
         Exit(1)
@@ -913,6 +914,9 @@ if not fast_start or not os.path.isfile(boost_config_h) \
                 'Define if you want assertions to be enabled in the code'
             ),
         ],
+        types = [
+            ('wchar_t', 'HAVE_WCHAR_T', None),
+        ],
         config_post = '''
 
 #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
@@ -931,6 +935,8 @@ if not fast_start or not os.path.isfile(boost_config_h) \
 
 #ifdef __CYGWIN__
 #  define BOOST_POSIX 1
+#  define BOOST_POSIX_API 1
+#  define BOOST_POSIX_PATH 1
 #endif
 
 #define BOOST_ALL_NO_LIB 1
@@ -979,6 +985,13 @@ if not fast_start or not os.path.isfile(boost_config_h) \
     # check arg types of select function
     (select_arg1, select_arg234, select_arg5) = conf.CheckSelectArgType()
 
+    # check the size of wchar_t
+    sizeof_wchar_t = conf.CheckSizeOfWChar()
+    # something wrong
+    if sizeof_wchar_t == 0:
+        print 'Error: Can not determine the size of wchar_t.'
+        Exit(1)
+
     #
     # create config.h
     result = utils.createConfigFile(conf,
@@ -1048,7 +1061,8 @@ int count()
         ],
         types = [
             ('std::istreambuf_iterator<std::istream>', 'HAVE_DECL_ISTREAMBUF_ITERATOR',
-                '#include <streambuf>\n#include <istream>')
+                '#include <streambuf>\n#include <istream>'),
+            ('wchar_t', 'HAVE_WCHAR_T', None),
         ],
         libs = [
             ('gdi32', 'HAVE_LIBGDI32'),
@@ -1105,7 +1119,13 @@ int count()
                 'libstdc++ pedantic debug mode'
             ),
             (os.name != 'nt', 'BOOST_POSIX',
-                'Indicates to boost which API to use (posix or windows).'
+                'Indicates to boost < 1.34 which API to use (posix or windows).'
+            ),
+            (os.name != 'nt', 'BOOST_POSIX_API',
+                'Indicates to boost 1.34 which API to use (posix or windows).'
+            ),
+            (os.name != 'nt', 'BOOST_POSIX_PATH',
+                'Indicates to boost 1.34 which path style to use (posix or windows).'
             ),
             (spell_engine is not None, spell_engine,
                 'Spell engine to use'
@@ -1140,6 +1160,8 @@ int count()
                 "Define to the type of arg 2, 3, 4 for `select'."),
             ('#define SELECT_TYPE_ARG5 %s' % select_arg5,
                 "Define to the type of arg 5 for `select'."),
+            ('#define SIZEOF_WCHAR_T %d' % sizeof_wchar_t,
+                'Define to be the size of type wchar_t'),
         ],
         config_post = '''/************************************************************
 ** You should not need to change anything beyond this point */
@@ -1273,7 +1295,9 @@ int mkstemp(char*);
                 ),
             ],
             extra_items = [
-                ('#define HAVE_ICONV 1', 'Define if iconv or libiconv is found')
+                ('#define HAVE_ICONV 1', 'Define if iconv or libiconv is found'),
+                ('#define SIZEOF_WCHAR_T %d' % sizeof_wchar_t,
+                    'Define to be the size of type wchar_t'),
             ],
             config_post = '#endif'
         )
@@ -1348,19 +1372,20 @@ elif frontend == 'qt4':
     frontend_libs = [x + qt_lib_suffix for x in qt_libs]
 
 
+system_libs = env['ICONV_LIB']
 if platform_name in ['win32', 'cygwin']:
     # the final link step needs stdc++ to succeed under mingw
     # FIXME: shouldn't g++ automatically link to stdc++?
     if use_vc:
-        system_libs = [env['ICONV_LIB'], 'ole32', 'shlwapi', 'shell32', 'advapi32', 'zdll']
+        system_libs += ['ole32', 'shlwapi', 'shell32', 'advapi32', 'zdll']
     else:
-        system_libs = [env['ICONV_LIB'], 'shlwapi', 'stdc++', 'z']
+        system_libs += ['shlwapi', 'stdc++', 'z']
 elif platform_name == 'cygwin' and env['X11']:
-    system_libs = [env['ICONV_LIB'], 'GL',  'Xmu', 'Xi', 'Xrender', 'Xrandr',
+    system_libs += ['GL',  'Xmu', 'Xi', 'Xrender', 'Xrandr',
         'Xcursor', 'Xft', 'freetype', 'fontconfig', 'Xext', 'X11', 'SM', 'ICE', 
         'resolv', 'pthread', 'z']
 else:
-    system_libs = [env['ICONV_LIB'], 'z']
+    system_libs += ['z']
 
 libs = [
     ('HAVE_LIBGDI32', 'gdi32'),