Merge branch 'master' into refactor

akashrawal · Sep 11, 2017 · 283541b · 283541b
2 parents 5ea2453 + c758250
commit 283541b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -103,6 +103,7 @@ sitemap index files.
 The following packages are needed to build the software
 
 * autotools (autoconf, autogen, automake, autopoint, libtool)
+* python (recommended for faster bootstrap)
 * pkg-config >= 0.28 (recommended)
 * doxygen (for creating the documentation)
 * gettext >= 0.18.2

diff --git a/bootstrap b/bootstrap
@@ -688,8 +688,11 @@ if $bootstrap_sync; then
   }
 fi
 
-gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit $?
+gnulib_tool=$GNULIB_SRCDIR/gnulib-tool.py
+if ! <$gnulib_tool; then
+  gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+  <$gnulib_tool || exit $?
+fi
 
 # Get translations.
 

diff --git a/gnulib b/gnulib