Reorganize the doc

Author: vstinner

Doc/using/configure.rst

@@ -94,154 +94,6 @@ List all :file:`configure` script options using::
 
 See also the :file:`Misc/SpecialBuilds.txt` in the Python source distribution.
 
-Variables
----------
-
-.. cmdoption:: BOLT_APPLY_FLAGS
-
-   Arguments to ``llvm-bolt`` when creating a `BOLT optimized binary
-   <https://github.com/facebookarchive/BOLT>`_.
-
-.. cmdoption:: BOLT_INSTRUMENT_FLAGS
-
-   Arguments to ``llvm-bolt`` when instrumenting binaries.
-
-.. cmdoption:: BZIP2_CFLAGS
-.. cmdoption:: BZIP2_LIBS
-
-   C compiler and linker flags to link Python to ``libbz2``, used by :mod:`bz2`
-   module, overriding ``pkg-config``.
-
-.. cmdoption:: CC
-
-   C compiler command.
-
-.. cmdoption:: CFLAGS
-
-   C compiler flags.
-
-.. cmdoption:: CPP
-
-   C preprocessor command.
-
-.. cmdoption:: CPPFLAGS
-
-   C preprocessor flags, e.g. ``-I<include dir>``.
-
-.. cmdoption:: CURSES_CFLAGS
-.. cmdoption:: CURSES_LIBS
-
-   C compiler and linker flags for ``libncurses`` or ``libncursesw``, used by
-   :mod:`curses` module, overriding ``pkg-config``.
-
-.. cmdoption:: GDBM_CFLAGS
-.. cmdoption:: GDBM_LIBS
-
-   C compiler and linker flags for ``gdbm``.
-
-.. cmdoption:: HOSTRUNNER
-
-   Program to run CPython for the host platform for cross-compilation.
-
-.. cmdoption:: LDFLAGS
-
-   Linker flags, e.g. ``-L<library directory>``.
-
-   See also :option:`LIBS`.
-
-.. cmdoption:: LIBATOMIC
-
-   Linker flags when ``cpython/pyatomic.h`` header file is used.
-
-   Default: ``LIBATOMIC='-latomic'`` if ``libatomic`` is needed, or
-   ``LIBATOMIC=''`` otherwise (also the default when Python is cross-compiled).
-
-   .. versionadded:: 3.13
-
-.. cmdoption:: LIBB2_CFLAGS
-.. cmdoption:: LIBB2_LIBS
-
-   C compiler and linker flags for ``libb2`` (:ref:`BLAKE2 <hashlib-blake2>`),
-   used by :mod:`hashlib` module, overriding ``pkg-config``.
-
-.. cmdoption:: LIBEDIT_CFLAGS
-.. cmdoption:: LIBEDIT_LIBS
-
-   C compiler and linker flags for ``libedit``, used by :mod:`readline` module,
-   overriding ``pkg-config``.
-
-.. cmdoption:: LIBFFI_CFLAGS
-.. cmdoption:: LIBFFI_LIBS
-
-   C compiler and linker flags for ``libffi``, used by :mod:`ctypes` module,
-   overriding ``pkg-config``.
-
-.. cmdoption:: LIBLZMA_CFLAGS
-.. cmdoption:: LIBLZMA_LIBS
-
-   C compiler and linker flags for ``liblzma``, used by :mod:`lzma` module,
-   overriding ``pkg-config``.
-
-.. cmdoption:: LIBREADLINE_CFLAGS
-.. cmdoption:: LIBREADLINE_LIBS
-
-   C compiler and linker flags for ``libreadline``, used by :mod:`readline`
-   module, overriding ``pkg-config``.
-
-.. cmdoption:: LIBS
-
-   Libraries to pass to the linker, e.g. ``-l<library>``.
-
-   See also :option:`LDFLAGS`.
-
-.. cmdoption:: LIBSQLITE3_CFLAGS
-.. cmdoption:: LIBSQLITE3_LIBS
-
-   C compiler and linker flags for ``libsqlite3``, used by :mod:`sqlite3`
-   module, overriding ``pkg-config``.
-
-.. cmdoption:: LIBUUID_CFLAGS
-.. cmdoption:: LIBUUID_LIBS
-
-   C compiler and linker flags for ``liuuid``, used by :mod:`uuid` module,
-   overriding ``pkg-config``.
-
-.. cmdoption:: MACHDEP
-
-   Name for machine-dependent library files.
-
-.. cmdoption:: PANEL_CFLAGS
-.. cmdoption:: PANEL_LIBS
-
-   C compiler and Linker flags for PANEL, overriding ``pkg-config``.
-
-   C compiler and linker flags for ``libpanel`` or ``libpanelw``, used by
-   :mod:`curses.panel` module, overriding ``pkg-config``.
-
-.. cmdoption:: PKG_CONFIG
-
-   Path to ``pkg-config`` utility.
-
-.. cmdoption:: PKG_CONFIG_LIBDIR
-.. cmdoption:: PKG_CONFIG_PATH
-.. cmdoption:: PROFILE_TASK
-
-   Python command line arguments for PGO generation task.
-
-   Default: ``PROFILE_TASK='-m test --pgo --timeout=$(TESTTIMEOUT)'``.
-
-.. cmdoption:: TCLTK_CFLAGS
-.. cmdoption:: TCLTK_LIBS
-
-   C compiler and linker flags for TCLTK, overriding ``pkg-config``.
-
-.. cmdoption:: ZLIB_CFLAGS
-.. cmdoption:: ZLIB_LIBS
-
-   C compiler and linker flags for ``libzlib``, used by :mod:`gzip` module,
-   overriding ``pkg-config``.
-
-
 General Options
 ---------------
 
