httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: httpd-2.0/support Makefile.in
Date Tue, 05 Dec 2000 04:30:56 GMT
rbb         00/12/04 20:30:56

  Modified:    .        configure.in
               build    build2.mk
               srclib   Makefile.in
               support  Makefile.in
  Log:
  Add apr-util to the build process.  This should now build once everything
  has been checked out to the correct locations.
  
  Revision  Changes    Path
  1.100     +1 -0      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- configure.in	2000/12/05 02:45:46	1.99
  +++ configure.in	2000/12/05 04:30:54	1.100
  @@ -225,6 +225,7 @@
   dnl ## This allows APR to detect libraries like dl and tell Apache that it
   dnl ## needs to include or not include them.
   RUN_SUBDIR_CONFIG_NOW(srclib/apr, $apache_apr_flags)
  +RUN_SUBDIR_CONFIG_NOW(srclib/apr-util, "--with-apr=../apr")
   RUN_SUBDIR_CONFIG_NOW(srclib/pcre)
   . ./srclib/apr/APRVARS
   
  
  
  
  1.21      +6 -1      httpd-2.0/build/build2.mk
  
  Index: build2.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/build2.mk,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build2.mk	2000/12/04 18:56:11	1.20
  +++ build2.mk	2000/12/05 04:30:55	1.21
  @@ -65,10 +65,11 @@
   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)
   
  -APR_TARGETS = $(apr_configure) $(apr_private.h_in) $(mm_configure)
  +APR_TARGETS = $(apr_configure) $(apr_private.h_in) $(mm_configure) $(aprutil_configure)
   
   PCRE_TARGETS = $(pcre_configure)
   
  @@ -116,6 +117,10 @@
   	@echo rebuilding $@
   	@rm -f $@
   	(cd srclib/apr && autoheader)
  +
  +$(aprutil_configure): srclib/apr-util/configure.in
  +	@echo rebuilding $@
  +	(cd srclib/apr-util && ./buildconf.sh)
   
   $(apr_configure): srclib/apr/aclocal.m4 srclib/apr/configure.in srclib/apr/apr_common.m4
srclib/apr/hints.m4
   	@echo rebuilding $@
  
  
  
  1.8       +1 -1      httpd-2.0/srclib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/srclib/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.in	2000/12/05 00:36:07	1.7
  +++ Makefile.in	2000/12/05 04:30:55	1.8
  @@ -1,4 +1,4 @@
   
  -SUBDIRS = apr pcre $(AP_LIB_DIRS)
  +SUBDIRS = apr apr-util pcre $(AP_LIB_DIRS)
   
   include $(top_srcdir)/build/rules.mk
  
  
  
  1.7       +1 -1      httpd-2.0/support/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	2000/12/05 02:45:50	1.6
  +++ Makefile.in	2000/12/05 04:30:55	1.7
  @@ -4,7 +4,7 @@
   
   PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
   PROGRAM_DEPENDENCIES = \
  -	../srclib/apr-util/libaprutil.la ../srclib/apr/$(LIBPRE)apr.a
  +	../srclib/apr-util/.libs/libaprutil.la ../srclib/apr/$(LIBPRE)apr.a
   
   include $(top_srcdir)/build/rules.mk
   
  
  
  

Mime
View raw message