[SCM] GNU Libtool branch, master, updated. v2.4.2-70-g6beb202

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  6beb2026137c9731f2734a5ef8f644ea23e91233 (commit)
       via  d2be6922339775ceb8a18922a88386518a1f47df (commit)
       via  65f9e9a2e5b1005ef949da3510bad4d582cee9d5 (commit)
       via  0f5df1ceef1653a0c9a86edcb277a6a4c99d9364 (commit)
      from  e73a3b080bd498c2d87314abffe0a5239b676b93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6beb2026137c9731f2734a5ef8f644ea23e91233
Author: Gary V. Vaughan <address@hidden>
Date:   Wed Nov 9 16:14:13 2011 +0700

    libtoolize: refactor $opt_quiet, func_echo and func_echo_once.
    
    Instead of long sequences checking for setting of $opt_quiet,
    followed by one or more func_echo variations, add and use a new
    function func_whisper - the complement of func_verbose.
    * libtoolize.m4sh (func_whisper): New function. Adjust all
    callers previously using `$opt_quiet || func_echo ...'.
    (func_whisper_once): Ditto, for `$opt_quiet || func_echo_once
    ...'.
    (func_whisper_hdr): New function, adjust all callers previously
    using `func_whisper_once ...; func_whisper ...'.
    (func_whisper_error_header): Ditto, but calling func_error.
    (func_echo_once): Remove.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit d2be6922339775ceb8a18922a88386518a1f47df
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Nov 10 12:27:34 2011 +0700

    libtoolize: update a bit-rotted comment.
    
    * libtoolize (func_copy_cb): Since this comment was written, the
    function has been changed to timestamp files as it copies.
    Update the comment to reflect that.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 65f9e9a2e5b1005ef949da3510bad4d582cee9d5
Author: Gary V. Vaughan <address@hidden>
Date:   Mon Nov 14 17:15:39 2011 +0700

    general.m4sh: relative path to the same directory is `.'.
    
    * general.m4sh (func_relative_path): We sometimes want to use
    the result of this function directly, rather than purely as a
    prefix, so we need to return `.' when both directories end up at
    the same location.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 0f5df1ceef1653a0c9a86edcb277a6a4c99d9364
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Nov 11 10:06:20 2011 +0700

    ltmain.sh: append relative path trailing slashes explicitly.
    
    In addition to being more idiomatic, and hence minimising
    suprises, seeing the slash written explicity when appending to
    the result of a relative path calculation is a lot more
    readable.
    * libltdl/config/general.m4sh (func_relative_path): Don't append
    an implicit trailing slash...
    * libltdl/config/ltmain.m4sh (func_mode_link): ...write it
    explicitly at the time of use.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 libltdl/config/general.m4sh |   12 ++---
 libltdl/config/ltmain.m4sh  |    2 +-
 libtoolize.m4sh             |   91 +++++++++++++++++++++++++++++--------------
 3 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index 40d5413..b6e3d41 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -221,9 +221,7 @@ func_normal_abspath ()
 }
 
 # func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
+# generates a relative path from SRCDIR to DSTDIR.
 #             value returned in "$func_relative_path_result"
 func_relative_path ()
 {
@@ -273,13 +271,13 @@ func_relative_path ()
     
func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
   fi
 
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
+  # Normalisation. If bindir is libdir, return `.' else relative path.
   if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
+    func_stripname './' '' "$func_relative_path_result"
     func_relative_path_result=$func_stripname_result
   fi
+
+  test -n "$func_relative_path_result" || func_relative_path_result=.
 }
 
 # The name of this program:
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index ca67c8a..24491a9 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -8621,7 +8621,7 @@ EOF
              if test "x$bindir" != x ;
              then
                func_relative_path "$install_libdir" "$bindir"
