mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2024-11-27 01:49:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* acgeneral.m4 (_AC_INIT_HELP): Move --srcdir in the first

Browse Source 
section.
Document --help=short and recursive.
Split the `Directory' section into `Installation directories' for
--prefix and --exec-prefix, and all the others into `Fine tuning
of the installation directories'.
In the latter, don't repeat `in DIR', the user understands, and it
comes out better.
Default for --exec-prefix is PREFIX.
Reported by Kathryn Hargreaves.
Move --host before --build.
Fix a test on `$ac_init_help' which was not updated.
This commit is contained in:
Akim Demaille 2000-04-12 11:50:57 +00:00
parent be342dbf70
commit afd63112d9
5 changed files with 194 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2000-04-12 Akim Demaille <akim@epita.fr>
* acgeneral.m4 (_AC_INIT_HELP): Move --srcdir in the first
section.
Document --help=short and recursive.
Split the `Directory' section into `Installation directories' for
--prefix and --exec-prefix, and all the others into `Fine tuning
of the installation directories'.
In the latter, don't repeat `in DIR', the user understands, and it
comes out better.
Default for --exec-prefix is PREFIX.
Reported by Kathryn Hargreaves.
Move --host before --build.
Fix a test on `$ac_init_help' which was not updated.
2000-04-11 Akim Demaille <akim@epita.fr> 2000-04-11 Akim Demaille <akim@epita.fr>
Have `make check' succeed with CC=g++. Have `make check' succeed with CC=g++.

1
THANKS
View File

@ -60,6 +60,7 @@ Joseph S. Myers jsm28@cam.ac.uk
Julian Onions j.onions@nexor.co.uk Julian Onions j.onions@nexor.co.uk
Karl Berry karl@cs.umb.edu Karl Berry karl@cs.umb.edu
Karl Heuer kwzh@gnu.org Karl Heuer kwzh@gnu.org
Kathryn Hargreaves kathryn@deas.harvard.edu
Kaveh R. Ghazi ghazi@caip.rutgers.edu Kaveh R. Ghazi ghazi@caip.rutgers.edu
Ken Pizzini ken@halcyon.com Ken Pizzini ken@halcyon.com
Ken Raeburn raeburn@cygnus.com Ken Raeburn raeburn@cygnus.com

81
acgeneral.m4
View File

