diff --git a/INSTALL b/INSTALL index 007e939..6e90e07 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/include/pcp/config.h.in b/include/pcp/config.h.in index c0093b6..6a08a31 100644 --- a/include/pcp/config.h.in +++ b/include/pcp/config.h.in @@ -158,6 +158,9 @@ */ #undef LT_OBJDIR +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #undef PACKAGE diff --git a/tests/unittests.cfg b/tests/unittests.cfg index 389c1e1..1ffdfc6 100755 --- a/tests/unittests.cfg +++ b/tests/unittests.cfg @@ -330,7 +330,7 @@ temporarily disabled cmd = $pcp -V vb -c -d -I testsig -x b - expect = /Unittests.*Verified/s + expect = /Verified/s # diff --git a/tests/unittests.pl b/tests/unittests.pl index b86ba38..1e642ae 100755 --- a/tests/unittests.pl +++ b/tests/unittests.pl @@ -23,7 +23,7 @@ use lib qw(lib); BEGIN { eval { - use IPC::Run qw( run timeout); + require IPC::Run; }; }; @@ -221,7 +221,7 @@ sub run3 { else { @c = split /\s\s*/, $cmd; } - my $ret = run \@c, \$input, \$o, \$e, timeout( $timeout ); + my $ret = IPC::Run::run( \@c, \$input, \$o, \$e, IPC::Run::timeout( $timeout )); $$output = $o; $$error = $e; return ret;