diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-04-05 14:21:38 -0500 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-04-07 14:34:59 +0200 |
| commit | b8f27e21e58f8d5f341a198bce8ccb3ad71eed84 (patch) | |
| tree | 370e2e9aff27ef394a6dc643167edb83d2411d63 /autogen.sh | |
| parent | c0b9fdfbbaa46e984dbe6ea9e7f5adc943b9f248 (diff) | |
fix the autogen perl wrapper: mishandling of the Darwins-pecific aclocal
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 7 |
1 files changed, 4 insertions, 3 deletions
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"; |