X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.in;h=1fba8530dd72455c065117d184e171ac6f971cc8;hp=bffdbd15c7f668c7eab2516b9ee9d8d393bf0e5c;hb=83194a23a30de5712375e10366bbd4f7b5b3e0c2;hpb=35771fa776db72927071f54a707ff7b106c6c4a3;ds=sidebyside

diff --git a/configure.in b/configure.in
index bffdbd15..1fba8530 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.82 2003/03/07 14:37:30 alex Exp $
+# $Id: configure.in,v 1.92 2003/04/25 15:04:43 alex Exp $
 #
 
 # -- Initialisierung --
@@ -17,7 +17,7 @@ AC_PREREQ(2.50)
 AC_INIT(ngircd, CVSHEAD)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(1.6)
 AM_CONFIG_HEADER(src/config.h)
 
 # -- Templates fuer config.h --
@@ -57,16 +57,30 @@ AC_C_CONST
 
 # -- Defines --
 
+if test `uname` = "Linux"; then
+	# define _POSIX_SOURCE, _GNU_SOURCE and _BSD_SOURCE when compiling
+	# on Linux (glibc-based systems):
+	AC_MSG_RESULT([detected Linux, defining _POSIX_SOURCE, _GNU_SOURCE and _BSD_SOURCE])
+	add_DEFINES="-D_POSIX_SOURCE -D_GNU_SOURCE -D_BSD_SOURCE $add_DEFINES"
+fi
+
 if test `uname` = "A/UX"; then
-	# unter A/UX sollte _POSIX_SOURCE definiert sein.
+	# define _POSIX_SOURCE when compiling on A/UX:
 	AC_MSG_RESULT([detected A/UX, defining _POSIX_SOURCE])
-	CFLAGS="$CFLAGS -D_POSIX_SOURCE"
+	add_DEFINES="-D_POSIX_SOURCE $add_DEFINES"
 fi
 
 if test `uname` = "HP-UX"; then
-	# unter HP-UX 11.11 muss _XOPEN_SOURCE_EXTENDED definiert sein.
+	# define _XOPEN_SOURCE_EXTENDED when compiling on HP-UX (11.11):
 	AC_MSG_RESULT([detected HP-UX, defining _XOPEN_SOURCE_EXTENDED])
-	CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+	add_DEFINES="-D_XOPEN_SOURCE_EXTENDED $add_DEFINES"
+fi
+
+if test `uname` = "SunOS"; then
+	# define _XOPEN_SOURCE, _XOPEN_SOURCE_EXTENDED=1 and __EXTENSIONS__
+	# when compiling on SunOS (tested with 5.6):
+	AC_MSG_RESULT([detected SunOS, defining _XOPEN_SOURCE, _XOPEN_SOURCE_EXTENDED=1 and __EXTENSIONS__])
+	add_DEFINES="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__ $add_DEFINES"
 fi
 
 # -- Header --
@@ -124,10 +138,8 @@ AC_CHECK_FUNCS([ \
 
 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!]))
-	]
+AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)],
+	AC_MSG_ERROR([required function select() is missing!])
 )
 
 # -- Konfigurationsoptionen --
