configure: clean up function definitions

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index 034b565305232131f5e63126c49cab0a7768a150..9a4cc992d41796b41317493eda0e963afa35bc21 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -75,23 +75,26 @@ AC_C_CONST
 AC_C_INLINE
 __ng_PROTOTYPES__
 
-# -- Hard coded system and compiler dependencies/features/options ... --
+# -- Function Definitions --
 
 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
+       ssp_cc=yes
+       # 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
 ])
 
+# -- 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"
@@ -187,8 +190,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 unsetenv waitpid])
 
 # -- Configuration options --
 
@@ -519,7 +523,7 @@ if test "$x_ircplus_on" = "yes"; then
        x_iconv_on=no
        AC_ARG_WITH(iconv,
                AS_HELP_STRING([--with-iconv],
-                              [enable character conversation using libiconv]),
+                              [enable character conversion using libiconv]),
                [ if test "$withval" != "no"; then
                        if test "$withval" != "yes"; then
                                CFLAGS="-I$withval/include $CFLAGS"
@@ -527,11 +531,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)
@@ -698,7 +706,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" \