diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2011-01-27 12:29:15 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2011-01-27 12:29:15 +0000 |
| commit | 1194ec552c2edfd49dc234cab7316344ffb9f684 (patch) | |
| tree | 2c7bb9abb45db12d9f1dca5b2d96a3cdba0884eb /usr.sbin/nsd/configure.ac | |
| parent | 7fd092e3c00a7462220af27f13cdb7328470e250 (diff) | |
upgrade to NSD 3.2.7; ok sthen@, tested by multiple people
Diffstat (limited to 'usr.sbin/nsd/configure.ac')
| -rw-r--r-- | usr.sbin/nsd/configure.ac | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr.sbin/nsd/configure.ac b/usr.sbin/nsd/configure.ac index b80ba667d07..ee2061684fe 100644 --- a/usr.sbin/nsd/configure.ac +++ b/usr.sbin/nsd/configure.ac @@ -4,7 +4,7 @@ dnl sinclude(acx_nlnetlabs.m4) -AC_INIT(NSD,3.2.6,nsd-bugs@nlnetlabs.nl) +AC_INIT(NSD,3.2.7,nsd-bugs@nlnetlabs.nl) AC_CONFIG_HEADER([config.h]) AC_AIX @@ -275,7 +275,9 @@ AC_DEFUN([CHECK_SSL], [ if test -f "$dir/include/openssl/ssl.h"; then found_ssl="yes"; AC_DEFINE_UNQUOTED([HAVE_SSL], [], [Define if you have the SSL libraries installed.]) - CPPFLAGS="$CPPFLAGS -I$ssldir/include"; + if test x_$ssldir != x_/usr; then + CPPFLAGS="$CPPFLAGS -I$ssldir/include"; + fi break; fi done @@ -284,7 +286,9 @@ AC_DEFUN([CHECK_SSL], [ else AC_MSG_RESULT(found in $ssldir) HAVE_SSL=yes - LDFLAGS="$LDFLAGS -L$ssldir/lib"; + if test x_$ssldir != x_/usr; then + LDFLAGS="$LDFLAGS -L$ssldir/lib"; + fi if test x_$ssldir = x_/usr/sfw; then LDFLAGS="$LDFLAGS -R$ssldir/lib"; fi @@ -463,6 +467,7 @@ AC_FUNC_MALLOC AC_TYPE_SIGNAL AC_FUNC_FSEEKO AC_SYS_LARGEFILE +AC_CHECK_FUNCS([arc4random arc4random_uniform]) AC_CHECK_FUNCS([alarm chroot dup2 endpwent gethostname memset memcpy socket strcasecmp strchr strdup strerror strncasecmp strtol getaddrinfo getnameinfo freeaddrinfo gai_strerror sigaction sigprocmask strptime setusercontext initgroups setresuid setreuid setresgid setregid getpwnam]) # check if setreuid en setregid fail, on MacOSX10.4(darwin8). @@ -527,7 +532,7 @@ AC_ARG_WITH([facility], AC_DEFINE_UNQUOTED([FACILITY], $facility, [Define to the default facility for syslog.]) dnl -dnl Determine the maximum number of interfaces that are allowed +dnl Determine the maximum number of ip-addresses that are allowed dnl max_ips=8 AC_ARG_WITH([max_ips], |