Software / code / prosody
Changeset
3884:b623ff8b2202
Make libidn default when not specifiying a IDN lib.
| author | Tobias Markmann <tm@ayena.de> |
|---|---|
| date | Tue, 14 Dec 2010 18:54:55 +0100 |
| parents | 3883:604dbcb2d46e |
| children | 3885:aa6ca3a7b940 |
| files | configure util-src/encodings.cpp |
| diffstat | 2 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Dec 14 18:35:05 2010 +0100 +++ b/configure Tue Dec 14 18:54:55 2010 +0100 @@ -20,6 +20,7 @@ CFLAGS="-fPIC -Wall" LDFLAGS="-shared" +IDN_LIBRARY=idn # Help show_help() { @@ -272,15 +273,12 @@ then IDNA_LIBS="$ICU_FLAGS" CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU" -else - if [ "$IDN_LIBRARY" = "idn" ] - then - IDNA_LIBS="-l$IDN_LIB" - else - echo "Must use idn or icu as argument for --idn-library!" - exit 1 - fi fi +if [ "$IDN_LIBRARY" = "idn" ] +then + IDNA_LIBS="-l$IDN_LIB" +fi + LDFLAGS="$LDFLAGS -llua$LUA_SUFFIX" echo -n "Checking Lua includes... "
--- a/util-src/encodings.cpp Tue Dec 14 18:35:05 2010 +0100 +++ b/util-src/encodings.cpp Tue Dec 14 18:54:55 2010 +0100 @@ -122,8 +122,9 @@ /***************** STRINGPREP *****************/ #ifndef USE_STRINGPREP_ICU /****************** libidn ********************/ +extern "C" { #include <stringprep.h> - +} static int stringprep_prep(lua_State *L, const Stringprep_profile *profile) { size_t len; @@ -140,7 +141,7 @@ return 1; // TODO return error message } strcpy(string, s); - ret = stringprep(string, 1024, 0, profile); + ret = stringprep(string, 1024, (Stringprep_profile_flags)0, profile); if (ret == STRINGPREP_OK) { lua_pushstring(L, string); return 1; @@ -169,7 +170,6 @@ #else #include <unicode/usprep.h> -//#include <unicode/stringpiece.h> #include <unicode/unistr.h> #include <unicode/utrace.h>
