X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=9e25f27d5d21817c90af2d3ddf4d95251f169b68;hb=bb98fd8c85fa3292b95134d727864c090c29d783;hp=d3a5881d0d3b03309d80a131bcd83f00cb02d757;hpb=cfe63565313991a788818e8603dd6286cf147cd5;p=ngircd-alex.git

diff --git a/configure.in b/configure.in
index d3a5881d..9e25f27d 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.95 2003/10/19 23:03:34 alex Exp $
+# $Id: configure.in,v 1.99 2003/12/31 17:31:03 alex Exp $
 #
 
 # -- Initialisierung --
@@ -26,11 +26,12 @@ AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled])
 AH_TEMPLATE([HAVE_socklen_t], [Define if socklen_t exists])
 AH_TEMPLATE([SNIFFER], [Define if IRC sniffer should be enabled])
 AH_TEMPLATE([STRICT_RFC], [Define if ngIRCd should behave strict RFC compliant])
-AH_TEMPLATE([USE_SYSLOG], [Define if syslog should be used for logging])
-AH_TEMPLATE([USE_ZLIB], [Define if zlib compression should be enabled])
-AH_TEMPLATE([USE_TCPWRAP], [Define if TCP wrappers should be used])
+AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging])
+AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled])
+AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used])
 AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
 AH_TEMPLATE([RENDEZVOUS], [Define if Rendezvous support should be included])
+AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests])
 
 AH_TEMPLATE([TARGET_OS], [Target operating system name])
 AH_TEMPLATE([TARGET_VENDOR], [Target system vendor])
@@ -162,7 +163,7 @@ AC_ARG_WITH(syslog,
 	]
 )
 if test "$x_syslog_on" = "yes"; then
-	AC_DEFINE(USE_SYSLOG, 1)
+	AC_DEFINE(SYSLOG, 1)
 	AC_CHECK_HEADERS(syslog.h)
 fi
 
@@ -181,7 +182,7 @@ AC_ARG_WITH(zlib,
 	]
 )
 if test "$x_zlib_on" = "yes"; then
-	AC_DEFINE(USE_ZLIB, 1)
+	AC_DEFINE(ZLIB, 1)
 	AC_CHECK_HEADERS(zlib.h)
 fi
 
@@ -198,7 +199,7 @@ AC_ARG_WITH(tcp-wrappers,
 				ptr = hosts_access;
 				],[
 				AC_MSG_RESULT(yes)
-				AC_DEFINE(USE_TCPWRAP, 1)
+				AC_DEFINE(TCPWRAP, 1)
 				x_tcpwrap_on=yes
 				],[
 				AC_MSG_RESULT(no)
@@ -223,6 +224,22 @@ if test "$x_rendezvous_on" = "yes"; then
 	AC_CHECK_HEADERS(DNSServiceDiscovery/DNSServiceDiscovery.h mach/port.h)
 fi
 
+x_identauth_on=no
+AC_ARG_WITH(ident,
+	[  --with-ident            enable "IDENT" ("AUTH") protocol support],
+	[	if test "$withval" = "yes"; then
+			AC_CHECK_LIB(ident, ident_id)
+			AC_CHECK_FUNCS(ident_id, x_identauth_on=yes,
+				AC_MSG_ERROR([Can't enable IDENT support!])
+			)
+		fi
+	]
+)
+if test "$x_identauth_on" = "yes"; then
+	AC_DEFINE(IDENTAUTH, 1)
+	AC_CHECK_HEADERS(ident.h)
+fi
+
 x_ircplus_on=yes
 AC_ARG_ENABLE(ircplus,
 	[  --disable-ircplus       disable IRC+ protocol],
@@ -271,7 +288,7 @@ if test "$GCC" = "yes"; then
 	ansi=" -ansi"
 	pedantic=" -pedantic"
 
-	$CC --version | grep 20020420 > /dev/null 2>&1
+	$CC --version | grep 20020420 >/dev/null 2>&1
 	if test $? -eq 0; then
 		# Mac OS X (and Darwin?) ship with a slightly broken
 		# prerelease of GCC 3.1 which don't like -pedantic:
@@ -279,7 +296,16 @@ if test "$GCC" = "yes"; then
 		pedantic=""
 	fi
 
-	uname | grep "CYGWIN" > /dev/null 2>&1
+	$CC --version | grep 20030304 >/dev/null 2>&1
+	if test $? -eq 0; then
+		# Mac OS X 10.3 (and Darwin 7.0?) have a strange gcc (or
+		# system header files?) which produces lots of errors when
+		# using -ansi; so we don't =:-)
+		AC_MSG_RESULT([detected broken GNU C compiler, disabling "-ansi"])
+		ansi=""
+	fi
+
+	uname | grep "CYGWIN" >/dev/null 2>&1
 	if test $? -eq 0; then
 		# The include files of Cygwin don't like -ansi,
 		# so we disable it:
@@ -300,8 +326,6 @@ CFLAGS="$the_CFLAGS $add_CFLAGS $add_DEFINES -DSYSCONFDIR='\"\$(sysconfdir)\"'"
 AC_OUTPUT([ \
 	Makefile \
 	doc/Makefile \
-	MacOSX/Makefile \
-	MacOSX/ngircd.pbproj/Makefile \
 	src/Makefile \
 	src/portab/Makefile \
 	src/tool/Makefile \
@@ -309,7 +333,7 @@ AC_OUTPUT([ \
 	src/testsuite/Makefile \
 	man/Makefile \
 	contrib/Makefile \
-	debian/Makefile \
+	contrib/Debian/Makefile \
 ])
 
 # -- Result --
@@ -375,6 +399,12 @@ echo $ECHO_N "      IRC+ protocol: $ECHO_C"
 test "$x_ircplus_on" = "yes" \
 	&& echo "yes" \
 	|| echo "no"
-echo
+
+echo $ECHO_N "      IDENT support: $ECHO_C"
+test "$x_identauth_on" = "yes" \
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
+
+echo; echo
 
 # -eof-