libtool-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU Libtool branch, master, updated. v2.4.2-333-gb7679c7


From: Gary V. Vaughan
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2-333-gb7679c7
Date: Thu, 25 Oct 2012 12:15:58 +0000

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  b7679c7c564582cfb8bf8a88436d1cd58d6c384b (commit)
       via  5d7e7ec0e12144ff450ac822e096cb3047de7d9c (commit)
       via  cd74bb4527fb6618707b7d976299ba85428fab81 (commit)
       via  21538ee961ede123015d22c596313e83b2fd35c7 (commit)
       via  52870fc557b20a4d833c03fd59ac88733e7ef258 (commit)
      from  c478e3a0b7e64f4fcbc1b66cfb175b6cdd287277 (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 b7679c7c564582cfb8bf8a88436d1cd58d6c384b
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Oct 25 07:14:27 2012 -0500

    maint: fix missing command error in make dist.
    
    * Makefile.am ($(readme)): Don't forget the 'test'!
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 5d7e7ec0e12144ff450ac822e096cb3047de7d9c
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Oct 25 06:28:57 2012 -0500

    tests: fixup experr for addition whitespace in error prefix.
    
    Fix spurious test failures due to unmatched experr output.
    * tests/libtoolize.at, tests/old-ltdl-iface.at: Add the addition
    2 spaces now used to justify error prefixes.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit cd74bb4527fb6618707b7d976299ba85428fab81
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Oct 25 05:11:33 2012 -0500

    bootstrap: use of ';' in sed scripts is not portable.
    
    * gl/build-aux/bootstrap.in (require_buildreq_automake)
    (require_dotgitmodules_parameters, require_package)
    (func_update_po_files): Use '\n' or -e to separate sed commands,
    instead of ';'.
    * gl/build-aux/extract-trace (func_autoconf_configure)
    (func_extract_trace_first): Likewise.
    * gl/funclib.sh: Likewise.
    (func_tr_sh): Likewise.
    * gl/build-aux/options-parser (func_usage_message): Likewise.
    * bootstrap: Regenerate.
    Reported by Robert Boehne.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 21538ee961ede123015d22c596313e83b2fd35c7
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Oct 25 07:06:50 2012 -0500

    bootstrap: don't $tc_standout spaces, it's ugly!
    
    * gl/build-aux/funclib.sh (func_error): Move the prefix indent
    before $tc_standout to avoid bright red inverse spaces.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 52870fc557b20a4d833c03fd59ac88733e7ef258
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Oct 25 07:03:17 2012 -0500

    bootstrap: fix rectangle select induced trailing spaces.
    
    * gl/build-aux/funclib.sh (require_term_colors): Delete trailing
    whitespace.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 Makefile.am                 |    2 +-
 bootstrap                   |   85 ++++++++++++++++++++++++-------------------
 gl/build-aux/bootstrap.in   |   13 ++++---
 gl/build-aux/extract-trace  |    7 +++-
 gl/build-aux/funclib.sh     |   58 +++++++++++++++---------------
 gl/build-aux/options-parser |    7 +++-
 tests/libtoolize.at         |   22 ++++++------
 tests/old-ltdl-iface.at     |    2 +-
 8 files changed, 109 insertions(+), 87 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d7baa93..4a1d1c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -550,7 +550,7 @@ EXTRA_DIST += $(edit_readme_alpha)
 re_odd_version = '\([0-9][0-9]*.[0-9][0-9]*.[0-9]*[13579]\)'
 $(readme): FORCE
        @if test -n `expr $(VERSION) : $(re_odd_version)`; then \
-         if test 0 = '$(AM_DEFAULT_VERBOSITY)' && 1 != '$(V)'; \
+         if test 0 = '$(AM_DEFAULT_VERBOSITY)' && test 1 != '$(V)'; \
            then echo "  GEN     " $@; \
          else echo "$(SHELL) $(edit_readme_alpha) $@"; fi; \
          $(SHELL) $(edit_readme_alpha) '$@'; \
diff --git a/bootstrap b/bootstrap
index 0cd5a2b..f6dd4e5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -321,32 +321,32 @@ func_require_term_colors ()
 {
     $debug_cmd
 
-    test -t 1 && {                                                       
-      # COLORTERM and USE_ANSI_COLORS environment variables take         
-      # precedence, because most terminfo databases neglect to describe  
-      # whether color sequences are supported.                           
-      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}             
-                                                                       
-      if test 1 = "$USE_ANSI_COLORS"; then                             
-        # Standard ANSI escape sequences                                 
-        tc_reset=''                                                 
-        tc_bold='';   tc_standout=''                           
-        tc_red='';   tc_green=''                             
-        tc_blue='';  tc_cyan=''                              
-      else                                                               
-        # Otherwise trust the terminfo database after all.               
-        test -n "`tput sgr0 2>/dev/null`" && {                           
-          tc_reset=`tput sgr0`                                           
-          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`       
-          tc_standout=$tc_bold                                           
-          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`   
-          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`  
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
           test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
-          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` 
-          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` 
-        }                                                                
-      fi                                                                 
-    }                                                                    
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
 
     require_term_colors=:
 }
@@ -618,7 +618,7 @@ func_error ()
 
     $require_term_colors
 
-    func_echo_infix_1 "$tc_standout${tc_red}  error$tc_reset" "$*" >&2
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
 }
 
 
@@ -1033,8 +1033,8 @@ else
     $debug_cmd
 
     case $2 in
-      .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
-      *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e 
"s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e 
"s%$2\$%%"`;;
     esac
   }
 fi
@@ -1106,7 +1106,7 @@ func_tr_sh ()
 
     case $1 in
     [0-9]* | *[!a-zA-Z0-9_]*)
-      func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; 
s/[^a-zA-Z0-9_]/_/g'`
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 
's/[^a-zA-Z0-9_]/_/g'`
       ;;
     * )
       func_tr_sh_result=$1
@@ -1730,7 +1730,12 @@ func_usage_message ()
 
     eval \$bs_echo \""Usage: $usage"\"
     echo
-    $SED -n 's|^# ||;/^Written by/{x;p;x;};h' < "$progpath"
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+       h
+       /^Written by/q' < "$progpath"
     echo
     eval \$bs_echo \""$usage_message"\"
 }
@@ -1838,7 +1843,10 @@ func_autoconf_configure ()
 {
     $debug_cmd
 
-    _G_sed_no_comment='s|#.*$||; s|^dnl .*$||; s| dnl .*$||;'
+    _G_sed_no_comment='
+      s|#.*$||
+      s|^dnl .*$||
+      s| dnl .*$||'
     _G_ac_init=
 
     # If we were passed a genuine file, make sure it calls AC_INIT.
@@ -2137,7 +2145,7 @@ func_extract_trace_first ()
 
     func_extract_trace ${1+"$@"}
     func_extract_trace_first_result=`$bs_echo "$func_extract_trace_result" \
-      |$SED 's|:.*$||g;1q'`
+      |$SED -e 's|:.*$||g' -e 1q`
 }
 
 
