arrfab / rpms / httpd

Forked from rpms/httpd 5 years ago
Clone
59234c
diff --git a/Makefile.in b/Makefile.in
59234c
index ea8366e..06b8c5a 100644
59234c
--- a/Makefile.in
59234c
+++ b/Makefile.in
59234c
@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
59234c
 
59234c
 PROGRAM_NAME         = $(progname)
59234c
 PROGRAM_SOURCES      = modules.c
59234c
-PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
59234c
+PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(HTTPD_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
59234c
 PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
59234c
 PROGRAM_DEPENDENCIES = \
59234c
   server/libmain.la \
59234c
diff --git a/acinclude.m4 b/acinclude.m4
59234c
index ce1d637..0ad0c13 100644
59234c
--- a/acinclude.m4
59234c
+++ b/acinclude.m4
59234c
@@ -606,6 +606,30 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[
59234c
   fi
59234c
 ])
59234c
 
59234c
+AC_DEFUN(APACHE_CHECK_SYSTEMD, [                                                                        
59234c
+dnl Check for systemd support for listen.c's socket activation.
59234c
+case $host in
59234c
+*-linux-*)
59234c
+   if test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd; then
59234c
+      SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd`
59234c
+   elif test -n "$PKGCONFIG" && $PKGCONFIG --exists libsystemd-daemon; then
59234c
+      SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd-daemon`
59234c
+   else
59234c
+      AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
59234c
+   fi
59234c
+   if test -n "$SYSTEMD_LIBS"; then
59234c
+      AC_CHECK_HEADERS(systemd/sd-daemon.h)
59234c
+      if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then
59234c
+        AC_MSG_WARN([Your system does not support systemd.])
59234c
+      else
59234c
+        APR_ADDTO(HTTPD_LIBS, [$SYSTEMD_LIBS])
59234c
+        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is supported])
59234c
+      fi
59234c
+   fi
59234c
+   ;;
59234c
+esac
59234c
+])
59234c
+
59234c
 dnl
59234c
 dnl APACHE_EXPORT_ARGUMENTS
59234c
 dnl Export (via APACHE_SUBST) the various path-related variables that
59234c
diff --git a/configure.in b/configure.in
59234c
index 82bfeef..eedba50 100644
59234c
--- a/configure.in
59234c
+++ b/configure.in
59234c
@@ -234,6 +234,7 @@ if test "$PCRE_CONFIG" != "false"; then
59234c
   AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
59234c
   APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`])
59234c
   APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`])
59234c
+  APR_ADDTO(HTTPD_LIBS, [\$(PCRE_LIBS)])
59234c
 else
59234c
   AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/])
59234c
 fi
59234c
@@ -504,6 +505,8 @@ if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
59234c
     AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
59234c
 fi
59234c
 
59234c
+APACHE_CHECK_SYSTEMD
59234c
+
59234c
 dnl ## Set up any appropriate OS-specific environment variables for apachectl
59234c
 
59234c
 case $host in
59234c
@@ -677,6 +680,7 @@ APACHE_SUBST(OS_DIR)
59234c
 APACHE_SUBST(BUILTIN_LIBS)
59234c
 APACHE_SUBST(SHLIBPATH_VAR)
59234c
 APACHE_SUBST(OS_SPECIFIC_VARS)
59234c
+APACHE_SUBST(HTTPD_LIBS)
59234c
 
59234c
 PRE_SHARED_CMDS='echo ""'
59234c
 POST_SHARED_CMDS='echo ""'