[Libreoffice-commits] .: autogen.sh

[Norbert Thiebaud]

 autogen.sh |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ddfaa97ee9b0b79e9ec28ef2ef5940b34e61a399
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Apr 5 14:21:38 2011 -0500

    fix the autogen perl wrapper: mishandling of the Darwins-pecific aclocal

diff --git a/autogen.sh b/autogen.sh
index 726ba7a..c2eacd4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -68,12 +68,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";