configure: order configure switches alphabetically

Alphabetical order should make it easier to find the switches you need
because we've got quite a lot of them now.

Keep --prefix at the top because that's arguably the one people will be
looking for most.

1 files changed, 235 insertions, 234 deletions

diff --git a/configure b/configure
index 833de8d11..a37f7dd4d 100755
--- a/configure
+++ b/configure
@@ -16,254 +16,255 @@ from gyp.common import GetFlavor
 # parse our options
 parser = optparse.OptionParser()
 
-parser.add_option("--debug",
-    action="store_true",
-    dest="debug",
-    help="Also build debug build")
-
-parser.add_option("--prefix",
-    action="store",
-    dest="prefix",
-    help="Select the install prefix (defaults to /usr/local)")
-
-parser.add_option("--without-npm",
-    action="store_true",
-    dest="without_npm",
-    help="Don\'t install the bundled npm package manager")
-
-parser.add_option("--without-ssl",
-    action="store_true",
-    dest="without_ssl",
-    help="Build without SSL")
-
-parser.add_option("--without-snapshot",
-    action="store_true",
-    dest="without_snapshot",
-    help="Build without snapshotting V8 libraries. You might want to set"
-         " this for cross-compiling. [Default: False]")
-
-parser.add_option("--shared-v8",
-    action="store_true",
-    dest="shared_v8",
-    help="Link to a shared V8 DLL instead of static linking")
-
-parser.add_option("--shared-v8-includes",
-    action="store",
-    dest="shared_v8_includes",
-    help="Directory containing V8 header files")
-
-parser.add_option("--shared-v8-libpath",
-    action="store",
-    dest="shared_v8_libpath",
-    help="A directory to search for the shared V8 DLL")
-
-parser.add_option("--shared-v8-libname",
-    action="store",
-    dest="shared_v8_libname",
-    help="Alternative lib name to link to (default: 'v8')")
-
-parser.add_option("--shared-openssl",
-    action="store_true",
-    dest="shared_openssl",
-    help="Link to a shared OpenSSl DLL instead of static linking")
-
-parser.add_option("--shared-openssl-includes",
-    action="store",
-    dest="shared_openssl_includes",
-    help="Directory containing OpenSSL header files")
-
-parser.add_option("--shared-openssl-libpath",
-    action="store",
-    dest="shared_openssl_libpath",
-    help="A directory to search for the shared OpenSSL DLLs")
-
-parser.add_option("--shared-openssl-libname",
-    action="store",
-    dest="shared_openssl_libname",
-    help="Alternative lib name to link to (default: 'crypto,ssl')")
+# Options should be in alphabetical order but keep --prefix at the top,
+# that's arguably the one people will be looking for most.
+parser.add_option('--prefix',
+    action='store',
+    dest='prefix',
+    help='select the install prefix (defaults to /usr/local)')
+
+parser.add_option('--debug',
+    action='store_true',
+    dest='debug',
+    help='also build debug build')
+
+parser.add_option('--dest-cpu',
+    action='store',
+    dest='dest_cpu',
+    help='CPU architecture to build for. Valid values are: arm, ia32, x64')
+
+parser.add_option('--dest-os',
+    action='store',
+    dest='dest_os',
+    help='operating system to build for. Valid values are: '
+         'win, mac, solaris, freebsd, openbsd, linux, android')
+
+parser.add_option('--gdb',
+    action='store_true',
+    dest='gdb',
+    help='add gdb support')
+
+parser.add_option('--ninja',
+    action='store_true',
+    dest='use_ninja',
+    help='generate files for the ninja build system')
+
+parser.add_option('--no-ifaddrs',
+    action='store_true',
+    dest='no_ifaddrs',
+    help='use on deprecated SunOS systems that do not support ifaddrs.h')
+
+parser.add_option('--no-ssl2',
+    action='store_true',
+    dest='no_ssl2',
+    help='disable OpenSSL v2')
 
 # deprecated
