cvs commit: httpd-2.0 buildconf

[tr...@apache.org]

trawick     2003/06/05 11:41:49

  Modified:    .        buildconf
  Log:
  steal some code from APR intended to allow you to properly switch
  between libtool 1.3 and 1.4+...  newer libtool doesn't have ltconfig,
  so having a stray ltconfig around will confuse some of our config
  logic
  
  This also fixes cp failure on FreeBSD since ltconfig and ltmain.sh
  are installed with 0400 perms, and when buildconf is run a second time
  the cp of those files would fail.
  
  Revision  Changes    Path
  1.36      +4 -0      httpd-2.0/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/buildconf,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- buildconf	12 Apr 2003 17:28:55 -0000	1.35
  +++ buildconf	5 Jun 2003 18:41:49 -0000	1.36
  @@ -162,6 +162,10 @@
      $apr_src_dir/build/PrintPath $apr_src_dir/build/apr_common.m4 \
      $apr_src_dir/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
   
  +# Remove any libtool files so one can switch between libtool 1.3
  +# and libtool 1.4 by simply rerunning the buildconf script.
  +(cd build ; rm -f ltconfig ltmain.sh libtool.m4)
  +
   # Optionally copy libtool-1.3.x files
   if [ -f $apr_src_dir/build/ltconfig ]; then
       cp $apr_src_dir/build/ltconfig build