[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS gsasl/lib
From: |
gsasl-commit |
Subject: |
CVS gsasl/lib |
Date: |
Tue, 30 Nov 2004 03:51:28 +0100 |
Update of /home/cvs/gsasl/lib
In directory dopio:/tmp/cvs-serv2800
Modified Files:
Makefile.am NEWS configure.ac
Log Message:
Add copy of libidn, so we always have SASLprep functionality.
--- /home/cvs/gsasl/lib/Makefile.am 2004/10/24 20:06:22 1.59
+++ /home/cvs/gsasl/lib/Makefile.am 2004/11/30 02:51:28 1.60
@@ -25,6 +25,10 @@
SUBDIRS = po gl crypto
+if MINILIBIDN
+SUBDIRS += libidn
+endif
+
# Plugins:
if EXTERNAL
SUBDIRS += external
--- /home/cvs/gsasl/lib/NEWS 2004/11/30 02:10:24 1.67
+++ /home/cvs/gsasl/lib/NEWS 2004/11/30 02:51:28 1.68
@@ -4,6 +4,11 @@
* Version 0.2.3 (unreleased)
+** 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/11/30 02:09:58 1.33
+++ /home/cvs/gsasl/lib/configure.ac 2004/11/30 02:51:28 1.34
@@ -356,19 +356,18 @@
AM_CONDITIONAL(KERBEROS_V5, test x$kerberos_v5 = xyes)
# Check for idn
-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.])])
+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.]]))
fi
-AM_CONDITIONAL(STRINGPREP, test x$stringprep = xyes)
+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,
@@ -407,7 +406,8 @@
AX_CREATE_STDINT_H(crypto/nettle-types.h, sys/types.h)
AC_CONFIG_FILES(Makefile libgsasl.pc po/Makefile.in \
- gl/Makefile crypto/Makefile src/gsasl.h src/Makefile \
+ gl/Makefile crypto/Makefile libidn/Makefile \
+ src/gsasl.h src/Makefile \
anonymous/Makefile cram-md5/Makefile \
digest-md5/Makefile external/Makefile \
gssapi/Makefile kerberos_v5/Makefile \
- CVS gsasl/lib, (continued)
- CVS gsasl/lib, gsasl-commit, 2004/11/26
- CVS gsasl/lib, gsasl-commit, 2004/11/28
- CVS gsasl/lib, gsasl-commit, 2004/11/28
- CVS gsasl/lib, gsasl-commit, 2004/11/28
- CVS gsasl/lib, gsasl-commit, 2004/11/28
- CVS gsasl/lib, gsasl-commit, 2004/11/29
- CVS gsasl/lib, gsasl-commit, 2004/11/29
- CVS gsasl/lib, gsasl-commit, 2004/11/29
- CVS gsasl/lib, gsasl-commit, 2004/11/29
- CVS gsasl/lib, gsasl-commit, 2004/11/29
- CVS gsasl/lib,
gsasl-commit <=
- CVS gsasl/lib, gsasl-commit, 2004/11/29
- CVS gsasl/lib, gsasl-commit, 2004/11/29
- CVS gsasl/lib, gsasl-commit, 2004/11/29
- CVS gsasl/lib, gsasl-commit, 2004/11/30
- CVS gsasl/lib, gsasl-commit, 2004/11/30
- CVS gsasl/lib, gsasl-commit, 2004/11/30
- CVS gsasl/lib, gsasl-commit, 2004/11/30