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
4 my $CFG_CC = get_vars("CC");
5 my $libexecdir = get_vars("libexecdir");
6 my $CFG_LIBEXECDIR = eval qq("$libexecdir");
8 my $sbindir = get_vars("sbindir");
9 my $CFG_SBINDIR = eval qq("$sbindir");
10 my $ltflags = $ENV{'LTFLAGS'};
13 my $oldval = eval "\$CFG_$var";
15 - unless ($var and $oldval) {
16 + unless ($var and defined $oldval) {
17 print STDERR "apxs:Error: no config variable $var\n";
21 ($httpd = $0) =~ s:support/apxs$::;
24 -unless (-x "$httpd") {
25 - error("$httpd not found or not executable");
27 +if (not -x "$httpd") {
28 + print STDERR "Note: $httpd not found or not executable.\n";
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");
36 error("your server binary `$httpd'.");
42 my ($file, $rh_config) = @_;
45 $t =~ s|\.[^./\\]+$|\.so|;
47 push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
48 - "$libtool' $f $CFG_LIBEXECDIR");
49 - push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
50 + "$libtool' $f $CFG_DESTDIR$CFG_LIBEXECDIR");
51 + push(@cmds, "chmod 755 $CFG_DESTDIR$CFG_LIBEXECDIR/$t");
54 # determine module symbolname and filename