diff options
| author | Tobias Markmann <tm@ayena.de> | 2010-12-14 18:54:55 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2010-12-14 18:54:55 +0100 |
| commit | 8f4671cca2312164afb0f7b123fbf21d881426fc (patch) | |
| tree | a954c2c240053926ce989da0a109d2222f135738 | |
| parent | 52b97c49a81277aabf8e74c853fcb6da266e50fb (diff) | |
| download | prosody-8f4671cca2312164afb0f7b123fbf21d881426fc.tar.gz prosody-8f4671cca2312164afb0f7b123fbf21d881426fc.zip | |
Make libidn default when not specifiying a IDN lib.
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | util-src/encodings.cpp | 6 |
2 files changed, 9 insertions, 11 deletions
@@ -20,6 +20,7 @@ LD=gcc CFLAGS="-fPIC -Wall" LDFLAGS="-shared" +IDN_LIBRARY=idn # Help show_help() { @@ -272,15 +273,12 @@ if [ "$IDN_LIBRARY" = "icu" ] 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... " diff --git a/util-src/encodings.cpp b/util-src/encodings.cpp index da2d10bb..81230afe 100644 --- a/util-src/encodings.cpp +++ b/util-src/encodings.cpp @@ -122,8 +122,9 @@ static const luaL_Reg Reg_base64[] = /***************** 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 @@ static int stringprep_prep(lua_State *L, const Stringprep_profile *profile) 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 @@ static const luaL_Reg Reg_stringprep[] = #else #include <unicode/usprep.h> -//#include <unicode/stringpiece.h> #include <unicode/unistr.h> #include <unicode/utrace.h> |