@@ -176,7 +188,7 @@ AC_ARG_WITH(tcp-wrappers,
 	[  --with-tcp-wrappers     enable TCP wrappers support],
 	[	if test "$withval" = "yes"; then
 			AC_CHECK_LIB(wrap, tcpd_warn)
-			AC_MSG_CHECKING(checking for hosts_access)
+			AC_MSG_CHECKING(for hosts_access)
 			AC_TRY_LINK([
 				#include <tcpd.h>
 				],[
@@ -253,21 +265,39 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" )
 # -- Variablen --
 
 if test "$GCC" = "yes"; then
-	the_CFLAGS="-Wall -Wtraditional -Wpointer-arith -Wstrict-prototypes"
-	add_CFLAGS="$CFLAGS $CFLAGS_ADD"
+	the_CFLAGS="-Wmissing-declarations -Wpointer-arith -Wstrict-prototypes"
+	ansi=" -ansi"
+	pedantic=" -pedantic"
+
+	$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:
+		AC_MSG_RESULT([detected broken GNU C compiler, disabling "-pedantic"])
+		pedantic=""
+	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:
+		AC_MSG_RESULT([detected Cygwin, disabling "-ansi"])
+		ansi=""
+	fi
+
+	add_CFLAGS="-Wall -W${ansi}${pedantic} $CFLAGS $CFLAGS_ADD"
 else
 	the_CFLAGS="$CFLAGS"
 	add_CFLAGS="$CFLAGS_ADD"
 fi
 
-CFLAGS="$the_CFLAGS $add_CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
+CFLAGS="$the_CFLAGS $add_CFLAGS $add_DEFINES -DSYSCONFDIR='\"\$(sysconfdir)\"'"
 
 # -- Ausgabe der Dateien --
 
 AC_OUTPUT([ \
 	Makefile \
 	doc/Makefile \
-	doc/de/Makefile \
 	MacOSX/Makefile \
 	MacOSX/ngircd.pbproj/Makefile \
 	src/Makefile \
@@ -290,36 +320,58 @@ 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}`
+D=`eval echo ${datadir}/doc/${PACKAGE}` ; D=`eval echo ${D}`
 
 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}"
+test -n "$add_CFLAGS"	&& echo "                     ${add_CFLAGS}"
+test -n "$add_DEFINES"	&& echo "                     ${add_DEFINES}"
+test -n "$CPPFLAGS"	&& echo " Preprocessor flags: ${CPPFLAGS}"
+test -n "$LDFLAGS"	&& echo "       Linker flags: ${LDFLAGS}"
+test -n "$LIBS"		&& echo "          Libraries: ${LIBS}"
 echo
 echo "    'ngircd' binary: $S"
 echo " Configuration file: $C"
 echo "       Manual pages: $M"
+echo "      Documentation: $D"
 echo
 
 echo $ECHO_N "     Syslog support: $ECHO_C"
-test "$x_syslog_on" = "yes" && echo "yes" || echo "no"
-echo $ECHO_N "   zlib compression: $ECHO_C"
-test "$x_zlib_on" = "yes" && echo "yes" || echo "no"
-echo $ECHO_N "   Use TCP Wrappers: $ECHO_C"
-test "$x_tcpwrap_on" = "yes" && echo "yes" || echo "no"
-echo $ECHO_N " Rendezvous support: $ECHO_C"
-test "$x_rendezvous_on" = "yes"	&& echo "yes" || echo "no"
+test "$x_syslog_on" = "yes" \
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
 echo $ECHO_N "  Enable debug code: $ECHO_C"
-test "$x_debug_on" = "yes" && echo "yes" || echo "no"
+test "$x_debug_on" = "yes" \
+	&& echo "yes" \
+	|| echo "no"
+
+echo $ECHO_N "   zlib compression: $ECHO_C"
+test "$x_zlib_on" = "yes" \
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
 echo $ECHO_N "        IRC sniffer: $ECHO_C"
-test "$x_sniffer_on" = "yes" && echo "yes" || echo "no"
+test "$x_sniffer_on" = "yes" \
+	&& echo "yes" \
+	|| echo "no"
+
+echo $ECHO_N "   Use TCP Wrappers: $ECHO_C"
+test "$x_tcpwrap_on" = "yes" \
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
 echo $ECHO_N "    Strict RFC mode: $ECHO_C"
-test "$x_strict_rfc_on" = "yes" && echo "yes" || echo "no"
+test "$x_strict_rfc_on" = "yes" \
+	&& echo "yes" \
+	|| echo "no"
+
+echo $ECHO_N " Rendezvous support: $ECHO_C"
+test "$x_rendezvous_on" = "yes"	\
+	&& echo $ECHO_N "yes $ECHO_C" \
+	|| echo $ECHO_N "no  $ECHO_C"
 echo $ECHO_N "      IRC+ protocol: $ECHO_C"
-test "$x_ircplus_on" = "yes" && echo "yes" || echo "no"
+test "$x_ircplus_on" = "yes" \
+	&& echo "yes" \
+	|| echo "no"
 echo
 
 # -eof-