From: Rainer Jung <rjung@apache.org>
Date: Tue, 5 Jul 2011 05:48:24 +0000 (+0000)
Subject: Move PCRE_LIBS from HTTPD_LDFLAGS to
X-Git-Tag: 2.3.14^2~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1197d4d83a038ecdbfbcb4f44cf422c8ba8cf02;p=thirdparty%2Fapache%2Fhttpd.git

Move PCRE_LIBS from HTTPD_LDFLAGS to
PROGRAM_LDADD.

Otherwise -lpcre comes before libmain which leads
to undefined recences during linking of httpd.

Followup to r1142739.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142893 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.in b/Makefile.in
index 594d4cfe8f0..a957bd2c55d 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) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
+PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_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 8d982b6dabb..4233a9dd971 100644
--- a/configure.in
+++ b/configure.in
@@ -207,7 +207,6 @@ else
   AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/])
 fi
 APACHE_SUBST(PCRE_LIBS)
-APR_ADDTO(HTTPD_LDFLAGS, [\$(PCRE_LIBS)])
 
 echo $ac_n "${nl}Configuring Apache httpd ...${nl}"