X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=2dbaad7e283d0da94a6cc946f5efbdf5b0d85176;hb=795802f2b0c4a82fb499e101da055a55a202e1fb;hp=49d2debe62218b397b6e0075e032f07e85a11171;hpb=558fe6b453a08c8924060b02d66f32a3683cc821;p=ngircd-alex.git

diff --git a/configure.in b/configure.in
index 49d2debe..2dbaad7e 100644
--- a/configure.in
+++ b/configure.in
@@ -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.102 2004/04/11 13:20:24 alex Exp $
+# $Id: configure.in,v 1.105 2005/03/19 14:09:32 alex Exp $
 #
 
 # -- Initialisation --
@@ -91,8 +91,8 @@ AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdint.h varargs.h])
 
 AC_MSG_CHECKING(whether socklen_t exists)
 AC_TRY_COMPILE([
-	#include <sys/socket.h>
-	#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 	],[
 	socklen_t a, b;
 	a = 2; b = 4; a += b;
@@ -146,7 +146,7 @@ AC_ARG_WITH(syslog,
 )
 if test "$x_syslog_on" = "yes"; then
 	AC_DEFINE(SYSLOG, 1)
-	AC_CHECK_HEADERS(syslog.h)
+	AC_CHECK_HEADERS(syslog.h,,AC_MSG_ERROR([required C header missing!]))
 fi
 
 x_zlib_on=no
@@ -165,7 +165,7 @@ AC_ARG_WITH(zlib,
 )
 if test "$x_zlib_on" = "yes"; then
 	AC_DEFINE(ZLIB, 1)
-	AC_CHECK_HEADERS(zlib.h)
+	AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!]))
 fi
 
 x_tcpwrap_on=no
@@ -195,15 +195,42 @@ x_rendezvous_on=no
 AC_ARG_WITH(rendezvous,
 	[  --with-rendezvous       enable support for "Rendezvous"],
 	[	if test "$withval" = "yes"; then
-			AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_on=yes,
-				AC_MSG_ERROR([Can't enable Rendezvous!])
-			)
+			AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_on=osx,
+			[
+				AC_CHECK_LIB(pthread, pthread_mutexattr_init)
+				AC_CHECK_LIB(howl, sw_discovery_init)
+				AC_CHECK_FUNCS(sw_discovery_init, \
+				 x_rendezvous_on=howl, \
+				 AC_MSG_ERROR([Can't enable Rendezvous!]))
+			])
 		fi
 	]
 )
-if test "$x_rendezvous_on" = "yes"; then
+if test "$x_rendezvous_on" = "osx"; then
+	AC_CHECK_HEADERS([DNSServiceDiscovery/DNSServiceDiscovery.h \
+	 mach/port.h],,AC_MSG_ERROR([required C header missing!]))
+	AC_DEFINE(RENDEZVOUS, 1)
+fi
+if test "$x_rendezvous_on" = "howl"; then
+	for dir in /usr/local/include /usr/local/include/howl* \
+	 /usr/include /usr/include/howl*; do
+	 	test -d "$dir" || continue
+		AC_MSG_CHECKING([for Howl headers in $dir])
+		if test -f "$dir/rendezvous/rendezvous.h"; then
+			if test "$dir" != "/usr/local/include" -a \
+			 "$dir" != "/usr/include"; then
+				CFLAGS="$CFLAGS -I$dir"
+				CPPFLAGS="-I$dir $CPPFLAGS"
+			fi
+			AC_MSG_RESULT(yes)
+			break
+		else
+			AC_MSG_RESULT(no)
+		fi
+	done
+	AC_CHECK_HEADERS([rendezvous/rendezvous.h],, \
+	 AC_MSG_ERROR([required C header missing!]))
 	AC_DEFINE(RENDEZVOUS, 1)
-	AC_CHECK_HEADERS(DNSServiceDiscovery/DNSServiceDiscovery.h mach/port.h)
 fi
 
 x_identauth_on=no
@@ -219,7 +246,7 @@ AC_ARG_WITH(ident,
 )
 if test "$x_identauth_on" = "yes"; then
 	AC_DEFINE(IDENTAUTH, 1)
-	AC_CHECK_HEADERS(ident.h)
+	AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!]))
 fi
 
 x_ircplus_on=yes
@@ -347,7 +374,7 @@ test "$x_strict_rfc_on" = "yes" \
 	|| echo "no"
 
 echo $ECHO_N " Rendezvous support: $ECHO_C"
-test "$x_rendezvous_on" = "yes"	\
+test "$x_rendezvous_on" = "osx" -o "$x_rendezvous_on" = "howl" \
 	&& echo $ECHO_N "yes $ECHO_C" \
 	|| echo $ECHO_N "no  $ECHO_C"
 echo $ECHO_N "      IRC+ protocol: $ECHO_C"