]>
Commit | Line | Data |
---|---|---|
1f094160 ER |
1 | --- httpd-2.2.0/support/apxs.in.save 2005-06-10 12:18:14.000000000 +0300 |
2 | +++ httpd-2.2.0/support/apxs.in 2006-01-02 15:08:43.000000000 +0200 | |
3 | @@ -44,6 +44,7 @@ | |
4 | my $CFG_CC = get_vars("CC"); | |
5 | my $libexecdir = get_vars("libexecdir"); | |
6 | my $CFG_LIBEXECDIR = eval qq("$libexecdir"); | |
7 | +my $CFG_DESTDIR = ''; | |
8 | my $sbindir = get_vars("sbindir"); | |
9 | my $CFG_SBINDIR = eval qq("$sbindir"); | |
10 | my $ltflags = $ENV{'LTFLAGS'}; | |
11 | @@ -171,7 +172,7 @@ | |
12 | my ($val) = $2; | |
13 | my $oldval = eval "\$CFG_$var"; | |
14 | ||
15 | - unless ($var and $oldval) { | |
16 | + unless ($var and defined $oldval) { | |
17 | print STDERR "apxs:Error: no config variable $var\n"; | |
18 | &usage; | |
19 | } | |
20 | @@ -199,11 +200,10 @@ | |
da3e4a09 | 21 | ($httpd = $0) =~ s:support/apxs$::; |
1fa08c1b | 22 | } |
23 | ||
da3e4a09 JB |
24 | -unless (-x "$httpd") { |
25 | - error("$httpd not found or not executable"); | |
26 | - exit 1; | |
27 | +if (not -x "$httpd") { | |
28 | + print STDERR "Note: $httpd not found or not executable.\n"; | |
29 | } | |
30 | - | |
31 | +else { | |
32 | unless (grep /mod_so/, `. $envvars && $httpd -l`) { | |
33 | error("Sorry, no shared object support for Apache"); | |
34 | error("available under your platform. Make sure"); | |
1f094160 | 35 | @@ -211,7 +211,7 @@ |
da3e4a09 JB |
36 | error("your server binary `$httpd'."); |
37 | exit 1; | |
38 | } | |
39 | - | |
40 | +} | |
41 | sub get_config_vars{ | |
42 | my ($file, $rh_config) = @_; | |
1fa08c1b | 43 | |
1f094160 | 44 | @@ -479,8 +479,8 @@ |
85f276f0 ER |
45 | $t =~ s|\.[^./\\]+$|\.so|; |
46 | if ($opt_i) { | |
47 | push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" . | |
48 | - "$libtool' $f $CFG_LIBEXECDIR"); | |
49 | - push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); | |
1f094160 ER |
50 | + "$libtool' $f $CFG_DESTDIR$CFG_LIBEXECDIR"); |
51 | + push(@cmds, "chmod 755 $CFG_DESTDIR$CFG_LIBEXECDIR/$t"); | |
85f276f0 ER |
52 | } |
53 | ||
54 | # determine module symbolname and filename |