Get Apache to configure completely again. This still doesn't build, but

now we are getting very close.

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

diff --git a/Makefile.in b/Makefile.in
index 210902681dee6db034c7da2c89cb691300619e76..c3c0e4622a65086adb013b90b22d7c895b505ed6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 
-SUBDIRS = ap lib main modules os support
+SUBDIRS = modules os server srclib support test
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c buildmark.c
@@ -9,7 +9,6 @@ PROGRAM_DEPENDENCIES = \
   $(MPM_LIB) \
   main/libmain.la \
   os/$(OS_DIR)/libos.la \
-  ap/libap.la \
   $(AP_LIBS)
 
 PROGRAMS        = $(PROGRAM_NAME)
@@ -49,7 +48,7 @@ htdocs-srcdir = $(srcdir)/../htdocs
 
 docs: include/*.h
        mkdir -p ./docs/api
-       lib/apr/helpers/scandoc -ihelpers/default.pl -p./docs/api/ ./include/*.h
+       srclib/apr/helpers/scandoc -ihelpers/default.pl -p./docs/api/ ./include/*.h
 
 install-htdocs:
        @echo Installing HTML documents
@@ -103,6 +102,6 @@ install-include:
             cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(includedir); \
         fi;
        @cp -p $(srcdir)/modules/dav/main/mod_dav.h $(includedir)
-       @cp -p $(srcdir)/lib/expat-lite/*.h $(includedir)/xml
-       @cp -p lib/apr/include/*.h $(srcdir)/lib/apr/include/*.h $(includedir)/apr
+       @cp -p $(srcdir)/srclib/expat-lite/*.h $(includedir)/xml
+       @cp -p srclib/apr/include/*.h $(srcdir)/srclib/apr/include/*.h $(includedir)/apr
        @chmod 644 $(includedir)/*.h $(includedir)/xml/*.h $(includedir)/apr/*.h

diff --git a/configure.in b/configure.in
index 724dedbd28de565a93d27be39c5e7f83787824a0..cd8fac10c9f56f3c36fbf692ca42ce1302bfde39 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -173,20 +173,19 @@ AC_ARG_WITH(program-name,
 dnl ### util_xml is always included, so we always need Expat (for now)
 apache_need_expat=yes
 
-dnl AP_LIB_DIRS specifies the additional libs from src/lib/ that we need
+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="lib/pcre/libpcre.la lib/aputil/libaputil.la"
-INCLUDES="$INCLUDES -I\$(top_srcdir)/lib/aputil"
+AP_LIBS="srclib/pcre/libpcre.la"
 
 if test "$apache_need_sdbm" = "yes"; then
   AP_LIB_DIRS="$AP_LIB_DIRS sdbm"
-  AP_LIBS="$AP_LIBS lib/sdbm/libsdbm.la"
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/lib/sdbm"
+  AP_LIBS="$AP_LIBS srclib/sdbm/libsdbm.la"
+  INCLUDES="$INCLUDES -I\$(top_srcdir)/srclib/sdbm"
 fi
 if test "$apache_need_expat" = "yes"; then
   AP_LIB_DIRS="$AP_LIB_DIRS expat-lite"
-  AP_LIBS="$AP_LIBS lib/expat-lite/libexpat.la"
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/lib/expat-lite"
+  AP_LIBS="$AP_LIBS srclib/expat-lite/libexpat.la"
+  INCLUDES="$INCLUDES -I\$(top_srcdir)/srclib/expat-lite"
 fi
 
 dnl APR should go after the other libs, so the right symbols can be picked up
@@ -210,12 +209,12 @@ else
                [byte order is unknown due to cross-compilation])
 fi
 
-APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile)
-APACHE_FAST_OUTPUT(modules/Makefile os/Makefile)
+APACHE_FAST_OUTPUT(Makefile modules/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(lib/pcre/Makefile lib/aputil/Makefile)
 for i in $AP_LIB_DIRS; do
-  APACHE_FAST_OUTPUT(lib/$i/Makefile)
+  APACHE_FAST_OUTPUT(srclib/$i/Makefile)
 done
 
 dnl ## Run configure for packages Apache uses

diff --git a/modules/Makefile.in b/modules/Makefile.in
index 9fb8a882808a83b317f4ea4d78d62601425c050f..ecb043547baf5f8a62d642c4229b9c46b8360a64 100644 (file)
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -1,5 +1,5 @@
 
-SUBDIRS = mpm $(MODULE_DIRS)
+SUBDIRS = $(MODULE_DIRS)
 
 include $(top_srcdir)/build/rules.mk
 

diff --git a/modules/loggers/config.m4 b/modules/loggers/config.m4
index b205d4da2dbd09c56ef389f6c4b255f0a9266aa5..915f620e8760557008ecbe801f6fe11dd66228cb 100644 (file)
--- a/modules/loggers/config.m4
+++ b/modules/loggers/config.m4
@@ -1,5 +1,5 @@
 dnl modules enabled in this directory by default
-APACHE_MODPATH_INIT(standard)
+APACHE_MODPATH_INIT(loggers)
 
 dnl APACHE_MODULE(vhost_alias,blabla)
        

diff --git a/server/mpm/beos/config.m4 b/server/mpm/beos/config.m4
index faf3e92a9d354d401939f5bc73d1220a0bd3d7a5..4f201408d6c93d6ab86e50bcb2e3e86b5b6e30cf 100644 (file)
--- a/server/mpm/beos/config.m4
+++ b/server/mpm/beos/config.m4
@@ -3,5 +3,5 @@ dnl ## XXX - Need a more thorough check of the proper flags to use
 if test "$MPM_NAME" = "beos" ; then
     apache_apr_flags="--enable-threads"
 
-    APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
+    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
 fi

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index 9d5649524133d20f5850dcb75068072cb6a6048e..7c5f58ffcada285b2b4b9092b1179cf2280c64ac 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -27,10 +27,10 @@ fi
 
 APACHE_CHECK_SIGWAIT_ONE_ARG
 
-APACHE_FAST_OUTPUT(modules/mpm/Makefile)
+APACHE_FAST_OUTPUT(server/mpm/Makefile)
 
 MPM_NAME=$apache_cv_mpm
-MPM_DIR=modules/mpm/$MPM_NAME
+MPM_DIR=server/mpm/$MPM_NAME
 MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
 
 APACHE_SUBST(MPM_NAME)

diff --git a/server/mpm/dexter/config.m4 b/server/mpm/dexter/config.m4
index db864c3a709437018151dc85099fa2302e47028e..872d56f1c8a516d5133c9a6b81a46f49728387ab 100644 (file)
--- a/server/mpm/dexter/config.m4
+++ b/server/mpm/dexter/config.m4
@@ -3,6 +3,6 @@ dnl ## XXX - Need a more thorough check of the proper flags to use
 if test "$MPM_NAME" = "dexter" ; then
     apache_apr_flags="--enable-threads"
 
-    APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
+    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
     APACHE_MPM_PTHREAD
 fi

diff --git a/server/mpm/mpmt_beos/config.m4 b/server/mpm/mpmt_beos/config.m4
index a6cf319d39a383884d60c90a02cd84ba21f476eb..5af5b6c8884cc49fd5d114c06eea8421b1a3afd0 100644 (file)
--- a/server/mpm/mpmt_beos/config.m4
+++ b/server/mpm/mpmt_beos/config.m4
@@ -3,5 +3,5 @@ dnl ## XXX - Need a more thorough check of the proper flags to use
 if test "$MPM_NAME" = "mpmt_beos" ; then
     apache_apr_flags="--enable-threads"
 
-    APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
+    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
 fi

diff --git a/server/mpm/mpmt_pthread/config.m4 b/server/mpm/mpmt_pthread/config.m4
index 9f79f6f6df72ae294466ce1090362e5605469385..0c3a68c4af5c178d5a1efc93b06eaedf7d4a71e3 100644 (file)
--- a/server/mpm/mpmt_pthread/config.m4
+++ b/server/mpm/mpmt_pthread/config.m4
@@ -3,7 +3,7 @@ dnl ## XXX - Need a more thorough check of the proper flags to use
 if test "$MPM_NAME" = "mpmt_pthread" ; then
     apache_apr_flags="--enable-threads"
 
-    APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
+    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
 
     APACHE_MPM_PTHREAD
 

diff --git a/server/mpm/perchild/config.m4 b/server/mpm/perchild/config.m4
index 80192bd2f06d2da0f37baf9f75ba227802d71c08..4e8c94af84db8c70d54c41cc4829bc2400071939 100644 (file)
--- a/server/mpm/perchild/config.m4
+++ b/server/mpm/perchild/config.m4
@@ -3,6 +3,6 @@ dnl ## XXX - Need a more thorough check of the proper flags to use
 if test "$MPM_NAME" = "perchild" ; then
     apache_apr_flags="--enable-threads"
 
-    APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
+    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
     APACHE_MPM_PTHREAD
 fi

diff --git a/server/mpm/prefork/config.m4 b/server/mpm/prefork/config.m4
index e6b2fcdfedb132f2ba91d3c20c5481e6385e0da9..4d839c7b8ef2e9f5c4dc2ffe8de68aacfe48f74e 100644 (file)
--- a/server/mpm/prefork/config.m4
+++ b/server/mpm/prefork/config.m4
@@ -2,7 +2,7 @@ if test "$MPM_NAME" = "prefork" ; then
 dnl Turn off all threading functions in APR
     apache_apr_flags="--disable-threads"
 
-    APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
+    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
 
 dnl Obsolete scoreboard code uses this.
     AC_CHECK_HEADERS(sys/times.h)

diff --git a/server/mpm/spmt_os2/config.m4 b/server/mpm/spmt_os2/config.m4
index 73b1b16aaa4056dba097101e7e250bf534ac08c9..89ba0c62adc79d6a5caa98400455f1740deedcb7 100644 (file)
--- a/server/mpm/spmt_os2/config.m4
+++ b/server/mpm/spmt_os2/config.m4
@@ -1,6 +1,6 @@
 if test "$MPM_NAME" = "spmt_os2" ; then
     AC_CACHE_SAVE
-    APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
+    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
     CFLAGS="$CFLAGS -Zmt"
     LDFLAGS="$LDFLAGS -Zmt"
 fi

diff --git a/test/Makefile.in b/test/Makefile.in
index e7770f7fbb9278f6b5ad688c8dcbf5c8b3c4083f..3b69f8449778172b260824c566f2a436ba075312 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -4,7 +4,6 @@ targets  = $(PROGRAMS)
 
 PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
 PROGRAM_DEPENDENCIES = ../ap/libap.la \
-       ../lib/aputil/libaputil.la \
        ../lib/sdbm/libsdbm.la \
        ../lib/apr/$(LIBPRE)apr.a