casa-mp-base

--- a/support/apxs.in   2013-08-30 10:36:39.000000000 -0700

+++ b/support/apxs.in   2013-08-30 10:37:05.000000000 -0700

@@ -219,7 +219,7 @@

                 ? $config_vars{$arg}

                 : $config_vars{lc $arg};

             $val =~ s/[()]//g;

-            $result .= eval "qq($val)" if defined $val;

+            $result  = eval "qq($val)" if defined $val;

             $result .= ";;";

             $ok = 1;

         }

@@ -227,7 +227,7 @@

             if (exists $internal_vars{$arg} or exists $internal_vars{lc $arg}) {

                 my $val = exists $internal_vars{$arg} ? $arg : lc $arg;

                 $val = eval "\$CFG_$val";

-                $result .= eval "qq($val)" if defined $val;

+                $result  = eval "qq($val)" if defined $val;

                 $result .= ";;";

                 $ok = 1;

             }

@@ -428,7 +428,7 @@

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

         my $o = $s;

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

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

+        push(@cmds, "$libtool $ltflags --mode=compile --tag=CC $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");

         unshift(@objs, $lo);

     }

@@ -469,7 +469,7 @@

         $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";

     }

-    push(@cmds, "$libtool $ltflags --mode=link $CFG_CC $ldflags -o $dso_file $opt $lo");

+    push(@cmds, "$libtool $ltflags --mode=link --tag=CC $CFG_CC $ldflags -o $dso_file $opt $lo");

     #   execute the commands

     &execute_cmds(@cmds);