Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 23 Sep 2001 18:01:15 -0000
Message-ID: <20010923180115.25724.qmail@icarus.apache.org>
From: jerenkrantz@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/support apxs.in

jerenkrantz    01/09/23 11:01:15

  Modified:    support  apxs.in
  Log:
  We need to use the APR-generated libtool for building modules.
  
  Revision  Changes    Path
  1.28      +3 -3      httpd-2.0/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- apxs.in	2001/09/06 15:31:09	1.27
  +++ apxs.in	2001/09/23 18:01:15	1.28
  @@ -412,7 +412,7 @@
           $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 @@
           $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 @@
           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");
           }