From d191c7d9932b8e8ad96c4345a6ceca67326806ac Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 21 Sep 2005 05:39:18 +0000 Subject: r10377: Save configuration stuff to sconf.cache so it isn't annoyingly run at every single build. Run 'scons configure=1' or delete sconf.cache to force checks to be re-run. Jelmer, I think this stuff is cached in the .sconf_cache directory but the message is still displayed and it looks like it caches the compiled test object file not the actual result of the test. (This used to be commit 9d001dc083937bbf5642af90bc8a8b1a27825de0) --- source4/lib/ldb/SConscript | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'source4/lib/ldb/SConscript') diff --git a/source4/lib/ldb/SConscript b/source4/lib/ldb/SConscript index 1079a441d8..b726d0ebc9 100644 --- a/source4/lib/ldb/SConscript +++ b/source4/lib/ldb/SConscript @@ -1,5 +1,6 @@ Import('hostenv') Import('talloc') +Import('defines') hostenv.StaticLibrary('modules/timestamps.c') hostenv.StaticLibrary('modules/rdn_name.c') @@ -7,12 +8,14 @@ hostenv.StaticLibrary('modules/schema.c') hostenv.StaticLibrary('ldb_ildap/ldb_ildap.c') hostenv.StaticLibrary('modules/ldb_map.c') -conf = Configure(hostenv) -have_sqlite3 = conf.CheckLibWithHeader("sqlite3","sqlite3.h",'c',"sqlite3_open()") -have_popt = conf.CheckLibWithHeader("popt","popt.h",'c',"poptGetArgs(NULL);") -conf.Finish() +if hostenv['configure']: + conf = Configure(hostenv) + if conf.CheckLibWithHeader("sqlite3","sqlite3.h",'c',"sqlite3_open()"): + defines['HAVE_SQLITE3'] = 1 + conf.CheckLibWithHeader("popt","popt.h",'c',"poptGetArgs(NULL);") + conf.Finish() -if have_sqlite3: +if defines.has_key('HAVE_SQLITE3'): hostenv.StaticLibrary('ldb_sqlite3/ldb_sqlite3.c') hostenv.StaticLibrary('ldb_tdb', -- cgit