httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/build build2.mk rules.mk
Date Fri, 16 Mar 2001 23:04:58 GMT
rbb         01/03/16 15:04:57

  Modified:    .        CHANGES configure.in
               build    build2.mk rules.mk
  Log:
  Cleanup the build process a bit more.  The Apache configure
  script no longer creates its own helper scripts, it just
  uses APR's.
  Submitted by:	jean-frederic clere <jfrederic.clere@fujitsu-siemens.com>
  
  Revision  Changes    Path
  1.135     +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -d -b -w -u -r1.134 -r1.135
  --- CHANGES	2001/03/16 07:37:10	1.134
  +++ CHANGES	2001/03/16 23:04:52	1.135
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.15-dev
   
  +  *) Cleanup the build process a bit more.  The Apache configure
  +     script no longer creates its own helper scripts, it just
  +     uses APR's.  
  +     [jean-frederic clere <jfrederic.clere@fujitsu-siemens.com>]
  +
     *) Stop the forced downgrade of the connection to HTTP/1.0 for
        proxy requests.  [Graham Leggett]
   
  
  
  
  1.131     +3 -2      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.130
  retrieving revision 1.131
  diff -u -d -b -w -u -r1.130 -r1.131
  --- configure.in	2001/03/11 23:40:47	1.130
  +++ configure.in	2001/03/16 23:04:53	1.131
  @@ -4,7 +4,7 @@
   AC_INIT(acinclude.m4)
   
   AC_CONFIG_HEADER(include/ap_config_auto.h)
  -AC_CONFIG_AUX_DIR(.)
  +AC_CONFIG_AUX_DIR(srclib/apr/build)
    
   dnl ## This is the central place where Apache's version should be kept.
   dnl AM_INIT_AUTOMAKE(apache, 2.0-dev)
  @@ -20,6 +20,7 @@
   dnl Absolute source/build directory
   abs_srcdir=`(cd $srcdir && pwd)`
   abs_builddir=`pwd`
  +aprbuild=$abs_srcdir/srclib/apr/build
   
   MKDIR=$abs_srcdir/srclib/apr/build/mkdir.sh
   
  @@ -155,7 +156,7 @@
   APACHE_LIBTOOL_SILENT
   
   if test "$apache_need_shared" = "yes"; then
  -  $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache
$srcdir/ltmain.sh
  +  $SHELL $aprbuild/ltconfig --output=shlibtool --disable-static --srcdir=$aprbuild --cache-file=./config.cache
$aprbuild/ltmain.sh
     case $PLATFORM in
       *os390)
         CFLAGS="$CFLAGS -Wc,DLL,EXPORTALL"
  
  
  
  1.31      +1 -6      httpd-2.0/build/build2.mk
  
  Index: build2.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/build2.mk,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -d -b -w -u -r1.30 -r1.31
  --- build2.mk	2001/02/27 01:39:25	1.30
  +++ build2.mk	2001/03/16 23:04:55	1.31
  @@ -58,15 +58,13 @@
   
   TOUCH_FILES = mkinstalldirs install-sh missing
   
  -LT_TARGETS = ltconfig ltmain.sh config.guess config.sub
  -
   config_h_in = include/ap_config_auto.h.in
   apr_configure = srclib/apr/configure
   mm_configure = srclib/apr/shmem/unix/mm/configure
   pcre_configure = srclib/pcre/configure
   aprutil_configure = srclib/apr-util/configure
   
  -APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in)
  +APACHE_TARGETS = $(TOUCH_FILES) configure $(config_h_in)
   
   APR_TARGETS = $(apr_configure) $(mm_configure) $(aprutil_configure)
   
  @@ -88,9 +86,6 @@
   	@echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf" >$@
   	@echo "dnl edits here will be lost" >>$@
   	@cat acinclude.m4 $(libtool_m4) >> $@
  -
  -$(LT_TARGETS):
  -	libtoolize $(AMFLAGS) --force
   
   $(config_h_in): configure
   # explicitly remove target since autoheader does not seem to work 
  
  
  
  1.44      +1 -1      httpd-2.0/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/rules.mk,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -d -b -w -u -r1.43 -r1.44
  --- rules.mk	2001/02/26 04:38:18	1.43
  +++ rules.mk	2001/03/16 23:04:56	1.44
  @@ -188,7 +188,7 @@
   	rm -rf .libs
   
   distclean: distclean-recursive clean-x
  -	rm -f config.cache config.log config.status config_vars.mk libtool \
  +	rm -f config.cache config.log config.status config_vars.mk \
   	stamp-h Makefile shlibtool .deps $(DISTCLEAN_TARGETS)
   
   include $(builddir)/.deps
  
  
  

Mime
View raw message