More fixes for APXS. APXS now works with httpd-test again

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

1 files changed, 17 insertions, 3 deletions

diff --git a/support/apxs.in b/support/apxs.in
index 40299ef357..0315be4933 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -72,6 +72,8 @@ my $CFG_INCLUDEDIR = eval qq("$includedir");
 my $CFG_CC         = get_vars("CC");
 my $libexecdir     = get_vars("libexecdir");
 my $CFG_LIBEXECDIR = eval qq("$libexecdir");
+my $bindir        = get_vars("bindir");
+my $CFG_SBINDIR    = eval qq("$bindir");
 
 ##
 ##  parse argument line
@@ -249,8 +251,20 @@ sub get_vars {
             }
         }
         if (not $ok) {
-            printf(STDERR "apxs:Error: Invalid query string `%s'\n", $arg);
-            exit(1);
+            foreach $name (qw(
+                TARGET CC CFLAGS CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB
+                PREFIX SBINDIR INCLUDEDIR LIBEXECDIR SYSCONFDIR
+                )) {
+                if ($arg eq $name or $arg eq lc($name)) {
+                    my $val = eval "\$CFG_$name";
+                    $result .= eval qq("${val}") . ";;";
+                    $ok = 1;
+                }
+            }
+            if (not $ok) {
+                printf(STDERR "apxs:Error: Invalid query string `%s'\n", $arg);
+                exit(1);
+            }
         }
     }
     $result =~ s|;;$||;
@@ -320,7 +334,7 @@ if ($opt_q) {
     ##  QUERY INFORMATION 
     ##
     my $result = get_vars(@args);
-    print "$result\n";
+    print "$result";
 }
 
 if ($opt_c) {