Mac OS X: fix test for packagemaker(1) tool in Makefile

[ngircd-alex.git] / configure.in

diff --git a/configure.in b/configure.in
index 7cbc80ac13653164754515de97dfc19be398122f..1940834b0f0977a40776001d18c905a2f08ba5dd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,12 +12,14 @@
 # -- Initialisation --
 
 AC_PREREQ(2.50)
-AC_INIT(ngircd, dev)
+AC_INIT(ngircd, 14.1)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.6)
 AM_CONFIG_HEADER(src/config.h)
 
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 # -- Templates for config.h --
 
 AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled])
@@ -309,6 +311,52 @@ if test "$x_io_backend" = "none"; then
        AC_MSG_ERROR([No useabe IO API activated/found!?])
 fi
 
+# use SSL?
+
+AC_ARG_WITH(openssl,
+       [  --with-openssl          enable SSL support using OpenSSL],
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
+                       AC_CHECK_LIB(crypto, BIO_s_mem)
+                       AC_CHECK_LIB(ssl, SSL_library_init)
+                       AC_CHECK_FUNCS(SSL_library_init, x_ssl_openssl=yes,
+                               AC_MSG_ERROR([Can't enable openssl])
+                       )
+               fi
+       ]
+)
+
+AC_ARG_WITH(gnutls,
+       [  --with-gnutls           enable SSL support using gnutls],
+       [       if test "$withval" != "no"; then
+                       if test "$withval" != "yes"; then
+                               CFLAGS="-I$withval/include $CFLAGS"
+                               CPPFLAGS="-I$withval/include $CPPFLAGS"
+                               LDFLAGS="-L$withval/lib $LDFLAGS"
+                       fi
+                       AC_CHECK_LIB(gnutls, gnutls_global_init)
+                       AC_CHECK_FUNCS(gnutls_global_init, x_ssl_gnutls=yes,
+                               AC_MSG_ERROR([Can't enable gnutls])
+                       )
+               fi
+       ]
+)
+
+x_ssl_lib="no"
+if test "$x_ssl_gnutls" = "yes"; then
+       if test "$x_ssl_openssl" = "yes";then
+               AC_MSG_ERROR([Cannot enable both gnutls and openssl])
+       fi
+       x_ssl_lib=gnutls
+fi
+if test "$x_ssl_openssl" = "yes"; then
+       x_ssl_lib=openssl
+fi
+
 # use TCP wrappers?
 
 x_tcpwrap_on=no
@@ -457,6 +505,7 @@ AC_ARG_ENABLE(debug,
 if test "$x_debug_on" = "yes"; then
        AC_DEFINE(DEBUG, 1)
        test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS"
+       AC_CHECK_FUNCS(mtrace)
 fi
 
 # enable "strict RFC rules"?
@@ -587,7 +636,11 @@ echo $ECHO_N "        I/O backend: $ECHO_C"
        echo "\"$x_io_backend\""
 
 echo $ECHO_N "      IPv6 protocol: $ECHO_C"
-echo "$x_ipv6_on"
+echo $ECHO_N "$x_ipv6_on    $ECHO_C"
+
+echo $ECHO_N "        SSL support: $ECHO_C"
+echo "$x_ssl_lib"
+
 echo
 
 # -eof-