From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 16 Jun 2010 04:03:27 +0000 (+0200)
Subject: Optimize func_ltwrapper_scriptname to assume a cwrapper.
X-Git-Tag: v2.4~148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d3ac408c863b1110ce7782d44c80b24f24111f1;p=thirdparty%2Flibtool.git

Optimize func_ltwrapper_scriptname to assume a cwrapper.

* libltdl/config/ltmain.m4sh (func_ltwrapper_scriptname): Do not
call func_ltwrapper_executable_p again here, this function is
documented to allow being called with wrapper executables.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index cc1144555..a5676efc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Optimize func_ltwrapper_scriptname to assume a cwrapper.
+	* libltdl/config/ltmain.m4sh (func_ltwrapper_scriptname): Do not
+	call func_ltwrapper_executable_p again here, this function is
+	documented to allow being called with wrapper executables.
+
 	Fix bootstrap script to cope with changed AC_INIT arguments.
 	* bootstrap: When extracting PACKAGE and VERSION from AC_INIT
 	arguments, be sure to remove a 'GNU ' prefix and lowercase the
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 99784b416..acb6e25eb 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -516,12 +516,9 @@ func_ltwrapper_executable_p ()
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 }
 
 # func_ltwrapper_p file