mirror of
git://git.sv.gnu.org/autoconf
synced 2024-11-21 01:01:48 +08:00
Introduce AC_SUBST(VAR, VAL).
* acgeneral.m4 (_AC_INIT_PARSE_ARGS): Stop global double quoting, failed experiment. Merge all the var=val AC_SUBST(var) into AC_SUBST(var, val). (AC_SUBST): Implement support for 2nd arg. * doc/autoconf.texi (Setting Output Variables): Adjust.
This commit is contained in:
Akim Demaille
parent
6b95f3a59e
commit
29df07981f
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2000-03-14 Akim Demaille <akim@epita.fr>
|
||||
|
||||
Introduce AC_SUBST(VAR, VAL).
|
||||
|
||||
* acgeneral.m4 (_AC_INIT_PARSE_ARGS): Stop global double quoting,
|
||||
failed experiment.
|
||||
Merge all the var=val AC_SUBST(var) into AC_SUBST(var, val).
|
||||
(AC_SUBST): Implement support for 2nd arg.
|
||||
* doc/autoconf.texi (Setting Output Variables): Adjust.
|
||||
|
||||
2000-03-13 Akim Demaille <akim@epita.fr>
|
||||
|
||||
Simplify the diversions naming system.
|
||||
|
||||
111
acgeneral.m4
111
acgeneral.m4
@ -659,7 +659,7 @@ AC_DIVERT_POP()])
|
||||
# -------------------
|
||||
AC_DEFUN(_AC_INIT_PARSE_ARGS,
|
||||
[AC_DIVERT_PUSH([INIT_PARSE_ARGS])dnl
|
||||
[
|
||||
|
||||
# Initialize some variables set by options.
|
||||
ac_init_help=false
|
||||
ac_init_version=false
|
||||
@ -667,51 +667,51 @@ ac_init_version=false
|
||||
# dashes changed to underlines.
|
||||
build=NONE
|
||||
cache_file=./config.cache
|
||||
exec_prefix=NONE
|
||||
AC_SUBST(exec_prefix, NONE)dnl
|
||||
host=NONE
|
||||
no_create=
|
||||
nonopt=NONE
|
||||
no_recursion=
|
||||
prefix=NONE
|
||||
AC_SUBST(prefix, NONE)dnl
|
||||
program_prefix=NONE
|
||||
program_suffix=NONE
|
||||
program_transform_name=s,x,x,
|
||||
AC_SUBST(program_transform_name, [s,x,x,])dnl
|
||||
silent=
|
||||
site=
|
||||
srcdir=
|
||||
target=NONE
|
||||
verbose=
|
||||
x_includes=NONE
|
||||
x_libraries=NONE]]
|
||||
x_libraries=NONE
|
||||
dnl Installation directory options.
|
||||
dnl These are left unexpanded so users can "make install exec_prefix=/foo"
|
||||
dnl and all the variables that are supposed to be based on exec_prefix
|
||||
dnl by default will actually change.
|
||||
dnl Use braces instead of parens because sh, perl, etc. also accept them.
|
||||
[[bindir='${exec_prefix}/bin'
|
||||
sbindir='${exec_prefix}/sbin'
|
||||
libexecdir='${exec_prefix}/libexec'
|
||||
datadir='${prefix}/share'
|
||||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
libdir='${exec_prefix}/lib'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
infodir='${prefix}/info'
|
||||
mandir='${prefix}/man'
|
||||
AC_SUBST(bindir, '${exec_prefix}/bin')dnl
|
||||
AC_SUBST(sbindir, '${exec_prefix}/sbin')dnl
|
||||
AC_SUBST(libexecdir, '${exec_prefix}/libexec')dnl
|
||||
AC_SUBST(datadir, '${prefix}/share')dnl
|
||||
AC_SUBST(sysconfdir, '${prefix}/etc')dnl
|
||||
AC_SUBST(sharedstatedir, '${prefix}/com')dnl
|
||||
AC_SUBST(localstatedir, '${prefix}/var')dnl
|
||||
AC_SUBST(libdir, '${exec_prefix}/lib')dnl
|
||||
AC_SUBST(includedir, '${prefix}/include')dnl
|
||||
AC_SUBST(oldincludedir, '/usr/include')dnl
|
||||
AC_SUBST(infodir, '${prefix}/info')dnl
|
||||
AC_SUBST(mandir, '${prefix}/man')dnl
|
||||
|
||||
# Initialize some other variables.
|
||||
subdirs=
|
||||
MFLAGS= MAKEFLAGS=
|
||||
SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Maximum number of lines to put in a shell here document.]]
|
||||
AC_SUBST(SHELL, ${CONFIG_SHELL-/bin/sh})dnl
|
||||
# Maximum number of lines to put in a shell here document.
|
||||
dnl This variable seems obsolete. It should probably be removed, and
|
||||
dnl only ac_max_sed_lines should be used.
|
||||
[[: ${ac_max_here_lines=48}
|
||||
: ${ac_max_here_lines=48}
|
||||
# Sed expression to map a string onto a valid sh and CPP variable names.
|
||||
ac_tr_sh='sed -e y%*+%pp%;s%[^a-zA-Z0-9_]%_%g'
|
||||
ac_tr_cpp='sed -e y%*abcdefghijklmnopqrstuvwxyz%PABCDEFGHIJKLMNOPQRSTUVWXYZ%;s%[^A-Z0-9_]%_%g'
|
||||
ac_tr_sh='sed -e y%*+%pp%;s%[[^a-zA-Z0-9_]]%_%g'
|
||||
ac_tr_cpp='sed -e y%*abcdefghijklmnopqrstuvwxyz%PABCDEFGHIJKLMNOPQRSTUVWXYZ%;s%[[^A-Z0-9_]]%_%g'
|
||||
|
||||
ac_prev=
|
||||
for ac_option
|
||||
@ -723,7 +723,7 @@ do
|
||||
continue
|
||||
fi
|
||||
|
||||
ac_optarg=`echo "$ac_option" | sed -n 's/^[^=]*=//p'`
|
||||
ac_optarg=`echo "$ac_option" | sed -n 's/^[[^=]]*=//p'`
|
||||
|
||||
# Accept the important Cygnus configure options, so we can diagnose typos.
|
||||
|
||||
@ -755,8 +755,8 @@ do
|
||||
-disable-* | --disable-*)
|
||||
ac_feature=`echo "$ac_option"|sed -e 's/-*disable-//'`
|
||||
# Reject names that are not valid shell variable names.
|
||||
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
|
||||
]AC_MSG_ERROR(invalid feature: $ac_feature)[
|
||||
if echo "$ac_feature" | grep '[[^-a-zA-Z0-9_]]' >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR(invalid feature: $ac_feature)
|
||||
fi
|
||||
ac_feature=`echo $ac_feature| sed 's/-/_/g'`
|
||||
eval "enable_${ac_feature}=no" ;;
|
||||
@ -764,8 +764,8 @@ do
|
||||
-enable-* | --enable-*)
|
||||
ac_feature=`echo "$ac_option"|sed -e 's/-*enable-//' -e 's/=.*//'`
|
||||
# Reject names that are not valid shell variable names.
|
||||
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
|
||||
]AC_MSG_ERROR(invalid feature: $ac_feature)[
|
||||
if echo "$ac_feature" | grep '[[^-a-zA-Z0-9_]]' >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR(invalid feature: $ac_feature)
|
||||
fi
|
||||
ac_feature=`echo $ac_feature| sed 's/-/_/g'`
|
||||
case "$ac_option" in
|
||||
@ -941,8 +941,8 @@ do
|
||||
-with-* | --with-*)
|
||||
ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'`
|
||||
# Reject names that are not valid shell variable names.
|
||||
if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
|
||||
]AC_MSG_ERROR(invalid package: $ac_package)[
|
||||
if echo "$ac_package" | grep '[[^-a-zA-Z0-9_]]' >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR(invalid package: $ac_package)
|
||||
fi
|
||||
ac_package=`echo $ac_package| sed 's/-/_/g'`
|
||||
case "$ac_option" in
|
||||
@ -954,8 +954,8 @@ do
|
||||
-without-* | --without-*)
|
||||
ac_package=`echo "$ac_option"|sed -e 's/-*without-//'`
|
||||
# Reject names that are not valid shell variable names.
|
||||
if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
|
||||
]AC_MSG_ERROR(invalid package: $ac_package)[
|
||||
if echo "$ac_package" | grep '[[^-a-zA-Z0-9_]]' >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR(invalid package: $ac_package)
|
||||
fi
|
||||
ac_package=`echo $ac_package| sed 's/-/_/g'`
|
||||
eval "with_${ac_package}=no" ;;
|
||||
@ -978,26 +978,26 @@ do
|
||||
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
||||
x_libraries="$ac_optarg" ;;
|
||||
|
||||
-*) ]AC_MSG_ERROR([unrecognized option: $ac_option
|
||||
Try `configure --help' for more information.])[
|
||||
-*) AC_MSG_ERROR([unrecognized option: $ac_option
|
||||
Try `configure --help' for more information.])
|
||||
;;
|
||||
|
||||
*=*)
|
||||
ac_envvar=`echo "$ac_option" | sed -e 's/=.*//'`
|
||||
# Reject names that are not valid shell variable names.
|
||||
if echo "$ac_envvar" | grep '[^a-zA-Z0-9_]' >/dev/null 2>&1; then
|
||||
]AC_MSG_ERROR(invalid variable name: $ac_envvar)[
|
||||
if echo "$ac_envvar" | grep '[[^a-zA-Z0-9_]]' >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR(invalid variable name: $ac_envvar)
|
||||
fi
|
||||
ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
|
||||
eval "$ac_envvar='$ac_optarg'"
|
||||
export $ac_envvar ;;
|
||||
|
||||
*)
|
||||
if echo "$ac_option" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then
|
||||
]AC_MSG_WARN(invalid host type: $ac_option)[
|
||||
if echo "$ac_option" | grep '[[^-a-zA-Z0-9.]]' >/dev/null 2>&1; then
|
||||
AC_MSG_WARN(invalid host type: $ac_option)
|
||||
fi
|
||||
if test "x$nonopt" != xNONE; then
|
||||
]AC_MSG_ERROR(can only configure for one host and one target at a time)[
|
||||
AC_MSG_ERROR(can only configure for one host and one target at a time)
|
||||
fi
|
||||
nonopt="$ac_option"
|
||||
;;
|
||||
@ -1006,9 +1006,8 @@ Try `configure --help' for more information.])[
|
||||
done
|
||||
|
||||
if test -n "$ac_prev"; then
|
||||
]AC_MSG_ERROR(missing argument to --`echo $ac_prev | sed 's/_/-/g'`)[
|
||||
AC_MSG_ERROR(missing argument to --`echo $ac_prev | sed 's/_/-/g'`)
|
||||
fi
|
||||
]dnl
|
||||
AC_DIVERT_POP()dnl
|
||||
])# _AC_INIT_PARSE_ARGS
|
||||
|
||||
@ -1254,7 +1253,6 @@ ac_includes_default="\
|
||||
|
||||
_AC_PROG_ECHO()dnl
|
||||
dnl Substitute for predefined variables.
|
||||
AC_SUBST(SHELL)dnl
|
||||
AC_SUBST(CFLAGS)dnl
|
||||
AC_SUBST(CPPFLAGS)dnl
|
||||
AC_SUBST(CXXFLAGS)dnl
|
||||
@ -1262,22 +1260,6 @@ AC_SUBST(FFLAGS)dnl
|
||||
AC_SUBST(DEFS)dnl
|
||||
AC_SUBST(LDFLAGS)dnl
|
||||
AC_SUBST(LIBS)dnl
|
||||
AC_SUBST(exec_prefix)dnl
|
||||
AC_SUBST(prefix)dnl
|
||||
AC_SUBST(program_transform_name)dnl
|
||||
dnl Installation directory options.
|
||||
AC_SUBST(bindir)dnl
|
||||
AC_SUBST(sbindir)dnl
|
||||
AC_SUBST(libexecdir)dnl
|
||||
AC_SUBST(datadir)dnl
|
||||
AC_SUBST(sysconfdir)dnl
|
||||
AC_SUBST(sharedstatedir)dnl
|
||||
AC_SUBST(localstatedir)dnl
|
||||
AC_SUBST(libdir)dnl
|
||||
AC_SUBST(includedir)dnl
|
||||
AC_SUBST(oldincludedir)dnl
|
||||
AC_SUBST(infodir)dnl
|
||||
AC_SUBST(mandir)dnl
|
||||
AC_DIVERT_POP()dnl
|
||||
])# _AC_INIT_PREPARE
|
||||
|
||||
@ -1843,12 +1825,19 @@ m4_append([_AC_SUBST_SED_PROGRAM],
|
||||
define([_AC_SUBST_SED_PROGRAM])
|
||||
|
||||
|
||||
# AC_SUBST(VARIABLE)
|
||||
# ------------------
|
||||
# AC_SUBST(VARIABLE, [VALUE])
|
||||
# ---------------------------
|
||||
# Create an output variable from a shell VARIABLE. If VALUE is given
|
||||
# assign it to VARIABLE. Use `""' is you want to set VARIABLE to an
|
||||
# empty value, not an empty second argument.
|
||||
#
|
||||
# Beware that if you change this macro, you also have to change the
|
||||
# sed script at the top of AC_OUTPUT_FILES.
|
||||
define(AC_SUBST,
|
||||
[_AC_SUBST([$1], [s%@$1@%[$]$1%;t t])])
|
||||
define([AC_SUBST],
|
||||
[ifval([$2], [$1=$2
|
||||
])[]dnl
|
||||
_AC_SUBST([$1], [s%@$1@%[$]$1%;t t])dnl
|
||||
])# AC_SUBST
|
||||
|
||||
|
||||
# AC_SUBST_FILE(VARIABLE)
|
||||
|
||||
22
configure
vendored
22
configure
vendored
@ -1280,17 +1280,6 @@ if test -n "\$CONFIG_FILES"; then
|
||||
# Protect against being on the right side of a sed subst in config.status.
|
||||
sed 's/%@/@@/; s/@%/@@/; s/%;t t\$/@;t t/; /@;t t\$/s/[\\\\&%]/\\\\&/g;
|
||||
s/@@/%@/; s/@@/@%/; s/@;t t\$/%;t t/' >\$ac_cs_root.subs <<\\CEOF
|
||||
s%@ECHO_C@%$ECHO_C%;t t
|
||||
s%@ECHO_N@%$ECHO_N%;t t
|
||||
s%@ECHO_T@%$ECHO_T%;t t
|
||||
s%@SHELL@%$SHELL%;t t
|
||||
s%@CFLAGS@%$CFLAGS%;t t
|
||||
s%@CPPFLAGS@%$CPPFLAGS%;t t
|
||||
s%@CXXFLAGS@%$CXXFLAGS%;t t
|
||||
s%@FFLAGS@%$FFLAGS%;t t
|
||||
s%@DEFS@%$DEFS%;t t
|
||||
s%@LDFLAGS@%$LDFLAGS%;t t
|
||||
s%@LIBS@%$LIBS%;t t
|
||||
s%@exec_prefix@%$exec_prefix%;t t
|
||||
s%@prefix@%$prefix%;t t
|
||||
s%@program_transform_name@%$program_transform_name%;t t
|
||||
@ -1306,6 +1295,17 @@ s%@includedir@%$includedir%;t t
|
||||
s%@oldincludedir@%$oldincludedir%;t t
|
||||
s%@infodir@%$infodir%;t t
|
||||
s%@mandir@%$mandir%;t t
|
||||
s%@SHELL@%$SHELL%;t t
|
||||
s%@ECHO_C@%$ECHO_C%;t t
|
||||
s%@ECHO_N@%$ECHO_N%;t t
|
||||
s%@ECHO_T@%$ECHO_T%;t t
|
||||
s%@CFLAGS@%$CFLAGS%;t t
|
||||
s%@CPPFLAGS@%$CPPFLAGS%;t t
|
||||
s%@CXXFLAGS@%$CXXFLAGS%;t t
|
||||
s%@FFLAGS@%$FFLAGS%;t t
|
||||
s%@DEFS@%$DEFS%;t t
|
||||
s%@LDFLAGS@%$LDFLAGS%;t t
|
||||
s%@LIBS@%$LIBS%;t t
|
||||
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%;t t
|
||||
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%;t t
|
||||
s%@INSTALL_DATA@%$INSTALL_DATA%;t t
|
||||
|
||||
@ -4569,15 +4569,17 @@ which are shell variables whose values are substituted into files that
|
||||
variables. @xref{Preset Output Variables}, for a list of output
|
||||
variables that are always available.
|
||||
|
||||
@defmac AC_SUBST (@var{variable})
|
||||
@defmac AC_SUBST (@var{variable}, @ovar{value})
|
||||
@maindex SUBST
|
||||
Create an output variable from a shell variable. Make @code{AC_OUTPUT}
|
||||
substitute the variable @var{variable} into output files (typically one
|
||||
or more @file{Makefile}s). This means that @code{AC_OUTPUT} will
|
||||
replace instances of @samp{@@@var{variable}@@} in input files with the
|
||||
value that the shell variable @var{variable} has when @code{AC_OUTPUT}
|
||||
is called. The value of @var{variable} should not contain literal
|
||||
is called. This value of @var{variable} should not contain literal
|
||||
newlines.
|
||||
|
||||
If @var{value} is given, in addition assign it to @samp{variable}.
|
||||
@end defmac
|
||||
|
||||
@defmac AC_SUBST_FILE (@var{variable})
|
||||
|
||||
@ -659,7 +659,7 @@ AC_DIVERT_POP()])
|
||||
# -------------------
|
||||
AC_DEFUN(_AC_INIT_PARSE_ARGS,
|
||||
[AC_DIVERT_PUSH([INIT_PARSE_ARGS])dnl
|
||||
[
|
||||
|
||||
# Initialize some variables set by options.
|
||||
ac_init_help=false
|
||||
ac_init_version=false
|
||||
@ -667,51 +667,51 @@ ac_init_version=false
|
||||
# dashes changed to underlines.
|
||||
build=NONE
|
||||
cache_file=./config.cache
|
||||
exec_prefix=NONE
|
||||
AC_SUBST(exec_prefix, NONE)dnl
|
||||
host=NONE
|
||||
no_create=
|
||||
nonopt=NONE
|
||||
no_recursion=
|
||||
prefix=NONE
|
||||
AC_SUBST(prefix, NONE)dnl
|
||||
program_prefix=NONE
|
||||
program_suffix=NONE
|
||||
program_transform_name=s,x,x,
|
||||
AC_SUBST(program_transform_name, [s,x,x,])dnl
|
||||
silent=
|
||||
site=
|
||||
srcdir=
|
||||
target=NONE
|
||||
verbose=
|
||||
x_includes=NONE
|
||||
x_libraries=NONE]]
|
||||
x_libraries=NONE
|
||||
dnl Installation directory options.
|
||||
dnl These are left unexpanded so users can "make install exec_prefix=/foo"
|
||||
dnl and all the variables that are supposed to be based on exec_prefix
|
||||
dnl by default will actually change.
|
||||
dnl Use braces instead of parens because sh, perl, etc. also accept them.
|
||||
[[bindir='${exec_prefix}/bin'
|
||||
sbindir='${exec_prefix}/sbin'
|
||||
libexecdir='${exec_prefix}/libexec'
|
||||
datadir='${prefix}/share'
|
||||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
libdir='${exec_prefix}/lib'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
infodir='${prefix}/info'
|
||||
mandir='${prefix}/man'
|
||||
AC_SUBST(bindir, '${exec_prefix}/bin')dnl
|
||||
AC_SUBST(sbindir, '${exec_prefix}/sbin')dnl
|
||||
AC_SUBST(libexecdir, '${exec_prefix}/libexec')dnl
|
||||
AC_SUBST(datadir, '${prefix}/share')dnl
|
||||
AC_SUBST(sysconfdir, '${prefix}/etc')dnl
|
||||
AC_SUBST(sharedstatedir, '${prefix}/com')dnl
|
||||
AC_SUBST(localstatedir, '${prefix}/var')dnl
|
||||
AC_SUBST(libdir, '${exec_prefix}/lib')dnl
|
||||
AC_SUBST(includedir, '${prefix}/include')dnl
|
||||
AC_SUBST(oldincludedir, '/usr/include')dnl
|
||||
AC_SUBST(infodir, '${prefix}/info')dnl
|
||||
AC_SUBST(mandir, '${prefix}/man')dnl
|
||||
|
||||
# Initialize some other variables.
|
||||
subdirs=
|
||||
MFLAGS= MAKEFLAGS=
|
||||
SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Maximum number of lines to put in a shell here document.]]
|
||||
AC_SUBST(SHELL, ${CONFIG_SHELL-/bin/sh})dnl
|
||||
# Maximum number of lines to put in a shell here document.
|
||||
dnl This variable seems obsolete. It should probably be removed, and
|
||||
dnl only ac_max_sed_lines should be used.
|
||||
[[: ${ac_max_here_lines=48}
|
||||
: ${ac_max_here_lines=48}
|
||||
# Sed expression to map a string onto a valid sh and CPP variable names.
|
||||
ac_tr_sh='sed -e y%*+%pp%;s%[^a-zA-Z0-9_]%_%g'
|
||||
ac_tr_cpp='sed -e y%*abcdefghijklmnopqrstuvwxyz%PABCDEFGHIJKLMNOPQRSTUVWXYZ%;s%[^A-Z0-9_]%_%g'
|
||||
ac_tr_sh='sed -e y%*+%pp%;s%[[^a-zA-Z0-9_]]%_%g'
|
||||
ac_tr_cpp='sed -e y%*abcdefghijklmnopqrstuvwxyz%PABCDEFGHIJKLMNOPQRSTUVWXYZ%;s%[[^A-Z0-9_]]%_%g'
|
||||
|
||||
ac_prev=
|
||||
for ac_option
|
||||
@ -723,7 +723,7 @@ do
|
||||
continue
|
||||
fi
|
||||
|
||||
ac_optarg=`echo "$ac_option" | sed -n 's/^[^=]*=//p'`
|
||||
ac_optarg=`echo "$ac_option" | sed -n 's/^[[^=]]*=//p'`
|
||||
|
||||
# Accept the important Cygnus configure options, so we can diagnose typos.
|
||||
|
||||
@ -755,8 +755,8 @@ do
|
||||
-disable-* | --disable-*)
|
||||
ac_feature=`echo "$ac_option"|sed -e 's/-*disable-//'`
|
||||
# Reject names that are not valid shell variable names.
|
||||
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
|
||||
]AC_MSG_ERROR(invalid feature: $ac_feature)[
|
||||
if echo "$ac_feature" | grep '[[^-a-zA-Z0-9_]]' >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR(invalid feature: $ac_feature)
|
||||
fi
|
||||
ac_feature=`echo $ac_feature| sed 's/-/_/g'`
|
||||
eval "enable_${ac_feature}=no" ;;
|
||||
@ -764,8 +764,8 @@ do
|
||||
-enable-* | --enable-*)
|
||||
ac_feature=`echo "$ac_option"|sed -e 's/-*enable-//' -e 's/=.*//'`
|
||||
# Reject names that are not valid shell variable names.
|
||||
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
|
||||
]AC_MSG_ERROR(invalid feature: $ac_feature)[
|
||||
if echo "$ac_feature" | grep '[[^-a-zA-Z0-9_]]' >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR(invalid feature: $ac_feature)
|
||||
fi
|
||||
ac_feature=`echo $ac_feature| sed 's/-/_/g'`
|
||||
case "$ac_option" in
|
||||
@ -941,8 +941,8 @@ do
|
||||
-with-* | --with-*)
|
||||
ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'`
|
||||
# Reject names that are not valid shell variable names.
|
||||
if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
|
||||
]AC_MSG_ERROR(invalid package: $ac_package)[
|
||||
if echo "$ac_package" | grep '[[^-a-zA-Z0-9_]]' >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR(invalid package: $ac_package)
|
||||
fi
|
||||
ac_package=`echo $ac_package| sed 's/-/_/g'`
|
||||
case "$ac_option" in
|
||||
@ -954,8 +954,8 @@ do
|
||||
-without-* | --without-*)
|
||||
ac_package=`echo "$ac_option"|sed -e 's/-*without-//'`
|
||||
# Reject names that are not valid shell variable names.
|
||||
if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
|
||||
]AC_MSG_ERROR(invalid package: $ac_package)[
|
||||
if echo "$ac_package" | grep '[[^-a-zA-Z0-9_]]' >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR(invalid package: $ac_package)
|
||||
fi
|
||||
ac_package=`echo $ac_package| sed 's/-/_/g'`
|
||||
eval "with_${ac_package}=no" ;;
|
||||
@ -978,26 +978,26 @@ do
|
||||
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
||||
x_libraries="$ac_optarg" ;;
|
||||
|
||||
-*) ]AC_MSG_ERROR([unrecognized option: $ac_option
|
||||
Try `configure --help' for more information.])[
|
||||
-*) AC_MSG_ERROR([unrecognized option: $ac_option
|
||||
Try `configure --help' for more information.])
|
||||
;;
|
||||
|
||||
*=*)
|
||||
ac_envvar=`echo "$ac_option" | sed -e 's/=.*//'`
|
||||
# Reject names that are not valid shell variable names.
|
||||
if echo "$ac_envvar" | grep '[^a-zA-Z0-9_]' >/dev/null 2>&1; then
|
||||
]AC_MSG_ERROR(invalid variable name: $ac_envvar)[
|
||||
if echo "$ac_envvar" | grep '[[^a-zA-Z0-9_]]' >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR(invalid variable name: $ac_envvar)
|
||||
fi
|
||||
ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
|
||||
eval "$ac_envvar='$ac_optarg'"
|
||||
export $ac_envvar ;;
|
||||
|
||||
*)
|
||||
if echo "$ac_option" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then
|
||||
]AC_MSG_WARN(invalid host type: $ac_option)[
|
||||
if echo "$ac_option" | grep '[[^-a-zA-Z0-9.]]' >/dev/null 2>&1; then
|
||||
AC_MSG_WARN(invalid host type: $ac_option)
|
||||
fi
|
||||
if test "x$nonopt" != xNONE; then
|
||||
]AC_MSG_ERROR(can only configure for one host and one target at a time)[
|
||||
AC_MSG_ERROR(can only configure for one host and one target at a time)
|
||||
fi
|
||||
nonopt="$ac_option"
|
||||
;;
|
||||
@ -1006,9 +1006,8 @@ Try `configure --help' for more information.])[
|
||||
done
|
||||
|
||||
if test -n "$ac_prev"; then
|
||||
]AC_MSG_ERROR(missing argument to --`echo $ac_prev | sed 's/_/-/g'`)[
|
||||
AC_MSG_ERROR(missing argument to --`echo $ac_prev | sed 's/_/-/g'`)
|
||||
fi
|
||||
]dnl
|
||||
AC_DIVERT_POP()dnl
|
||||
])# _AC_INIT_PARSE_ARGS
|
||||
|
||||
@ -1254,7 +1253,6 @@ ac_includes_default="\
|
||||
|
||||
_AC_PROG_ECHO()dnl
|
||||
dnl Substitute for predefined variables.
|
||||
AC_SUBST(SHELL)dnl
|
||||
AC_SUBST(CFLAGS)dnl
|
||||
AC_SUBST(CPPFLAGS)dnl
|
||||
AC_SUBST(CXXFLAGS)dnl
|
||||
@ -1262,22 +1260,6 @@ AC_SUBST(FFLAGS)dnl
|
||||
AC_SUBST(DEFS)dnl
|
||||
AC_SUBST(LDFLAGS)dnl
|
||||
AC_SUBST(LIBS)dnl
|
||||
AC_SUBST(exec_prefix)dnl
|
||||
AC_SUBST(prefix)dnl
|
||||
AC_SUBST(program_transform_name)dnl
|
||||
dnl Installation directory options.
|
||||
AC_SUBST(bindir)dnl
|
||||
AC_SUBST(sbindir)dnl
|
||||
AC_SUBST(libexecdir)dnl
|
||||
AC_SUBST(datadir)dnl
|
||||
AC_SUBST(sysconfdir)dnl
|
||||
AC_SUBST(sharedstatedir)dnl
|
||||
AC_SUBST(localstatedir)dnl
|
||||
AC_SUBST(libdir)dnl
|
||||
AC_SUBST(includedir)dnl
|
||||
AC_SUBST(oldincludedir)dnl
|
||||
AC_SUBST(infodir)dnl
|
||||
AC_SUBST(mandir)dnl
|
||||
AC_DIVERT_POP()dnl
|
||||
])# _AC_INIT_PREPARE
|
||||
|
||||
@ -1843,12 +1825,19 @@ m4_append([_AC_SUBST_SED_PROGRAM],
|
||||
define([_AC_SUBST_SED_PROGRAM])
|
||||
|
||||
|
||||
# AC_SUBST(VARIABLE)
|
||||
# ------------------
|
||||
# AC_SUBST(VARIABLE, [VALUE])
|
||||
# ---------------------------
|
||||
# Create an output variable from a shell VARIABLE. If VALUE is given
|
||||
# assign it to VARIABLE. Use `""' is you want to set VARIABLE to an
|
||||
# empty value, not an empty second argument.
|
||||
#
|
||||
# Beware that if you change this macro, you also have to change the
|
||||
# sed script at the top of AC_OUTPUT_FILES.
|
||||
define(AC_SUBST,
|
||||
[_AC_SUBST([$1], [s%@$1@%[$]$1%;t t])])
|
||||
define([AC_SUBST],
|
||||
[ifval([$2], [$1=$2
|
||||
])[]dnl
|
||||
_AC_SUBST([$1], [s%@$1@%[$]$1%;t t])dnl
|
||||
])# AC_SUBST
|
||||
|
||||
|
||||
# AC_SUBST_FILE(VARIABLE)
|
||||
|
||||
@ -18,6 +18,12 @@ print this help, then exit
|
||||
\fB\-V\fR, \fB\-\-version\fR
|
||||
print version number, then exit
|
||||
.TP
|
||||
\fB\-v\fR, \fB\-\-verbose\fR
|
||||
verbosely report processing
|
||||
.TP
|
||||
\fB\-d\fR, \fB\-\-debug\fR
|
||||
don't remove temporary files
|
||||
.TP
|
||||
\fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR
|
||||
directory storing Autoconf's macro files
|
||||
.TP
|
||||
@ -27,6 +33,9 @@ directory storing the `aclocal.m4' file
|
||||
\fB\-t\fR, \fB\-\-trace\fR=\fIMACRO\fR
|
||||
report the list of calls to MACRO
|
||||
.TP
|
||||
\fB\-i\fR, \fB\-\-initialization\fR
|
||||
also trace Autoconf's initialization process
|
||||
.TP
|
||||
\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
|
||||
save output in FILE (stdout is the default)
|
||||
.SH AUTHOR
|
||||
@ -34,7 +43,7 @@ Written by David J. MacKenzie.
|
||||
.SH "REPORTING BUGS"
|
||||
Report bugs to <bug-autoconf@gnu.org>.
|
||||
.SH COPYRIGHT
|
||||
Copyright \(co 1992, 1993, 1994, 1996, 1999 Free Software Foundation, Inc.
|
||||
Copyright \(co 1992, 93, 94, 96, 99, 2000 Free Software Foundation, Inc.
|
||||
.br
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user