X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.in;h=b707b60be46512d8aef2a95b65de996831ea27f4;hp=b073607b9b41789906f3c256cec66dbaca1569bc;hb=7a2b49a6293a82cf118abd6dc12ed34300480547;hpb=e7c1b19161ab7a3f4dabb11ef17c33746721444c

diff --git a/configure.in b/configure.in
index b073607b..b707b60b 100644
--- a/configure.in
+++ b/configure.in
@@ -9,12 +9,13 @@
 # Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
 # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
 #
-# $Id: configure.in,v 1.50 2002/05/22 09:50:58 alex Exp $
+# $Id: configure.in,v 1.61 2002/10/01 09:57:08 alex Exp $
 #
 
 # -- Initialisierung --
 
 AC_INIT
+AC_PREREQ(2.50)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR(src/config.h.in)
 AM_INIT_AUTOMAKE(ngircd,CurrentCVS)
@@ -27,6 +28,7 @@ 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([IRCPLUS], [Define if IRC+ protocol should be used])
 
 AH_TEMPLATE([TARGET_OS], [Target operating system name])
 AH_TEMPLATE([TARGET_VENDOR], [Target system vendor])
@@ -60,11 +62,11 @@ AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 
 AC_CHECK_HEADERS([ \
-	ctype.h errno.h fcntl.h malloc.h netdb.h netinet/in.h regex.h \
-	stdlib.h string.h strings.h sys/socket.h sys/time.h unistd.h \
+	ctype.h errno.h fcntl.h netdb.h netinet/in.h stdlib.h string.h \
+	strings.h sys/socket.h sys/time.h unistd.h \
 	],,AC_MSG_ERROR([required C header missing!]))
 
-AC_CHECK_HEADERS(arpa/inet.h stdint.h)
+AC_CHECK_HEADERS(arpa/inet.h malloc.h stdint.h sys/select.h varargs.h)
 
 # -- Datentypen --
 
@@ -101,49 +103,44 @@ AC_FUNC_STRFTIME
 
 AC_CHECK_FUNCS([ \
 	bind gethostbyaddr gethostbyname gethostname inet_ntoa memmove \
-	memset regcomp select setsockopt socket strcasecmp strchr \
-	strerror strstr waitpid \
+	memset select setsockopt socket strcasecmp strchr strerror \
+	strstr waitpid \
 	],,AC_MSG_ERROR([required function missing!]))
 
 AC_CHECK_FUNCS(inet_aton sigaction snprintf vsnprintf)
 
 # -- Konfigurationsoptionen --
 
+x_syslog_on=no
 AC_ARG_ENABLE(syslog,
 	[  --disable-syslog        disable syslog (autodetected by default)],
 	[	if test "$enableval" = "yes"; then
-			AC_CHECK_HEADER(syslog.h,
-				[	AC_DEFINE(USE_SYSLOG, 1)
-					AC_CHECK_LIB(be,syslog)
-				],
+			AC_CHECK_HEADER(syslog.h, x_syslog_on=yes,
 				AC_MSG_ERROR([Can't enable syslog: syslog.h not found!])
 			)
-		else
-			AC_MSG_RESULT([disabling syslog])
 		fi
 	],
-	[	AC_CHECK_HEADER(syslog.h,
-			[	AC_DEFINE(USE_SYSLOG, 1)
-				AC_CHECK_LIB(be,syslog)
-			]
-		)
-	]
+	[	AC_CHECK_HEADER(syslog.h, x_syslog_on=yes) ]
 )
+if test "$x_syslog_on" = "yes"; then
+	AC_DEFINE(USE_SYSLOG, 1)
+	AC_CHECK_LIB(be,syslog)
+fi
 
-AC_ARG_ENABLE(strict-rfc,
-	[  --enable-strict-rfc     strict RFC conformance, may break clients],
-	if test "$enableval" = "yes"; then
-		AC_DEFINE(STRICT_RFC, 1)
-		AC_MSG_RESULT([enabling strict RFC conformance])
-	fi
+x_ircplus_on=yes
+AC_ARG_ENABLE(ircplus,
+	[  --disable-ircplus       disable IRC+ protocol],
+	if test "$enableval" = "no"; then x_ircplus_on=no; fi
 )
+if test "$x_ircplus_on" = "yes"; then
+	AC_DEFINE(IRCPLUS, 1)
+fi
 
 AC_ARG_ENABLE(sniffer,
-	[  --enable-sniffer        enable network traffic monitor (enables debug mode!)],
+	[  --enable-sniffer        enable IRC traffic sniffer (enables debug mode)],
 	if test "$enableval" = "yes"; then
 		AC_DEFINE(SNIFFER, 1)
-		AC_MSG_RESULT([enabling network traffic monitor])
-		x_debug_on=yes
+		x_sniffer_on=yes; x_debug_on=yes
 	fi
 )
 
@@ -153,9 +150,17 @@ AC_ARG_ENABLE(debug,
 )
 if test "$x_debug_on" = "yes"; then
 	AC_DEFINE(DEBUG, 1)
-	AC_MSG_RESULT([enabling additional debug output])
 fi
 
+AC_ARG_ENABLE(strict-rfc,
+	[  --enable-strict-rfc     strict RFC conformance -- may break clients!],
+	if test "$enableval" = "yes"; then
+		AC_DEFINE(STRICT_RFC, 1)
+		x_strict_rfc_on=yes
+	fi
+)
+
+
 # -- Definitionen --
 
 AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu" )
@@ -176,7 +181,7 @@ fi
 
 CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
 
-# -- Ausgabe --
+# -- Ausgabe der Dateien --
 
 AC_OUTPUT([ \
 	Makefile \
@@ -187,7 +192,40 @@ AC_OUTPUT([ \
 	src/Makefile \
 	src/portab/Makefile \
 	src/ngircd/Makefile \
+	src/testsuite/Makefile \
 	man/Makefile \
+	contrib/Makefile \
 ])
 
+# -- Ergebnis --
+
+echo
+
+# Someone please show me a better way :)  [borrowed by OpenSSH]
+B=`eval echo ${bindir}` ; B=`eval echo ${B}`
+S=`eval echo ${sbindir}` ; S=`eval echo ${S}`
+C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}`
+M=`eval echo ${mandir}` ; M=`eval echo ${M}`
+
+echo "                host: ${host}"
+echo "            compiler: ${CC}"
+echo "      compiler flags: ${CFLAGS}"
+echo "  preprocessor flags: ${CPPFLAGS}"
+echo "        linker flags: ${LDFLAGS}"
+echo "           libraries: ${LIBS}"
+echo
+
+echo "     'ngircd' binary: $S"
+echo "  configuration file: $C"
+echo "        manual pages: $M"
+echo
+
+echo $ECHO_N "      active options: $ECHO_C"
+test "$x_syslog_on" = "yes"	&& echo $ECHO_N "Syslog $ECHO_C"
+test "$x_debug_on" = "yes"	&& echo $ECHO_N "Debug $ECHO_C"
+test "$x_sniffer_on" = "yes"	&& echo $ECHO_N "Sniffer $ECHO_C"
+test "$x_strict_rfc_on" = "yes"	&& echo $ECHO_N "Strict-RFC $ECHO_C"
+test "$x_ircplus_on" = "yes"	&& echo $ECHO_N "IRC+ $ECHO_C"
+echo; echo
+
 # -eof-