[SCM] GNU Libtool branch, master, updated. v2.4.2-369-g8d2a63c

[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  8d2a63c23a2dfb424e4b2f934c73c1737f979062 (commit)
       via  ea6773ca6f3b01a35fe7be9313099b57e96113c1 (commit)
       via  51496e032d8c431cdb4d750d1e4928ecb3d816ba (commit)
      from  05a3f4271916833e0f3639a09b331768451c1dd4 (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 8d2a63c23a2dfb424e4b2f934c73c1737f979062
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Jan 27 19:57:22 2013 +0700

    bootstrap: factor out gnulib-tool option calculations.
    
    * gl/build-aux/bootstrap.in (func_gnulib_tool): Factor base option
    settings out...
    (require_gnulib_tool_base_options): ...to here.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit ea6773ca6f3b01a35fe7be9313099b57e96113c1
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Jan 27 20:13:27 2013 +0700

    syntax-check: fix a quoted_test_operand violation.
    
    * gl/build-aux/bootstrap.in (func_insert_if_absent): Make sure
    test operands are quoted correctly.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 51496e032d8c431cdb4d750d1e4928ecb3d816ba
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Jan 27 20:20:30 2013 +0700

    syntax-check: fix new SPACE-TAB violations.
    
    * build-aux/ltmain.in (func_dll_def_p): Replace SPACE-TAB by
    TAB-SPACE.
    * m4/libtool.m4 (_LT_DLL_DEF_P): Likewise.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 bootstrap                 |   85 +++++++++++++++++++++++++++++---------------
 build-aux/ltmain.in       |    4 +-
 gl/build-aux/bootstrap.in |   85 +++++++++++++++++++++++++++++---------------
 m4/libtool.m4             |    4 +-
 4 files changed, 116 insertions(+), 62 deletions(-)

diff --git a/bootstrap b/bootstrap
index 44bc328..2297205 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2588,60 +2588,50 @@ func_gnulib_tool ()
     test true = "$gnulib_tool" || {
       if test -n "$gnulib_modules"; then
         $require_gnulib_cache
-        $require_build_aux
-        $require_macro_dir
+        $require_gnulib_tool_base_options
+
+        gnulib_mode=--import
 
         # Try not to pick up any stale values from 'gnulib-cache.m4'.
         rm -f "$gnulib_cache"
 
-        gnulib_mode=--import
-
-        # 'gnulib_modules' and others are maintained in 'bootstrap.conf':
-        # Use 'gnulib --import' to fetch gnulib modules.
-        test -n "$build_aux" \
-            && func_append_uniq gnulib_tool_options " --aux-dir=$build_aux"
-        test -n "$macro_dir" \
-            && func_append_uniq gnulib_tool_options " --m4-base=$macro_dir"
-        test -n "$doc_base" \
-            && func_append_uniq gnulib_tool_options " --doc-base=$doc_base"
-        test -n "$gnulib_name" \
-            && func_append_uniq gnulib_tool_options " --lib=$gnulib_name"
-        test -n "$local_gl_dir" \
-            && func_append_uniq gnulib_tool_options " 
--local-dir=$local_gl_dir"
-        test -n "$source_base" \
-            && func_append_uniq gnulib_tool_options " 
--source-base=$source_base"
+        gnulib_tool_all_options=$gnulib_tool_options
+        test -n "$gnulib_tool_base_options" \
+            && func_append_uniq gnulib_tool_all_options " 
$gnulib_tool_base_options"
         test -n "$gnulib_mk" \
-            && func_append_uniq gnulib_tool_options " 
--makefile-name=$gnulib_mk"
+            && func_append_uniq gnulib_tool_all_options " 
--makefile-name=$gnulib_mk"
         test -n "$tests_base" && {
-          func_append_uniq gnulib_tool_options " --tests-base=$tests_base"
-          func_append_uniq gnulib_tool_options " --with-tests"
+          func_append_uniq gnulib_tool_all_options " --tests-base=$tests_base"
+          func_append_uniq gnulib_tool_all_options " --with-tests"
         }
       else
 
         # 'gnulib_modules' and others are cached in 'gnulib-cache.m4':
         # Use 'gnulib --update' to fetch gnulib modules.
         gnulib_mode=--update
+
+        gnulib_tool_all_options=$gnulib_tool_options
       fi
 
       # Add a sensible default libtool option to gnulib_tool_options.
       # The embedded echo is to squash whitespace before globbing.
-      case `echo " "$gnulib_tool_options" "` in
+      case `echo " "$gnulib_tool_all_options" "` in
         *" --no-libtool "*|*" --libtool "*) ;;
         *)  if test true = "$LIBTOOLIZE"; then
-              func_append_uniq gnulib_tool_options " --no-libtool"
+              func_append_uniq gnulib_tool_all_options " --no-libtool"
             else
-              func_append_uniq gnulib_tool_options " --libtool"
+              func_append_uniq gnulib_tool_all_options " --libtool"
             fi
             ;;
       esac
 
-      $opt_copy || func_append_uniq gnulib_tool_options " --symlink"
+      $opt_copy || func_append_uniq gnulib_tool_all_options " --symlink"
 
-      func_append_uniq gnulib_tool_options " $gnulib_mode"
-      func_append gnulib_tool_options " $gnulib_modules"
+      func_append_uniq gnulib_tool_all_options " $gnulib_mode"
+      func_append gnulib_tool_all_options " $gnulib_modules"
 
       # The embedded echo is to squash whitespace before display.
-      gnulib_cmd=`echo $gnulib_tool $gnulib_tool_options`
+      gnulib_cmd=`echo $gnulib_tool $gnulib_tool_all_options`
 
       func_show_eval "$gnulib_cmd" 'exit $?'
 
@@ -3689,6 +3679,43 @@ func_require_gnulib_tool ()
 }
 
 