@ -1258,67 +1258,88 @@ define([_AC_INIT_HELP],
if test "$ac_init_help" = "long"; then if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<\EOF cat <<EOF
`configure' configures ifset([AC_PACKAGE_STRING], \`configure' configures ifset([AC_PACKAGE_STRING],
[AC_PACKAGE_STRING], [AC_PACKAGE_STRING],
[this package]) to adapt to many kinds [this package]) to adapt to many kinds of systems.
[Usage: configure [OPTION]... [VAR=VALUE]... [HOST] Usage: $[0] [[OPTION]... [VAR=VALUE]... [HOST]]
To safely assign special values to environment variables (e.g., CC, [To assign environment variables (e.g., CC, CFLAGS...), specify them as
CFLAGS...), give to `configure' the definition as VAR=VALUE. VAR=VALUE.
Defaults for the options are specified in brackets. Defaults for the options are specified in brackets.
Configuration: Configuration:
-h, --help print this message -h, --help display this help and exit
-V, --version print the version of autoconf that created configure --help=short display options specific to this package
-q, --quiet, --silent do not print `checking...' messages --help=recursive display the short help of all the included packages
-V, --version display version information and exit
-q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled] --cache-file=FILE cache test results in FILE [disabled]
-n, --no-create do not create output files -n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or ..]
EOF EOF
cat <<EOF cat <<EOF
Directories: Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX --prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix] [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[same as prefix] [PREFIX]
--bindir=DIR user executables in DIR [EPREFIX/bin]
--sbindir=DIR system admin executables in DIR [EPREFIX/sbin] By default, \`make install' will install all the files in
--libexecdir=DIR program executables in DIR [EPREFIX/libexec] \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
--datadir=DIR read-only architecture-independent data in DIR an installation prefix other than \`$ac_default_prefix' using \`--prefix',
[PREFIX/share] for instance \`--prefix=\$HOME'.
--sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data in DIR For better control, use the options below.
[PREFIX/com]
--localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] Fine tuning of the installation directories:
--libdir=DIR object code libraries in DIR [EPREFIX/lib] --bindir=DIR user executables [EPREFIX/bin]
--includedir=DIR C header files in DIR [PREFIX/include] --sbindir=DIR system admin executables [EPREFIX/sbin]
--oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] --libexecdir=DIR program executables [EPREFIX/libexec]
--infodir=DIR info documentation in DIR [PREFIX/info] --datadir=DIR read-only architecture-independent data [PREFIX/share]
--mandir=DIR man documentation in DIR [PREFIX/man] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--srcdir=DIR find the sources in DIR [configure dir or ..] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
--infodir=DIR info documentation [PREFIX/info]
--mandir=DIR man documentation [PREFIX/man]
EOF EOF
cat <<\EOF cat <<\EOF
Host type: Host type:
--build=BUILD configure for building on BUILD [BUILD=HOST]
--host=HOST configure for HOST [guessed] --host=HOST configure for HOST [guessed]
--build=BUILD configure for building on BUILD [BUILD=HOST]
--target=TARGET configure for TARGET [TARGET=HOST] --target=TARGET configure for TARGET [TARGET=HOST]
EOF EOF
cat <<\EOF] cat <<\EOF]
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
dnl The order of the diversions here is
dnl HELP_BEGIN, which may be prolongated by extra generic options
dnl such as with X or AC_ARG_PROGRAM. Displayed only
dnl in long --help.
dnl HELP_ENABLE, which starts with the trailer of the HELP_BEGIN
dnl section, then implements the header of the non
dnl generic options.
dnl HELP_WITH,
dnl HELP_VAR,
dnl HELP_END, initialized below, in which we dump the trailer
dnl (handling of the recursion for instance).
AC_DIVERT_PUSH([HELP_ENABLE])dnl AC_DIVERT_PUSH([HELP_ENABLE])dnl
EOF EOF
fi fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
ifset([AC_PACKAGE_STRING], ifset([AC_PACKAGE_STRING],
[ $ac_init_help || [ case "$ac_init_help" in
echo "Configuration of AC_PACKAGE_STRING:"]) short | recursive ) echo "Configuration of AC_PACKAGE_STRING:";;
esac])
cat <<\EOF cat <<\EOF
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
AC_DIVERT_PUSH([HELP_END])dnl AC_DIVERT_PUSH([HELP_END])dnl

142
configure vendored
View File

@ -435,53 +435,62 @@ srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
if test "$ac_init_help" = "long"; then if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<\EOF cat <<EOF
`configure' configures Autoconf 2.14a to adapt to many kinds \`configure' configures Autoconf 2.14a to adapt to many kinds of systems.
Usage: configure [OPTION]... [VAR=VALUE]... [HOST] Usage: $0 [OPTION]... [VAR=VALUE]... [HOST]
To safely assign special values to environment variables (e.g., CC, To assign environment variables (e.g., CC, CFLAGS...), specify them as
CFLAGS...), give to `configure' the definition as VAR=VALUE. VAR=VALUE.
Defaults for the options are specified in brackets. Defaults for the options are specified in brackets.
Configuration: Configuration:
-h, --help print this message -h, --help display this help and exit
-V, --version print the version of autoconf that created configure --help=short display options specific to this package
-q, --quiet, --silent do not print `checking...' messages --help=recursive display the short help of all the included packages
-V, --version display version information and exit
-q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled] --cache-file=FILE cache test results in FILE [disabled]
-n, --no-create do not create output files -n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or ..]
EOF EOF
cat <<EOF cat <<EOF
Directories: Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX --prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix] [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[same as prefix] [PREFIX]
--bindir=DIR user executables in DIR [EPREFIX/bin]
--sbindir=DIR system admin executables in DIR [EPREFIX/sbin] By default, \`make install' will install all the files in
--libexecdir=DIR program executables in DIR [EPREFIX/libexec] \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
--datadir=DIR read-only architecture-independent data in DIR an installation prefix other than \`$ac_default_prefix' using \`--prefix',
[PREFIX/share] for instance \`--prefix=\$HOME'.
--sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data in DIR For better control, use the options below.
[PREFIX/com]
--localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] Fine tuning of the installation directories:
--libdir=DIR object code libraries in DIR [EPREFIX/lib] --bindir=DIR user executables [EPREFIX/bin]
--includedir=DIR C header files in DIR [PREFIX/include] --sbindir=DIR system admin executables [EPREFIX/sbin]
--oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] --libexecdir=DIR program executables [EPREFIX/libexec]
--infodir=DIR info documentation in DIR [PREFIX/info] --datadir=DIR read-only architecture-independent data [PREFIX/share]
--mandir=DIR man documentation in DIR [PREFIX/man] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--srcdir=DIR find the sources in DIR [configure dir or ..] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
--infodir=DIR info documentation [PREFIX/info]
--mandir=DIR man documentation [PREFIX/man]
EOF EOF
cat <<\EOF cat <<\EOF
Host type: Host type:
--build=BUILD configure for building on BUILD [BUILD=HOST]
--host=HOST configure for HOST [guessed] --host=HOST configure for HOST [guessed]
--build=BUILD configure for building on BUILD [BUILD=HOST]
--target=TARGET configure for TARGET [TARGET=HOST] --target=TARGET configure for TARGET [TARGET=HOST]
EOF EOF
cat <<\EOF cat <<\EOF
@ -494,8 +503,9 @@ EOF
fi fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
$ac_init_help || case "$ac_init_help" in
echo "Configuration of Autoconf 2.14a:" short | recursive ) echo "Configuration of Autoconf 2.14a:";;
esac
cat <<\EOF cat <<\EOF
EOF EOF
fi fi
@ -684,7 +694,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
# AFS /usr/afsws/bin/install, which mishandles nonexistent args # AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo "configure:606: checking for a BSD compatible install" >&5 echo "configure:613: checking for a BSD compatible install" >&5
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then if test "${ac_cv_path_install+set}" = set; then
@ -731,7 +741,7 @@ fi
INSTALL=$ac_install_sh INSTALL=$ac_install_sh
fi fi
fi fi
echo "configure:652: result: $INSTALL" >&5 echo "configure:659: result: $INSTALL" >&5
echo "$ECHO_T""$INSTALL" >&6 echo "$ECHO_T""$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}. # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@ -742,7 +752,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo "configure:659: checking whether build environment is sane" >&5 echo "configure:666: checking whether build environment is sane" >&5
echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
# Just in case # Just in case
sleep 1 sleep 1
@ -779,7 +789,7 @@ else
Check your system clock" >&2; exit 1; } Check your system clock" >&2; exit 1; }
fi fi
rm -f conftest* rm -f conftest*
echo "configure:694: result: yes" >&5 echo "configure:701: result: yes" >&5
echo "$ECHO_T""yes" >&6 echo "$ECHO_T""yes" >&6
if test "$program_transform_name" = s,x,x,; then if test "$program_transform_name" = s,x,x,; then
program_transform_name= program_transform_name=
@ -800,7 +810,7 @@ test "$program_suffix" != NONE &&
# sed with no file args requires a program. # sed with no file args requires a program.
test "$program_transform_name" = "" && program_transform_name="s,x,x," test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo "configure:713: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo "configure:720: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@ -820,11 +830,11 @@ fi
rm -f conftestmake rm -f conftestmake
fi fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
echo "configure:733: result: yes" >&5 echo "configure:740: result: yes" >&5
echo "$ECHO_T""yes" >&6 echo "$ECHO_T""yes" >&6
SET_MAKE= SET_MAKE=
else else
echo "configure:737: result: no" >&5 echo "configure:744: result: no" >&5
echo "$ECHO_T""no" >&6 echo "$ECHO_T""no" >&6
SET_MAKE="MAKE=${MAKE-make}" SET_MAKE="MAKE=${MAKE-make}"
fi fi
@ -849,78 +859,78 @@ cat >>confdefs.h <<EOF
EOF EOF
missing_dir=`cd $ac_aux_dir && pwd` missing_dir=`cd $ac_aux_dir && pwd`
echo "configure:755: checking for working aclocal" >&5 echo "configure:762: checking for working aclocal" >&5
echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6 echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
if (aclocal --version) < /dev/null > /dev/null 2>&1; then if (aclocal --version) < /dev/null > /dev/null 2>&1; then
ACLOCAL=aclocal ACLOCAL=aclocal
echo "configure:762: result: found" >&5 echo "configure:769: result: found" >&5
echo "$ECHO_T""found" >&6 echo "$ECHO_T""found" >&6
else else
ACLOCAL="$missing_dir/missing aclocal" ACLOCAL="$missing_dir/missing aclocal"
echo "configure:766: result: missing" >&5 echo "configure:773: result: missing" >&5
echo "$ECHO_T""missing" >&6 echo "$ECHO_T""missing" >&6
fi fi
echo "configure:769: checking for working autoconf" >&5 echo "configure:776: checking for working autoconf" >&5
echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
if (autoconf --version) < /dev/null > /dev/null 2>&1; then if (autoconf --version) < /dev/null > /dev/null 2>&1; then
AUTOCONF=autoconf AUTOCONF=autoconf
echo "configure:776: result: found" >&5 echo "configure:783: result: found" >&5
echo "$ECHO_T""found" >&6 echo "$ECHO_T""found" >&6
else else
AUTOCONF="$missing_dir/missing autoconf" AUTOCONF="$missing_dir/missing autoconf"
echo "configure:780: result: missing" >&5 echo "configure:787: result: missing" >&5
echo "$ECHO_T""missing" >&6 echo "$ECHO_T""missing" >&6
fi fi
echo "configure:783: checking for working automake" >&5 echo "configure:790: checking for working automake" >&5
echo $ECHO_N "checking for working automake... $ECHO_C" >&6 echo $ECHO_N "checking for working automake... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
if (automake --version) < /dev/null > /dev/null 2>&1; then if (automake --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake AUTOMAKE=automake
echo "configure:790: result: found" >&5 echo "configure:797: result: found" >&5
echo "$ECHO_T""found" >&6 echo "$ECHO_T""found" >&6
else else
AUTOMAKE="$missing_dir/missing automake" AUTOMAKE="$missing_dir/missing automake"
echo "configure:794: result: missing" >&5 echo "configure:801: result: missing" >&5
echo "$ECHO_T""missing" >&6 echo "$ECHO_T""missing" >&6
fi fi
echo "configure:797: checking for working autoheader" >&5 echo "configure:804: checking for working autoheader" >&5
echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
if (autoheader --version) < /dev/null > /dev/null 2>&1; then if (autoheader --version) < /dev/null > /dev/null 2>&1; then
AUTOHEADER=autoheader AUTOHEADER=autoheader
echo "configure:804: result: found" >&5 echo "configure:811: result: found" >&5
echo "$ECHO_T""found" >&6 echo "$ECHO_T""found" >&6
else else
AUTOHEADER="$missing_dir/missing autoheader" AUTOHEADER="$missing_dir/missing autoheader"
echo "configure:808: result: missing" >&5 echo "configure:815: result: missing" >&5
echo "$ECHO_T""missing" >&6 echo "$ECHO_T""missing" >&6
fi fi
echo "configure:811: checking for working makeinfo" >&5 echo "configure:818: checking for working makeinfo" >&5
echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
if (makeinfo --version) < /dev/null > /dev/null 2>&1; then if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
MAKEINFO=makeinfo MAKEINFO=makeinfo
echo "configure:818: result: found" >&5 echo "configure:825: result: found" >&5
echo "$ECHO_T""found" >&6 echo "$ECHO_T""found" >&6
else else
MAKEINFO="$missing_dir/missing makeinfo" MAKEINFO="$missing_dir/missing makeinfo"
echo "configure:822: result: missing" >&5 echo "configure:829: result: missing" >&5
echo "$ECHO_T""missing" >&6 echo "$ECHO_T""missing" >&6
fi fi
@ -930,7 +940,7 @@ for ac_prog in gm4 gnum4 m4
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo "configure:830: checking for $ac_word" >&5 echo "configure:837: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_M4+set}" = set; then if test "${ac_cv_path_M4+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -955,10 +965,10 @@ esac
fi fi
M4=$ac_cv_path_M4 M4=$ac_cv_path_M4
if test -n "$M4"; then if test -n "$M4"; then
echo "configure:855: result: $M4" >&5 echo "configure:862: result: $M4" >&5
echo "$ECHO_T""$M4" >&6 echo "$ECHO_T""$M4" >&6
else else
echo "configure:858: result: no" >&5 echo "configure:865: result: no" >&5
echo "$ECHO_T""no" >&6 echo "$ECHO_T""no" >&6
fi fi
@ -966,7 +976,7 @@ test -n "$M4" && break
done done
test -n "$M4" || M4="m4" test -n "$M4" || M4="m4"
echo "configure:864: checking whether m4 supports frozen files" >&5 echo "configure:871: checking whether m4 supports frozen files" >&5
echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6 echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6
if test "${ac_cv_prog_gnu_m4+set}" = set; then if test "${ac_cv_prog_gnu_m4+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -978,7 +988,7 @@ if test x"$M4" != x; then
esac esac
fi fi
fi fi
echo "configure:876: result: $ac_cv_prog_gnu_m4" >&5 echo "configure:883: result: $ac_cv_prog_gnu_m4" >&5
echo "$ECHO_T""$ac_cv_prog_gnu_m4" >&6 echo "$ECHO_T""$ac_cv_prog_gnu_m4" >&6
if test x"$ac_cv_prog_gnu_m4" != xyes; then if test x"$ac_cv_prog_gnu_m4" != xyes; then
{ echo "configure: error: GNU m4 1.4 is required" >&2; exit 1; } { echo "configure: error: GNU m4 1.4 is required" >&2; exit 1; }
@ -988,7 +998,7 @@ for ac_prog in mawk gawk nawk awk
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo "configure:885: checking for $ac_word" >&5 echo "configure:892: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_AWK+set}" = set; then if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -1013,34 +1023,34 @@ fi
fi fi
AWK=$ac_cv_prog_AWK AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then if test -n "$AWK"; then
echo "configure:910: result: $AWK" >&5 echo "configure:917: result: $AWK" >&5
echo "$ECHO_T""$AWK" >&6 echo "$ECHO_T""$AWK" >&6
else else
echo "configure:913: result: no" >&5 echo "configure:920: result: no" >&5
echo "$ECHO_T""no" >&6 echo "$ECHO_T""no" >&6
fi fi
test -n "$AWK" && break test -n "$AWK" && break
done done
echo "configure:918: checking for working help2man" >&5 echo "configure:925: checking for working help2man" >&5
echo $ECHO_N "checking for working help2man... $ECHO_C" >&6 echo $ECHO_N "checking for working help2man... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
if (help2man --version) < /dev/null > /dev/null 2>&1; then if (help2man --version) < /dev/null > /dev/null 2>&1; then
HELP2MAN=help2man HELP2MAN=help2man
echo "configure:925: result: found" >&5 echo "configure:932: result: found" >&5
echo "$ECHO_T""found" >&6 echo "$ECHO_T""found" >&6
else else
HELP2MAN="\${SHELL} \${top_srcdir}/missing help2man" HELP2MAN="\${SHELL} \${top_srcdir}/missing help2man"
echo "configure:929: result: missing" >&5 echo "configure:936: result: missing" >&5
echo "$ECHO_T""missing" >&6 echo "$ECHO_T""missing" >&6
fi fi
# Extract the first word of "perl", so it can be a program name with args. # Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2 set dummy perl; ac_word=$2
echo "configure:934: checking for $ac_word" >&5 echo "configure:941: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_PERL+set}" = set; then if test "${ac_cv_path_PERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -1066,10 +1076,10 @@ esac
fi fi
PERL=$ac_cv_path_PERL PERL=$ac_cv_path_PERL
if test -n "$PERL"; then if test -n "$PERL"; then
echo "configure:960: result: $PERL" >&5 echo "configure:967: result: $PERL" >&5
echo "$ECHO_T""$PERL" >&6 echo "$ECHO_T""$PERL" >&6
else else
echo "configure:963: result: no" >&5 echo "configure:970: result: no" >&5
echo "$ECHO_T""no" >&6 echo "$ECHO_T""no" >&6
fi fi
@ -1090,7 +1100,7 @@ fi
# AFS /usr/afsws/bin/install, which mishandles nonexistent args # AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo "configure:982: checking for a BSD compatible install" >&5 echo "configure:989: checking for a BSD compatible install" >&5
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then if test "${ac_cv_path_install+set}" = set; then
@ -1137,7 +1147,7 @@ fi
INSTALL=$ac_install_sh INSTALL=$ac_install_sh
fi fi
fi fi
echo "configure:1028: result: $INSTALL" >&5 echo "configure:1035: result: $INSTALL" >&5
echo "$ECHO_T""$INSTALL" >&6 echo "$ECHO_T""$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}. # Use test -z because SunOS4 sh mishandles braces in ${var-val}.

81
lib/autoconf/general.m4
View File

@ -1258,67 +1258,88 @@ define([_AC_INIT_HELP],
if test "$ac_init_help" = "long"; then if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<\EOF cat <<EOF
`configure' configures ifset([AC_PACKAGE_STRING], \`configure' configures ifset([AC_PACKAGE_STRING],
[AC_PACKAGE_STRING], [AC_PACKAGE_STRING],
[this package]) to adapt to many kinds [this package]) to adapt to many kinds of systems.
[Usage: configure [OPTION]... [VAR=VALUE]... [HOST] Usage: $[0] [[OPTION]... [VAR=VALUE]... [HOST]]
To safely assign special values to environment variables (e.g., CC, [To assign environment variables (e.g., CC, CFLAGS...), specify them as
CFLAGS...), give to `configure' the definition as VAR=VALUE. VAR=VALUE.
Defaults for the options are specified in brackets. Defaults for the options are specified in brackets.
Configuration: Configuration:
-h, --help print this message -h, --help display this help and exit
-V, --version print the version of autoconf that created configure --help=short display options specific to this package
-q, --quiet, --silent do not print `checking...' messages --help=recursive display the short help of all the included packages
-V, --version display version information and exit
-q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled] --cache-file=FILE cache test results in FILE [disabled]
-n, --no-create do not create output files -n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or ..]
EOF EOF
cat <<EOF cat <<EOF
Directories: Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX --prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix] [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[same as prefix] [PREFIX]
--bindir=DIR user executables in DIR [EPREFIX/bin]
--sbindir=DIR system admin executables in DIR [EPREFIX/sbin] By default, \`make install' will install all the files in
--libexecdir=DIR program executables in DIR [EPREFIX/libexec] \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
--datadir=DIR read-only architecture-independent data in DIR an installation prefix other than \`$ac_default_prefix' using \`--prefix',
[PREFIX/share] for instance \`--prefix=\$HOME'.
--sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data in DIR For better control, use the options below.
[PREFIX/com]
--localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] Fine tuning of the installation directories:
--libdir=DIR object code libraries in DIR [EPREFIX/lib] --bindir=DIR user executables [EPREFIX/bin]
--includedir=DIR C header files in DIR [PREFIX/include] --sbindir=DIR system admin executables [EPREFIX/sbin]
--oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] --libexecdir=DIR program executables [EPREFIX/libexec]
--infodir=DIR info documentation in DIR [PREFIX/info] --datadir=DIR read-only architecture-independent data [PREFIX/share]
--mandir=DIR man documentation in DIR [PREFIX/man] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--srcdir=DIR find the sources in DIR [configure dir or ..] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
--infodir=DIR info documentation [PREFIX/info]
--mandir=DIR man documentation [PREFIX/man]
EOF EOF
cat <<\EOF cat <<\EOF
Host type: Host type:
--build=BUILD configure for building on BUILD [BUILD=HOST]
--host=HOST configure for HOST [guessed] --host=HOST configure for HOST [guessed]
--build=BUILD configure for building on BUILD [BUILD=HOST]
--target=TARGET configure for TARGET [TARGET=HOST] --target=TARGET configure for TARGET [TARGET=HOST]
EOF EOF
cat <<\EOF] cat <<\EOF]
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
dnl The order of the diversions here is
dnl HELP_BEGIN, which may be prolongated by extra generic options
dnl such as with X or AC_ARG_PROGRAM. Displayed only
dnl in long --help.
dnl HELP_ENABLE, which starts with the trailer of the HELP_BEGIN
dnl section, then implements the header of the non
dnl generic options.
dnl HELP_WITH,
dnl HELP_VAR,
dnl HELP_END, initialized below, in which we dump the trailer
dnl (handling of the recursion for instance).
AC_DIVERT_PUSH([HELP_ENABLE])dnl AC_DIVERT_PUSH([HELP_ENABLE])dnl
EOF EOF
fi fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
ifset([AC_PACKAGE_STRING], ifset([AC_PACKAGE_STRING],
[ $ac_init_help || [ case "$ac_init_help" in
echo "Configuration of AC_PACKAGE_STRING:"]) short | recursive ) echo "Configuration of AC_PACKAGE_STRING:";;
esac])
cat <<\EOF cat <<\EOF
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
AC_DIVERT_PUSH([HELP_END])dnl AC_DIVERT_PUSH([HELP_END])dnl