X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=9b2c7128fa259c642d4d199b665a8380ca6a6a7d;hb=fb0c7ad2528b474194d4796b8c372e9e18cb76fa;hp=87cf3062aaebf15851efe3200cb8ba070349bb8f;hpb=02b0a5151719d04081af2db01e8266a1eafb8537;p=ngircd-alex.git

diff --git a/configure.in b/configure.in
index 87cf3062..9b2c7128 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.114 2005/07/08 16:18:38 alex Exp $
+# $Id: configure.in,v 1.124 2006/10/02 21:57:13 fw Exp $
 #
 
 # -- Initialisation --
@@ -53,12 +53,31 @@ AC_PROG_RANLIB
 
 AM_C_PROTOTYPES
 AC_C_CONST
+AC_C_INLINE
 
 # -- Hard coded system and compiler dependencies/features/options ... --
 
+AC_DEFUN([GCC_STACK_PROTECT_CC],[
+  ssp_cc=yes
+  # we use -fstack-protector-all for the test to enfoce the use of the guard variable 
+  AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
+  ssp_old_cflags="$CFLAGS"
+  CFLAGS="$CFLAGS -fstack-protector-all"
+  AC_TRY_LINK(,,, ssp_cc=no)
+  echo $ssp_cc
+  CFLAGS="$ssp_old_cflags"
+  if test "X$ssp_cc" = "Xyes"; then
+      CFLAGS="$CFLAGS -fstack-protector"
+      AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+  fi
+])
+
+
 if test "$GCC" = "yes"; then
 	# We are using the GNU C compiler. Good!
 	CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"
+
+	GCC_STACK_PROTECT_CC
 fi
 
 case "$target_os" in
@@ -105,6 +124,7 @@ AC_TRY_COMPILE([
 AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 
+
 # -- Libraries --
 
 AC_CHECK_LIB(UTIL,memmove)
@@ -118,7 +138,7 @@ AC_FUNC_STRFTIME
 
 AC_CHECK_FUNCS([ \
 	bind gethostbyaddr gethostbyname gethostname inet_ntoa malloc memmove \
-	memset realloc setsid setsockopt socket strcasecmp strchr strerror \
+	memset realloc setsid setsockopt socket strcasecmp strchr strcspn strerror \
 	strstr waitpid],,AC_MSG_ERROR([required function missing!]))
 
 AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strdup strlcpy strlcat)
@@ -179,7 +199,43 @@ if test "$x_zlib_on" = "yes"; then
 fi
 
 
-x_io_backend=select
+x_io_backend=select\(\)
+AC_ARG_WITH(poll,
+	[  --without-poll          disable poll support (autodetected by default)],
+	[	if test "$withval" != "no"; then
+			if test "$withval" != "yes"; then
+				CFLAGS="-I$withval/include $CFLAGS"
+				CPPFLAGS="-I$withval/include $CPPFLAGS"
+				LDFLAGS="-L$withval/lib $LDFLAGS"
+			fi
+			AC_CHECK_FUNCS(poll, x_io_backend=poll\(\),
+				AC_MSG_ERROR([Can't enable poll support!])
+			)
+		fi
+	],
+	[
+		AC_CHECK_FUNCS(poll, x_io_backend=poll\(\))
+	]
+)
+
+
+AC_ARG_WITH(devpoll,
+	[  --without-devpoll          disable /dev/poll support (autodetected by default)],
+	[	if test "$withval" != "no"; then
+			if test "$withval" != "yes"; then
+				CFLAGS="-I$withval/include $CFLAGS"
+				CPPFLAGS="-I$withval/include $CPPFLAGS"
+				LDFLAGS="-L$withval/lib $LDFLAGS"
+			fi
+
+				AC_CHECK_HEADERS(sys/devpoll.h,,AC_MSG_ERROR([required C header missing!]))
+		fi
+	],
+	[
+		AC_CHECK_HEADERS(sys/devpoll.h,x_io_backend=/dev/poll,)
+	]
+)
+
 AC_ARG_WITH(epoll,
 	[  --without-epoll         disable epoll support (autodetected by default)],
 	[	if test "$withval" != "no"; then
@@ -188,16 +244,17 @@ AC_ARG_WITH(epoll,
 				CPPFLAGS="-I$withval/include $CPPFLAGS"
 				LDFLAGS="-L$withval/lib $LDFLAGS"
 			fi
-			AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll,
+			AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll\(\),
 				AC_MSG_ERROR([Can't enable epoll support!])
 			)
 		fi
 	],
 	[
-		AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll)
+		AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll\(\))
 	]
 )
 
+
 AC_ARG_WITH(kqueue,
 	[  --without-kqueue        disable kqueue support (autodetected by default)],
 	[	if test "$withval" != "no"; then
@@ -206,13 +263,13 @@ AC_ARG_WITH(kqueue,
 				CPPFLAGS="-I$withval/include $CPPFLAGS"
 				LDFLAGS="-L$withval/lib $LDFLAGS"
 			fi
-			AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue,
+			AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\),
 				AC_MSG_ERROR([Can't enable kqueue support!])
 			)
 		fi
 	],
 	[
-		AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue)
+		AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\))
 	]
 )
 
@@ -273,7 +330,8 @@ if test "$x_zeroconf_on" = "osx"; then
 fi
 if test "$x_zeroconf_on" = "howl"; then
 	for dir in /usr/local/include /usr/local/include/howl* \
-	 /usr/include /usr/include/howl*; do
+	 /usr/include /usr/include/howl* \
+	 /usr/local/include/avahi* /usr/include/avahi*; do
 	 	test -d "$dir" || continue
 		AC_MSG_CHECKING([for Howl headers in $dir])
 		if test -f "$dir/rendezvous/rendezvous.h"; then
@@ -365,6 +423,7 @@ test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
 AC_OUTPUT([ \
 	Makefile \
 	doc/Makefile \
+	doc/src/Makefile \
 	src/Makefile \
 	src/portab/Makefile \
 	src/tool/Makefile \
@@ -460,7 +519,7 @@ test "$x_identauth_on" = "yes" \
 	&& echo $ECHO_N "yes   $ECHO_C" \
 	|| echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "        I/O backend: $ECHO_C"
-	echo "$x_io_backend"
+	echo "\"$x_io_backend\""
 
 echo