-               tdlname=$func_relative_path_result$dlname
+               tdlname=$func_relative_path_result/$dlname
              else
                # Otherwise fall back on heuristic.
                tdlname=../bin/$dlname
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 9299a8c..c920248 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -157,10 +157,19 @@ M4SH_GETOPTS(
 
 
 M4SH_VERBATIM([[
-# func_echo_once msg_var
-# Calls func_echo with the value of MSG_VAR, and then sets MSG_VAR="" so
-# that subsequent calls have no effect.
-func_echo_once ()
+# func_whisper arg...
+# Echo program name prefixed message unless $opt_quiet was given.
+func_whisper ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+}
+
+# func_whisper_once msg_var
+# Call func_whisper with the value of MSG_VAR, and then set MSG_VAR="" so
+# that subsequent calls will have no effect.
+func_whisper_once ()
 {
     $debug_cmd
 
@@ -168,13 +177,43 @@ func_echo_once ()
       eval my_msg=\$$1
 
       if test -n "$my_msg"; then
-        func_echo "$my_msg"
+        func_whisper "$my_msg"
         eval $1=""
       fi
     fi
 }
 
 
+# func_whisper_hdr msg_var arg...
+# With at least 1 non-empty ARG, call func_whisper_once with MSG_VAR,
+# and then func_whisper with the remaining arguments.
+func_whisper_hdr ()
+{
+    $debug_cmd
+
+    my_msg_var=$1; shift
+    test -n "$*" || return
+
+    func_whisper_once "$my_msg_var"
+    func_whisper "$*"
+}
+
+
+# func_whisper_error_hdr msg_var arg...
+# Much the same as func_whisper_header, but for (non-fatal) error
+# messages.
+func_whisper_error_hdr ()
+{
+    $debug_cmd
+
+    my_msg_var=$1; shift
+    test -n "$*" || return
+
+    func_whisper_once "$my_msg_var"
+    func_error "$*"
+}
+
+
 # func_copy srcfile destfile [msg_var]
 # A wrapper for func_copy_cb that accepts arguments in the same order
 # as the cp(1) shell command.
@@ -213,9 +252,10 @@ func_copy ()
 
 
 # func_copy_cb filename srcdir destdir [msg_var]
-# If option `--copy' was specified, or soft-linking SRCFILE to DESTFILE fails,
-# then try to copy SRCFILE to DESTFILE (without changing the timestamp if
-# possible).
+# If option `--copy' was specified, or soft-linking SRCFILE to DESTFILE
+# fails, then try to copy SRCFILE to DESTFILE (making sure to update the
+# timestamp so that a series of files with dependencies can be copied
+# in the right order that their timestamps won't trigger rebuilds).
 func_copy_cb ()
 {
     $debug_cmd
@@ -241,8 +281,7 @@ func_copy_cb ()
       if { ( cd "$my_srcdir" && $TAR chf - "$my_file" ) 2>/dev/null \
            | ( umask 0 && cd "$my_destdir" && $TAR xf - ) >/dev/null 2>&1; } \
         && touch "$my_destdir/$my_file"; then
-       $opt_quiet || func_echo_once "$my_msg_var"
-       $opt_quiet || func_echo "copying $my_copy_msg"
+       func_whisper_hdr "$my_msg_var" "copying $my_copy_msg"
        copy_return_status=0
       fi
     else
@@ -250,21 +289,19 @@ func_copy_cb ()
        if { ( cd "$my_srcdir" && $TAR chf - "$my_file" ) 2>/dev/null \
             | ( umask 0 && cd "$my_destdir" && $TAR xf - ) >/dev/null 2>&1 ; }
        then
-         $opt_quiet || func_echo_once "$my_msg_var"
-         $opt_quiet || func_echo "copying $my_copy_msg"
+         func_whisper_hdr "$my_msg_var" "copying $my_copy_msg"
          copy_return_status=0
        fi
       else
        if $LN_S "$my_srcdir/$my_file" "$my_destdir/$my_file"; then
-         $opt_quiet || func_echo_once "$my_msg_var"
-         $opt_quiet || func_echo "linking $my_copy_msg"
+         func_whisper_hdr "$my_msg_var" "linking $my_copy_msg"
          copy_return_status=0
        fi
       fi
     fi
     if test "$copy_return_status" != 0; then
-      $opt_quiet || func_echo_once "$my_msg_var"
-      func_error "can not copy \`$my_srcdir/$my_file' to \`$my_destdir/'"
+      func_whisper_error_hdr "$my_msg_var" \
+          "can not copy \`$my_srcdir/$my_file' to \`$my_destdir/'"
       exit_status=$EXIT_FAILURE
     fi
 }
@@ -287,15 +324,14 @@ func_copy_some_files ()
       if test -f "$my_srcdir/$my_filename"; then
         if test "X$my_copy_cb" = Xfunc_copy_cb; then
          $opt_force || if test -f "$my_destdir/$my_filename"; then
-           $opt_quiet || func_echo_once "$my_msg_var"
-           $opt_quiet \
-             || func_error "\`$my_destdir/$my_filename' exists: use \`--force' 
to overwrite"
+           func_whisper_error_hdr "$my_msg_var" \
+             "\`$my_destdir/$my_filename' exists: use \`--force' to overwrite"
            continue
          fi
         fi
       else
-       func_echo_once "$my_msg_var"
-       func_fatal_error "\`$my_filename' not found in \`$my_srcdir'"
+       func_whisper_error_hdr "$my_msg_var" \
+         "\`$my_filename' not found in \`$my_srcdir'"
       fi
 
       $my_copy_cb "$my_filename" "$my_srcdir" "$my_destdir" "$my_msg_var"
@@ -345,7 +381,7 @@ func_fixup_Makefile ()
     esac
 
     $RM "$my_destdir/$my_filename" 2>/dev/null
-    $opt_quiet || func_echo "creating file \`$my_destdir/$my_filename'"
+    func_whisper "creating file \`$my_destdir/$my_filename'"
     if $opt_dry_run; then :;
     else
       $SED "$my_fixup_non_subpackage_script
@@ -614,9 +650,7 @@ func_serial_update ()
       func_copy "$my_srcfile" "$my_destfile" "$my_msg_var"
       my_return_status=$?
     elif $opt_force && test "X$my_dest_serial" = "X$my_src_serial"; then
-      $opt_quiet || func_echo_once "$my_msg_var"
-      $opt_quiet \
-        || func_echo "\`$my_destfile' is already up to date."
+      func_whisper_hdr "$my_msg_var" "\`$my_destfile' is already up to date."
     fi
 
     # Do this after the copy for hand maintained `aclocal.m4', incase
@@ -637,8 +671,8 @@ func_serial_update ()
           func_serial_max \
               "$my_src_serial" `func_serial aclocal.m4 "$my_macro_regex"`
           if test "X$my_src_serial" = "X$func_serial_max_result"; then
-              func_echo_once "$my_msg_var"
-             func_echo "You should add the contents of \`$my_destfile' to 
\`aclocal.m4'."
+             func_whisper_hdr "$my_msg_var" \
+                "You should add the contents of \`$my_destfile' to 
\`aclocal.m4'."
           fi
         fi
         ;;
@@ -687,8 +721,7 @@ func_keyword_update ()
     if $my_keyword_update_p || $opt_force; then
       func_copy "$my_srcfile" "$my_destfile" "$my_msg_var"
     elif $opt_verbose || $opt_force && test "X$my_dest_serial" = 
"X$my_src_serial"; then
-      func_echo_once "$my_msg_var"
-      func_echo "\`$my_destfile' is already up to date."
+      func_whisper_hdr "$my_msg_var" "\`$my_destfile' is already up to date."
     fi
 }
 


hooks/post-receive
-- 
GNU Libtool