[ekg2-commit] r4264 - in trunk: . scons.d: trunk/SConstruct trunk/scons.d/ncurses trunk/scons.d/standard

[SVN commit]

Author: peres
Date: 2008-08-09 22:52:08 +0200 (Sat, 09 Aug 2008)
New Revision: 4264

Modified:
   trunk/SConstruct
   trunk/scons.d/ncurses
   trunk/scons.d/standard
Log:

Forgot about CODESET, HAVE_NCURSES (it ain't used by ncurses itself, but is by core (stupid, but what can I do?)).
Also thought we don't need to se SHARED_LIBS.



Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2008-08-09 20:30:53 UTC (rev 4263)
+++ trunk/SConstruct	2008-08-09 20:52:08 UTC (rev 4264)
@@ -6,12 +6,14 @@
 EnsureSConsVersion(0, 98)
 
 consts = {
-	'VERSION': 'SVN'
+	'VERSION':		'SVN',
+	'SHARED_LIBS':	True
 	}
 dirs = {
 	'SYSCONFDIR':	'/etc',
 	'LOCALEDIR':	'/usr/share/locale',
-	'DATADIR':		'/usr/share'
+	'DATADIR':		'/usr/share',
+	'PLUGINDIR':	'/usr/lib/ekg2/plugins'
 	}
 mapped = {
 	'UNICODE':		'USE_UNICODE'

Modified: trunk/scons.d/ncurses
===================================================================
--- trunk/scons.d/ncurses	2008-08-09 20:30:53 UTC (rev 4263)
+++ trunk/scons.d/ncurses	2008-08-09 20:52:08 UTC (rev 4264)
@@ -19,6 +19,7 @@
 	defines['HAVE_NCURSES_ULC'] = conf.CheckLib(nc_lib, 'use_legacy_coding')
 	defines['HAVE_NCURSES_TERMINFO'] = conf.CheckLib(nc_lib, 'tigetstr')
 
+defines['HAVE_NCURSES'] = out # used by core, I think the use is stupid
 Return('out')
 
 # vim:ts=4:sts=4:syntax=python

Modified: trunk/scons.d/standard
===================================================================
--- trunk/scons.d/standard	2008-08-09 20:30:53 UTC (rev 4263)
+++ trunk/scons.d/standard	2008-08-09 20:52:08 UTC (rev 4264)
@@ -73,6 +73,8 @@
 		ret = False
 	defines['HAVE_%s' % (func.upper())] = ret
 
+defines['HAVE_LANGINFO_CODESET'] = conf.CheckLibWithHeader(None, ['langinfo.h'], 'C', 'nl_langinfo(CODESET);')
+
 have_idn = conf.CheckLibWithHeader('idn', ['stringprep.h'], 'C', 'stringprep_check_version(NULL);')
 defines['LIBIDN'] = have_idn
 ekg_libs.append('idn')