Commit bc5a0bc6 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Add apr-util to the build process. This should now build once everything 

has been checked out to the correct locations.


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

build/build2.mk

+6 −1
Original line number Diff line number Diff line
@@ -65,10 +65,11 @@ apr_private.h_in = srclib/apr/include/apr_private.h.in 
apr_configure = srclib/apr/configure

mm_configure = srclib/apr/shmem/unix/mm/configure

pcre_configure = srclib/pcre/configure

aprutil_configure = srclib/apr-util/configure



APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in)



APR_TARGETS = $(apr_configure) $(apr_private.h_in) $(mm_configure)

APR_TARGETS = $(apr_configure) $(apr_private.h_in) $(mm_configure) $(aprutil_configure)



PCRE_TARGETS = $(pcre_configure)
@@ -117,6 +118,10 @@ $(apr_private.h_in): $(apr_configure) srclib/apr/acconfig.h 
	@rm -f $@

	(cd srclib/apr && autoheader)



$(aprutil_configure): srclib/apr-util/configure.in

	@echo rebuilding $@

	(cd srclib/apr-util && ./buildconf.sh)



$(apr_configure): srclib/apr/aclocal.m4 srclib/apr/configure.in srclib/apr/apr_common.m4 srclib/apr/hints.m4

	@echo rebuilding $@

	(cd srclib/apr && ./buildconf)

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ dnl ## APRVARS before Apache generates it's Makefiles and the related files. 
dnl ## This allows APR to detect libraries like dl and tell Apache that it

dnl ## needs to include or not include them.

RUN_SUBDIR_CONFIG_NOW(srclib/apr, $apache_apr_flags)

RUN_SUBDIR_CONFIG_NOW(srclib/apr-util, "--with-apr=../apr")

RUN_SUBDIR_CONFIG_NOW(srclib/pcre)

. ./srclib/apr/APRVARS

srclib/Makefile.in

+1 −1
Original line number Diff line number Diff line 


SUBDIRS = apr pcre $(AP_LIB_DIRS)

SUBDIRS = apr apr-util pcre $(AP_LIB_DIRS)



include $(top_srcdir)/build/rules.mk

support/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ targets = $(PROGRAMS) 


PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)

PROGRAM_DEPENDENCIES = \

	../srclib/apr-util/libaprutil.la ../srclib/apr/$(LIBPRE)apr.a

	../srclib/apr-util/.libs/libaprutil.la ../srclib/apr/$(LIBPRE)apr.a



include $(top_srcdir)/build/rules.mk