From d0ccf2b9626acc5826c8b601c9759458f4ba348a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 29 Jul 2010 17:10:49 +0200 Subject: [PATCH] feature #282: Added libxml to tests SConstructs --- src/authm/test/SConstruct | 3 +++ src/host/test/SConstruct | 4 ++++ src/image/test/SConstruct | 3 +++ src/um/test/SConstruct | 3 +++ src/vm/test/SConstruct | 3 +++ src/vnm/test/SConstruct | 3 +++ 6 files changed, 19 insertions(+) diff --git a/src/authm/test/SConstruct b/src/authm/test/SConstruct index 827237c72b..d254d0d1a4 100644 --- a/src/authm/test/SConstruct +++ b/src/authm/test/SConstruct @@ -73,6 +73,9 @@ main_env.Append(CPPFLAGS=[ main_env.Append(LIBPATH=["/usr/lib/mysql"]) main_env.Append(CPPPATH=["/usr/include/mysql"]) +# libxml2 +main_env.ParseConfig('xml2-config --libs --cflags') + sqlite=ARGUMENTS.get('sqlite', 'yes') if sqlite=='yes': main_env.Append(CPPFLAGS=["-DSQLITE_DB"]) diff --git a/src/host/test/SConstruct b/src/host/test/SConstruct index 26a0c4d5b6..295c230080 100644 --- a/src/host/test/SConstruct +++ b/src/host/test/SConstruct @@ -67,6 +67,10 @@ main_env.Append(LIBPATH=["/usr/lib/mysql"]) main_env.Append(CPPPATH=["/usr/include/mysql"]) +# libxml2 +main_env.ParseConfig('xml2-config --libs --cflags') + + sqlite=ARGUMENTS.get('sqlite', 'yes') if sqlite=='yes': main_env.Append(CPPFLAGS=["-DSQLITE_DB"]) diff --git a/src/image/test/SConstruct b/src/image/test/SConstruct index 34f67f44a3..ac843f7345 100644 --- a/src/image/test/SConstruct +++ b/src/image/test/SConstruct @@ -80,6 +80,9 @@ main_env.Append(LIBS=[ main_env.Append(LIBPATH=["/usr/lib/mysql"]) main_env.Append(CPPPATH=["/usr/include/mysql"]) +# libxml2 +main_env.ParseConfig('xml2-config --libs --cflags') + sqlite=ARGUMENTS.get('sqlite', 'yes') if sqlite=='yes': main_env.Append(CPPFLAGS=["-DSQLITE_DB"]) diff --git a/src/um/test/SConstruct b/src/um/test/SConstruct index fcce418e74..0c42681e24 100644 --- a/src/um/test/SConstruct +++ b/src/um/test/SConstruct @@ -80,6 +80,9 @@ main_env.Program('test','UserPoolTest.cc') main_env.Append(LIBPATH=["/usr/lib/mysql"]) main_env.Append(CPPPATH=["/usr/include/mysql"]) +# libxml2 +main_env.ParseConfig('xml2-config --libs --cflags') + sqlite=ARGUMENTS.get('sqlite', 'yes') if sqlite=='yes': main_env.Append(CPPFLAGS=["-DSQLITE_DB"]) diff --git a/src/vm/test/SConstruct b/src/vm/test/SConstruct index 362a0dd4ea..9b966d6c99 100644 --- a/src/vm/test/SConstruct +++ b/src/vm/test/SConstruct @@ -80,6 +80,9 @@ main_env.Append(LIBS=[ main_env.Append(LIBPATH=["/usr/lib/mysql"]) main_env.Append(CPPPATH=["/usr/include/mysql"]) +# libxml2 +main_env.ParseConfig('xml2-config --libs --cflags') + sqlite=ARGUMENTS.get('sqlite', 'yes') if sqlite=='yes': main_env.Append(CPPFLAGS=["-DSQLITE_DB"]) diff --git a/src/vnm/test/SConstruct b/src/vnm/test/SConstruct index 811f856d6b..e3ae35abed 100644 --- a/src/vnm/test/SConstruct +++ b/src/vnm/test/SConstruct @@ -73,6 +73,9 @@ main_env.Append(LIBS=[ main_env.Append(LIBPATH=["/usr/lib/mysql"]) main_env.Append(CPPPATH=["/usr/include/mysql"]) +# libxml2 +main_env.ParseConfig('xml2-config --libs --cflags') + sqlite=ARGUMENTS.get('sqlite', 'yes') if sqlite=='yes': main_env.Append(CPPFLAGS=["-DSQLITE_DB"])