Get base Apache to build properly. This doesn't solve the problem of

not having apr-util, but we should be getting to the link stage now.

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

diff --git a/.cvsignore b/.cvsignore
index 1e493134b1d0e347e56f614031bec75ab95bf63d..07ec98e1fc397b5cb5691f68cd2d04a3de6b9814 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,10 @@ aclocal.m4
 .deps
 generated_lists
 buildmk.stamp
+config.log
+Makefile
+libtool
+config.status
+modules.c
+config.cache
+config_vars.mk

diff --git a/build/rules.mk b/build/rules.mk
index 5cfaee85aa452ef8b82f57d41c913166f95dd5b6..9e88336b3769df15693779dae25a141c898692bb 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -83,7 +83,7 @@ INSTALL = $(abs_srcdir)/build/install.sh -c
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_PROGRAM = $(INSTALL) -m 755
 
-DEFS = -I. -I$(srcdir) -I$(top_srcdir)/modules/mpm/$(MPM_NAME)
+DEFS = -I. -I$(srcdir) -I$(top_srcdir)/server/mpm/$(MPM_NAME)
 
 # Suffixes
 

diff --git a/configure.in b/configure.in
index cd8fac10c9f56f3c36fbf692ca42ce1302bfde39..6e9b76fecbc4af1fc88a912e43f3ff365a6f31b6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -209,10 +209,10 @@ else
                [byte order is unknown due to cross-compilation])
 fi
 
-APACHE_FAST_OUTPUT(Makefile modules/Makefile) 
+APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
 APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile)
 APACHE_FAST_OUTPUT(os/unix/Makefile server/Makefile)
-APACHE_FAST_OUTPUT(support/Makefile test/Makefile)
+APACHE_FAST_OUTPUT(support/Makefile test/Makefile srclib/pcre/Makefile)
 for i in $AP_LIB_DIRS; do
   APACHE_FAST_OUTPUT(srclib/$i/Makefile)
 done

diff --git a/server/Makefile.in b/server/Makefile.in
index b9ee283a06763a205ba690b3aaaeea60b82637cc..f28a11b140b1957ce57bc36740a592b30bab3a0d 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -4,10 +4,9 @@ CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h
 LTLIBRARY_NAME    = libmain.la
 LTLIBRARY_SOURCES = \
     uri_delims.h test_char.h \
-       http_config.c http_core.c http_log.c http_main.c \
-       http_protocol.c http_request.c http_vhost.c util.c util_date.c \
+       config.c log.c main.c vhost.c util.c util_date.c \
        util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \
-       rfc1413.c http_connection.c listen.c \
+       rfc1413.c connection.c listen.c \
         mpm_common.c util_charset.c util_debug.c util_xml.c \
        util_filter.c exports.c
 

diff --git a/srclib/Makefile.in b/srclib/Makefile.in
index a3ef7c0cbe800ec2199a5300daca6259f688e1ca..1e58b2679cbd35b66786303b8df043aebfc35760 100644 (file)
--- a/srclib/Makefile.in
+++ b/srclib/Makefile.in
@@ -1,4 +1,4 @@
 
-SUBDIRS = apr pcre aputil $(AP_LIB_DIRS)
+SUBDIRS = apr pcre $(AP_LIB_DIRS)
 
 include $(top_srcdir)/build/rules.mk

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