Get the support programs building properly. Httpd itself is next.

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

diff --git a/configure.in b/configure.in
index 6e9b76fecbc4af1fc88a912e43f3ff365a6f31b6..5a321d1337aab988a5c58cd4becf9347800f46f4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -175,7 +175,7 @@ apache_need_expat=yes
 
 dnl AP_LIB_DIRS specifies the additional libs from srclib/ that we need
 dnl AP_LIBS specifies the actual libraries. note we have some required libs.
-AP_LIBS="srclib/pcre/libpcre.la"
+AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/.libs/libaprutil.la"
 
 if test "$apache_need_sdbm" = "yes"; then
   AP_LIB_DIRS="$AP_LIB_DIRS sdbm"

diff --git a/support/Makefile.in b/support/Makefile.in
index 1160f73b70bc9790c8e3332392243e95cc2cfe9e..e884fb4867661fd65b601b28d9e6c0fb3d342d72 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -3,7 +3,8 @@ PROGRAMS = htpasswd htdigest rotatelogs logresolve ab
 targets  = $(PROGRAMS)
 
 PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
-PROGRAM_DEPENDENCIES = ../srclib/apr/$(LIBPRE)apr.a
+PROGRAM_DEPENDENCIES = ../srclib/apr/$(LIBPRE)apr.a \
+       ../srclib/apr-util/.libs/libaprutil.a
 
 include $(top_srcdir)/build/rules.mk