corrected configure option.

diff --git a/configure.ac b/configure.ac
index 516f118bf30ccd8aa0d310a853ef1f99bf87b3b2..e463b5f2bf042df52839fc42c79faf1fd6737775 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -788,7 +788,6 @@ if features are disabled)
   ECDHE support:        $ac_enable_ecdhe
   Anon auth support:    $ac_enable_anon
   Heartbeat support:    $ac_enable_heartbeat
-  RSA-EXPORT compat:    $ac_enable_rsa_export
   Unicode support:      $ac_have_unicode
   Self checks:          $enable_self_checks
   Non-SuiteB curves:    $enable_non_suiteb

diff --git a/doc/cha-library.texi b/doc/cha-library.texi
index a9891882b3785c5186e917fdb7d3b1717d205853..cb65d68c49311a4d9214c1ff8928375d7206d226 100644 (file)
--- a/doc/cha-library.texi
+++ b/doc/cha-library.texi
@@ -96,15 +96,18 @@ options are given.
 --disable-srp-authentication
 --disable-psk-authentication
 --disable-anon-authentication
+--disable-openpgp-authentication
 --disable-dhe
 --disable-ecdhe
---disable-extra-pki
---disable-openpgp-authentication
 --disable-openssl-compatibility
+--disable-dtls-srtp-support
+--disable-alpn-support
+--disable-heartbeat-support
 --disable-libdane
 --without-p11-kit
 --without-tpm
---disable-dtls-srtp-support
+--without-zlib
+
 @end verbatim
 
 For the complete list, refer to the output from @code{configure --help}.

diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 3eb795f29b3706e1caf77b17a819853a18e9f077..301f256dbd289fc42317cd7660d5c721a347529f 100644 (file)
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -145,8 +145,8 @@ AC_MSG_ERROR([[
   AM_CONDITIONAL(ENABLE_DTLS_SRTP, test "$ac_enable_srtp" != "no")
 
   AC_MSG_CHECKING([whether to disable ALPN extension])
-  AC_ARG_ENABLE(dtls-alpn-support,
-    AS_HELP_STRING([--disable-dtls-alpn-support],
+  AC_ARG_ENABLE(alpn-support,
+    AS_HELP_STRING([--disable-alpn-support],
                    [disable support for the Application Layer Protocol Negotiation (ALPN) extension]),
     ac_enable_alpn=$enableval,ac_enable_alpn=yes)
   if test x$ac_enable_alpn != xno; then
@@ -245,20 +245,6 @@ AC_MSG_ERROR([[
   fi
   AM_CONDITIONAL(ENABLE_ECDHE, test "$ac_enable_ecdhe" != "no")
 
-  AC_MSG_CHECKING([whether to disable RSA-EXPORT support])
-  AC_ARG_ENABLE(rsa-export,
-    AS_HELP_STRING([--disable-rsa-export],
-                   [disable the RSA-EXPORT support]),
-    ac_enable_rsa_export=$enableval, ac_enable_rsa_export=yes)
-  if test x$ac_enable_rsa_export != xno; then
-   AC_MSG_RESULT(no)
-   AC_DEFINE([ENABLE_RSA_EXPORT], 1, [enable RSA-EXPORT])
-  else
-   ac_full=0
-   AC_MSG_RESULT(yes)
-  fi
-  AM_CONDITIONAL(ENABLE_RSA_EXPORT, test "$ac_enable_rsa_export" != "no")
-
   ac_enable_openpgp=yes
   AC_MSG_CHECKING([whether to disable OpenPGP Certificate authentication support])
   AC_ARG_ENABLE(openpgp-authentication,