Swiftdiff options
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 1 | ||||
| -rw-r--r-- | BuildTools/SCons/SConstruct | 6 | ||||
| -rw-r--r-- | Swiften/IDN/PlatformIDNConverter.cpp | 2 | ||||
| -rw-r--r-- | Swiften/IDN/SConscript | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index 51be9ab..0a4eb33 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -67,4 +67,5 @@ vars.Add(PathVariable("libidn_includedir", "LibIDN headers location", None, Path vars.Add(PathVariable("libidn_libdir", "LibIDN library location", None, PathVariable.PathAccept)) vars.Add("libidn_libname", "LibIDN library name", os.name == "nt" and "libidn" or "idn") +vars.Add(BoolVariable("need_idn", "Whether an IDN library is required. Without this, most internal binaries will fail", "true")) vars.Add(PathVariable("libminiupnpc_includedir", "LibMiniUPNPC headers location", None, PathVariable.PathAccept)) vars.Add(PathVariable("libminiupnpc_libdir", "LibMiniUPNPC library location", None, PathVariable.PathAccept)) diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 7bda9c1..5db30f8 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -329,4 +329,6 @@ if not env.get("HAVE_EXPAT", 0) and not env.get("HAVE_LIBXML", 0) : ################################################################################ +env["NEED_IDN"] = env.get("need_idn", True) + # ICU icu_env = conf_env.Clone() @@ -368,7 +370,9 @@ if not env.get("HAVE_ICU", False) and not env.get("HAVE_LIBIDN", False) : env["HAVE_LIBIDN"] = 1 env["LIBIDN_BUNDLED"] = 1 - else : + elif env.get("need_idn", True): print "Error: ICU and LIBIDN not found, and libidn_bundled_enable is false" Exit(1) + else: + print "Proceeding without an IDN library because need_idn was false. This will break all internal binaries" # Unbound 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 @@ -20,5 +20,7 @@ IDNConverter* PlatformIDNConverter::create() { 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 @@ -5,4 +5,6 @@ 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"]) |