Fixed ./configure test for TCP Wrappers: now it runs on Mac OS X as well.

[ngircd-alex.git] / configure.in

diff --git a/configure.in b/configure.in
index 2dbaad7e283d0da94a6cc946f5efbdf5b0d85176..eefefd7cd98e06f73282fb61c0a960633dd5bacd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.105 2005/03/19 14:09:32 alex Exp $
+# $Id: configure.in,v 1.108 2005/03/21 22:15:15 alex Exp $
 #
 
 # -- Initialisation --
@@ -85,7 +85,7 @@ AC_CHECK_HEADERS([ \
        strings.h sys/socket.h sys/time.h unistd.h \
        ],,AC_MSG_ERROR([required C header missing!]))
 
-AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdint.h varargs.h])
+AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdbool.h stddef.h varargs.h])
 
 # -- Datatypes --
 
@@ -132,7 +132,12 @@ AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)],
 x_syslog_on=no
 AC_ARG_WITH(syslog,
        [  --without-syslog        disable syslog (autodetected by default)],
-       [       if test "$withval" = "yes"; then
+       [       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(be, syslog)
                        AC_CHECK_FUNCS(syslog, x_syslog_on=yes,
                                AC_MSG_ERROR([Can't enable syslog!])
@@ -152,7 +157,12 @@ fi
 x_zlib_on=no
 AC_ARG_WITH(zlib,
        [  --without-zlib          disable zlib compression (autodetected by default)],
-       [       if test "$withval" = "yes"; then
+       [       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(z, deflate)
                        AC_CHECK_FUNCS(deflate, x_zlib_on=yes,
                                AC_MSG_ERROR([Can't enable zlib!])
@@ -171,14 +181,20 @@ fi
 x_tcpwrap_on=no
 AC_ARG_WITH(tcp-wrappers,
        [  --with-tcp-wrappers     enable TCP wrappers support],
-       [       if test "$withval" = "yes"; then
-                       AC_CHECK_LIB(wrap, tcpd_warn)
+       [       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_MSG_CHECKING(for hosts_access)
+                       LIBS="-lwrap $LIBS"
                        AC_TRY_LINK([
-                               #include <tcpd.h>
+#include <tcpd.h>
+int allow_severity = 0;
+int deny_severity = 0;
                                ],[
-                               void *ptr;
-                               ptr = hosts_access;
+                               tcpd_warn("link test");
                                ],[
                                AC_MSG_RESULT(yes)
                                AC_DEFINE(TCPWRAP, 1)
@@ -194,7 +210,12 @@ AC_ARG_WITH(tcp-wrappers,
 x_rendezvous_on=no
 AC_ARG_WITH(rendezvous,
        [  --with-rendezvous       enable support for "Rendezvous"],
-       [       if test "$withval" = "yes"; then
+       [       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_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_on=osx,
                        [
                                AC_CHECK_LIB(pthread, pthread_mutexattr_init)
@@ -219,7 +240,7 @@ if test "$x_rendezvous_on" = "howl"; then
                if test -f "$dir/rendezvous/rendezvous.h"; then
                        if test "$dir" != "/usr/local/include" -a \
                         "$dir" != "/usr/include"; then
-                               CFLAGS="$CFLAGS -I$dir"
+                               CFLAGS="-I$dir $CFLAGS"
                                CPPFLAGS="-I$dir $CPPFLAGS"
                        fi
                        AC_MSG_RESULT(yes)
@@ -236,7 +257,12 @@ fi
 x_identauth_on=no
 AC_ARG_WITH(ident,
        [  --with-ident            enable "IDENT" ("AUTH") protocol support],
-       [       if test "$withval" = "yes"; then
+       [       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(ident, ident_id)
                        AC_CHECK_FUNCS(ident_id, x_identauth_on=yes,
                                AC_MSG_ERROR([Can't enable IDENT support!])