@@ -3299,7 +3307,7 @@ func_require_buildreq_automake ()
       # ...and AM_INIT_AUTOMAKE is declared...
       test -n "$func_extract_trace_result" && {
         automake_version=`$bs_echo "$func_extract_trace_result" \
-           |$SED 's|[^0-9]*||; s| .*$||'`
+           |$SED -e 's|[^0-9]*||' -e 's| .*$||'`
         test -n "$automake_version" || automake_version=-
 
         func_append buildreq "\
@@ -3576,13 +3584,15 @@ func_require_dotgitmodules_parameters ()
                                    /[   ]*path *= */{
                                     s|[   ]*||g;s|^[^=]*=||;p
                                   }
-                                };d' .gitmodules |$SED 1q`
+                                }
+                                d' .gitmodules |$SED 1q`
       test -n "$gnulib_url" \
         || gnulib_url=`$SED -e '/^.submodule "gnulib".$/,${
                                   /[    ]*url *= */{
                                    s|[   ]*||g;s|^[^=]*=||;p
                                  }
-                               };d' .gitmodules |$SED 1q`
+                               }
+                               d' .gitmodules |$SED 1q`
 
       func_verbose "gnulib_path='$gnulib_path'"
       func_verbose "gnulib_url='$gnulib_url'"
@@ -3802,7 +3812,8 @@ func_require_package ()
       $require_package_name
 
       package=`echo "$package_name" \
-        |$SED 's/GNU 
//;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+        |$SED -e 's/GNU //' \
+             -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
     }
 
     func_verbose "package='$package'"
@@ -4511,7 +4522,7 @@ func_update_po_files ()
     test -d "$_G_ref_po_dir" || mkdir $_G_ref_po_dir || return
     func_download_po_files $_G_ref_po_dir $_G_domain \
       && ls "$_G_ref_po_dir"/*.po 2>/dev/null \
-         |$SED 's|.*/||; s|\.po$||' > "$_G_po_dir/LINGUAS" || return
+         |$SED -e 's|.*/||' -e 's|\.po$||' > "$_G_po_dir/LINGUAS" || return
 
     # Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6+.
     func_find_tool SHA1SUM sha1sum gsha1sum shasum
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 84fbec7..a0cb11f 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -1117,7 +1117,7 @@ func_require_buildreq_automake ()
       # ...and AM_INIT_AUTOMAKE is declared...
       test -n "$func_extract_trace_result" && {
         automake_version=`$bs_echo "$func_extract_trace_result" \
