-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #117 from aws/108
Fix autoconf build issue
- Loading branch information
Showing
3 changed files
with
132 additions
and
0 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
diff --git a/configure.ac b/configure.ac | ||
index d24daea..64aca7f 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -193,87 +193,96 @@ AS_HELP_STRING([--with-schannel],[enable Windows native SSL/TLS]), | ||
|
||
OPT_SECURETRANSPORT=no | ||
AC_ARG_WITH(secure-transport,dnl | ||
-AS_HELP_STRING([--with-secure-transport],[enable Apple OS native SSL/TLS]), | ||
+AS_HELP_STRING([--with-secure-transport],[enable Apple OS native SSL/TLS]),[ | ||
OPT_SECURETRANSPORT=$withval | ||
test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }Secure-Transport" | ||
-) | ||
+]) | ||
|
||
OPT_AMISSL=no | ||
AC_ARG_WITH(amissl,dnl | ||
-AS_HELP_STRING([--with-amissl],[enable Amiga native SSL/TLS (AmiSSL)]), | ||
+AS_HELP_STRING([--with-amissl],[enable Amiga native SSL/TLS (AmiSSL)]),[ | ||
OPT_AMISSL=$withval | ||
- test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }AmiSSL") | ||
+ test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }AmiSSL" | ||
+]) | ||
+ | ||
|
||
OPT_OPENSSL=no | ||
dnl Default to no CA bundle | ||
ca="no" | ||
AC_ARG_WITH(ssl,dnl | ||
AS_HELP_STRING([--with-ssl=PATH],[old version of --with-openssl]) | ||
-AS_HELP_STRING([--without-ssl], [build without any TLS library]), | ||
+AS_HELP_STRING([--without-ssl], [build without any TLS library]),[ | ||
OPT_SSL=$withval | ||
OPT_OPENSSL=$withval | ||
if test X"$withval" != Xno; then | ||
- test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL") | ||
+ test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL" | ||
fi | ||
+]) | ||
|
||
AC_ARG_WITH(openssl,dnl | ||
-AS_HELP_STRING([--with-openssl=PATH],[Where to look for OpenSSL, PATH points to the SSL installation (default: /usr/local/ssl); when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]), | ||
+AS_HELP_STRING([--with-openssl=PATH],[Where to look for OpenSSL, PATH points to the SSL installation (default: /usr/local/ssl); when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]),[ | ||
OPT_OPENSSL=$withval | ||
if test X"$withval" != Xno; then | ||
- test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL") | ||
+ test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL" | ||
fi | ||
+]) | ||
|
||
OPT_GNUTLS=no | ||
AC_ARG_WITH(gnutls,dnl | ||
-AS_HELP_STRING([--with-gnutls=PATH],[where to look for GnuTLS, PATH points to the installation root]), | ||
+AS_HELP_STRING([--with-gnutls=PATH],[where to look for GnuTLS, PATH points to the installation root]),[ | ||
OPT_GNUTLS=$withval | ||
if test X"$withval" != Xno; then | ||
- test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }GnuTLS") | ||
+ test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }GnuTLS" | ||
fi | ||
+]) | ||
|
||
OPT_MBEDTLS=no | ||
AC_ARG_WITH(mbedtls,dnl | ||
-AS_HELP_STRING([--with-mbedtls=PATH],[where to look for mbedTLS, PATH points to the installation root]), | ||
+AS_HELP_STRING([--with-mbedtls=PATH],[where to look for mbedTLS, PATH points to the installation root]),[ | ||
OPT_MBEDTLS=$withval | ||
if test X"$withval" != Xno; then | ||
- test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }mbedTLS") | ||
+ test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }mbedTLS" | ||
fi | ||
+]) | ||
|
||
OPT_WOLFSSL=no | ||
AC_ARG_WITH(wolfssl,dnl | ||
-AS_HELP_STRING([--with-wolfssl=PATH],[where to look for WolfSSL, PATH points to the installation root (default: system lib default)]), | ||
+AS_HELP_STRING([--with-wolfssl=PATH],[where to look for WolfSSL, PATH points to the installation root (default: system lib default)]),[ | ||
OPT_WOLFSSL=$withval | ||
if test X"$withval" != Xno; then | ||
- test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }wolfSSL") | ||
+ test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }wolfSSL" | ||
fi | ||
+]) | ||
|
||
OPT_BEARSSL=no | ||
AC_ARG_WITH(bearssl,dnl | ||
-AS_HELP_STRING([--with-bearssl=PATH],[where to look for BearSSL, PATH points to the installation root]), | ||
+AS_HELP_STRING([--with-bearssl=PATH],[where to look for BearSSL, PATH points to the installation root]),[ | ||
OPT_BEARSSL=$withval | ||
if test X"$withval" != Xno; then | ||
- test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }BearSSL") | ||
+ test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }BearSSL" | ||
fi | ||
+]) | ||
|
||
OPT_RUSTLS=no | ||
AC_ARG_WITH(rustls,dnl | ||
-AS_HELP_STRING([--with-rustls=PATH],[where to look for rustls, PATH points to the installation root]), | ||
+AS_HELP_STRING([--with-rustls=PATH],[where to look for rustls, PATH points to the installation root]),[ | ||
OPT_RUSTLS=$withval | ||
if test X"$withval" != Xno; then | ||
- test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }rustls") | ||
+ test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }rustls" | ||
fi | ||
+]) | ||
|
||
OPT_NSS_AWARE=no | ||
AC_ARG_WITH(nss-deprecated,dnl | ||
-AS_HELP_STRING([--with-nss-deprecated],[confirm you realize NSS is going away]), | ||
+AS_HELP_STRING([--with-nss-deprecated],[confirm you realize NSS is going away]),[ | ||
if test X"$withval" != Xno; then | ||
OPT_NSS_AWARE=$withval | ||
fi | ||
-) | ||
+]) | ||
|
||
OPT_NSS=no | ||
AC_ARG_WITH(nss,dnl | ||
-AS_HELP_STRING([--with-nss=PATH],[where to look for NSS, PATH points to the installation root]), | ||
+AS_HELP_STRING([--with-nss=PATH],[where to look for NSS, PATH points to the installation root]),[ | ||
OPT_NSS=$withval | ||
if test X"$withval" != Xno; then | ||
|
||
@@ -283,7 +292,7 @@ AS_HELP_STRING([--with-nss=PATH],[where to look for NSS, PATH points to the inst | ||
|
||
test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }NSS" | ||
fi | ||
-) | ||
+]) | ||
|
||
dnl If no TLS choice has been made, check if it was explicitly disabled or | ||
dnl error out to force the user to decide. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters