1 --- httpd-2.2.3/support/apxs.in-orig 2006-11-01 00:59:27.000000000 +0100
2 +++ httpd-2.2.3/support/apxs.in 2006-11-01 00:59:54.000000000 +0100
4 my $exec_prefix = get_vars("exec_prefix");
5 my $datadir = get_vars("datadir");
6 my $localstatedir = get_vars("localstatedir");
7 +my $libdir = get_vars("libdir");
8 my $CFG_TARGET = get_vars("progname");
9 my $CFG_SYSCONFDIR = get_vars("sysconfdir");
10 my $CFG_CFLAGS = join ' ', map { get_vars($_) }
12 my $CFG_CC = get_vars("CC");
13 my $libexecdir = get_vars("libexecdir");
14 my $CFG_LIBEXECDIR = eval qq("$libexecdir");
15 +my $CFG_DESTDIR = '';
16 my $sbindir = get_vars("sbindir");
17 my $CFG_SBINDIR = eval qq("$sbindir");
18 my $ltflags = $ENV{'LTFLAGS'};
21 my $oldval = eval "\$CFG_$var";
23 - unless ($var and $oldval) {
24 + unless ($var and defined $oldval) {
25 print STDERR "apxs:Error: no config variable $var\n";
29 ($httpd = $0) =~ s:support/apxs$::;
32 -unless (-x "$httpd") {
33 - error("$httpd not found or not executable");
35 +if (not -x "$httpd") {
36 + print STDERR "Note: $httpd not found or not executable.\n";
40 unless (grep /mod_so/, `. $envvars && $httpd -l`) {
41 error("Sorry, no shared object support for Apache");
42 error("available under your platform. Make sure");
44 error("your server binary `$httpd'.");
50 my ($file, $rh_config) = @_;
53 $t =~ s|\.[^./\\]+$|\.so|;
55 push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
56 - "$libtool' $f $CFG_LIBEXECDIR");
57 - push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
58 + "$libtool' $f $CFG_DESTDIR$CFG_LIBEXECDIR");
59 + push(@cmds, "chmod 755 $CFG_DESTDIR$CFG_LIBEXECDIR/$t");
62 # determine module symbolname and filename