[ekg2-commit] r4271 - trunk/scons.d: trunk/scons.d/expat trunk/scons.d/ncurses trunk/scons.d/standard

[SVN commit]

Author: peres
Date: 2008-08-10 01:10:44 +0200 (Sun, 10 Aug 2008)
New Revision: 4271

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

Environment pollution.



Modified: trunk/scons.d/expat
===================================================================
--- trunk/scons.d/expat	2008-08-09 23:06:30 UTC (rev 4270)
+++ trunk/scons.d/expat	2008-08-09 23:10:44 UTC (rev 4271)
@@ -3,7 +3,7 @@
 
 Import('*')
 
-out = conf.CheckLibWithHeader('expat', ['expat.h'], 'C', 'XML_ParserCreate(NULL);')
+out = conf.CheckLibWithHeader('expat', ['expat.h'], 'C', 'XML_ParserCreate(NULL);', 0)
 defines['HAVE_EXPAT'] = out
 defines['HAVE_EXPAT_H'] = out
 if (out):

Modified: trunk/scons.d/ncurses
===================================================================
--- trunk/scons.d/ncurses	2008-08-09 23:06:30 UTC (rev 4270)
+++ trunk/scons.d/ncurses	2008-08-09 23:10:44 UTC (rev 4271)
@@ -5,19 +5,19 @@
 
 if env['UNICODE']:
 	nc_lib = 'ncursesw'
-	out = conf.CheckLibWithHeader(nc_lib, ['ncursesw/ncurses.h'], 'C', 'initscr();')
+	out = conf.CheckLibWithHeader(nc_lib, ['ncursesw/ncurses.h'], 'C', 'initscr();', 0)
 else:
 	nc_lib = 'ncurses'
-	out = conf.CheckLibWithHeader(nc_lib, ['ncurses/ncurses.h'], 'C', 'initscr();')
+	out = conf.CheckLibWithHeader(nc_lib, ['ncurses/ncurses.h'], 'C', 'initscr();', 0)
 	defines['HAVE_NCURSES_NCURSES_H'] = out
 	if not out:
-		out = conf.CheckLibWithHeader('ncurses', ['ncurses.h'], 'C', 'initscr();')
+		out = conf.CheckLibWithHeader('ncurses', ['ncurses.h'], 'C', 'initscr();', 0)
 		defines['HAVE_NCURSES_H'] = out
 
 if out:
 	libs.append(nc_lib)
-	defines['HAVE_NCURSES_ULC'] = conf.CheckLib(nc_lib, 'use_legacy_coding')
-	defines['HAVE_NCURSES_TERMINFO'] = conf.CheckLib(nc_lib, 'tigetstr')
+	defines['HAVE_NCURSES_ULC'] = conf.CheckLib(nc_lib, 'use_legacy_coding', None, None, 0)
+	defines['HAVE_NCURSES_TERMINFO'] = conf.CheckLib(nc_lib, 'tigetstr', None, None, 0)
 
 defines['HAVE_NCURSES'] = out # used by core, I think the use is stupid
 Return('out')

Modified: trunk/scons.d/standard
===================================================================
--- trunk/scons.d/standard	2008-08-09 23:06:30 UTC (rev 4270)
+++ trunk/scons.d/standard	2008-08-09 23:10:44 UTC (rev 4271)
@@ -48,7 +48,7 @@
 	if not isinstance(funcs, list):
 		funcs = [funcs]
 	for func in funcs:
-		if conf.CheckLib(lib, func):
+		if conf.CheckLib(lib, func, None, None, 0):
 			ekg_libs.append(lib)
 			break
 
@@ -66,16 +66,16 @@
 for func, lib in possibly_libbized.items():
 	if conf.CheckFunc(func):
 		ret = True
-	elif conf.CheckLib(lib, func):
+	elif conf.CheckLib(lib, func, None, None, 0):
 		ret = True
 		ekg_libs.append(lib)
 	else:
 		ret = False
 	defines['HAVE_%s' % (func.upper())] = ret
 
-defines['HAVE_LANGINFO_CODESET'] = conf.CheckLibWithHeader(None, ['langinfo.h'], 'C', 'nl_langinfo(CODESET);')
+defines['HAVE_LANGINFO_CODESET'] = conf.CheckLibWithHeader(None, ['langinfo.h'], 'C', 'nl_langinfo(CODESET);'), 0
 
-have_idn = conf.CheckLibWithHeader('idn', ['stringprep.h'], 'C', 'stringprep_check_version(NULL);')
+have_idn = conf.CheckLibWithHeader('idn', ['stringprep.h'], 'C', 'stringprep_check_version(NULL);', 0)
 defines['LIBIDN'] = have_idn
 ekg_libs.append('idn')