CVS gsasl/lib

[gsasl-commit]

Update of /home/cvs/gsasl/lib
In directory dopio:/tmp/cvs-serv2772

Modified Files:
        Makefile.am NEWS configure.ac 
Log Message:
Revert LibIDN dependency stuff.

--- /home/cvs/gsasl/lib/Makefile.am     2004/11/30 02:51:28     1.60
+++ /home/cvs/gsasl/lib/Makefile.am     2004/12/15 00:28:48     1.61
@@ -25,10 +25,6 @@
 
 SUBDIRS = po gl crypto
 
-if MINILIBIDN
-SUBDIRS += libidn
-endif
-
 # Plugins:
 if EXTERNAL
 SUBDIRS += external
--- /home/cvs/gsasl/lib/NEWS    2004/12/14 23:23:41     1.74
+++ /home/cvs/gsasl/lib/NEWS    2004/12/15 00:28:48     1.75
@@ -15,11 +15,6 @@
 There is no specification for LOGIN, but arguable it should use
 SASLprep, but on the server side.
 
-** If Libidn is not installed on the system, a stripped down version is used.
-If you for some reason wish to use the included copy, instead of the
-system libidn, use --with-included-libidn.  The system libidn should
-be detected automatically, if present.
-
 ** DIGEST-MD5 is disabled by default, pending a rewrite for the new API.
 
 ** LOGIN client now uses authentication identity, not authorization identity,
--- /home/cvs/gsasl/lib/configure.ac    2004/12/15 00:15:43     1.38
+++ /home/cvs/gsasl/lib/configure.ac    2004/12/15 00:28:48     1.39
@@ -356,41 +356,18 @@
 AM_CONDITIONAL(KERBEROS_V5, test x$kerberos_v5 = xyes)
 
 # Check for idn
-AC_ARG_WITH(included-libidn,
-       AS_HELP_STRING([--with-included-libidn],
-               [unconditionally use the included libidn]),
-               minilibidn_enabled=$enableval, minilibidn_enabled=no)
-if test "$minilibidn_enabled" = "no"; then
-       sj_CHECK_HEADERLIB(stringprep.h, idn, stringprep_check_version,,
-               [minilibidn_enabled=yes
-               AC_MSG_WARN([[Libidn not found.  Using the included copy.]])
-               AM_ICONV
-               # Check if locale stuff works
-               AC_CACHE_CHECK([if setlocale() and nl_langinfo() works],
-                       ac_cv_locale_works, [
-                       AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <locale.h>
-#include <langinfo.h>
-int main ()
-{
-  char* cs;
-  setlocale(LC_CTYPE, "");
-  cs = nl_langinfo(CODESET);
-  return !cs;
-}
-]])],
-                       [ac_cv_locale_works=yes],
-                       [ac_cv_locale_works=no],
-                       [ac_cv_locale_works=no])
-               ])
-               if test "$ac_cv_locale_works" = "yes"; then
-                 AC_DEFINE(LOCALE_WORKS, 1,
-                       [Define if setlocale() and nl_langinfo() works.])
-               fi])
+AC_ARG_WITH(stringprep,
+  AS_HELP_STRING([--without-stringprep],
+               [don't use libidn for string processing even if available]),
+       stringprep=$withval, stringprep=yes)
+if test "$stringprep" != "no"; then
+       sj_CHECK_HEADERLIB(stringprep.h, idn, stringprep_check_version,
+               [stringprep=yes
+               AC_DEFINE(WITH_STRINGPREP, 1,
+                       [Define to 1 if you want to use libidn.])],
+               [stringprep=no
+               AC_MSG_WARN([Libidn not found.  String process disabled.])])
 fi
-AC_MSG_CHECKING([whether to use the included libidn])
-AC_MSG_RESULT($minilibidn_enabled)
-AM_CONDITIONAL(MINILIBIDN, test "$minilibidn_enabled" = "yes")
 
 # Allow disabling of client or server.
 AC_ARG_ENABLE(client,