Apache builds again, although the test directory doesn't. I will work on

the test directory soon.  The server does NOT currently run, but it does
build cleanly.

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

diff --git a/Makefile.in b/Makefile.in
index c3c0e4622a65086adb013b90b22d7c895b505ed6..d054c669be12eefedf0076cf86d7710a06296951 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,12 +2,12 @@
 SUBDIRS = modules os server srclib support test
 
 PROGRAM_NAME         = $(progname)
-PROGRAM_SOURCES      = modules.c buildmark.c
+PROGRAM_SOURCES      = modules.c
 PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
 PROGRAM_DEPENDENCIES = \
   $(BUILTIN_LIBS) \
   $(MPM_LIB) \
-  main/libmain.la \
+  server/libmain.la \
   os/$(OS_DIR)/libos.la \
   $(AP_LIBS)
 

diff --git a/configure.in b/configure.in
index 5a321d1337aab988a5c58cd4becf9347800f46f4..d9a24851aaced2425eba57f7714090f4922f436b 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 srclib/apr-util/.libs/libaprutil.la"
+AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/libaprutil.la"
 
 if test "$apache_need_sdbm" = "yes"; then
   AP_LIB_DIRS="$AP_LIB_DIRS sdbm"
@@ -210,7 +210,7 @@ else
 fi
 
 APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
-APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile)
+APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile os/Makefile)
 APACHE_FAST_OUTPUT(os/unix/Makefile server/Makefile)
 APACHE_FAST_OUTPUT(support/Makefile test/Makefile srclib/pcre/Makefile)
 for i in $AP_LIB_DIRS; do

diff --git a/server/Makefile.in b/server/Makefile.in
index f28a11b140b1957ce57bc36740a592b30bab3a0d..e1fa986ac120b0ddcf718e5f0f23b830fa084ccb 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,6 +1,8 @@
 
 CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h
 
+SUBDIRS = mpm
+
 LTLIBRARY_NAME    = libmain.la
 LTLIBRARY_SOURCES = \
     uri_delims.h test_char.h \
@@ -8,7 +10,7 @@ LTLIBRARY_SOURCES = \
        util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \
        rfc1413.c connection.c listen.c \
         mpm_common.c util_charset.c util_debug.c util_xml.c \
-       util_filter.c exports.c
+       util_filter.c exports.c buildmark.c
 
 include $(top_srcdir)/build/ltlib.mk
 

diff --git a/support/Makefile.in b/support/Makefile.in
index e884fb4867661fd65b601b28d9e6c0fb3d342d72..219a1de411aa744c21a43316c9558cc699dceb5c 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -3,8 +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 \
-       ../srclib/apr-util/.libs/libaprutil.a
+PROGRAM_DEPENDENCIES = \
+       ../srclib/apr-util/libaprutil.la ../srclib/apr/$(LIBPRE)apr.a
 
 include $(top_srcdir)/build/rules.mk