@@ -437,6 +289,143 @@ General Options
 
    .. versionadded:: 3.13
 
+.. cmdoption:: PKG_CONFIG
+
+   Path to ``pkg-config`` utility.
+
+.. cmdoption:: PKG_CONFIG_LIBDIR
+.. cmdoption:: PKG_CONFIG_PATH
+
+   ``pkg-config`` options.
+
+
+C Compiler Options
+------------------
+
+.. cmdoption:: CC
+
+   C compiler command.
+
+.. cmdoption:: CFLAGS
+
+   C compiler flags.
+
+.. cmdoption:: CPP
+
+   C preprocessor command.
+
+.. cmdoption:: CPPFLAGS
+
+   C preprocessor flags, e.g. ``-I<include dir>``.
+
+
+Linker Options
+--------------
+
+.. cmdoption:: LDFLAGS
+
+   Linker flags, e.g. ``-L<library directory>``.
+
+.. cmdoption:: LIBATOMIC
+
+   Linker flags when ``cpython/pyatomic.h`` header file is used.
+
+   Default: ``LIBATOMIC='-latomic'`` if ``libatomic`` is needed, or
+   ``LIBATOMIC=''`` otherwise (also the default when Python is cross-compiled).
+
+   .. versionadded:: 3.13
+
+.. cmdoption:: LIBS
+
+   Libraries to pass to the linker, e.g. ``-l<library>``.
+
+.. cmdoption:: MACHDEP
+
+   Name for machine-dependent library files.
+
+
+Libraries Options
+-----------------
+
+.. cmdoption:: BZIP2_CFLAGS
+.. cmdoption:: BZIP2_LIBS
+
+   C compiler and linker flags to link Python to ``libbz2``, used by :mod:`bz2`
+   module, overriding ``pkg-config``.
+
+.. cmdoption:: CURSES_CFLAGS
+.. cmdoption:: CURSES_LIBS
+
+   C compiler and linker flags for ``libncurses`` or ``libncursesw``, used by
+   :mod:`curses` module, overriding ``pkg-config``.
+
+.. cmdoption:: GDBM_CFLAGS
+.. cmdoption:: GDBM_LIBS
+
+   C compiler and linker flags for ``gdbm``.
+
+.. cmdoption:: LIBB2_CFLAGS
+.. cmdoption:: LIBB2_LIBS
+
+   C compiler and linker flags for ``libb2`` (:ref:`BLAKE2 <hashlib-blake2>`),
+   used by :mod:`hashlib` module, overriding ``pkg-config``.
+
+.. cmdoption:: LIBEDIT_CFLAGS
+.. cmdoption:: LIBEDIT_LIBS
+
+   C compiler and linker flags for ``libedit``, used by :mod:`readline` module,
+   overriding ``pkg-config``.
+
+.. cmdoption:: LIBFFI_CFLAGS
+.. cmdoption:: LIBFFI_LIBS
+
+   C compiler and linker flags for ``libffi``, used by :mod:`ctypes` module,
+   overriding ``pkg-config``.
+
+.. cmdoption:: LIBLZMA_CFLAGS
+.. cmdoption:: LIBLZMA_LIBS
+
+   C compiler and linker flags for ``liblzma``, used by :mod:`lzma` module,
+   overriding ``pkg-config``.
+
+.. cmdoption:: LIBREADLINE_CFLAGS
+.. cmdoption:: LIBREADLINE_LIBS
+
+   C compiler and linker flags for ``libreadline``, used by :mod:`readline`
+   module, overriding ``pkg-config``.
+
+.. cmdoption:: LIBSQLITE3_CFLAGS
+.. cmdoption:: LIBSQLITE3_LIBS
+
+   C compiler and linker flags for ``libsqlite3``, used by :mod:`sqlite3`
+   module, overriding ``pkg-config``.
+
+.. cmdoption:: LIBUUID_CFLAGS
+.. cmdoption:: LIBUUID_LIBS
+
+   C compiler and linker flags for ``liuuid``, used by :mod:`uuid` module,
+   overriding ``pkg-config``.
+
+.. cmdoption:: PANEL_CFLAGS
+.. cmdoption:: PANEL_LIBS
+
+   C compiler and Linker flags for PANEL, overriding ``pkg-config``.
+
+   C compiler and linker flags for ``libpanel`` or ``libpanelw``, used by
+   :mod:`curses.panel` module, overriding ``pkg-config``.
+
+.. cmdoption:: TCLTK_CFLAGS
+.. cmdoption:: TCLTK_LIBS
+
+   C compiler and linker flags for TCLTK, overriding ``pkg-config``.
+
+.. cmdoption:: ZLIB_CFLAGS
+.. cmdoption:: ZLIB_LIBS
+
+   C compiler and linker flags for ``libzlib``, used by :mod:`gzip` module,
+   overriding ``pkg-config``.
+
+
 WebAssembly Options
 -------------------
 
