summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Kaduk <kaduk@mit.edu>2012-06-29 14:10:07 -0400
committerBen Kaduk <kaduk@mit.edu>2012-07-12 14:57:26 -0400
commit8d2b33bdbe85f4de28b70bf6a6439b12b9b5d5bc (patch)
tree18a1eea36b8159946dfdd17fb81f6464ef7f6ae2
parentb9e59579a28944f48821a57a57757919c4f9fb72 (diff)
downloadkrb5-8d2b33bdbe85f4de28b70bf6a6439b12b9b5d5bc.tar.gz
krb5-8d2b33bdbe85f4de28b70bf6a6439b12b9b5d5bc.tar.xz
krb5-8d2b33bdbe85f4de28b70bf6a6439b12b9b5d5bc.zip
Sort configure options
Stick to the order of 'configure --help' for most sections, but sort environment variables alphabetically (since, e.g., configure --help does not list CPPFLAGS and there is not a good way to add that). Note that this does not add or remove any content, even though some options are missing/extra.
-rw-r--r--doc/rst_source/krb_build/options2configure.rst22
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/rst_source/krb_build/options2configure.rst b/doc/rst_source/krb_build/options2configure.rst
index 7d1e700352..744e3694c7 100644
--- a/doc/rst_source/krb_build/options2configure.rst
+++ b/doc/rst_source/krb_build/options2configure.rst
@@ -99,13 +99,19 @@ Environment variables
**CFLAGS=**\ *FLAGS*
Use *FLAGS* as the default set of C compiler flags.
+**CPP=**\ *CPP*
+ C preprocessor to use. (e.g. ``CPP='gcc -E'``)
+
**CPPFLAGS=**\ *CPPOPTS*
Use *CPPOPTS* as the default set of C preprocessor flags. The
most common use of this option is to select certain #define's for
use with the operating system's include files.
-**CPP=**\ *CPP*
- C preprocessor to use. (e.g. ``CPP='gcc -E'``)
+**CXX**
+ C++ compiler command
+
+**CXXFLAGS**
+ C++ compiler flags
**DB_HEADER=**\ *headername*
If db.h is not the correct header file to include to compile
@@ -139,12 +145,6 @@ Environment variables
This option is ignored if **--with-system-ss** is not specified.
-**CXX**
- C++ compiler command
-
-**CXXFLAGS**
- C++ compiler flags
-
**YACC**
The 'Yet Another C Compiler' implementation to use. Defaults to
the first program found out of: '`bison -y`', '`byacc`',
@@ -278,12 +278,12 @@ System types
Optional features
-----------------
-**--disable-**\ *FEATURE*
- Do not include *FEATURE* (same as --enable-FEATURE=no).
-
**--disable-option-checking**
Ignore unrecognized --enable/--with options.
+**--disable-**\ *FEATURE*
+ Do not include *FEATURE* (same as --enable-FEATURE=no).
+
**--enable-**\ *FEATURE*\ [=\ *ARG*]
Include *FEATURE* [ARG=yes].