# (at your option) any later version.
# Please read the file COPYING, README and AUTHORS for more information.
#
-# $Id: configure.in,v 1.116 2005/08/30 20:59:30 fw Exp $
+# $Id: configure.in,v 1.124 2006/10/02 21:57:13 fw Exp $
#
# -- Initialisation --
AM_C_PROTOTYPES
AC_C_CONST
+AC_C_INLINE
# -- Hard coded system and compiler dependencies/features/options ... --
-if test "$GCC" = "yes"; then
- # We are using the GNU C compiler. Good!
- CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"
-fi
-
-
AC_DEFUN([GCC_STACK_PROTECT_CC],[
ssp_cc=yes
- if test "X$CC" != "X"; then
- AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
- ssp_old_cflags="$CFLAGS"
- CFLAGS="$CFLAGS -fstack-protector"
- AC_TRY_COMPILE(,,, ssp_cc=no)
- echo $ssp_cc
- if test "X$ssp_cc" = "Xno"; then
- CFLAGS="$ssp_old_cflags"
- else
+ # 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
fi
])
-GCC_STACK_PROTECT_CC
+
+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
hpux*)
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)
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
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
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\(\))
]
)
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
&& 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