Check and call arc4random_stir() if present

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index 732e55ee01388280e2e858a86b686dee0826dbb4..e3f51cf0268a086a49c4baddd34a723cc75106ea 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -120,14 +120,14 @@ AC_HEADER_TIME
 
 # Required header files
 AC_CHECK_HEADERS([ \
-       fcntl.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h string.h \
+       fcntl.h netdb.h netinet/in.h stdlib.h string.h \
        strings.h sys/socket.h sys/time.h unistd.h \
        ],,AC_MSG_ERROR([required C header missing!]))
 
 # Optional header files
 AC_CHECK_HEADERS_ONCE([ \
-       arpa/inet.h inttypes.h malloc.h netinet/ip.h stdbool.h stddef.h \
-       stdint.h varargs.h \
+       arpa/inet.h inttypes.h malloc.h netinet/in_systm.h netinet/ip.h \
+       stdbool.h stddef.h stdint.h varargs.h \
        ])
 
 # -- Datatypes --
@@ -187,8 +187,9 @@ AC_CHECK_FUNCS([ \
 
 # Optional functions
 AC_CHECK_FUNCS_ONCE([ \
-       gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \
-       snprintf vsnprintf strdup strlcpy strlcat strtok_r waitpid])
+       arc4random arc4random_stir gai_strerror getaddrinfo getnameinfo inet_aton
+       sigaction sigprocmask snprintf vsnprintf strdup strndup strlcpy strlcat \
+       strtok_r waitpid])
 
 # -- Configuration options --
 
@@ -518,7 +519,8 @@ if test "$x_ircplus_on" = "yes"; then
        # CHARCONV is the only function depending on it.
        x_iconv_on=no
        AC_ARG_WITH(iconv,
-               [  --with-iconv            enable character conversation using libiconv],
+               AS_HELP_STRING([--with-iconv],
+                              [enable character conversion using libiconv]),
                [ if test "$withval" != "no"; then
                        if test "$withval" != "yes"; then
                                CFLAGS="-I$withval/include $CFLAGS"
@@ -526,11 +528,15 @@ if test "$x_ircplus_on" = "yes"; then
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
                        AC_CHECK_LIB(iconv, iconv_open)
-                       AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes,
+                       AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes)
+                       if test "$x_iconv_on" != "yes"; then
+                               AC_CHECK_LIB(iconv, libiconv_open)
+                               AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes)
+                       fi
+                       if test "$x_iconv_on" != "yes"; then
                                AC_MSG_ERROR([Can't enable libiconv support!])
-                       )
-                 fi
-               ]
+                       fi
+               fi ]
        )
        if test "$x_iconv_on" = "yes"; then
                AC_DEFINE(ICONV, 1)
@@ -697,7 +703,7 @@ test "$x_ipv6_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 $ECHO_N "        PAM support: $ECHO_C"
 test "$x_pam_on" = "yes" \
@@ -711,7 +717,8 @@ echo $ECHO_N "   libiconv support: $ECHO_C"
 
 echo
 
-if ! grep "^AUTOMAKE_OPTIONS = ../portab/ansi2knr" src/ngircd/Makefile.am >/dev/null 2>&1; then
+define(_automake_regex_,[[^AUTOMAKE_OPTIONS = [a-z .\-]*/portab/ansi2knr]])
+if ! grep "_automake_regex_" src/ngircd/Makefile.am >/dev/null 2>&1; then
        echo "WARNING:"
        echo "This GNU automake generated build system does not support \"de-ANSI-fication\","
        echo "therefore don't use it to generate \"official\" distribution archives!"