+# require_gnulib_tool_base_options
+# --------------------------------
+# Ensure that '$gnulib_tool_base_options' contains all the base options
+# required according to user configuration from bootstrap.conf.
+require_gnulib_tool_base_options=func_require_gnulib_tool_base_options
+func_require_gnulib_tool_base_options ()
+{
+    $debug_cmd
+
+    $require_gnulib_tool
+
+    gnulib_tool_base_options=
+
+    test true = "$gnulib_tool" || {
+      $require_build_aux
+      $require_macro_dir
+
+      # 'gnulib_modules' and others are maintained in 'bootstrap.conf':
+      # Use 'gnulib --import' to fetch gnulib modules.
+      test -n "$build_aux" \
+          && func_append_uniq gnulib_tool_base_options " --aux-dir=$build_aux"
+      test -n "$macro_dir" \
+          && func_append_uniq gnulib_tool_base_options " --m4-base=$macro_dir"
+      test -n "$doc_base" \
+          && func_append_uniq gnulib_tool_base_options " --doc-base=$doc_base"
+      test -n "$gnulib_name" \
+          && func_append_uniq gnulib_tool_base_options " --lib=$gnulib_name"
+      test -n "$local_gl_dir" \
+          && func_append_uniq gnulib_tool_base_options " 
--local-dir=$local_gl_dir"
+      test -n "$source_base" \
+          && func_append_uniq gnulib_tool_base_options " 
--source-base=$source_base"
+    }
+
+    require_gnulib_tool_base_options=:
+}
+
+
 # require_libtoolize
 # ------------------
 # Skip libtoolize if it's not needed.
@@ -4359,7 +4386,7 @@ func_insert_if_absent ()
       linesold=`func_gitignore_entries "$file" |wc -l`
       linesnew=`$bs_echo "$str" \
                 |func_gitignore_entries - "$file" |sort -u |wc -l`
-      test $linesold -eq $linesnew \
+      test "$linesold" -eq "$linesnew" \
         || sed "1i\\$nl$str$nl" "$file" \
         || func_permissions_error "$file"
     done
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index f41fdc7..4c56b98 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -1323,9 +1323,9 @@ func_dll_def_p ()
   $debug_cmd
 
   func_dll_def_p_tmp=`$SED -n \
-    -e 's/^[   ]*//' \
+    -e 's/^[    ]*//' \
     -e '/^\(;.*\)*$/d' \
-    -e 's/^\(EXPORTS\|LIBRARY\)\([     ].*\)*$/DEF/p' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([      ].*\)*$/DEF/p' \
     -e q \
     "$1"`
   test DEF = "$func_dll_def_p_tmp"
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index d9c7c27..bfd4ad6 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -398,60 +398,50 @@ func_gnulib_tool ()
     test true = "$gnulib_tool" || {
       if test -n "$gnulib_modules"; then
         $require_gnulib_cache
-        $require_build_aux
-        $require_macro_dir
+        $require_gnulib_tool_base_options
+
+        gnulib_mode=--import
 
         # Try not to pick up any stale values from 'gnulib-cache.m4'.
         rm -f "$gnulib_cache"
 
-        gnulib_mode=--import
-
-        # 'gnulib_modules' and others are maintained in 'bootstrap.conf':
-        # Use 'gnulib --import' to fetch gnulib modules.
-        test -n "$build_aux" \
-            && func_append_uniq gnulib_tool_options " --aux-dir=$build_aux"
-        test -n "$macro_dir" \
-            && func_append_uniq gnulib_tool_options " --m4-base=$macro_dir"
-        test -n "$doc_base" \
-            && func_append_uniq gnulib_tool_options " --doc-base=$doc_base"
-        test -n "$gnulib_name" \
-            && func_append_uniq gnulib_tool_options " --lib=$gnulib_name"
-        test -n "$local_gl_dir" \
-            && func_append_uniq gnulib_tool_options " 
--local-dir=$local_gl_dir"
-        test -n "$source_base" \
-            && func_append_uniq gnulib_tool_options " 
--source-base=$source_base"
+        gnulib_tool_all_options=$gnulib_tool_options
+        test -n "$gnulib_tool_base_options" \
+            && func_append_uniq gnulib_tool_all_options " 
$gnulib_tool_base_options"
         test -n "$gnulib_mk" \
-            && func_append_uniq gnulib_tool_options " 
--makefile-name=$gnulib_mk"
+            && func_append_uniq gnulib_tool_all_options " 
--makefile-name=$gnulib_mk"
         test -n "$tests_base" && {
-          func_append_uniq gnulib_tool_options " --tests-base=$tests_base"
-          func_append_uniq gnulib_tool_options " --with-tests"
+          func_append_uniq gnulib_tool_all_options " --tests-base=$tests_base"
+          func_append_uniq gnulib_tool_all_options " --with-tests"
         }
       else
 
         # 'gnulib_modules' and others are cached in 'gnulib-cache.m4':
         # Use 'gnulib --update' to fetch gnulib modules.
         gnulib_mode=--update
+
+        gnulib_tool_all_options=$gnulib_tool_options
       fi
 
       # Add a sensible default libtool option to gnulib_tool_options.
       # The embedded echo is to squash whitespace before globbing.
-      case `echo " "$gnulib_tool_options" "` in
+      case `echo " "$gnulib_tool_all_options" "` in
         *" --no-libtool "*|*" --libtool "*) ;;
         *)  if test true = "$LIBTOOLIZE"; then
