Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 5 Jun 2002 11:59:26 -0000
Message-ID: <20020605115926.38395.qmail@icarus.apache.org>
From: trawick@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/support apxs.in

trawick     2002/06/05 04:59:26

  Modified:    .        CHANGES
               build    install-bindist.sh.in
               support  apxs.in
  Log:
  Fix apxs to allow it to work when the build directory is somewhere
  besides server-root/build.
  
  PR:           8453
  
  Submitted by: a number of people hit this problem and offered hints or
                partial fixes; Thom May and Pier Fumagalli had a patch to
                apxs, a subset of which mostly fixed this problem; there
                were hints in PRs 8453 and 9316
  
  Revision  Changes    Path
  1.809     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.808
  retrieving revision 1.809
  diff -u -r1.808 -r1.809
  --- CHANGES	4 Jun 2002 18:50:12 -0000	1.808
  +++ CHANGES	5 Jun 2002 11:59:25 -0000	1.809
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.37
   
  +  *) Fix apxs to allow it to work when the build directory is somewhere
  +     besides server-root/build.  PR 8453  
  +     [Jeff Trawick and a host of others]
  +
     *) Allow ap_discard_request_body to be called multiple times in the
        same request.  Essentially, ap_http_filter keeps track of whether
        it has sent an EOS bucket up the stack, if so, it will only ever
  
  
  
  1.9       +1 -1      httpd-2.0/build/install-bindist.sh.in
  
  Index: install-bindist.sh.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/install-bindist.sh.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- install-bindist.sh.in	3 Jun 2002 18:06:26 -0000	1.8
  +++ install-bindist.sh.in	5 Jun 2002 11:59:26 -0000	1.9
  @@ -120,7 +120,7 @@
     lcopy bindist/error $SR/error 755 644
   fi
    
  -sed -e "s;^#!\@perlbin\@.*;#!$PERL;" -e "s;\@prefix\@;$SR;" \
  +sed -e "s;^#!\@perlbin\@.*;#!$PERL;" -e "s;\@exp_installbuilddir\@;$SR/build;" \
   	support/apxs.in > $SR/bin/apxs
   PRE=`grep "^prefix = " bindist/build/config_vars.mk`
   PRE=`echo $PRE | sed -e "s;prefix = ;;"`
  
  
  
  1.39      +12 -9     httpd-2.0/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- apxs.in	13 May 2002 17:16:55 -0000	1.38
  +++ apxs.in	5 Jun 2002 11:59:26 -0000	1.39
  @@ -61,13 +61,15 @@
   ##  Configuration
   ##
   
  -my $prefix         = "@prefix@";
  -my $CFG_PREFIX     = $prefix;
  +my %config_vars = ();
  +
  +my $installbuilddir = "@exp_installbuilddir@";
  +get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
   
   # read the configuration variables once
  -my %config_vars = ();
  -get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
   
  +my $prefix         = get_vars("prefix");
  +my $CFG_PREFIX     = $prefix;
   my $exec_prefix    = get_vars("exec_prefix");
   my $CFG_TARGET     = get_vars("progname");
   my $CFG_SYSCONFDIR = get_vars("sysconfdir");
  @@ -324,6 +326,7 @@
       $data =~ s|%NAME%|$name|sg;
       $data =~ s|%TARGET%|$CFG_TARGET|sg;
       $data =~ s|%PREFIX%|$prefix|sg;
  +    $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
   
       my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
   
  @@ -418,7 +421,7 @@
           $la =~ s|\.c$|.la|;
           my $o = $s;
           $o =~ s|\.c$|.o|;
  -        push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
  +        push(@cmds, "$installbuilddir/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
           unshift(@objs, $lo);
       }
   
  @@ -443,7 +446,7 @@
           $opt .= " -l$opt_l";
       }
   
  -    push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
  +    push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
   
       #   execute the commands
       &execute_cmds(@cmds);
  @@ -474,8 +477,8 @@
           $t =~ s|^.+/([^/]+)$|$1|;
           $t =~ s|\.la$|\.so|;
           if ($opt_i) {
  -	    push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .
  -                 "$prefix/build/libtool' $f $CFG_LIBEXECDIR");
  +	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
  +                 "$installbuilddir/libtool' $f $CFG_LIBEXECDIR");
   	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
           }
   
  @@ -592,7 +595,7 @@
   builddir=$(shell pwd)
   top_srcdir=%PREFIX%
   top_builddir=%PREFIX%
  -include %PREFIX%/build/special.mk
  +include %INSTALLBUILDDIR%/special.mk
   
   #   the used tools
   APXS=apxs