gnulib: update

diff --git a/bootstrap b/bootstrap
index e31d17df58411168c8956b5b52f7ecf210316d65..e0c4ec2c3206ca5a9e0fa8e89ca415304243914d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Print a version string.
 #! /bin/sh
 # Print a version string.

-scriptversion=2013-08-15.22; # UTC
+scriptversion=2014-12-08.12; # UTC

 
 # Bootstrap this package from checked-out sources.
 
 
 # Bootstrap this package from checked-out sources.
 

-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -42,6 +42,9 @@ export LC_ALL
 
 local_gl_dir=gl
 
 
 local_gl_dir=gl
 

+# Honour $PERL, but work even if there is none
+PERL="${PERL-perl}"
+

 me=$0
 
 usage() {
 me=$0
 
 usage() {


@@ -210,7 +213,17 @@ bootstrap_sync=false
 use_git=true
 
 check_exists() {
 use_git=true
 
 check_exists() {

-  ($1 --version </dev/null) >/dev/null 2>&1
+  if test "$1" = "--verbose"; then
+    ($2 --version </dev/null) >/dev/null 2>&1
+    if test $? -ge 126; then
+      # If not found, run with diagnostics as one may be
+      # presented with env variables to set to find the right version
+      ($2 --version </dev/null)
+    fi
+  else
+    ($1 --version </dev/null) >/dev/null 2>&1
+  fi
+

   test $? -lt 126
 }
 
   test $? -lt 126
 }
 


@@ -408,7 +421,7 @@ sort_ver() { # sort -V is not generally available
 get_version() {
   app=$1
 
 get_version() {
   app=$1
 

-  $app --version >/dev/null 2>&1 || return 1
+  $app --version >/dev/null 2>&1 || { $app --version; return 1; }

 
   $app --version 2>&1 |
   sed -n '# Move version to start of line.
 
   $app --version 2>&1 |
   sed -n '# Move version to start of line.


@@ -446,6 +459,7 @@ check_versions() {
     test "$appvar" = TAR && appvar=AMTAR
     case $appvar in
         GZIP) ;; # Do not use $GZIP:  it contains gzip options.
     test "$appvar" = TAR && appvar=AMTAR
     case $appvar in
         GZIP) ;; # Do not use $GZIP:  it contains gzip options.

+        PERL::*) ;; # Keep perl modules as-is

         *) eval "app=\${$appvar-$app}" ;;
     esac
 
         *) eval "app=\${$appvar-$app}" ;;
     esac
 


@@ -463,11 +477,22 @@ check_versions() {
           ret=1
           continue
         } ;;
           ret=1
           continue
         } ;;

+      # Another check is for perl modules.  These can be written as
+      # e.g. perl::XML::XPath in case of XML::XPath module, etc.
+      perl::*)
+        # Extract module name
+        app="${app#perl::}"
+        if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then
+          warn_ "Error: perl module '$app' not found"
+          ret=1
+        fi
+        continue
+        ;;

     esac
     if [ "$req_ver" = "-" ]; then
       # Merely require app to exist; not all prereq apps are well-behaved
       # so we have to rely on $? rather than get_version.
     esac
     if [ "$req_ver" = "-" ]; then
       # Merely require app to exist; not all prereq apps are well-behaved
       # so we have to rely on $? rather than get_version.

-      if ! check_exists $app; then
+      if ! check_exists --verbose $app; then

         warn_ "Error: '$app' not found"
         ret=1
       fi
         warn_ "Error: '$app' not found"
         ret=1
       fi


@@ -551,6 +576,14 @@ if ! printf "$buildreq" | check_versions; then
   fi
 fi
 
   fi
 fi
 

+# Warn the user if autom4te appears to be broken; this causes known
+# issues with at least gettext 0.18.3.
+probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -)
+if test "x$probe" != xhi; then
+  warn_ "WARNING: your autom4te wrapper eats stdin;"
+  warn_ "if bootstrap fails, consider upgrading your autotools"
+fi
+

 echo "$0: Bootstrapping from checked-out $package sources..."
 
 # See if we can use gnulib's git-merge-changelog merge driver.
 echo "$0: Bootstrapping from checked-out $package sources..."
 
 # See if we can use gnulib's git-merge-changelog merge driver.


@@ -590,8 +623,8 @@ case ${GNULIB_SRCDIR--} in
   # Note that $use_git is necessarily true in this case.
   if git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
   # Note that $use_git is necessarily true in this case.
   if git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."

-    git submodule init || exit $?
-    git submodule update || exit $?
+    git submodule init -- "$gnulib_path" || exit $?
+    git submodule update -- "$gnulib_path" || exit $?

 
   elif [ ! -d "$gnulib_path" ]; then
     echo "$0: getting gnulib files..."
 
   elif [ ! -d "$gnulib_path" ]; then
     echo "$0: getting gnulib files..."


@@ -620,13 +653,14 @@ case ${GNULIB_SRCDIR--} in
       # This fallback allows at least git 1.5.5.
       if test -f "$gnulib_path"/gnulib-tool; then
         # Since file already exists, assume submodule init already complete.
       # This fallback allows at least git 1.5.5.
       if test -f "$gnulib_path"/gnulib-tool; then
         # Since file already exists, assume submodule init already complete.

-        git submodule update || exit $?
+        git submodule update -- "$gnulib_path" || exit $?

       else
         # Older git can't clone into an empty directory.
         rmdir "$gnulib_path" 2>/dev/null
         git clone --reference "$GNULIB_SRCDIR" \
           "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
       else
         # Older git can't clone into an empty directory.
         rmdir "$gnulib_path" 2>/dev/null
         git clone --reference "$GNULIB_SRCDIR" \
           "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \

-          && git submodule init && git submodule update \
+          && git submodule init -- "$gnulib_path" \
+          && git submodule update -- "$gnulib_path" \

           || exit $?
       fi
     fi
           || exit $?
       fi
     fi

diff --git a/gnulib b/gnulib
index 74540d44dc16bfd3546e39ae2d7262f32a4147ab..7177237ead4c6080705129e6ec3c3a9e9eef2f68 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 74540d44dc16bfd3546e39ae2d7262f32a4147ab
+Subproject commit 7177237ead4c6080705129e6ec3c3a9e9eef2f68

diff --git a/lib/.gitignore b/lib/.gitignore
index 0197e833bd6c9796263596e211575aa517c39f29..46447a333b8503a6e25ad3aa89e5a3d965a7acf9 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -274,3 +274,5 @@
 /wctype-h.c
 /lstat.c
 /unlink.c
 /wctype-h.c
 /lstat.c
 /unlink.c

+/gettimeofday.c
+/sys_time.in.h

diff --git a/m4/.gitignore b/m4/.gitignore
index 465d4d6cc74407297a73f5af2d36ca21005109d2..adf98229c707a5f72c18f61fc83235552165486c 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -183,3 +183,6 @@
 /absolute-header.m4
 /lstat.m4
 /unlink.m4
 /absolute-header.m4
 /lstat.m4
 /unlink.m4

+/gettimeofday.m4
+/obstack.m4
+/sys_time_h.m4