You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by rj...@apache.org on 2011/07/05 07:48:25 UTC

svn commit: r1142893 - in /httpd/httpd/trunk: Makefile.in configure.in

Author: rjung
Date: Tue Jul  5 05:48:24 2011
New Revision: 1142893

URL: http://svn.apache.org/viewvc?rev=1142893&view=rev
Log:
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.

Modified:
    httpd/httpd/trunk/Makefile.in
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=1142893&r1=1142892&r2=1142893&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Tue Jul  5 05:48:24 2011
@@ -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 \

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1142893&r1=1142892&r2=1142893&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Tue Jul  5 05:48:24 2011
@@ -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}"