-              func_append_uniq gnulib_tool_options " --no-libtool"
+              func_append_uniq gnulib_tool_all_options " --no-libtool"
             else
-              func_append_uniq gnulib_tool_options " --libtool"
+              func_append_uniq gnulib_tool_all_options " --libtool"
             fi
             ;;
       esac
 
-      $opt_copy || func_append_uniq gnulib_tool_options " --symlink"
+      $opt_copy || func_append_uniq gnulib_tool_all_options " --symlink"
 
-      func_append_uniq gnulib_tool_options " $gnulib_mode"
-      func_append gnulib_tool_options " $gnulib_modules"
+      func_append_uniq gnulib_tool_all_options " $gnulib_mode"
+      func_append gnulib_tool_all_options " $gnulib_modules"
 
       # The embedded echo is to squash whitespace before display.
-      gnulib_cmd=`echo $gnulib_tool $gnulib_tool_options`
+      gnulib_cmd=`echo $gnulib_tool $gnulib_tool_all_options`
 
       func_show_eval "$gnulib_cmd" 'exit $?'
 
@@ -1499,6 +1489,43 @@ func_require_gnulib_tool ()
 }
 
 
+# require_gnulib_tool_base_options
+# --------------------------------
+# Ensure that '$gnulib_tool_base_options' contains all the base options
+# required according to user configuration from bootstrap.conf.
+require_gnulib_tool_base_options=func_require_gnulib_tool_base_options
+func_require_gnulib_tool_base_options ()
+{
+    $debug_cmd
+
+    $require_gnulib_tool
+
+    gnulib_tool_base_options=
+
+    test true = "$gnulib_tool" || {
+      $require_build_aux
+      $require_macro_dir
+
+      # 'gnulib_modules' and others are maintained in 'bootstrap.conf':
+      # Use 'gnulib --import' to fetch gnulib modules.
+      test -n "$build_aux" \
+          && func_append_uniq gnulib_tool_base_options " --aux-dir=$build_aux"
+      test -n "$macro_dir" \
+          && func_append_uniq gnulib_tool_base_options " --m4-base=$macro_dir"
+      test -n "$doc_base" \
+          && func_append_uniq gnulib_tool_base_options " --doc-base=$doc_base"
+      test -n "$gnulib_name" \
+          && func_append_uniq gnulib_tool_base_options " --lib=$gnulib_name"
+      test -n "$local_gl_dir" \
+          && func_append_uniq gnulib_tool_base_options " 
--local-dir=$local_gl_dir"
+      test -n "$source_base" \
+          && func_append_uniq gnulib_tool_base_options " 
--source-base=$source_base"
+    }
+
+    require_gnulib_tool_base_options=:
+}
+
+
 # require_libtoolize
 # ------------------
 # Skip libtoolize if it's not needed.
@@ -2169,7 +2196,7 @@ func_insert_if_absent ()
       linesold=`func_gitignore_entries "$file" |wc -l`
       linesnew=`$bs_echo "$str" \
                 |func_gitignore_entries - "$file" |sort -u |wc -l`
-      test $linesold -eq $linesnew \
+      test "$linesold" -eq "$linesnew" \
         || sed "1i\\$nl$str$nl" "$file" \
         || func_permissions_error "$file"
     done
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 0a6c334..3f50b0c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3537,9 +3537,9 @@ _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
 AC_DEFUN([_LT_DLL_DEF_P],
 [dnl
   test DEF = "`$SED -n dnl
-    -e '\''s/^[[       ]]*//'\'' dnl Strip leading whitespace
+    -e '\''s/^[[        ]]*//'\'' dnl Strip leading whitespace
     -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
-    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[         ]].*\)*$/DEF/p'\'' dnl
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[  ]].*\)*$/DEF/p'\'' dnl
     -e q dnl                          Only consider the first "real" line
     $1`" dnl
 ])# _LT_DLL_DEF_P


hooks/post-receive
-- 
GNU Libtool