Commit aa55d11d authored by Rainer Jung's avatar Rainer Jung
Browse files

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
parent 25cfc680

Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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 \

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -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}"