Merge branch 'master' of github.com:wolfSSL/wolfssl

pull/61/merge
John Safranek 2015-03-31 09:54:27 -07:00
commit 00b335d71a
1 changed files with 3 additions and 3 deletions

View File

@ -426,7 +426,7 @@ AM_CONDITIONAL([BUILD_AESNI], [test "x$ENABLED_AESNI" = "xyes"])
# POLY1305 # POLY1305
AC_ARG_ENABLE([poly1305], AC_ARG_ENABLE([poly1305],
[AS_HELP_STRING([--enable-poly1305],[Enable wolfSSL POLY1305 support (default: disabled)])], [AS_HELP_STRING([--enable-poly1305],[Enable wolfSSL POLY1305 support (default: enabled)])],
[ ENABLED_POLY1305=$enableval ], [ ENABLED_POLY1305=$enableval ],
[ ENABLED_POLY1305=yes ] [ ENABLED_POLY1305=yes ]
) )
@ -1027,7 +1027,7 @@ AM_CONDITIONAL([BUILD_DES3], [test "x$ENABLED_DES3" = "xyes"])
# ARC4 # ARC4
AC_ARG_ENABLE([arc4], AC_ARG_ENABLE([arc4],
[ --enable-arc4 Enable ARC4 (default: enabled)], [ --enable-arc4 Enable ARC4 (default: disabled)],
[ ENABLED_ARC4=$enableval ], [ ENABLED_ARC4=$enableval ],
[ ENABLED_ARC4=no ] [ ENABLED_ARC4=no ]
) )
@ -1156,7 +1156,7 @@ AM_CONDITIONAL([BUILD_RABBIT], [test "x$ENABLED_RABBIT" = "xyes"])
# CHACHA # CHACHA
AC_ARG_ENABLE([chacha], AC_ARG_ENABLE([chacha],
[ --enable-chacha Enable CHACHA (default: disabled)], [ --enable-chacha Enable CHACHA (default: enabled)],
[ ENABLED_CHACHA=$enableval ], [ ENABLED_CHACHA=$enableval ],
[ ENABLED_CHACHA=yes ] [ ENABLED_CHACHA=yes ]
) )