- Fix autoconf of systemd check for lack of pkg-config.

git-svn-id: file:///svn/unbound/trunk@4009 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-02-13 10:15:01 +00:00
parent 86dcdaae33
commit f97dcc8e40
3 changed files with 9 additions and 0 deletions

2
configure vendored
View file

@ -18634,6 +18634,7 @@ fi
if test "x$enable_systemd" != xno; then :
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
$as_echo_n "checking for SYSTEMD... " >&6; }
@ -18796,6 +18797,7 @@ $as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
;;
esac
fi
if test "x$have_systemd" = xyes; then
USE_SYSTEMD_TRUE=

View file

@ -1,3 +1,6 @@
13 February 2017: Wouter
- Fix autoconf of systemd check for lack of pkg-config.
10 February 2017: Wouter
- Fix pythonmod for typedef changes.
- Fix dnstap for warning of set but not used.

View file

@ -6,6 +6,7 @@ AC_ARG_ENABLE([systemd],
[], [enable_systemd=no])
have_systemd=no
AS_IF([test "x$enable_systemd" != xno], [
ifdef([PKG_CHECK_MODULES], [
dnl systemd v209 or newer
PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [have_systemd=yes], [have_systemd=no])
dnl old systemd library
@ -23,5 +24,8 @@ AS_IF([test "x$enable_systemd" != xno], [
LIBS="$LIBS $SYSTEMD_LIBS"
]
)
], [
AC_MSG_ERROR([systemd enabled but need pkg-config to configure for it])
])
])
AM_CONDITIONAL([USE_SYSTEMD], [test "x$have_systemd" = xyes])