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 594d4cfe8f04f4e12682f046e45b50e5b9ab6e9a..a957bd2c55d062b4a2103dc7d3884b4d6665911f 100644 (file)
--- 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 8d982b6dabb90bbea62d9625cab51a9e9bd2f89e..4233a9dd9714c56d10d9bddfb8f3acc53a8da665 100644 (file)
--- 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}"