[Emacs-diffs] trunk r116544: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 116544
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2014-02-23 23:12:42 -0800
message:
  Merge from gnulib.
  
  2014-02-21 timer: fix uClibc detection of threading
  2014-02-21 maintainer-makefiles: provide AC_PROG_SED for older autoconf
  * texinfo.tex: Update from gnulib.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/texinfo.tex           
texinfo.tex-20091113204419-o5vbwnq5f7feedwu-6323
  m4/gnulib-common.m4            
gnulibcommon.m4-20110108211121-3ig4un4ogtyyca3s-10
  m4/timer_time.m4               timer_time.m4-20120927005931-6jg4s8b0e95i96hz-1

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-02-18 01:47:35 +0000
+++ b/ChangeLog 2014-02-24 07:12:42 +0000
@@ -1,3 +1,9 @@
+2014-02-24  Paul Eggert  <address@hidden>
+
+       Merge from gnulib, incorporating:
+       2014-02-21 timer: fix uClibc detection of threading
+       2014-02-21 maintainer-makefiles: provide AC_PROG_SED for older autoconf
+
 2014-02-18  Mirek Kaim  <address@hidden>  (tiny change)
 
        * configure.ac [HAVE_W32]: Test for ImageMagick.  (Bug#16754)

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2014-02-22 23:14:49 +0000
+++ b/doc/misc/ChangeLog        2014-02-24 07:12:42 +0000
@@ -1,3 +1,7 @@
+2014-02-24  Paul Eggert  <address@hidden>
+
+       * texinfo.tex: Update from gnulib.
+
 2014-02-22  Xue Fuqiao  <address@hidden>
 
        * remember.texi (Quick Start): Add an index.

=== modified file 'doc/misc/texinfo.tex'
--- a/doc/misc/texinfo.tex      2014-02-12 22:09:31 +0000
+++ b/doc/misc/texinfo.tex      2014-02-24 07:12:42 +0000
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2014-02-09.15}
+\def\texinfoversion{2014-02-16.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4428,7 +4428,7 @@
   % complicated, when \tex is in effect and \{ is a \delimiter again.
   % We can't use \lbracecmd and \rbracecmd because texindex assumes
   % braces and backslashes are used only as delimiters.  Perhaps we
-  % should define @lbrace and @rbrace commands a la @comma.
+  % should use @lbracechar and @rbracechar?
   \def\{{{\tt\char123}}%
   \def\}{{\tt\char125}}%
   %
@@ -4449,8 +4449,7 @@
   % @end macro
   % ...
   % @funindex commtest
-  %
-  % The above is not enough to reproduce the bug, but it gives the flavor.
+  % This is not enough to reproduce the bug, but it gives the flavor.
   %
   % Sample whatsit resulting:
   % address@hidden@folio address@hidden address@hidden }}}
@@ -4663,6 +4662,9 @@
   \let\xeatspaces = \eatspaces
 }
 
+% For testing: output @{ and @} in index sort strings as \{ and \}.
+\newif\ifusebracesinindexes
+
 % \indexnofonts is used when outputting the strings to sort the index
 % by, and when constructing control sequence names.  It eliminates all
 % control sequences and just writes whatever the best ASCII sort string
@@ -4691,11 +4693,16 @@
   % Unfortunately, texindex is not prepared to handle braces in the
   % content at all.  So for index sorting, we map @{ and @} to strings
   % starting with |, since that ASCII character is between ASCII { and }.
-  \def\{{|a}%
-  \def\lbracechar{|a}%
+  \ifusebracesinindexes
+    \def\lbracechar{\lbracecmd}%
+    \def\rbracechar{\rbracecmd}%
+  \else
+    \def\lbracechar{|a}%
+    \def\rbracechar{|b}%
+  \fi
+  \let\{=\lbracechar
+  \let\}=\rbracechar
   %
-  \def\}{|b}%
-  \def\rbracechar{|b}%
   %
   % Non-English letters.
   \def\AA{AA}%

=== modified file 'm4/gnulib-common.m4'
--- a/m4/gnulib-common.m4       2014-01-11 07:01:30 +0000
+++ b/m4/gnulib-common.m4       2014-02-24 07:12:42 +0000
@@ -379,3 +379,59 @@
 # AS_VAR_COPY was added in autoconf 2.63b
 m4_define_default([AS_VAR_COPY],
 [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
+
+# AC_PROG_SED was added in autoconf 2.59b
+m4_ifndef([AC_PROG_SED],
+[AC_DEFUN([AC_PROG_SED],
+[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
+    [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
+     dnl but more than about 7000 bytes, to catch a limit in Solaris 8 
/usr/ucb/sed.
+     
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     AS_UNSET([ac_script])
+     if test -z "$SED"; then
+       ac_path_SED_found=false
+       _AS_PATH_WALK([], [
+         for ac_prog in sed gsed; do
+           for ac_exec_ext in '' $ac_executable_extensions; do
+             ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+             AS_EXECUTABLE_P(["$ac_path_SED"]) || continue
+             case `"$ac_path_SED" --version 2>&1` in
+               *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;;
+               *)
+                 ac_count=0
+                 _AS_ECHO_N([0123456789]) >conftest.in
+                 while :
+                 do
+                   cat conftest.in conftest.in >conftest.tmp
+                   mv conftest.tmp conftest.in
+                   cp conftest.in conftest.nl
+                   echo >> conftest.nl
+                   "$ac_path_SED" -f conftest.sed <conftest.nl >conftest.out 
2>/dev/null || break
+                   diff conftest.out conftest.nl >/dev/null 2>&1 || break
+                   ac_count=`expr $ac_count + 1`
+                   if test $ac_count -gt ${ac_path_SED_max-0}; then
+                     # Best so far, but keep looking for better
+                     ac_cv_path_SED=$ac_path_SED
+                     ac_path_SED_max=$ac_count
+                   fi
+                   test $ac_count -gt 10 && break
+                 done
+                 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+             esac
+             $ac_path_SED_found && break 3
+           done
+         done])
+       if test -z "$ac_cv_path_SED"; then
+         AC_ERROR([no acceptable sed could be found in \$PATH])
+       fi
+     else
+       ac_cv_path_SED=$SED
+     fi
+ SED="$ac_cv_path_SED"
+ AC_SUBST([SED])dnl
+ rm -f conftest.sed
+])])])

=== modified file 'm4/timer_time.m4'
--- a/m4/timer_time.m4  2014-01-01 07:43:34 +0000
+++ b/m4/timer_time.m4  2014-02-24 07:12:42 +0000
@@ -28,7 +28,7 @@
 #include <features.h>
 #ifdef __GNU_LIBRARY__
  #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \
-     && !defined __UCLIBC__
+     && !(__UCLIBC__ && __HAS_NO_THREADS__)
   Thread emulation available
  #endif
 #endif