X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=ed34f871b6f2a0f6e89a1c2eacf871d96a89c69f;hb=4953c15bdfd960006d99135c46925231a1d7d045;hp=470fcfb105cc9411fd877799ce300ed4a0c3d0d4;hpb=b1a148905aeb7539497177452e875c178ce3de0a;p=ngircd-alex.git

diff --git a/configure.in b/configure.in
index 470fcfb1..ed34f871 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@
 # 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.67 2002/11/15 22:08:19 alex Exp $
+# $Id: configure.in,v 1.75 2002/12/28 21:58:02 alex Exp $
 #
 
 # -- Initialisierung --
@@ -28,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([USE_ZLIB], [Define if zlib compression should be enabled])
 AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
 
 AH_TEMPLATE([TARGET_OS], [Target operating system name])
@@ -80,7 +81,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 malloc.h stdint.h sys/select.h varargs.h)
+AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdint.h varargs.h])
 
 # -- Datentypen --
 
@@ -117,11 +118,16 @@ AC_FUNC_STRFTIME
 
 AC_CHECK_FUNCS([ \
 	bind gethostbyaddr gethostbyname gethostname inet_ntoa memmove \
-	memset select setsockopt socket strcasecmp strchr strerror \
-	strstr waitpid \
+	memset setsockopt socket strcasecmp strchr strerror strstr waitpid \
 	],,AC_MSG_ERROR([required function missing!]))
 
-AC_CHECK_FUNCS(inet_aton sigaction snprintf vsnprintf)
+AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strlcpy strlcat)
+
+AC_CHECK_FUNCS(poll,[AC_CHECK_HEADER(sys/poll.h)],
+	[AC_CHECK_FUNCS(select,[AC_CHECK_HEADER(sys/select.h)],
+		AC_MSG_ERROR([neither poll() nor select() is available!]))
+	]
+)
 
 # -- Konfigurationsoptionen --
 
@@ -141,6 +147,22 @@ if test "$x_syslog_on" = "yes"; then
 	AC_CHECK_LIB(be,syslog)
 fi
 
+x_zlib_on=no
+AC_ARG_ENABLE(zlib,
+	[  --disable-zlib          disable zlib compression (autodetected by default)],
+	[	if test "$enableval" = "yes"; then
+			AC_CHECK_HEADER(zlib.h, x_zlib_on=yes,
+				AC_MSG_ERROR([Can't enable zlib: zlib.h not found!])
+			)
+		fi
+	],
+	[	AC_CHECK_HEADER(zlib.h, x_zlib_on=yes) ]
+)
+if test "$x_zlib_on" = "yes"; then
+	AC_DEFINE(USE_ZLIB, 1)
+	AC_CHECK_LIB(z,deflate)
+fi
+
 x_ircplus_on=yes
 AC_ARG_ENABLE(ircplus,
 	[  --disable-ircplus       disable IRC+ protocol],
@@ -184,12 +206,14 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" )
 # -- Variablen --
 
 if test "$GCC" = "yes"; then
-	CFLAGS="-Wall $CFLAGS"
+	the_CFLAGS="-Wall -Wtraditional -Wpointer-arith -Wstrict-prototypes"
+	add_CFLAGS="$CFLAGS $CFLAGS_ADD"
+else
+	the_CFLAGS="$CFLAGS"
+	add_CFLAGS="$CFLAGS_ADD"
 fi
 
-the_CFLAGS="$CFLAGS"
-
-CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
+CFLAGS="$the_CFLAGS $add_CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
 
 # -- Ausgabe der Dateien --
 
@@ -220,6 +244,7 @@ M=`eval echo ${mandir}` ; M=`eval echo ${M}`
 echo "                host: ${host}"
 echo "            compiler: ${CC}"
 echo "      compiler flags: ${the_CFLAGS}"
+test -n "$add_CFLAGS" && echo "                      ${add_CFLAGS}"
 echo "  preprocessor flags: ${CPPFLAGS}"
 echo "        linker flags: ${LDFLAGS}"
 echo "           libraries: ${LIBS}"
@@ -231,6 +256,7 @@ echo
 
 echo $ECHO_N "      active options: $ECHO_C"
 test "$x_syslog_on" = "yes"	&& echo $ECHO_N "Syslog $ECHO_C"
+test "$x_zlib_on" = "yes"	&& echo $ECHO_N "zLib $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"