@@ -576,6 +565,19 @@ also be used to improve performance.
 
    .. versionadded:: 3.12
 
+.. cmdoption:: BOLT_APPLY_FLAGS
+
+   Arguments to ``llvm-bolt`` when creating a `BOLT optimized binary
+   <https://github.com/facebookarchive/BOLT>`_.
+
+   .. versionadded:: 3.12
+
+.. cmdoption:: BOLT_INSTRUMENT_FLAGS
+
+   Arguments to ``llvm-bolt`` when instrumenting binaries.
+
+   .. versionadded:: 3.12
+
 .. cmdoption:: --with-computed-gotos
 
    Enable computed gotos in evaluation loop (enabled by default on supported
@@ -898,8 +900,6 @@ for another CPU architecture or platform. Cross compiling requires a Python
 interpreter for the build platform. The version of the build Python must match
 the version of the cross compiled host Python.
 
-See also :option:`HOSTRUNNER`.
-
 .. cmdoption:: --build=BUILD
 
    configure for building on BUILD, usually guessed by :program:`config.guess`.
@@ -925,6 +925,10 @@ See also :option:`HOSTRUNNER`.
       ac_cv_file__dev_ptmx=yes
       ac_cv_file__dev_ptc=no
 
+.. cmdoption:: HOSTRUNNER
+
+   Program to run CPython for the host platform for cross-compilation.
+
 
 Cross compiling example::