Commit 83e517bf authored by Graham Leggett's avatar Graham Leggett
Browse files

apxs: fix handling of -Wc/-Wl and "-o mod_foo.so". 

PR:	31448
Obtained from:
Submitted by:	jorton
Reviewed by:	jorton, jerenkrantz, pquerna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@105564 13f79535-47bb-0310-9956-ffa450edef68
parent 2a026c19

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.53













  *) apxs: fix handling of -Wc/-Wl and "-o mod_foo.so". PR 31448













     [Joe Orton]



























  *) mod_ldap: Fix format strings to use %APR_PID_T_FMT instead of %d.















     [Jeff Trawick]















 

































STATUS



+1
−6






























Original line number
Diff line number
Diff line















APACHE 2.0 STATUS:                                              -*-text-*-













Last modified at [$Date: 2004/10/23 14:11:48 $]













Last modified at [$Date: 2004/10/23 14:25:24 $]































Release:


























@@ -103,11 +103,6 @@ PATCHES TO BACKPORT FROM 2.1













       PR 24437















       +1: minfrin





























    *) apxs: fix handling of -Wc/-Wl and "-o mod_foo.so".













         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/support/apxs.in?r1=1.62&r2=1.64













       PR: 31448













       +1: jorton, jerenkrantz, pquerna





























    *) Fix ap_save_brigade's handling of ENOTIMPL setaside functions.















         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/util_filter.c?r1=1.100&r2=1.101















       PR: 31247

































support/apxs.in



+4
−6






























Original line number
Diff line number
Diff line








@@ -376,11 +376,12 @@ if ($opt_c) {













            $dso_file =~ s|\.[^.]+$|.la|;















        }















        else {













            $dso_file = "mod_unknown.so";













            $dso_file = "mod_unknown.la";















        }















    }















    else {















        $dso_file = $opt_o;













        $dso_file =~ s|\.[^.]+$|.la|;















    }































    #   create compilation commands










@@ -419,12 +420,9 @@ if ($opt_c) {













        $lo .= " $o";















    }















    my ($opt_Wl, $opt_L, $opt_l);













    $opt = '';















    foreach $opt_Wl (@opt_W) {













        if ($CFG_CC !~ m/gcc$/) {















        $opt .= "$1 " if ($opt_Wl =~ m|^\s*l,(.*)$|);













        } else {













            $opt .= " -W$opt_Wl";













        }















    }















    foreach $opt_L (@opt_L) {















        $opt .= " -L$opt_L";