# HG changeset patch
# User Rik <rik@octave.org>
# Date 1405311947 25200
# Node ID c4def7ab39e79fbb76ce50c379a3e6d5223b5806
# Parent  ab7d81d5fbdf4fe898d94090b52943c4dac43cc8# Parent  2c1e8de41649bee0cb5ab748f52d49573ec6383d
maint: Periodic merge of gui-release to default.

diff -r ab7d81d5fbdf -r c4def7ab39e7 Makefile.am
diff -r ab7d81d5fbdf -r c4def7ab39e7 configure.ac
diff -r ab7d81d5fbdf -r c4def7ab39e7 src/mkoctfile.in.cc
--- a/src/mkoctfile.in.cc	Sun Jul 13 19:46:57 2014 -0700
+++ b/src/mkoctfile.in.cc	Sun Jul 13 21:25:47 2014 -0700
@@ -648,7 +648,7 @@
       return 0;
     }
 
-  for (it = f77files.begin (); it != f77files.end (); ++it)
+  for (it = f77files.begin (); it != f77files.end () && !result; ++it)
     {
       std::string f = *it, b = basename (f, true);
       if (!vars["F77"].empty ())
@@ -677,7 +677,7 @@
         }
     }
 
-  for (it = cfiles.begin (); it != cfiles.end (); ++it)
+  for (it = cfiles.begin (); it != cfiles.end () && !result; ++it)
     {
       std::string f = *it;
       if (!vars["CC"].empty ())
@@ -707,7 +707,7 @@
         }
     }
 
-  for (it = ccfiles.begin (); it != ccfiles.end (); ++it)
+  for (it = ccfiles.begin (); it != ccfiles.end () && !result; ++it)
     {
       std::string f = *it;
       if (!vars["CXX"].empty ())
@@ -737,7 +737,7 @@
         }
     }
 
-  if (link && !objfiles.empty ())
+  if (link && !objfiles.empty () && !result)
     {
       if (link_stand_alone)
         {