You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.7 KiB
45 lines
1.7 KiB
diff --git a/Makefile.in b/Makefile.in |
|
index a2e9c82..bd8045c 100644 |
|
--- a/Makefile.in |
|
+++ b/Makefile.in |
|
@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test |
|
|
|
PROGRAM_NAME = $(progname) |
|
PROGRAM_SOURCES = modules.c |
|
-PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) |
|
+PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(HTTPD_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) |
|
PROGRAM_PRELINK = $(COMPILE) -c $(top_srcdir)/server/buildmark.c |
|
PROGRAM_DEPENDENCIES = \ |
|
server/libmain.la \ |
|
diff --git a/acinclude.m4 b/acinclude.m4 |
|
index 97484c9..05abe18 100644 |
|
--- a/acinclude.m4 |
|
+++ b/acinclude.m4 |
|
@@ -631,6 +631,7 @@ case $host in |
|
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 |
|
diff --git a/configure.in b/configure.in |
|
index cf437fe..521fc45 100644 |
|
--- a/configure.in |
|
+++ b/configure.in |
|
@@ -239,6 +239,7 @@ if test "x$PCRE_CONFIG" != "x"; then |
|
AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) |
|
APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`]) |
|
APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs8 2>/dev/null || $PCRE_CONFIG --libs`]) |
|
+ APR_ADDTO(HTTPD_LIBS, [\$(PCRE_LIBS)]) |
|
else |
|
AC_MSG_ERROR([pcre(2)-config for libpcre not found. PCRE is required and available from http://pcre.org/]) |
|
fi |
|
@@ -734,6 +735,7 @@ APACHE_SUBST(OS_DIR) |
|
APACHE_SUBST(BUILTIN_LIBS) |
|
APACHE_SUBST(SHLIBPATH_VAR) |
|
APACHE_SUBST(OS_SPECIFIC_VARS) |
|
+APACHE_SUBST(HTTPD_LIBS) |
|
|
|
PRE_SHARED_CMDS='echo ""' |
|
POST_SHARED_CMDS='echo ""'
|
|
|