-           |$SED 's|[^0-9]*||; s| .*$||'`
+           |$SED -e 's|[^0-9]*||' -e 's| .*$||'`
         test -n "$automake_version" || automake_version=-
 
         func_append buildreq "\
@@ -1394,13 +1394,15 @@ func_require_dotgitmodules_parameters ()
                                    /[   ]*path *= */{
                                     s|[   ]*||g;s|^[^=]*=||;p
                                   }
-                                };d' .gitmodules |$SED 1q`
+                                }
+                                d' .gitmodules |$SED 1q`
       test -n "$gnulib_url" \
         || gnulib_url=`$SED -e '/^.submodule "gnulib".$/,${
                                   /[    ]*url *= */{
                                    s|[   ]*||g;s|^[^=]*=||;p
                                  }
-                               };d' .gitmodules |$SED 1q`
+                               }
+                               d' .gitmodules |$SED 1q`
 
       func_verbose "gnulib_path='$gnulib_path'"
       func_verbose "gnulib_url='$gnulib_url'"
@@ -1620,7 +1622,8 @@ func_require_package ()
       $require_package_name
 
       package=`echo "$package_name" \
-        |$SED 's/GNU 
//;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+        |$SED -e 's/GNU //' \
+             -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
     }
 
     func_verbose "package='$package'"
@@ -2329,7 +2332,7 @@ func_update_po_files ()
     test -d "$_G_ref_po_dir" || mkdir $_G_ref_po_dir || return
     func_download_po_files $_G_ref_po_dir $_G_domain \
       && ls "$_G_ref_po_dir"/*.po 2>/dev/null \
-         |$SED 's|.*/||; s|\.po$||' > "$_G_po_dir/LINGUAS" || return
+         |$SED -e 's|.*/||' -e 's|\.po$||' > "$_G_po_dir/LINGUAS" || return
 
     # Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6+.
     func_find_tool SHA1SUM sha1sum gsha1sum shasum
diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace
index 758c49b..f739448 100755
--- a/gl/build-aux/extract-trace
+++ b/gl/build-aux/extract-trace
@@ -60,7 +60,10 @@ func_autoconf_configure ()
 {
     $debug_cmd
 
-    _G_sed_no_comment='s|#.*$||; s|^dnl .*$||; s| dnl .*$||;'
+    _G_sed_no_comment='
+      s|#.*$||
+      s|^dnl .*$||
+      s| dnl .*$||'
     _G_ac_init=
 
     # If we were passed a genuine file, make sure it calls AC_INIT.
@@ -359,7 +362,7 @@ func_extract_trace_first ()
 
     func_extract_trace ${1+"$@"}
     func_extract_trace_first_result=`$bs_echo "$func_extract_trace_result" \
-      |$SED 's|:.*$||g;1q'`
+      |$SED -e 's|:.*$||g' -e 1q`
 }
 
 
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index 1203d83..90f40a5 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -311,32 +311,32 @@ func_require_term_colors ()
 {
     $debug_cmd
 
-    test -t 1 && {                                                       
-      # COLORTERM and USE_ANSI_COLORS environment variables take         
-      # precedence, because most terminfo databases neglect to describe  
-      # whether color sequences are supported.                           
-      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}             
-                                                                       
-      if test 1 = "$USE_ANSI_COLORS"; then                             
-        # Standard ANSI escape sequences                                 
-        tc_reset=''                                                 
-        tc_bold='';   tc_standout=''                           
-        tc_red='';   tc_green=''                             
-        tc_blue='';  tc_cyan=''                              
-      else                                                               
-        # Otherwise trust the terminfo database after all.               
-        test -n "`tput sgr0 2>/dev/null`" && {                           
-          tc_reset=`tput sgr0`                                           
-          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`       
-          tc_standout=$tc_bold                                           
-          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`   
-          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`  
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
           test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
-          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` 
-          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` 
-        }                                                                
-      fi                                                                 
-    }                                                                    
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
 
     require_term_colors=:
 }
@@ -608,7 +608,7 @@ func_error ()
 
     $require_term_colors
 
-    func_echo_infix_1 "$tc_standout${tc_red}  error$tc_reset" "$*" >&2
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
 }
 
 
@@ -1023,8 +1023,8 @@ else
     $debug_cmd
 
     case $2 in
-      .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
-      *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e 
"s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e 
"s%$2\$%%"`;;
     esac
   }
 fi
@@ -1096,7 +1096,7 @@ func_tr_sh ()
 
     case $1 in
     [0-9]* | *[!a-zA-Z0-9_]*)
