Add `--minimized-build` which does the same thing as `--no-autoload`

but the meaning of the option is probably easier to understand with
this name.

4 files changed, 10 insertions, 6 deletions

diff --git a/configure.py b/configure.py
index ebde4d9a3..1c6dfedc7 100755
--- a/configure.py
+++ b/configure.py
@@ -356,7 +356,9 @@ def process_command_line(args):
                           action='store_true',
                           help='list available modules')
     mods_group.add_option('--no-autoload', action='store_true', default=False,
-                          help='disable automatic loading')
+                          help=optparse.SUPPRESS_HELP)
+    mods_group.add_option('--minimized-build', action='store_true', dest='no_autoload',
+                          help='minimize build')
 
     # Should be derived from info.txt but this runs too early
     third_party  = ['boost', 'bzip2', 'lzma', 'openssl', 'sqlite3', 'zlib']
diff --git a/doc/manual/building.rst b/doc/manual/building.rst
index 778a74a29..dd5bebf0f 100644
--- a/doc/manual/building.rst
+++ b/doc/manual/building.rst
@@ -67,7 +67,7 @@ You can control which algorithms and modules are built using the
 options ``--enable-modules=MODS`` and ``--disable-modules=MODS``, for
 instance ``--enable-modules=zlib`` and ``--disable-modules=rc5,idea``.
 Modules not listed on the command line will simply be loaded if needed
-or if configured to load by default. If you use ``--no-autoload``,
+or if configured to load by default. If you use ``--minimized-build``,
 only the most core modules will be included; you can then explicitly
 enable things that you want to use with ``--enable-modules``. This is
 useful for creating a minimal build targeting to a specific
@@ -76,7 +76,7 @@ see :ref:`amalgamation`.
 
 For instance::
 
- $ ./configure.py --no-autoload --enable-modules=rsa,ecdsa,eme1,emsa1,emsa4
+ $ ./configure.py --minimized-build --enable-modules=rsa,ecdsa,eme1,emsa1,emsa4
 
 will set up a build that only includes RSA, ECDSA, and some padding
 modes, along with their dependencies. A small subset of core features,
@@ -187,7 +187,7 @@ To cross compile for iOS, configure with::
 
    $ ./configure.py --cpu=armv7 --cc=clang --cc-abi-flags="-arch armv7 -arch armv7s -stdlib=libc++ --sysroot=$(IOS_SYSROOT)"
 
-Along with any additional configuration arguments. Using ``--no-autoload``
+Along with any additional configuration arguments. Using ``--minimized-build``
 might be helpful as can substantially reduce code size.
 
 Edit the makefile and change AR (around line 30) to::
@@ -247,7 +247,7 @@ options you would ordinarily use, along with the option
 compiled with the appropriate compiler flags to enable that
 instruction set. The ISA specific files are only generated if there is
 code that requires them, so you can simplify your build The
-``--no-autoload`` option (described elsewhere in this documentation)
+``--minimized-build`` option (described elsewhere in this documentation)
 is also quite useful with the amalgamation.
 
 Whenever you would have included a botan header, you can then include
diff --git a/doc/news.rst b/doc/news.rst
index 70e760a9b..cab97c782 100644
--- a/doc/news.rst
+++ b/doc/news.rst
@@ -4,6 +4,8 @@ Release Notes
 Version 1.11.22, Not Yet Released
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+* The `configure.py` option `--no-autoload` is now also available
+  under the more understandable name `--minimized-build`.
 
 Version 1.11.21, 2015-10-11
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh
index 8bb8c9380..e1ced58d3 100755
--- a/src/scripts/ci/travis/build.sh
+++ b/src/scripts/ci/travis/build.sh
@@ -14,7 +14,7 @@ elif [ "$BUILD_MODE" = "sanitizer" ]; then
 fi
 
 if [ "$MODULES" = "min" ]; then
-    CFG_FLAGS+=(--no-autoload --enable-modules=base)
+    CFG_FLAGS+=(--minimized-build --enable-modules=base)
 fi
 
 # Workaround for missing update-alternatives