From: Gary V. Vaughan <gary@gnu.org>
Date: Tue, 2 Oct 2012 12:31:49 +0000 (+0700)
Subject: libtool: simplify $skipped_export blocks
X-Git-Tag: v2.4.2.418~168^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0228e02d1ccced003b64c2c6efe13fc7cd793b5;p=thirdparty%2Flibtool.git

libtool: simplify $skipped_export blocks

* build-aux/ltmain.m4sh (func_mode_link): Save an if statement
with '$skipped_export && { block; }' instead of 'if $skipped_export;
then block; fi'.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh
index af26717f9..f4ca699b2 100644
--- a/build-aux/ltmain.m4sh
+++ b/build-aux/ltmain.m4sh
@@ -7668,7 +7668,7 @@ EOF
 	      output=
 	    fi
 
-	    if ${skipped_export-false}; then
+	    ${skipped_export-false} && {
 	      func_verbose "generating symbol list for \`$libname.la'"
 	      export_symbols=$output_objdir/$libname.exp
 	      $opt_dry_run || $RM $export_symbols
@@ -7679,7 +7679,7 @@ EOF
 	      if test -n "$last_robj"; then
 		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
-	    fi
+	    }
 
 	    test -n "$save_libobjs" &&
 	      func_verbose "creating a temporary reloadable object file: $output"
@@ -7713,7 +7713,7 @@ EOF
 	    fi
 	  fi
 
-          if ${skipped_export-false}; then
+          ${skipped_export-false} && {
 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	      tmp_export_symbols=$export_symbols
 	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
@@ -7733,7 +7733,7 @@ EOF
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
-	  fi
+	  }
 
 	  libobjs=$output
 	  # Restore the value of output.