Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2014-10-02 11:34:50 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2014-10-06 14:37:20 (GMT) |
| commit | e2385da3debfdd372630fa36f70e2440f9c13ac4 (patch) | |
| tree | f0c9da71120d9d84b80dbc732f165251ab7ad057 /Swiften | |
| parent | 9d9dc201b24109c8d7fd8f85553659888c1d7747 (diff) | |
| download | swift-e2385da3debfdd372630fa36f70e2440f9c13ac4.zip swift-e2385da3debfdd372630fa36f70e2440f9c13ac4.tar.bz2 | |
Allow scons to not require an IDN library
This will clearly break all the tests, Swift, Sluift etc., but is useful
if someone wants to use Swiften and inject their own IDN provider.
Test-information:
Compiles with Isode's IDN provider
Change-Id: Ia55991054f42f332bf34b653d7b55f64f654820e
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/IDN/PlatformIDNConverter.cpp | 2 | ||||
| -rw-r--r-- | Swiften/IDN/SConscript | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Swiften/IDN/PlatformIDNConverter.cpp b/Swiften/IDN/PlatformIDNConverter.cpp index 6d9cff7..4882b60 100644 --- a/Swiften/IDN/PlatformIDNConverter.cpp +++ b/Swiften/IDN/PlatformIDNConverter.cpp @@ -19,7 +19,9 @@ IDNConverter* PlatformIDNConverter::create() { #elif defined(HAVE_ICU) return new ICUConverter(); #else +#if defined(NEED_IDN) #error "No IDN implementation" +#endif return 0; #endif } diff --git a/Swiften/IDN/SConscript b/Swiften/IDN/SConscript index 9d3b8f9..4c1a71d 100644 --- a/Swiften/IDN/SConscript +++ b/Swiften/IDN/SConscript @@ -4,6 +4,8 @@ Import("swiften_env", "env") objects = swiften_env.SwiftenObject(["IDNConverter.cpp"]) myenv = swiften_env.Clone() +if myenv.get("NEED_IDN"): + myenv.Append(CPPDEFINES = ["NEED_IDN"]) if myenv.get("HAVE_ICU") : myenv.MergeFlags(swiften_env["ICU_FLAGS"]) myenv.Append(CPPDEFINES = ["HAVE_ICU"]) |