diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2017-04-04 20:13:11 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-05-01 12:58:23 +0200 |
| commit | abe6a12b9766219163f99d7807a0b07fbe5f590c (patch) | |
| tree | d6ae3a7993290b2fa9d688cdf5be1f738be2b612 /configure.ac | |
| parent | 8f981f0373fd3484659a5b0452306d01e13fc26d (diff) | |
| download | gnutls-abe6a12b9766219163f99d7807a0b07fbe5f590c.tar.gz | |
Removed support for libidn1
Currently we support both IDNA2003 and IDNA2008. However, IDNA2003
is already obsolete by registrars and NICs, thus there is no reason
to continue supporting it. We switch to IDNA2008 exclusively using libidn2.
Resolves #194
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 84c9500eda..972faf7362 100644 --- a/configure.ac +++ b/configure.ac @@ -465,26 +465,19 @@ AM_CONDITIONAL(WITH_OLD_NETTLE, test "$with_old_nettle" != "no") AC_ARG_WITH(idn, AS_HELP_STRING([--without-idn], - [disable support for libidn]), - try_libidn="$withval", - try_libidn=yes) - -AC_ARG_WITH(libidn2, AS_HELP_STRING([--without-libidn2], - [force support for libidn instead of libidn2]), + [disable support for IDNA]), try_libidn2="$withval", try_libidn2=yes) idna_support=no with_libidn2=no -with_libidn=no -if test "$try_libidn" = yes;then - if test "$try_libidn2" = yes;then +if test "$try_libidn2" = yes;then AC_SEARCH_LIBS(idn2_lookup_u8, idn2, [ with_libidn2=yes; idna_support="IDNA 2008 (libidn2)" AC_DEFINE([HAVE_LIBIDN2], 1, [Define if IDNA 2008 support is enabled.]) - AC_SUBST([LIBIDN_LIBS], [-lidn2]) + AC_SUBST([LIBIDN2_CFLAGS], []) AC_SUBST([LIBIDN2_LIBS], [-lidn2]) dnl used in gnutls.pc.in dnl enable once libidn2.pc is widespread; and remove LIBIDN2_LIBS from gnutls.pc.in (Libs.private) dnl if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then @@ -496,36 +489,11 @@ dnl fi with_libidn2=no; AC_MSG_WARN(*** LIBIDN2 was not found. You will not be able to use IDN2008 support) ]) - else +else with_libidn2=no - fi - - if test "$with_libidn2" = "no"; then - PKG_CHECK_MODULES(LIBIDN, libidn >= 0.5.6, [with_libidn=yes], [with_libidn=no]) - if test "$with_libidn" != "no";then - idna_support="IDNA 2003 (libidn)" - if ! $PKG_CONFIG --atleast-version=1.31 libidn; then - with_buggy_libidn=yes - fi - - AC_DEFINE([HAVE_LIBIDN], 1, [Build IDNA support]) - if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then - GNUTLS_REQUIRES_PRIVATE="Requires.private: libidn" - else - GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libidn" - fi - else - AC_MSG_WARN([[ -*** -*** libidn was not found. IDNA support will be disabled. -*** ]]) - fi - fi fi AM_CONDITIONAL(HAVE_LIBIDN2, test "$with_libidn2" != "no") -AM_CONDITIONAL(HAVE_LIBIDN, test "$with_libidn" != "no") -AM_CONDITIONAL(HAVE_BUGGY_LIBIDN, test "$with_buggy_libidn" = "yes") AC_ARG_ENABLE(non-suiteb-curves, AS_HELP_STRING([--disable-non-suiteb-curves], [disable curves not in SuiteB]), |