-parser.add_option("--openssl-use-sys",
-    action="store_true",
-    dest="shared_openssl",
+parser.add_option('--openssl-includes',
+    action='store',
+    dest='shared_openssl_includes',
     help=optparse.SUPPRESS_HELP)
 
 # deprecated
-parser.add_option("--openssl-includes",
-    action="store",
-    dest="shared_openssl_includes",
+parser.add_option('--openssl-libpath',
+    action='store',
+    dest='shared_openssl_libpath',
     help=optparse.SUPPRESS_HELP)
 
 # deprecated
-parser.add_option("--openssl-libpath",
-    action="store",
-    dest="shared_openssl_libpath",
+parser.add_option('--openssl-use-sys',
+    action='store_true',
+    dest='shared_openssl',
     help=optparse.SUPPRESS_HELP)
 
+parser.add_option('--shared-cares',
+    action='store_true',
+    dest='shared_cares',
+    help='link to a shared cares DLL instead of static linking')
+
+parser.add_option('--shared-cares-includes',
+    action='store',
+    dest='shared_cares_includes',
+    help='directory containing cares header files')
+
+parser.add_option('--shared-cares-libname',
+    action='store',
+    dest='shared_cares_libname',
+    help='alternative lib name to link to (default: \'cares\')')
+
+parser.add_option('--shared-cares-libpath',
+    action='store',
+    dest='shared_cares_libpath',
+    help='a directory to search for the shared cares DLL')
+
+parser.add_option('--shared-http-parser',
+    action='store_true',
+    dest='shared_http_parser',
+    help='link to a shared http_parser DLL instead of static linking')
+
+parser.add_option('--shared-http-parser-includes',
+    action='store',
+    dest='shared_http_parser_includes',
+    help='directory containing http_parser header files')
+
+parser.add_option('--shared-http-parser-libname',
+    action='store',
+    dest='shared_http_parser_libname',
+    help='alternative lib name to link to (default: \'http_parser\')')
+
+parser.add_option('--shared-http-parser-libpath',
+    action='store',
+    dest='shared_http_parser_libpath',
+    help='a directory to search for the shared http_parser DLL')
+
+parser.add_option('--shared-libuv',
+    action='store_true',
+    dest='shared_libuv',
+    help='link to a shared libuv DLL instead of static linking')
+
+parser.add_option('--shared-libuv-includes',
+    action='store',
+    dest='shared_libuv_includes',
+    help='directory containing libuv header files')
+
+parser.add_option('--shared-libuv-libname',
+    action='store',
+    dest='shared_libuv_libname',
+    help='alternative lib name to link to (default: \'uv\')')
+
+parser.add_option('--shared-libuv-libpath',
+    action='store',
+    dest='shared_libuv_libpath',
+    help='a directory to search for the shared libuv DLL')
+
+parser.add_option('--shared-openssl',
+    action='store_true',
+    dest='shared_openssl',
+    help='link to a shared OpenSSl DLL instead of static linking')
+
+parser.add_option('--shared-openssl-includes',
+    action='store',
+    dest='shared_openssl_includes',
+    help='directory containing OpenSSL header files')
+
+parser.add_option('--shared-openssl-libname',
+    action='store',
+    dest='shared_openssl_libname',
+    help='alternative lib name to link to (default: \'crypto,ssl\')')
+
+parser.add_option('--shared-openssl-libpath',
+    action='store',
+    dest='shared_openssl_libpath',
+    help='a directory to search for the shared OpenSSL DLLs')
+
+parser.add_option('--shared-v8',
+    action='store_true',
+    dest='shared_v8',
+    help='link to a shared V8 DLL instead of static linking')
+
+parser.add_option('--shared-v8-includes',
+    action='store',
+    dest='shared_v8_includes',
+    help='directory containing V8 header files')
+
+parser.add_option('--shared-v8-libname',
+    action='store',
+    dest='shared_v8_libname',
+    help='alternative lib name to link to (default: \'v8\')')
+
+parser.add_option('--shared-v8-libpath',
+    action='store',
+    dest='shared_v8_libpath',
+    help='a directory to search for the shared V8 DLL')
+
+parser.add_option('--shared-zlib',
+    action='store_true',
+    dest='shared_zlib',
+    help='link to a shared zlib DLL instead of static linking')
+
+parser.add_option('--shared-zlib-includes',
+    action='store',
+    dest='shared_zlib_includes',
+    help='directory containing zlib header files')
+
+parser.add_option('--shared-zlib-libname',
+    action='store',
+    dest='shared_zlib_libname',
+    help='alternative lib name to link to (default: \'z\')')
+
+parser.add_option('--shared-zlib-libpath',
+    action='store',
+    dest='shared_zlib_libpath',
+    help='a directory to search for the shared zlib DLL')
+
 # TODO document when we've decided on what the tracing API and its options will
 # look like
-parser.add_option("--systemtap-includes",
-    action="store",
-    dest="systemtap_includes",
+parser.add_option('--systemtap-includes',
+    action='store',
+    dest='systemtap_includes',
     help=optparse.SUPPRESS_HELP)
 
-parser.add_option("--no-ssl2",
-    action="store_true",
-    dest="no_ssl2",
-    help="Disable OpenSSL v2")
-
-parser.add_option("--shared-zlib",
-    action="store_true",
-    dest="shared_zlib",
-    help="Link to a shared zlib DLL instead of static linking")
-
-parser.add_option("--shared-zlib-includes",
-    action="store",
-    dest="shared_zlib_includes",
-    help="Directory containing zlib header files")
-
-parser.add_option("--shared-zlib-libpath",
-    action="store",
-    dest="shared_zlib_libpath",
-    help="A directory to search for the shared zlib DLL")
-
-parser.add_option("--shared-zlib-libname",
-    action="store",
-    dest="shared_zlib_libname",
-    help="Alternative lib name to link to (default: 'z')")
-
-parser.add_option("--shared-http-parser",
-    action="store_true",
-    dest="shared_http_parser",
-    help="Link to a shared http_parser DLL instead of static linking")
-
-parser.add_option("--shared-http-parser-includes",
-    action="store",
-    dest="shared_http_parser_includes",
-    help="Directory containing http_parser header files")
-
-parser.add_option("--shared-http-parser-libpath",
-    action="store",
-    dest="shared_http_parser_libpath",
-    help="A directory to search for the shared http_parser DLL")
-
-parser.add_option("--shared-http-parser-libname",
-    action="store",
-    dest="shared_http_parser_libname",
-    help="Alternative lib name to link to (default: 'http_parser')")
-
-parser.add_option("--shared-cares",
-    action="store_true",
-    dest="shared_cares",
-    help="Link to a shared cares DLL instead of static linking")
-
-parser.add_option("--shared-cares-includes",
-    action="store",
-    dest="shared_cares_includes",
-    help="Directory containing cares header files")
-
-parser.add_option("--shared-cares-libpath",
-    action="store",
-    dest="shared_cares_libpath",
-    help="A directory to search for the shared cares DLL")
-
-parser.add_option("--shared-cares-libname",
-    action="store",
-    dest="shared_cares_libname",
-    help="Alternative lib name to link to (default: 'cares')")
-
-parser.add_option("--shared-libuv",
-    action="store_true",
-    dest="shared_libuv",
-    help="Link to a shared libuv DLL instead of static linking")
-
-parser.add_option("--shared-libuv-includes",
-    action="store",
-    dest="shared_libuv_includes",
-    help="Directory containing libuv header files")
-
-parser.add_option("--shared-libuv-libpath",
-    action="store",
-    dest="shared_libuv_libpath",
-    help="A directory to search for the shared libuv DLL")
-
-parser.add_option("--shared-libuv-libname",
-    action="store",
-    dest="shared_libuv_libname",
-    help="Alternative lib name to link to (default: 'uv')")
-
-parser.add_option("--with-dtrace",
-    action="store_true",
-    dest="with_dtrace",
-    help="Build with DTrace (default is true on sunos)")
-
-parser.add_option("--without-dtrace",
-    action="store_true",
-    dest="without_dtrace",
-    help="Build without DTrace")
-
-parser.add_option("--with-etw",
-    action="store_true",
-    dest="with_etw",
-    help="Build with ETW (default is true on Windows)")
-
-parser.add_option("--without-etw",
-    action="store_true",
-    dest="without_etw",
-    help="Build without ETW")
-
-parser.add_option("--with-perfctr",
-    action="store_true",
-    dest="with_perfctr",
-    help="Build with performance counters (default is true on Windows)")
-
-parser.add_option("--without-perfctr",
-    action="store_true",
-    dest="without_perfctr",
-    help="Build without performance counters")
-
-# CHECKME does this still work with recent releases of V8?
-parser.add_option("--gdb",
-    action="store_true",
-    dest="gdb",
-    help="add gdb support")
-
-parser.add_option("--dest-cpu",
-    action="store",
-    dest="dest_cpu",
-    help="CPU architecture to build for. Valid values are: arm, ia32, x64")
-
-parser.add_option("--dest-os",
-    action="store",
-    dest="dest_os",
-    help="Operating system to build for. Valid values are: "
-         "win, mac, solaris, freebsd, openbsd, linux, android")
-
-parser.add_option("--no-ifaddrs",
-    action="store_true",
-    dest="no_ifaddrs",
-    help="Use on deprecated SunOS systems that do not support ifaddrs.h")
-
-parser.add_option("--with-arm-float-abi",
-    action="store",
-    dest="arm_float_abi",
-    help="Specifies which floating-point ABI to use. Valid values are: "
-         "soft, softfp, hard")
-
-parser.add_option("--ninja",
-    action="store_true",
-    dest="use_ninja",
-    help="Generate files for the ninja build system")
-
-parser.add_option("--xcode",
-    action="store_true",
-    dest="use_xcode",
-    help="Generate build files for use with xcode")
-
-parser.add_option("--tag",
-    action="store",
-    dest="tag",
-    help="Custom build tag")
+parser.add_option('--tag',
+    action='store',
+    dest='tag',
+    help='custom build tag')
+
+parser.add_option('--with-arm-float-abi',
+    action='store',
+    dest='arm_float_abi',
+    help='specifies which floating-point ABI to use. Valid values are: '
+         'soft, softfp, hard')
+
+parser.add_option('--with-dtrace',
+    action='store_true',
+    dest='with_dtrace',
+    help='build with DTrace (default is true on sunos)')
+
+parser.add_option('--with-etw',
+    action='store_true',
+    dest='with_etw',
+    help='build with ETW (default is true on Windows)')
+
+parser.add_option('--with-perfctr',
+    action='store_true',
+    dest='with_perfctr',
+    help='build with performance counters (default is true on Windows)')
+
+parser.add_option('--without-dtrace',
+    action='store_true',
+    dest='without_dtrace',
+    help='build without DTrace')
+
+parser.add_option('--without-etw',
+    action='store_true',
+    dest='without_etw',
+    help='build without ETW')
+
+parser.add_option('--without-npm',
+    action='store_true',
+    dest='without_npm',
+    help='don\'t install the bundled npm package manager')
+
+parser.add_option('--without-perfctr',
+    action='store_true',
+    dest='without_perfctr',
+    help='build without performance counters')
+
+parser.add_option('--without-snapshot',
+    action='store_true',
+    dest='without_snapshot',
+    help='build without snapshotting V8 libraries. You might want to set'
+         ' this for cross-compiling. [Default: False]')
+
+parser.add_option('--without-ssl',
+    action='store_true',
+    dest='without_ssl',
+    help='build without SSL')
+
+parser.add_option('--xcode',
+    action='store_true',
+    dest='use_xcode',
+    help='generate build files for use with xcode')
 
 (options, args) = parser.parse_args()