svn commit: r1614821 - in /httpd/httpd/trunk: acinclude.m4 configure.in

[jo...@apache.org]

Author: jorton
Date: Thu Jul 31 07:56:44 2014
New Revision: 1614821

URL: http://svn.apache.org/r1614821
Log:
* configure.in, acinclude.m4: Move systemd check to APACHE_CHECK_SYSTEMD
  and use pkg-config where available.

Modified:
    httpd/httpd/trunk/acinclude.m4
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1614821&r1=1614820&r2=1614821&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Thu Jul 31 07:56:44 2014
@@ -653,6 +653,27 @@ AC_DEFUN([APACHE_CHECK_SERF], [
   fi
 ])
 
+AC_DEFUN(APACHE_CHECK_SYSTEMD, [
+dnl Check for systemd support for listen.c's socket activation.
+case $host in
+*-linux-*)
+   if test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd-daemon; then
+      SYSTEMD_LIBS=`pkg-config --libs libsystemd-daemon`
+   else
+      AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
+   fi
+   if test -n "$SYSTEMD_LIBS"; then
+      AC_CHECK_HEADERS(systemd/sd-daemon.h)
+      if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then
+        AC_MSG_WARN([Your system does not support systemd.])
+      else
+        APR_ADDTO(HTTPD_LIBS, [$SYSTEMD_LIBS])
+        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is supported])
+      fi
+   fi
+   ;;
+esac
+])
 
 dnl
 dnl APACHE_EXPORT_ARGUMENTS

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1614821&r1=1614820&r2=1614821&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Thu Jul 31 07:56:44 2014
@@ -531,18 +531,7 @@ if test "$ac_cv_struct_tm_gmtoff" = "yes
     AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
 fi
 
-dnl Check for systemd support for listen.c's socket activation.
-case $host in
-*-linux-*)
-      AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
-      AC_CHECK_HEADERS(systemd/sd-daemon.h)
-      if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then
-        AC_MSG_WARN([Your system does not support systemd.])
-      else
-        APR_ADDTO(HTTPD_LIBS, [$SYSTEMD_LIBS])
-        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is supported])
-      fi
-esac
+APACHE_CHECK_SYSTEMD
 
 dnl ## Set up any appropriate OS-specific environment variables for apachectl