Make the debug loglevel always available

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index 57ae8bb8e66d1aba58cb84ac0fd136c4b2558fe1..28ababbf450234b33e409af5ed1dfebf75067274 100644 (file)
--- 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])
                        )
@@ -501,6 +506,8 @@ if test "$x_ssl_openssl" = "yes"; then
        x_ssl_lib=openssl
 fi
 
+AM_CONDITIONAL(HAVE_SSL, [test $x_ssl_lib != "no"])
+
 # use TCP wrappers?
 
 x_tcpwrap_on=no
@@ -702,7 +709,6 @@ AC_CONFIG_FILES([ \
        Makefile \
        contrib/Debian/Makefile \
        contrib/MacOSX/Makefile \
-       contrib/MacOSX/ngIRCd.pmdoc/Makefile \
        contrib/MacOSX/ngIRCd.xcodeproj/Makefile \
        contrib/Makefile \
        doc/Makefile \