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 cc1144555321017c0c62f627eaf8c1cddf010cff..a5676efc43e8c4c2f33cd8eab49a0edd2d9844e1 100644 (file)
--- 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 99784b416fd8e8f394995b2c07c64b05fd3464fc..acb6e25ebc2f494666970d77c9d9bda19b3ac44c 100644 (file)
--- 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