You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/12/04 23:33:51 UTC
cvs commit: httpd-2.0/test Makefile.in
rbb 00/12/04 14:33:51
Modified: . Makefile.in configure.in
modules Makefile.in
modules/loggers config.m4
server/mpm config.m4
server/mpm/beos config.m4
server/mpm/dexter config.m4
server/mpm/mpmt_beos config.m4
server/mpm/mpmt_pthread config.m4
server/mpm/perchild config.m4
server/mpm/prefork config.m4
server/mpm/spmt_os2 config.m4
test Makefile.in
Log:
Get Apache to configure completely again. This still doesn't build, but
now we are getting very close.
Revision Changes Path
1.36 +4 -5 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile.in 2000/10/07 19:54:22 1.35
+++ Makefile.in 2000/12/04 22:33:35 1.36
@@ -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 @@
$(MPM_LIB) \
main/libmain.la \
os/$(OS_DIR)/libos.la \
- ap/libap.la \
$(AP_LIBS)
PROGRAMS = $(PROGRAM_NAME)
@@ -49,7 +48,7 @@
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 @@
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
1.96 +10 -11 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- configure.in 2000/12/04 20:10:39 1.95
+++ configure.in 2000/12/04 22:33:38 1.96
@@ -173,20 +173,19 @@
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 @@
[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
1.4 +1 -1 httpd-2.0/modules/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 2000/04/30 00:06:03 1.3
+++ Makefile.in 2000/12/04 22:33:41 1.4
@@ -1,5 +1,5 @@
-SUBDIRS = mpm $(MODULE_DIRS)
+SUBDIRS = $(MODULE_DIRS)
include $(top_srcdir)/build/rules.mk
1.2 +1 -1 httpd-2.0/modules/loggers/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/loggers/config.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.m4 2000/12/04 21:38:42 1.1
+++ config.m4 2000/12/04 22:33:41 1.2
@@ -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)
1.28 +2 -2 httpd-2.0/server/mpm/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/config.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- config.m4 2000/08/23 20:16:29 1.27
+++ config.m4 2000/12/04 22:33:43 1.28
@@ -27,10 +27,10 @@
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)
1.3 +1 -1 httpd-2.0/server/mpm/beos/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/beos/config.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.m4 2000/11/02 03:30:27 1.2
+++ config.m4 2000/12/04 22:33:45 1.3
@@ -3,5 +3,5 @@
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
1.6 +1 -1 httpd-2.0/server/mpm/dexter/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/dexter/config.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.m4 2000/11/02 03:30:29 1.5
+++ config.m4 2000/12/04 22:33:48 1.6
@@ -3,6 +3,6 @@
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
1.3 +1 -1 httpd-2.0/server/mpm/mpmt_beos/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_beos/config.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.m4 2000/11/02 03:30:30 1.2
+++ config.m4 2000/12/04 22:33:49 1.3
@@ -3,5 +3,5 @@
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
1.9 +1 -1 httpd-2.0/server/mpm/mpmt_pthread/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_pthread/config.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config.m4 2000/11/02 03:30:31 1.8
+++ config.m4 2000/12/04 22:33:49 1.9
@@ -3,7 +3,7 @@
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
1.3 +1 -1 httpd-2.0/server/mpm/perchild/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/config.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.m4 2000/11/02 03:30:34 1.2
+++ config.m4 2000/12/04 22:33:50 1.3
@@ -3,6 +3,6 @@
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
1.7 +1 -1 httpd-2.0/server/mpm/prefork/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/config.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config.m4 2000/11/02 03:30:36 1.6
+++ config.m4 2000/12/04 22:33:50 1.7
@@ -2,7 +2,7 @@
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)
1.2 +1 -1 httpd-2.0/server/mpm/spmt_os2/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/config.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.m4 2000/01/26 07:51:41 1.1
+++ config.m4 2000/12/04 22:33:50 1.2
@@ -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
1.2 +0 -1 httpd-2.0/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/test/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 2000/11/26 15:27:33 1.1
+++ Makefile.in 2000/12/04 22:33:51 1.2
@@ -4,7 +4,6 @@
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
Re: cvs commit: httpd-2.0/test Makefile.in
Posted by rb...@covalent.net.
>
> Guess I need to get apu_dbm integrated into apr-util pretty quick, and
> then apr-util into Apache.
>
> [ dav doesn't build without it ]
Right now, nothing will build, because the buckets aren't in the code
anyplace. All of ap was not moved to httpd-2.0, so we are basically
screwed with regard to a working (or even compiling) server. My plan is
to get httpd-2.0 to mostly compile, and then get to work populating
apr-utils ASAP. Feel free to start working on getting APR-utils up and
working. I am VERY driven to get this done though, so I will be working
on apr-utils as soon as httpd-2.0 requires it to build. :-)
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0/test Makefile.in
Posted by Greg Stein <gs...@lyra.org>.
On Mon, Dec 04, 2000 at 10:33:51PM -0000, rbb@locus.apache.org wrote:
> rbb 00/12/04 14:33:51
>
> Modified: . Makefile.in configure.in
> modules Makefile.in
> modules/loggers config.m4
> server/mpm config.m4
> server/mpm/beos config.m4
> server/mpm/dexter config.m4
> server/mpm/mpmt_beos config.m4
> server/mpm/mpmt_pthread config.m4
> server/mpm/perchild config.m4
> server/mpm/prefork config.m4
> server/mpm/spmt_os2 config.m4
> test Makefile.in
> Log:
> Get Apache to configure completely again. This still doesn't build, but
> now we are getting very close.
>...
> --- configure.in 2000/12/04 20:10:39 1.95
> +++ configure.in 2000/12/04 22:33:38 1.96
> @@ -173,20 +173,19 @@
> 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 @@
> [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
>...
Guess I need to get apu_dbm integrated into apr-util pretty quick, and then
apr-util into Apache.
[ dav doesn't build without it ]
Cheers,
-g
--
Greg Stein, http://www.lyra.org/