Merge branch 'katp32/master'

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index a3855dbebee95b1bd33059ce16b16a87abb9a4a5..b8bcd24d13bad32c47ecb97ce54450e4f49d1e83 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])])
 
@@ -101,6 +101,7 @@ AC_DEFUN([WORKING_GETADDRINFO],[
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <string.h>
 int
 main(int argc, char **argv)
 {
@@ -506,6 +507,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
@@ -707,7 +710,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 \