httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Greg Stein <gst...@lyra.org>
Subject Re: cvs commit: httpd-2.0/test Makefile.in
Date Mon, 04 Dec 2000 23:08:12 GMT
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/

Mime
View raw message