Commit 7a60ad3a authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

We need to use the APR-generated libtool for building modules. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91118 13f79535-47bb-0310-9956-ffa450edef68
parent 1e623fd0

support/apxs.in

+3 −3
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ if ($opt_c) { 
        $la =~ s|\.c$|.la|;

        my $o = $s;

        $o =~ s|\.c$|.o|;

        push(@cmds, "libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");

        push(@cmds, "$prefix/build/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");

        unshift(@objs, $lo);

    }
@@ -437,7 +437,7 @@ if ($opt_c) { 
        $opt .= " -l$opt_l";

    }



    push(@cmds, "libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");

    push(@cmds, "$prefix/build/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");



    #   execute the commands

    &execute_cmds(@cmds);
@@ -467,7 +467,7 @@ if ($opt_i or $opt_e) { 
        my $t = $f;

        $t =~ s|^.+/([^/]+)$|$1|;

        if ($opt_i) {

	    push(@cmds, "libtool --mode=install cp $f $CFG_LIBEXECDIR/$t");

	    push(@cmds, "$prefix/build/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t");

	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");

        }