Commit f7c853a5 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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
parent e9c76e91

support/apxs.in

+17 −3
Original line number Diff line number Diff line
@@ -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
@@ -248,11 +250,23 @@ sub get_vars { 
                last;

            }

        }

        if (not $ok) {

            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|;;$||;

    $result =~ s|:| |;

    return("$result");
@@ -320,7 +334,7 @@ if ($opt_q) { 
    ##  QUERY INFORMATION 

    ##

    my $result = get_vars(@args);

    print "$result\n";

    print "$result";

}



if ($opt_c) {