X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=44598d55ae69deb7b9580c92fd94aa327b38a621;hb=09c890ebc6ca494fc683e201e6f1aa62b2264246;hp=50d84097807bcf6a7bec8789767d37b2fda35b5f;hpb=cc359af2cae96ac1046bce9ff8c723ac95a1bf40;p=shibboleth%2Fcpp-sp.git

diff --git a/configure.ac b/configure.ac
index 50d8409..44598d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.5.2],[https://issues.shibboleth.net/],[shibboleth-sp])
+AC_INIT([shibboleth],[2.5.5],[https://issues.shibboleth.net/],[shibboleth-sp])
 AC_CONFIG_SRCDIR(shibsp)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
@@ -77,7 +77,7 @@ AC_FUNC_STRFTIME
 AC_FUNC_STRERROR_R
 AC_CHECK_HEADERS([sys/utsname.h grp.h pwd.h])
 AC_CHECK_HEADERS([sys/socket.h], [AC_DEFINE([SHIBSP_HAVE_SYS_SOCKET_H],[1],[Define to 1 if you have the <sys/socket> header file.])], [])
-AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r localtime_r strtok_r strcasecmp getpwnam getgrnam])
+AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r localtime_r strtok_r strcasecmp getpwnam getgrnam initgroups])
 AC_CHECK_TYPES([struct sockaddr_storage], [], [], [[#include <sys/socket.h>]])
 AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [[#include <sys/socket.h>]])
 
@@ -139,7 +139,7 @@ AC_CXX_REQUIRE_STL
 BOOST_REQUIRE
 BOOST_BIND
 BOOST_LAMBDA
-BOOST_PTR_CONTAINER
+BOOST_POINTER_CONTAINER
 BOOST_SMART_PTR
 BOOST_STRING_ALGO
 BOOST_TUPLE
@@ -430,6 +430,31 @@ else
     WANT_SUBDIRS="$WANT_SUBDIRS adfs"
 fi
 
+## systemd
+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
 
 #
 # Build NSAPI module?
@@ -494,14 +519,14 @@ if test "$WANT_FASTCGI" != "no"; then
     fi
 
     # save and append master flags
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$FASTCGI_INCLUDE $CFLAGS"
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$FASTCGI_INCLUDE $CPPFLAGS"
 
     AC_CHECK_HEADER([fcgio.h],,AC_MSG_ERROR([unable to find FastCGI header files]))
     FASTCGI_LIBS="-lfcgi -lfcgi++"
 
     # restore standard flags
-    CFLAGS="$save_CFLAGS"
+    CPPFLAGS="$save_CPPFLAGS"
 fi
 
 AC_SUBST(FASTCGI_INCLUDE)
@@ -535,8 +560,8 @@ if test "$WANT_MEMCACHED" != "no"; then
     fi
 
     # save and append master flags
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$MEMCACHED_INCLUDE $CFLAGS"    
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$MEMCACHED_INCLUDE $CPPFLAGS"    
 
     AC_CHECK_HEADER([libmemcached/memcached.h],,
         AC_MSG_ERROR([unable to find Memcached header files]))
@@ -546,7 +571,7 @@ if test "$WANT_MEMCACHED" != "no"; then
     MEMCACHED_LIBS="-lmemcached"
 
     # restore standard flags
-    CFLAGS="$save_CFLAGS"
+    CPPFLAGS="$save_CPPFLAGS"
 fi
 
 AC_SUBST(MEMCACHED_INCLUDE)