Merge branch 'feature/upstream' into develop

1 files changed, 6 insertions, 1 deletions

diff --git a/autogen.sh b/autogen.sh
index c738a86..269ab0d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -43,6 +43,8 @@ while :; do
   esac
 done
 
+TEXINFO_VERSION=4.13
+
 if test $skip_gnulib = false; then
   # texinfo.tex
   # The most recent snapshot of it is available in the gnulib repository.
@@ -51,7 +53,7 @@ if test $skip_gnulib = false; then
   # but that is too old (does not support @arrow{}). So take the version which
   # matches the latest stable texinfo release.
   if test ! -f build-aux/texinfo.tex; then
-    { wget -q --timeout=5 -O build-aux/texinfo.tex.tmp 'http://cvs.savannah.gnu.org/viewvc/*checkout*/texinfo/doc/texinfo.tex?root=texinfo&pathrev=texinfo_4_13' \
+    { wget -q --timeout=5 -O build-aux/texinfo.tex.tmp 'http://cvs.savannah.gnu.org/viewvc/*checkout*/texinfo/doc/texinfo.tex?root=texinfo&pathrev=texinfo_'`echo $TEXINFO_VERSION | sed -e 's/[.]/_/g'` \
         && mv build-aux/texinfo.tex.tmp build-aux/texinfo.tex; \
     } || rm -f build-aux/texinfo.tex.tmp
   fi
@@ -327,6 +329,7 @@ if test $skip_gnulib = false; then
       unigbrk/uc-gbrk-prop
       unigbrk/uc-is-grapheme-break
       unigbrk/ulc-grapheme-breaks
+      unigbrk/uc-grapheme-breaks
       uniwbrk/base
       uniwbrk/u8-wordbreaks
       uniwbrk/u16-wordbreaks
@@ -462,3 +465,5 @@ autoheader && touch config.h.in
 # Make sure we get new versions of files brought in by automake.
 (cd build-aux && rm -f ar-lib compile depcomp install-sh mdate-sh missing test-driver)
 automake --add-missing --copy
+# Get rid of autom4te.cache directory.
+rm -rf autom4te.cache