-      func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; 
s/[^a-zA-Z0-9_]/_/g'`
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 
's/[^a-zA-Z0-9_]/_/g'`
       ;;
     * )
       func_tr_sh_result=$1
diff --git a/gl/build-aux/options-parser b/gl/build-aux/options-parser
index af460fd..3aa568d 100644
--- a/gl/build-aux/options-parser
+++ b/gl/build-aux/options-parser
@@ -555,7 +555,12 @@ func_usage_message ()
 
     eval \$bs_echo \""Usage: $usage"\"
     echo
-    $SED -n 's|^# ||;/^Written by/{x;p;x;};h' < "$progpath"
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+       h
+       /^Written by/q' < "$progpath"
     echo
     eval \$bs_echo \""$usage_message"\"
 }
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index ea7265b..187ba8e 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -115,7 +115,7 @@ AT_DATA([Makefile.am],
 ]])
 
 AT_DATA(experr,
-[[libtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with 
ACLOCAL_AMFLAGS=-I me2.
+[[libtoolize:   error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with 
ACLOCAL_AMFLAGS=-I me2.
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy], 1, [ignore], experr)
@@ -241,8 +241,8 @@ libtoolize: copying file 'm4/lt~obsolete.m4'
 ]])
 
 AT_DATA(experr,
-[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite
-libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite
+[[libtoolize:   error: 'build-aux/ltmain.sh' is newer: use '--force' to 
overwrite
+libtoolize:   error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout, experr)
@@ -255,8 +255,8 @@ LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout, experr)
 : >expout
 
 AT_DATA(experr,
-[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite
-libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite
+[[libtoolize:   error: 'build-aux/ltmain.sh' is newer: use '--force' to 
overwrite
+libtoolize:   error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout, experr)
@@ -318,8 +318,8 @@ libtoolize: copying file 'm4/lt~obsolete.m4'
 ]])
 
 AT_DATA(experr,
-[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite
-libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite
+[[libtoolize:   error: 'build-aux/ltmain.sh' is newer: use '--force' to 
overwrite
+libtoolize:   error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy --install], 0, expout, experr)
@@ -332,8 +332,8 @@ LT_AT_CHECK_LIBTOOLIZE([--copy --install], 0, expout, 
experr)
 : >expout
 
 AT_DATA(experr,
-[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite
-libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite
+[[libtoolize:   error: 'build-aux/ltmain.sh' is newer: use '--force' to 
overwrite
+libtoolize:   error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy --install], 0, expout, experr)
@@ -716,7 +716,7 @@ libtoolize: copying file 'm4/libtool.m4'
 ]])
 
 AT_DATA([experr],
-[[libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite
+[[libtoolize:   error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout, experr)
@@ -1104,7 +1104,7 @@ LIBTOOLIZE_OPTIONS=narf
 export LIBTOOLIZE_OPTIONS
 
 AT_DATA(experr,
-[[libtoolize: error: garbled LIBTOOLIZE_OPTIONS near 'narf'
+[[libtoolize:   error: garbled LIBTOOLIZE_OPTIONS near 'narf'
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--copy], 1, [ignore], experr)
diff --git a/tests/old-ltdl-iface.at b/tests/old-ltdl-iface.at
index 8f3a28e..6bf94e6 100644
--- a/tests/old-ltdl-iface.at
+++ b/tests/old-ltdl-iface.at
@@ -124,7 +124,7 @@ libtoolize: Consider updating to use of 'include 
ltdl/ltdl.mk' in Makefile.am.
 ]])
 
 AT_DATA([experr],
-[[libtoolize: error: Use of 'include ltdl/Makefile.inc' is deprecated!
+[[libtoolize:   error: Use of 'include ltdl/Makefile.inc' is deprecated!
 ]])
 
 LT_AT_CHECK_LIBTOOLIZE([--ltdl=ltdl --nonrecursive --install], 0, [expout], 
[experr])


hooks/post-receive
-- 
GNU Libtool



reply via email to

[Prev in Thread] Current Thread [Next in Thread]