apxs: Let the LTFLAGS environment variable override the default --silent flag.

Previously you had to edit the generated apxs to get rid of --silent.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93168 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 4462599482c035777c122780014f9927cd029f2e..2d1c2d9cc28556076c5371513ea7ddecebd5b700 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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

diff --git a/support/apxs.in b/support/apxs.in
index 3dfe83e8738a858d04f264ee545b88f9115f3fc2..8b805a9153c9a6b30c893df69133ed93bb4773d6 100644 (file)
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -80,6 +80,8 @@ my $libexecdir     = get_vars("libexecdir");
 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 @@ if ($opt_c) {
         $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 @@ if ($opt_c) {
         $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);