@@ -44,10 +44,11 @@
 	LDFLAGS="$LDFLAGS -noixemul"
 	LIBS="$LIBS -ldebug"
 
 	enable_files="yes"	# Required for reading ENV:
 	enable_shared="no"
+	with_tls="no"
 	supports_amiga_lib="yes"
 
 	AS_IF([test x"$enable_amiga_lib" != x"no"], [
 		AC_SUBST(OBJFWRT_AMIGA_LIB,
 			['objfwrt${OBJFWRT_LIB_MAJOR}.library'])
@@ -64,10 +65,11 @@
 powerpc-*-amigaos*)
 	CPPFLAGS="$CPPFLAGS -D__USE_INLINE__"
 
 	enable_files="yes"	# Required for reading ENV:
 	enable_shared="no"
+	with_tls="no"
 
 	AC_SUBST(LIBBASES_M, libbases.m)
 	;;
 *-morphos*)
 	AS_IF([test x"$OBJCFLAGS" = x""], [OBJCFLAGS="-O2 -g"])
@@ -76,10 +78,11 @@
 	LDFLAGS="$LDFLAGS -noixemul"
 	LIBS="$LIBS -ldebug"
 
 	enable_files="yes"	# Required for reading ENV:
 	enable_shared="no"
+	with_tls="no"
 	supports_amiga_lib="yes"
 
 	AS_IF([test x"$enable_amiga_lib" != x"no"], [
 		AC_SUBST(OBJFWRT_AMIGA_LIB,
 			['objfwrt${OBJFW_LIB_MAJOR}ppc.library'])
@@ -178,10 +181,11 @@
 	LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -meabi -mhard-float"
 	LIBS="$LIBS -L$DEVKITPRO/libogc/lib/wii -lfat -logc"
 	TESTS_LIBS="$TESTS_LIBS -lwiiuse -lbte"
 	enable_shared="no"
 	enable_threads="no"	# TODO
+	with_tls="no"
 
 	AC_DEFINE(OF_WII, 1, [Whether we are compiling for Wii])
 	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DGEKKO -I\$DEVKITPRO/libogc/include"
 	AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map'])
 ])
@@ -226,10 +230,11 @@
 	LDFLAGS="$LDFLAGS -specs=3dsx.specs -march=armv6k -mtune=mpcore"
 	LDFLAGS="$LDFLAGS -mfloat-abi=hard -mtp=soft -mword-relocations"
 	LIBS="$LIBS -L$DEVKITPRO/libctru/lib -lctru"
 	enable_shared="no"
 	enable_threads="no"	# TODO
+	with_tls="no"
 	check_pedantic="no"
 
 	AC_DEFINE(OF_NINTENDO_3DS, 1,
 		[Whether we are compiling for Nintendo 3DS])
 	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DARM11 -I\$DEVKITPRO/libctru/include"
@@ -1534,33 +1539,43 @@
 				"OFSelectKernelEventObserver.m")
 		])
 		;;
 	esac
 
+	AC_ARG_WITH(tls,
+		AS_HELP_STRING([--with-tls], [
+			enable TLS support using the specified library
+			(yes, gnutls, securetransport or no)]))
+	AS_IF([test x"$with_tls" = x""], [with_tls="yes"])
 	tls_support="no"
-	AC_CHECK_HEADERS(Security/SecureTransport.h, [
-		old_LIBS="$LIBS"
-		LIBS="-framework Security -framework Foundation $LIBS"
-
-		AC_CHECK_FUNC(SSLHandshake, [
-			AC_DEFINE(HAVE_SECURE_TRANSPORT, 1,
-				[Whether we have Secure Transport])
-
-			tls_support="Secure Transport"
-			TLS_LIBS="-framework Foundation $TLS_LIBS"
-			TLS_LIBS="-framework Security $TLS_LIBS"
-
-			AC_SUBST(OF_SECURE_TRANSPORT_TLS_STREAM_M,
-				"OFSecureTransportTLSStream.m")
-
-			AC_CHECK_FUNCS(SSLCreateContext)
-		], [])
-
-		LIBS="$old_LIBS"
+
+	AS_IF([test x"$with_tls" = x"securetransport" \
+		-o x"$with_tls" = x"yes"], [
+		AC_CHECK_HEADERS(Security/SecureTransport.h, [
+			old_LIBS="$LIBS"
+			LIBS="-framework Security -framework Foundation $LIBS"
+
+			AC_CHECK_FUNC(SSLHandshake, [
+				AC_DEFINE(HAVE_SECURE_TRANSPORT, 1,
+					[Whether we have Secure Transport])
+
+				tls_support="Secure Transport"
+				TLS_LIBS="-framework Foundation $TLS_LIBS"
+				TLS_LIBS="-framework Security $TLS_LIBS"
+
+				AC_SUBST(OF_SECURE_TRANSPORT_TLS_STREAM_M,
+					"OFSecureTransportTLSStream.m")
+
+				AC_CHECK_FUNCS(SSLCreateContext)
+			], [])
+
+			LIBS="$old_LIBS"
+		])
 	])
 
-	AS_IF([test x"$tls_support" = x"no"], [
+	AS_IF([test x"$with_tls" = x"gnutls" \
+		-o \( x"$with_tls" = x"yes" -a x"$tls_support" = x"no" \)], [
 		PKG_CHECK_MODULES(gnutls, [gnutls >= 3.5.0], [
 			AC_DEFINE(HAVE_GNUTLS, 1, [Whether we have GnuTLS])
 
 			tls_support="GnuTLS"
 			TLS_CPPFLAGS="$gnutls_CFLAGS $TLS_CPPFLAGS"
@@ -1594,10 +1609,17 @@
 		])
 		AS_IF([test x"$build_framework" = x"yes"], [
 			AC_SUBST(OBJFWTLS_FRAMEWORK, "ObjFWTLS.framework")
 		])
 	])
+
+	AS_IF([test x"$with_tls" != x"no" -a x"$tls_support" = x"no"], [
+		AC_MSG_ERROR(m4_normalize([
+			No TLS implementation was found. Please install GnuTLS
+			or use --without-tls.
+		]))
+	])
 
 	AS_IF([test x"$enable_threads" != x"no"], [
 		AC_SUBST(OF_HTTP_CLIENT_TESTS_M, "OFHTTPClientTests.m")
 	])
 
@@ -2083,14 +2105,5 @@
 	printf "  ** be locked for every retain and release! If you don't "
 	echo "need threads, try"
 	echo "  ** --disable-threads to work around this problem."
 	echo
 ])
-
-AS_IF([test x"$enable_sockets" != x"no" -a x"$tls_support" = x"no"], [
-       echo
-       printf "  ** Warning: You have enabled sockets, but no TLS "
-       echo "implementation was found."
-       printf "  ** TLS support will be disabled. Please install "
-       echo "GnuTLS for TLS support."
-       echo
-])