[cpp-sp] 02/04: Search for libsystemd instead of libsystemd-daemon

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=42e2e51c750a88e8bec04a2c08523c5f8b792037

commit 42e2e51c750a88e8bec04a2c08523c5f8b792037
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Mon Feb 1 19:28:48 2016 +0100

    Search for libsystemd instead of libsystemd-daemon
    
    The systemd utility libraries were merged into a single libsystemd at
    version 209.
---
 configure.ac | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6871cf6..6f3f6b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,26 +191,11 @@ dnl Systemd will be disabled by default and requires you to run configure with
 dnl --enable-systemd to look for and enable systemd.
 AC_ARG_ENABLE(systemd,
     AS_HELP_STRING([--enable-systemd],[Build with systemd (Default = no)]),
-	[if test "x$enableval" = "x" ; then
-         WANT_SYSTEMD=no
-	 else
-	     WANT_SYSTEMD="$enableval"
-	 fi
-	],[ WANT_SYSTEMD=no ])
-AC_MSG_CHECKING(whether to build with systemd)
-
-AC_MSG_RESULT($WANT_SYSTEMD)
-if test "$WANT_SYSTEMD" = "yes" ; then
-	AC_CHECK_HEADER([systemd/sd-daemon.h], [
-	    AC_CHECK_LIB([systemd-daemon], [sd_notify], [hassdnotify="y"])])
-	AS_IF([test "x$hassdnotify=" = x], [
-	   AC_MSG_ERROR([Unable to find a suitable libsystemd-daemon library])
-	])
-	AC_DEFINE([HAVE_SD_NOTIFY],[1],[Define to 1 if you have the sd_notify function.])
-	PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon])
-	AC_SUBST([SYSTEMD_CFLAGS])
-	AC_SUBST([SYSTEMD_LIBS])
-fi
+    [AS_IF([test "x$enableval" != xno],
+        [PKG_CHECK_MODULES([SYSTEMD],[libsystemd],,[PKG_CHECK_MODULES([SYSTEMD],[libsystemd-daemon])])
+	 # because in systemd 209 the libraries were merged into a single libsystemd.
+	 # sd_notify() is always present, no need to check for it:
+         AC_DEFINE([HAVE_SD_NOTIFY],[1],[Define to 1 if you have the sd_notify function.])])])
 
 #
 # Build NSAPI module?

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.