cvs commit: httpd-2.0/support apxs.in

[tr...@apache.org]

trawick     02/02/01 11:25:14

  Modified:    .        CHANGES
               support  apxs.in
  Log:
  apxs: Let the LTFLAGS environment variable override the default --silent flag.
  Previously you had to edit the generated apxs to get rid of --silent.
  
  Revision  Changes    Path
  1.559     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.558
  retrieving revision 1.559
  diff -u -r1.558 -r1.559
  --- CHANGES	1 Feb 2002 17:57:43 -0000	1.558
  +++ CHANGES	1 Feb 2002 19:25:13 -0000	1.559
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.32-dev
   
  +  *) apxs: LTFLAGS envvar can override default libtool options.  Try
  +     "LTFLAGS=' ' apxs -c mod_foo.c" to see what libtool does under
  +     the covers.  [Jeff Trawick]
  +
     *) The Location: response header field, used for external
        redirect, *must* be an absoluteURI.  The Redirect directive
        tested for that, but RedirectMatch didn't -- it would allow
  
  
  
  1.34      +4 -2      httpd-2.0/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- apxs.in	22 Dec 2001 04:17:56 -0000	1.33
  +++ apxs.in	1 Feb 2002 19:25:14 -0000	1.34
  @@ -80,6 +80,8 @@
   my $CFG_LIBEXECDIR = eval qq("$libexecdir");
   my $sbindir        = get_vars("sbindir");
   my $CFG_SBINDIR    = eval qq("$sbindir");
  +my $ltflags        = $ENV{'LTFLAGS'};
  +$ltflags or $ltflags = "--silent";
   
   my %internal_vars = map {$_ => 1}
       qw(TARGET CC CFLAGS CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB
  @@ -412,7 +414,7 @@
           $la =~ s|\.c$|.la|;
           my $o = $s;
           $o =~ s|\.c$|.o|;
  -        push(@cmds, "$prefix/build/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
  +        push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
           unshift(@objs, $lo);
       }
   
  @@ -437,7 +439,7 @@
           $opt .= " -l$opt_l";
       }
   
  -    push(@cmds, "$prefix/build/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
  +    push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
   
       #   execute the commands
       &execute_cmds(@cmds);