diff options
| author | Joe Orton <jorton@apache.org> | 2013-10-01 10:25:02 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2013-10-01 10:25:02 +0000 |
| commit | c19caf32190ffa7c395360efde81455ed4d3dc7c (patch) | |
| tree | 4bac93e7840cd2dcbbdf98a9b1ef84c8ea314ec6 | |
| parent | f6f568d30c9718df3b0474529b6663100f5bba41 (diff) | |
| download | httpd-c19caf32190ffa7c395360efde81455ed4d3dc7c.tar.gz | |
Don't link support/* against systemd libs.
* Makefile.in: Link httpd using $(HTTPD_LIBS).
* configure.in: Add systemd to HTTPD_LIBS rather than LIBS. Add PCRE
libs to HTTPD_LIBS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528034 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 6e542657eb..6780d9eba1 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/configure.in b/configure.in index 5fd99f37a1..df73d03064 100644 --- a/configure.in +++ b/configure.in @@ -242,6 +242,7 @@ if test "$PCRE_CONFIG" != "false"; then AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`]) APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`]) + APR_ADDTO(HTTPD_LIBS, [\$(PCRE_LIBS)]) else AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/]) fi @@ -521,7 +522,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(LIBS, $SYSTEMD_LIBS) + APR_ADDTO(HTTPD_LIBS, [$SYSTEMD_LIBS]) AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is supported]) fi esac @@ -705,6 +706,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 ""' |