Merge branch 'master' of git+ssh://git.gnunet.org/gnunet

1 files changed, 3 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 8a3574118..f0db752c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,7 +102,7 @@ CC_CHECK_CFLAG_APPEND([tautological-constant-out-of-range-compare])
 # Use Linux interface name unless the OS has a different preference
 DEFAULT_INTERFACE="\"eth0\""
 
-funcstocheck="getnameinfo gethostname gethostbyname gethostbyaddr getaddrinfo getaddrinfo_a"
+AC_CHECK_FUNCS(getnameinfo gethostname gethostbyname gethostbyaddr getaddrinfo getaddrinfo_a)
 
 # Srcdir in a form that native compiler understands (i.e. DOS path on W32)
 native_srcdir=$srcdir
@@ -1576,7 +1576,7 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs wait4 timegm])
+AC_CHECK_FUNCS(atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs wait4 timegm)
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -2217,7 +2217,7 @@ AS_IF([test x$MSG_USER_SETUP != xfalse],
   AS_IF([test x$HAVE_GNUNET_USER != 0],
     [AC_MSG_NOTICE([To do this on this system, run:
 # adduser USERNAME gnunet
-   for each of your users, replacing \"USERNAME\" with the respective login name. Users may have to login again for the changes to take effect.
+   for each of your users, replacing "USERNAME" with the respective login name. Users may have to login again for the changes to take effect.
 ])])])
 
 AC_MSG_NOTICE([For detailed setup instructions, type 'info gnunet' after the installation or visit https://docs.gnunet.org/])