httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/support apxs.in
Date Fri, 04 Apr 2003 19:04:22 GMT
trawick     2003/04/04 11:04:22

  Modified:    support  apxs.in
  Log:
  run libtool from the apr install directory (in case that is different
  from the apache install directory)
  
  further changes are needed to automatically pick up apr and apr-util
  include directories; for now, "-Wc,-I/path" needs to be added to the
  apxs -c invocation to work around that problem
  
  Revision  Changes    Path
  1.54      +14 -10    httpd-2.0/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- apxs.in	19 Feb 2003 14:39:39 -0000	1.53
  +++ apxs.in	4 Apr 2003 19:04:21 -0000	1.54
  @@ -362,6 +362,17 @@
       print "$result\n";
   }
   
  +my $apr_bindir = get_vars("APR_BINDIR");
  +
  +if (! -x "$apr_bindir/apr-config") {
  +    error("$apr_bindir/apr-config not found!");
  +    exit(1);
  +}
  +
  +my $libtool = `$apr_bindir/apr-config --installbuilddir`;
  +chomp($libtool);
  +$libtool = "$libtool/libtool";
  +
   if ($opt_c) {
       ##
       ##  SHARED OBJECT COMPILATION
  @@ -424,7 +435,7 @@
           $la =~ s|\.c$|.la|;
           my $o = $s;
           $o =~ s|\.c$|.o|;
  -        push(@cmds, "$installbuilddir/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR
$opt -c -o $lo $s && touch $slo");
  +        push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR
$opt -c -o $lo $s && touch $slo");
           unshift(@objs, $lo);
       }
   
  @@ -449,13 +460,6 @@
           $opt .= " -l$opt_l";
       }
   
  -    my $apr_bindir = get_vars("APR_BINDIR");
  -
  -    if (! -x "$apr_bindir/apr-config") {
  -        error("$apr_bindir/apr-config not found!");
  -        exit(1);
  -    }
  -
       if ($opt_p == 1) {
           my $apu_bindir = get_vars("APU_BINDIR");
   
  @@ -477,7 +481,7 @@
           $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
       }
   
  -    push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt
$lo");
  +    push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
   
       #   execute the commands
       &execute_cmds(@cmds);
  @@ -508,7 +512,7 @@
           $t =~ s|\.la$|\.so|;
           if ($opt_i) {
   	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
  -                 "$installbuilddir/libtool' $f $CFG_LIBEXECDIR");
  +                 "$libtool' $f $CFG_LIBEXECDIR");
   	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
           }
   
  
  
  

Mime
View raw message