Revert "Revert "Merge tag 'v1.0.5' into HEAD""

Bug: 114832768
Test: mma
This reverts commit c4af2b09ada22257ff12967537264627a3936822.

Change-Id: Ibea95f37fb1ce2ef6ae7d40aaac2a3ec41a2c5c9
diff --git a/configure b/configure
index d9bd3e3..d96129a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
-echo "Use Bazel, CMake or Premake5 to generate projects / build files."
+echo "Use Autotools, Bazel, CMake or Premake5 to generate projects / build files."
 echo "  Bazel: http://www.bazel.build/"
 echo "  CMake: https://cmake.org/"
 echo "  Premake5: https://premake.github.io/"
+echo "To generate Autotools 'configure' file run './bootstrap'."
+echo "Run './configure-cmake' for Autotools-like CMake configuration."
 echo "Or simply run 'make' to build and test command line tool."