httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: httpd-2.0/build build2.mk
Date Tue, 09 Jan 2001 11:35:54 GMT
gstein      01/01/09 03:35:53

  Modified:    .        configure.in
               build    build2.mk
  Log:
  a couple tweaks to get Apache building with the new libtool-ized APR
  
  Revision  Changes    Path
  1.113     +2 -2      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -u -r1.112 -r1.113
  --- configure.in	2001/01/08 23:01:47	1.112
  +++ configure.in	2001/01/09 11:35:46	1.113
  @@ -213,7 +213,7 @@
   fi
   
   dnl APR should go after the other libs, so the right symbols can be picked up
  -AP_LIBS="$AP_LIBS srclib/apr/\$(LIBPRE)apr.a"
  +AP_LIBS="$AP_LIBS srclib/apr/\$(LIBPRE)apr.la"
   APACHE_SUBST(AP_LIB_DIRS)
   APACHE_SUBST(AP_LIBS)
   
  @@ -248,7 +248,7 @@
   dnl ## APRVARS before Apache generates it's Makefiles and the related files.
   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, "$apache_apr_flags --disable-shared")
   RUN_SUBDIR_CONFIG_NOW(srclib/apr-util, "--with-apr=../apr --disable-shared")
   RUN_SUBDIR_CONFIG_NOW(srclib/pcre)
   . ./srclib/apr/APRVARS
  
  
  
  1.27      +2 -1      httpd-2.0/build/build2.mk
  
  Index: build2.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/build2.mk,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -u -r1.26 -r1.27
  --- build2.mk	2001/01/06 21:47:48	1.26
  +++ build2.mk	2001/01/09 11:35:51	1.27
  @@ -121,7 +121,8 @@
   	@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
  +### we shouldn't (have to) know what goes into the configure script!
  +$(apr_configure): srclib/apr/helpers/apr-conf.m4 srclib/apr/configure.in srclib/apr/apr_common.m4
srclib/apr/hints.m4
   	@echo rebuilding $@
   	(cd srclib/apr && ./buildconf)
   
  
  
  

Mime
View raw message