From b8f27e21e58f8d5f341a198bce8ccb3ad71eed84 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Tue, 5 Apr 2011 14:21:38 -0500 Subject: fix the autogen perl wrapper: mishandling of the Darwins-pecific aclocal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fridrich Štrba --- autogen.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index 1b26c9a74dc9..c83ad8c0b397 100755 --- a/autogen.sh +++ b/autogen.sh @@ -82,12 +82,13 @@ for my $arg (@cmdline_args) { system ("touch ChangeLog"); my $system = `uname -s`; +chomp $system; my $aclocal_flags = $ENV{ACLOCAL_FLAGS}; -$aclocal_flags = "-I ./m4/mac" if (!defined $aclocal_flags && $system eq 'Darwin'); -$aclocal_flags = "" if (!defined $aclocal_flags); -$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!$system eq 'Darwin'); +$aclocal_flags = "-I ./m4/mac" if (($aclocal_flags eq "") && ($system eq 'Darwin')); + +$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin')); system ("aclocal $aclocal_flags") && die "Failed to run aclocal"; system ("autoconf") && die "Failed to run autoconf"; -- cgit v1.2.3