X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ng;h=d1f731bc8c05093b65fd55f3a451653a932bfc02;hb=71e9bb1ca6378d517b491db54c42e992e0707ed1;hp=57ae8bb8e66d1aba58cb84ac0fd136c4b2558fe1;hpb=d803ff052585b29defb41f7e5c3c0915f767bebc;p=ngircd-alex.git

diff --git a/configure.ng b/configure.ng
index 57ae8bb8..d1f731bc 100644
--- a/configure.ng
+++ b/configure.ng
@@ -29,7 +29,7 @@ AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
 AC_CONFIG_HEADER([src/config.h])
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([-Wall 1.10 ]ng_color_tests)
+AM_INIT_AUTOMAKE([-Wall 1.10 foreign ]ng_color_tests)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -265,6 +265,7 @@ AC_CHECK_FUNCS_ONCE([
 	strlcat \
 	strlcpy \
 	strndup \
+	strsignal \
 	strtok_r \
 	unsetenv \
 	vsnprintf \
@@ -464,8 +465,12 @@ AC_ARG_WITH(openssl,
 				CPPFLAGS="-I$withval/include $CPPFLAGS"
 				LDFLAGS="-L$withval/lib $LDFLAGS"
 			fi
-			AC_CHECK_LIB(crypto, BIO_s_mem)
-			AC_CHECK_LIB(ssl, SSL_new)
+			PKG_CHECK_MODULES([OPENSSL], [libssl libcrypto],
+				[LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+				AC_DEFINE(HAVE_LIBSSL, 1)],
+				[AC_CHECK_LIB(crypto, BIO_s_mem)
+				AC_CHECK_LIB(ssl, SSL_new)]
+			)
 			AC_CHECK_FUNCS(SSL_new, x_ssl_openssl=yes,
 				AC_MSG_ERROR([Can't enable openssl])
 			)