Update libtool

[nagiosplug.git] / tools / tinderbox_build

diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index 416f926c74489dd3b7b054cb96b563bd68de5244..12528d9ba400ee8203f58365ba6508243de6b9e9 100755 (executable)
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
@@ -234,11 +234,11 @@ sub SetupPath {
     $Path = $ENV{PATH};
     print "Path before: $Path\n";
 
-# Any reason for this? This make use of Sun make which cannot handle the
-# optional makefile include used for Git versioning.
-#    if ( $OS eq 'SunOS' ) {
-#      $ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
-#    }
+    # Don't alter path if we're building off a repository tree;
+    # SunOS make will be used only for snapshots and releases.
+    if ( $OS eq 'SunOS' && !( -e '.svn' || -e '.git' )) {
+        $ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
+    }
 
     $Path = $ENV{PATH};
     print "Path After: $Path\n";
@@ -246,8 +246,8 @@ sub SetupPath {
 
 sub configure {
        # Configure
-        print LOG "./configure $ConfigureArgs\n";
-        open (CONFIGURE, "./configure $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
+        print LOG "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1\n";
+        open (CONFIGURE, "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
         while (<CONFIGURE>) {
             print $_;
             print LOG $_;
@@ -270,8 +270,8 @@ sub make {
 
 sub maketest {
         # Tests
-        print LOG "LANG=C make test 2>&1\n";
-        open( MAKE, "LANG=C make test && make install DESTDIR=$TmpDir/tinderbox_build.$$ && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
+        print LOG "LANG=C make test 2>&1 && make install DESTDIR=$TmpDir/tinderbox_build.$$ 2>&1 && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1\n";
+        open( MAKE, "LANG=C make test 2>&1 && make install DESTDIR=$TmpDir/tinderbox_build.$$ 2>&1 && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
        while ( <MAKE> ) {
                print $_;
                print LOG $_;