Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-06-04 17:15:34 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-06-05 07:32:01 (GMT) |
| commit | e43999d275ff27970ba973edd2be68fb6b998aaf (patch) | |
| tree | b3442e40a221b19f60535028e04712396dabe7ed /Swiften/IDN/SConscript | |
| parent | 1514e787b28ee09ea28d75828bf41049696fd5c7 (diff) | |
| download | swift-e43999d275ff27970ba973edd2be68fb6b998aaf.zip swift-e43999d275ff27970ba973edd2be68fb6b998aaf.tar.bz2 | |
Added ICU support.
Diffstat (limited to 'Swiften/IDN/SConscript')
| -rw-r--r-- | Swiften/IDN/SConscript | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Swiften/IDN/SConscript b/Swiften/IDN/SConscript index 99b35fd..1433318 100644 --- a/Swiften/IDN/SConscript +++ b/Swiften/IDN/SConscript @@ -1,7 +1,12 @@ Import("swiften_env", "env") myenv = swiften_env.Clone() -myenv.MergeFlags(swiften_env["LIBIDN_FLAGS"]) +if myenv.get("HAVE_ICU") : + myenv.MergeFlags(swiften_env["ICU_FLAGS"]) + myenv.Append(CPPDEFINES = ["HAVE_ICU"]) +elif myenv.get("HAVE_LIBIDN") : + myenv.MergeFlags(swiften_env["LIBIDN_FLAGS"]) + myenv.Append(CPPDEFINES = ["HAVE_LIBIDN"]) objects = myenv.SwiftenObject([ "StringPrep.cpp", @@ -11,4 +16,5 @@ swiften_env.Append(SWIFTEN_OBJECTS = [objects]) env.Append(UNITTEST_SOURCES = [ File("UnitTest/StringPrepTest.cpp"), + File("UnitTest/IDNATest.cpp"), ]) |