Merge branch 'master' into next

* master:
  Silence aclocal warnings
  Add missing HAVE_INET_NTOP check to silence clang warning about mismatching prototype

build/autotools/configure.ac

@@ -200,7 +200,7 @@ AC_CHECK_FUNCS([clock fsync getrusage isascii getpassphrase])
 AC_CHECK_FUNCS([memcpy memset random rename snprintf srandom gettime])
 #checkpoint
 AC_CACHE_SAVE
-AC_CHECK_FUNCS([strcasecmp strncasecmp vsnprintf])
+AC_CHECK_FUNCS([strcasecmp strncasecmp vsnprintf inet_ntop])
 
 #autoscan suggested this....
 #These are recommended by autoscan, but no code supports it currently

build/autotools/includes/acinclude.m4

@@ -133,12 +133,12 @@ AC_DEFUN([EGG_CHECK_CCPIPE],
     AC_CACHE_CHECK([whether the compiler understands -pipe], egg_cv_var_ccpipe, [
         ac_old_CXX="$CXX"
         CXX="$CXX -pipe"
-        AC_COMPILE_IFELSE([[
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
           int main ()
           {
             return(0);
           }
-        ]], [
+        ])], [
           egg_cv_var_ccpipe="yes"
         ], [
           egg_cv_var_ccpipe="no"
@@ -162,12 +162,12 @@ AC_DEFUN([EGG_CHECK_CCWALL],
     AC_CACHE_CHECK([whether the compiler understands -Wall], egg_cv_var_ccwall, [
       ac_old_CXXFLAGS="$CXXFLAGS"
       CXXFLAGS="$CXXFLAGS -Wall"
-       AC_COMPILE_IFELSE([[
+       AC_COMPILE_IFELSE([AC_LANG_SOURCE([
          int main ()
          {
            return(0);
          }
-       ]], [
+       ])], [
          egg_cv_var_ccwall="yes"
        ], [
          egg_cv_var_ccwall="no"
@@ -223,12 +223,12 @@ AC_DEFUN([CHECK_CC_COLOR_DIAGNOSTICS],
     AC_CACHE_CHECK([whether the compiler understands -fcolor-diagnostics], egg_cv_var_cc_color_diagnostics, [
       ac_old_CXXFLAGS="$CXXFLAGS"
       CXXFLAGS="$CXXFLAGS -fcolor-diagnostics"
-       AC_COMPILE_IFELSE([[
+       AC_COMPILE_IFELSE([AC_LANG_SOURCE([
          int main ()
          {
            return(0);
          }
-       ]], [
+       ])], [
          egg_cv_var_cc_color_diagnostics="yes"
        ], [
          egg_cv_var_cc_color_diagnostics="no"

configure

@@ -8425,7 +8425,7 @@ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
-for ac_func in strcasecmp strncasecmp vsnprintf
+for ac_func in strcasecmp strncasecmp vsnprintf inet_ntop
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"

src/config.h.in

@@ -57,6 +57,9 @@
 /* Define to 1 if you have the `gettime' function. */
 #undef HAVE_GETTIME
 
+/* Define to 1 if you have the `inet_ntop' function. */
+#undef HAVE_INET_NTOP
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H