head 1.3; access; symbols; locks; strict; comment @# @; 1.3 date 2009.11.21.09.40.03; author rse; state Exp; branches; next 1.2; commitid Idb8FLX8pgOqUmcu; 1.2 date 2009.11.18.19.37.45; author rse; state Exp; branches; next 1.1; commitid RsXCAQIyueVsj2cu; 1.1 date 2009.11.15.10.36.53; author rse; state Exp; branches; next ; commitid 23VxIjC47FpTpBbu; desc @@ 1.3 log @modifying package: mm-1.4.2 20091118 -> 20091121 @ text @Index: IPC-MMA-0.59009/Makefile.PL --- IPC-MMA-0.59009/Makefile.PL.orig 2009-11-20 04:49:26 +0100 +++ IPC-MMA-0.59009/Makefile.PL 2009-11-21 10:20:35 +0100 @@@@ -5,31 +5,8 @@@@ use Config; use ExtUtils::MakeMaker; -my $binpath = 'mm-config'; -if (system "which $binpath>/dev/null") { - - # mm-config is not in PATH, but maybe it's installed outside PATH - print "$binpath not in PATH: trying to find it...\n"; - my $found; - DIR: for ('/usr', glob("~")) { - my $result = `find $_ -maxdepth 6 -name "$binpath" 2>/dev/null`; - while ($result =~ m"^(\S*?/$binpath)$"mg) { - if ($found = -X $1) {$binpath = $1; last DIR} - } } - if (!$found) { - print "IPC::MMA requires the mm library, including its $binpath utility\n"; - $binpath = prompt("Please enter path to $binpath (or just return to quit):"); - chomp $binpath; - $binpath =~ s"(.)(/(mm-config)?)?$"$1/mm-config"; - - if (!$binpath || !-e $binpath || !-X $binpath) { - if ($binpath) {warn "'$binpath' not found or not executable\n"} - warn "The mm library is available at http://www.ossp.org/pkg/lib/mm/\n"; - exit 0; -} } } -# mm-config provides parameters to link with the mm library -my $cflags = `$binpath --cflags`; -my $libs = `$binpath --ldflags --libs`; +my $cflags = "-I.."; +my $libs = "-L../.libs -lmm"; chomp ($cflags, $libs); my @@optional = (); my $errwarn = qr/(^|\b)(warning|error)(\b|$)/im; @ 1.2 log @modifying package: mm-1.4.2 20091115 -> 20091118 @ text @d1 3 a3 3 Index: IPC-MMA-0.59007/Makefile.PL --- IPC-MMA-0.59007/Makefile.PL.orig 2009-11-17 17:07:28 +0100 +++ IPC-MMA-0.59007/Makefile.PL 2009-11-18 20:35:10 +0100 d36 2 a37 7 # test cc optimize by size (OK in gcc, possibly others) @@@@ -64,3 +41,4 @@@@ 'Time::HiRes' =>0}, 'VERSION_FROM' => 'MMA.pm', # finds $VERSION @@moreStuff); + @ 1.1 log @modifying package: mm-1.4.2 20091105 -> 20091115 @ text @d1 4 a4 4 Index: IPC-MMA-0.59005/Makefile.PL --- IPC-MMA-0.59005/Makefile.PL.orig 2009-11-15 11:31:02 +0100 +++ IPC-MMA-0.59005/Makefile.PL 2009-11-15 11:33:14 +0100 @@@@ -3,31 +3,8 @@@@ d35 1 a35 1 chomp $cflags, $libs; d38 3 a40 3 @@@@ -54,3 +31,4 @@@@ 'PREREQ_PM' => {'Test::Warn'=>'0.11', 'ExtUtils::ParseXS'=>'2.200401'}, 'VERSION_FROM' => 'MMA.pm', # finds $VERSION @