--- configure.ac
+++ configure.ac
@@ -68,16 +68,32 @@
 ###############################################################################
 # GNUTLS support
 ###############################################################################
-PKG_CHECK_MODULES(GNUTLS, gnutls, [
+AC_ARG_WITH([ssl],
+	AS_HELP_STRING([--with-ssl],[Enable SSL support]))
+
+AS_IF([test "x$with_ssl" = "xyes"], [
+	PKG_CHECK_MODULES(GNUTLS, gnutls, [
 		AC_DEFINE(HAVE_GNUTLS, 1, [Whether GNUTLS is available])
 		SSL_OBJS="src/gnutls.o src/tlscert.o"
 		AC_SUBST(SSL_OBJS)
 		], [ AC_MSG_WARN([GNUTLS not found, SSL will not be available]) ])
 
-AC_CHECK_LIB(readline, readline, [ 
-	AC_DEFINE(HAVE_READLINE, 1, [Whether readline is available])
-	BINS="$BINS linestack-cmd$ac_cv_exeext ctrlproxy-admin$ac_cv_exeext" 
-	LIBS="$LIBS -lreadline"
+	AS_IF([test "x$SSL_OBJS" != "x"], [
+		AC_CHECK_LIB(gcrypt, gcry_check_version, 
+			[ LIBS="$LIBS -lgcrypt" ],
+			[ AC_MSG_WARN([libgcrypt not found, SSL will not be available]); $HAVE_GNUTLS=0 ])
+	])
+])
+
+AC_ARG_WITH([readline],
+	AS_HELP_STRING([--with-readline],[Enable readline support]))
+
+AS_IF([test "x$with_readline" = "xyes"], [
+	AC_CHECK_LIB(readline, readline, [ 
+		AC_DEFINE(HAVE_READLINE, 1, [Whether readline is available])
+		BINS="$BINS linestack-cmd$ac_cv_exeext ctrlproxy-admin$ac_cv_exeext" 
+		LIBS="$LIBS -lreadline"
+	])
 ])
 
 ###############################################################################