backport checks for inline keyword and strcspn() [from HEAD]

diff --git a/configure.in b/configure.in
index 766e78532e253560e0f16174ef28d05fde015d13..74f95f424f8d836e9e0a30eb972a94a5ed9b84d0 100644 (file)
--- 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.118.2.6 2006/10/01 16:21:56 alex Exp $
+# $Id: configure.in,v 1.118.2.7 2006/12/02 13:13:53 fw Exp $
 #
 
 # -- Initialisation --
@@ -53,6 +53,7 @@ AC_PROG_RANLIB
 
 AM_C_PROTOTYPES
 AC_C_CONST
+AC_C_INLINE
 
 # -- Hard coded system and compiler dependencies/features/options ... --
 
@@ -137,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)
@@ -198,7 +199,7 @@ if test "$x_zlib_on" = "yes"; then
 fi
 
 
-x_io_backend=select
+x_io_backend=select\(\)
 AC_ARG_WITH(epoll,
        [  --without-epoll         disable epoll support (autodetected by default)],
        [       if test "$withval" != "no"; then
@@ -207,16 +208,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
@@ -225,13 +227,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\(\))
        ]
 )
 
@@ -481,7 +483,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