+2000-02-10 Akim Demaille <akim@epita.fr>
+
+ Clean up a few changequotes.
+
+ * acgeneral.m4 (AC_INIT_PARSE_ARGS): Instead of using changequote
+ to protect a few `[ ]', double quote the constant sections.
+
2000-02-10 Akim Demaille <akim@epita.fr>
Restore AC_HAVE_LIBRARY.
# AC_INIT_PARSE_ARGS
# ------------------
AC_DEFUN(AC_INIT_PARSE_ARGS,
-[
+[[
# Initialize some variables set by options.
# The variables have the same names as the options, with
# dashes changed to underlines.
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'
+[[bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
datadir='${prefix}/share'
subdirs=
MFLAGS= MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
+# 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.
-changequote(, )dnl
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'
-changequote([, ])dnl
ac_prev=
for ac_option
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.
-disable-* | --disable-*)
ac_feature=`echo "$ac_option"|sed -e 's/-*disable-//'`
# Reject names that are not valid shell variable names.
-changequote(, )dnl
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_ERROR($ac_feature: invalid feature name)
+ ]AC_MSG_ERROR($ac_feature: invalid feature name)[
fi
ac_feature=`echo $ac_feature| sed 's/-/_/g'`
eval "enable_${ac_feature}=no" ;;
-enable-* | --enable-*)
ac_feature=`echo "$ac_option"|sed -e 's/-*enable-//' -e 's/=.*//'`
# Reject names that are not valid shell variable names.
-changequote(, )dnl
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_ERROR($ac_feature: invalid feature name)
+ ]AC_MSG_ERROR($ac_feature: invalid feature name)[
fi
ac_feature=`echo $ac_feature| sed 's/-/_/g'`
case "$ac_option" in
-help | --help | --hel | --he | -h)
# 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.
-changequote(, )dnl
cat <<\EOF
`configure' configures software source code packages to adapt to many kinds
of systems.
X features:
--x-includes=DIR X include files are in DIR
--x-libraries=DIR X library files are in DIR
-EOF
-changequote([, ])dnl
+EOF]]
dnl It would be great to sort, unfortunately, since each entry maybe
dnl split on several lines, it is not as evident as a simple `| sort'.
- test -n "$ac_arg_enable_help" && echo "
+[[ test -n "$ac_arg_enable_help" && echo "
Optional features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE@BKL@=ARG@BKR@ include FEATURE @BKL@ARG=yes@BKR@\
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version AC_ACVERSION"
+ echo "configure generated by autoconf version ]AC_ACVERSION["
exit 0 ;;
-with-* | --with-*)
ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'`
# Reject names that are not valid shell variable names.
-changequote(, )dnl
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_ERROR($ac_package: invalid package name)
+ ]AC_MSG_ERROR($ac_package: invalid package name)[
fi
ac_package=`echo $ac_package| sed 's/-/_/g'`
case "$ac_option" in
-without-* | --without-*)
ac_package=`echo "$ac_option"|sed -e 's/-*without-//'`
# Reject names that are not valid shell variable names.
-changequote(, )dnl
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_ERROR($ac_package: invalid package name)
+ ]AC_MSG_ERROR($ac_package: invalid package name)[
fi
ac_package=`echo $ac_package| sed 's/-/_/g'`
eval "with_${ac_package}=no" ;;
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries="$ac_optarg" ;;
- -*) AC_MSG_ERROR([$ac_option: invalid option; use --help to show usage])
+ -*) ]AC_MSG_ERROR([$ac_option: invalid option; use --help to show usage])[
;;
*=*)
ac_envvar=`echo "$ac_option" | sed -e 's/=.*//'`
# Reject names that are not valid shell variable names.
-changequote(, )dnl
if echo "$ac_envvar" | grep '[^a-zA-Z0-9_]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_ERROR($ac_envvar: invalid variable name)
+ ]AC_MSG_ERROR($ac_envvar: invalid variable name)[
fi
ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
eval "$ac_envvar='$ac_optarg'"
export $ac_envvar ;;
*)
-changequote(, )dnl
if echo "$ac_feature" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_WARN($ac_option: invalid host type)
+ ]AC_MSG_WARN($ac_option: invalid host type)[
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"
;;
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
-])# AC_INIT_PARSE_ARGS
+]])# AC_INIT_PARSE_ARGS
# AC_INIT_BINSH
# AC_INIT_PARSE_ARGS
# ------------------
AC_DEFUN(AC_INIT_PARSE_ARGS,
-[
+[[
# Initialize some variables set by options.
# The variables have the same names as the options, with
# dashes changed to underlines.
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'
+[[bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
datadir='${prefix}/share'
subdirs=
MFLAGS= MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
+# 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.
-changequote(, )dnl
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'
-changequote([, ])dnl
ac_prev=
for ac_option
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.
-disable-* | --disable-*)
ac_feature=`echo "$ac_option"|sed -e 's/-*disable-//'`
# Reject names that are not valid shell variable names.
-changequote(, )dnl
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_ERROR($ac_feature: invalid feature name)
+ ]AC_MSG_ERROR($ac_feature: invalid feature name)[
fi
ac_feature=`echo $ac_feature| sed 's/-/_/g'`
eval "enable_${ac_feature}=no" ;;
-enable-* | --enable-*)
ac_feature=`echo "$ac_option"|sed -e 's/-*enable-//' -e 's/=.*//'`
# Reject names that are not valid shell variable names.
-changequote(, )dnl
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_ERROR($ac_feature: invalid feature name)
+ ]AC_MSG_ERROR($ac_feature: invalid feature name)[
fi
ac_feature=`echo $ac_feature| sed 's/-/_/g'`
case "$ac_option" in
-help | --help | --hel | --he | -h)
# 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.
-changequote(, )dnl
cat <<\EOF
`configure' configures software source code packages to adapt to many kinds
of systems.
X features:
--x-includes=DIR X include files are in DIR
--x-libraries=DIR X library files are in DIR
-EOF
-changequote([, ])dnl
+EOF]]
dnl It would be great to sort, unfortunately, since each entry maybe
dnl split on several lines, it is not as evident as a simple `| sort'.
- test -n "$ac_arg_enable_help" && echo "
+[[ test -n "$ac_arg_enable_help" && echo "
Optional features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE@BKL@=ARG@BKR@ include FEATURE @BKL@ARG=yes@BKR@\
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version AC_ACVERSION"
+ echo "configure generated by autoconf version ]AC_ACVERSION["
exit 0 ;;
-with-* | --with-*)
ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'`
# Reject names that are not valid shell variable names.
-changequote(, )dnl
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_ERROR($ac_package: invalid package name)
+ ]AC_MSG_ERROR($ac_package: invalid package name)[
fi
ac_package=`echo $ac_package| sed 's/-/_/g'`
case "$ac_option" in
-without-* | --without-*)
ac_package=`echo "$ac_option"|sed -e 's/-*without-//'`
# Reject names that are not valid shell variable names.
-changequote(, )dnl
if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_ERROR($ac_package: invalid package name)
+ ]AC_MSG_ERROR($ac_package: invalid package name)[
fi
ac_package=`echo $ac_package| sed 's/-/_/g'`
eval "with_${ac_package}=no" ;;
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries="$ac_optarg" ;;
- -*) AC_MSG_ERROR([$ac_option: invalid option; use --help to show usage])
+ -*) ]AC_MSG_ERROR([$ac_option: invalid option; use --help to show usage])[
;;
*=*)
ac_envvar=`echo "$ac_option" | sed -e 's/=.*//'`
# Reject names that are not valid shell variable names.
-changequote(, )dnl
if echo "$ac_envvar" | grep '[^a-zA-Z0-9_]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_ERROR($ac_envvar: invalid variable name)
+ ]AC_MSG_ERROR($ac_envvar: invalid variable name)[
fi
ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
eval "$ac_envvar='$ac_optarg'"
export $ac_envvar ;;
*)
-changequote(, )dnl
if echo "$ac_feature" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then
-changequote([, ])dnl
- AC_MSG_WARN($ac_option: invalid host type)
+ ]AC_MSG_WARN($ac_option: invalid host type)[
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"
;;
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
-])# AC_INIT_PARSE_ARGS
+]])# AC_INIT_PARSE_ARGS
# AC_INIT_BINSH
projects / thirdparty / autoconf.git / commitdiff
