From 682d0209e8a67d53594fb524b5d9ae4141bcc9b2 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Fri, 11 Apr 2014 17:35:54 -0700 Subject: [PATCH] [master] customize configure --help --- aclocal.m4 | 10 ++++++++ configure | 64 +++++++++++++++++++++++++++++++------------------ configure.in | 4 +--- doc/dev/release | 3 ++- 4 files changed, 54 insertions(+), 27 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 3f017c9996..e7ac2ec47c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -3,3 +3,13 @@ sinclude(libtool.m4/ltoptions.m4)dnl sinclude(libtool.m4/ltsugar.m4)dnl sinclude(libtool.m4/ltversion.m4)dnl sinclude(libtool.m4/lt~obsolete.m4)dnl + +m4_divert_text(HELP_CANON, [[ + NOTE: If PREFIX is not set, then the default values for --sysconfdir + and --localstatedir are /etc and /var, respectively.]]) +m4_divert_text(HELP_END, [[ +Professional support for BIND is provided by Internet Systems Consortium, +Inc., doing business as DNSco. Information about paid support options is +available at http://www.dns-co.com/solutions/. Free support is provided by +our user community via a mailing list. Information on public email lists +is available at https://www.isc.org/community/mailing-list/.]]) diff --git a/configure b/configure index ac6bb9d8e3..b49b54f762 100755 --- a/configure +++ b/configure @@ -14,9 +14,10 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# From configure.in Revision: 1.533.34.1 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69. +# Generated by GNU Autoconf 2.69 for BIND 9.10. +# +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -288,10 +289,11 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." + $as_echo "$0: Please tell bug-autoconf@gnu.org and bind9-bugs@isc.org +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." fi exit 1 fi @@ -601,14 +603,13 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= -PACKAGE_URL= +PACKAGE_NAME='BIND' +PACKAGE_TARNAME='bind' +PACKAGE_VERSION='9.10' +PACKAGE_STRING='BIND 9.10' +PACKAGE_BUGREPORT='bind9-bugs@isc.org' +PACKAGE_URL='https://www.isc.org/downloads/BIND/' -ac_unique_file="lib/dns/name.c" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -1078,7 +1079,7 @@ sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' infodir='${datarootdir}/info' htmldir='${docdir}' dvidir='${docdir}' @@ -1578,7 +1579,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures BIND 9.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1626,7 +1627,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --docdir=DIR documentation root [DATAROOTDIR/doc/bind] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1635,6 +1636,9 @@ _ACEOF cat <<\_ACEOF + NOTE: If PREFIX is not set, then the default values for --sysconfdir + and --localstatedir are /etc and /var, respectively. + System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] @@ -1642,7 +1646,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of BIND 9.10:";; + esac cat <<\_ACEOF Optional Features: @@ -1747,7 +1753,14 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to the package provider. +Professional support for BIND is provided by Internet Systems Consortium, +Inc., doing business as DNSco. Information about paid support options is +available at http://www.dns-co.com/solutions/. Free support is provided by +our user community via a mailing list. Information on public email lists +is available at https://www.isc.org/community/mailing-list/. + +Report bugs to . +BIND home page: . _ACEOF ac_status=$? fi @@ -1810,7 +1823,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +BIND configure 9.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2209,6 +2222,10 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## --------------------------------- ## +## Report this to bind9-bugs@isc.org ## +## --------------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 @@ -2412,7 +2429,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by BIND $as_me 9.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -21888,7 +21905,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by $as_me, which was +This file was extended by BIND $as_me 9.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21948,13 +21965,14 @@ $config_headers Configuration commands: $config_commands -Report bugs to the package provider." +Report bugs to . +BIND home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -config.status +BIND config.status 9.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 39caa6fc49..1637510545 100644 --- a/configure.in +++ b/configure.in @@ -32,9 +32,7 @@ AC_DIVERT_PUSH(1)dnl esyscmd([sed -e 's/^/# /' -e '/Portions of this code/,$d' COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.533.34.1 $) - -AC_INIT(lib/dns/name.c) +AC_INIT(BIND, [9.10], [bind9-bugs@isc.org], [], [https://www.isc.org/downloads/BIND/]) AC_PREREQ(2.59) AC_CONFIG_HEADER(config.h) diff --git a/doc/dev/release b/doc/dev/release index dcf11f937d..3d5d27fdaf 100644 --- a/doc/dev/release +++ b/doc/dev/release @@ -307,7 +307,8 @@ release. - When the web pages are up, announce the release on bind-announce@isc.org - - Increment the version in the file "version" + - Increment the version in the file "version", "configure.in" and + "doc/arm/Bv9ARM-book.xml". - Resume doing pullups