mirror of
git://git.sv.gnu.org/autoconf
synced 2025-01-30 11:01:45 +08:00
Move the quadrigraphs out of the user name space.
* acgeneral.m4: 's/@BKL@/@<:@/g', 's/@BKR@/@:>@/g', 's/@DLR@/@S|@/g', 's/@PND@/@%:@/g'. * acspecific.m4: Likewise. * autoconf.sh: Likewise.
This commit is contained in:
Akim Demaille
parent
2585dd7c36
commit
c33696519a
@ -1,3 +1,12 @@
|
||||
2000-03-03 Paul Eggert <eggert@twinsun.com>
|
||||
|
||||
Move the quadrigraphs out of the user name space.
|
||||
|
||||
* acgeneral.m4: 's/\@BKL@/@<:@/g', 's/\@BKR@/\@:>@/g',
|
||||
's/\@DLR@/\@S|@/g', 's/\@PND@/@%:@/g'.
|
||||
* acspecific.m4: Likewise.
|
||||
* autoconf.sh: Likewise.
|
||||
|
||||
2000-03-03 Akim Demaille <akim@epita.fr>
|
||||
|
||||
* acgeneral.m4 (_AC_WHICH_A): New macro.
|
||||
|
||||
30
acgeneral.m4
30
acgeneral.m4
@ -553,7 +553,7 @@ ac_includes_default="\
|
||||
#if HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
@PND@ Any additions from configure.in:])
|
||||
@%:@ Any additions from configure.in:])
|
||||
|
||||
|
||||
# AC_PREFIX_DEFAULT(PREFIX)
|
||||
@ -1054,9 +1054,9 @@ AC_DEFUN(AC_INIT_PREPARE,
|
||||
# 3 some systems may open it to /dev/tty
|
||||
# 4 used on the Kubota Titan
|
||||
define(AC_FD_MSG, 6)dnl
|
||||
@PND@ AC_FD_MSG checking for... messages and results
|
||||
@%:@ AC_FD_MSG checking for... messages and results
|
||||
define(AC_FD_CC, 5)dnl
|
||||
@PND@ AC_FD_CC compiler messages saved in config.log
|
||||
@%:@ AC_FD_CC compiler messages saved in config.log
|
||||
if test "$silent" = yes; then
|
||||
exec AC_FD_MSG>/dev/null
|
||||
else
|
||||
@ -1186,7 +1186,7 @@ AC_DEFUN(AC_ARG_ENABLE,
|
||||
ac_arg_enable_help="$ac_arg_enable_help
|
||||
[$2]"
|
||||
AC_DIVERT_POP()dnl
|
||||
@PND@ Check whether --enable-[$1] or --disable-[$1] was given.
|
||||
@%:@ Check whether --enable-[$1] or --disable-[$1] was given.
|
||||
if test "[${enable_]patsubst([$1], -, _)+set}" = set; then
|
||||
enableval="[$enable_]patsubst([$1], -, _)"
|
||||
ifelse([$3], , :, [$3])
|
||||
@ -1213,7 +1213,7 @@ AC_DEFUN(AC_ARG_WITH,
|
||||
ac_arg_with_help="$ac_arg_with_help
|
||||
[$2]"
|
||||
AC_DIVERT_POP()dnl
|
||||
@PND@ Check whether --with-[$1] or --without-[$1] was given.
|
||||
@%:@ Check whether --with-[$1] or --without-[$1] was given.
|
||||
if test "[${with_]patsubst([$1], -, _)+set}" = set; then
|
||||
withval="[$with_]patsubst([$1], -, _)"
|
||||
ifelse([$3], , :, [$3])
|
||||
@ -2277,7 +2277,7 @@ AC_DEFUN(AC_TRY_COMPILER,
|
||||
[cat >conftest.$ac_ext <<EOF
|
||||
AC_LANG_CASE([FORTRAN77], ,
|
||||
[
|
||||
@PND@line __oline__ "configure"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
])
|
||||
[$1]
|
||||
@ -2428,7 +2428,7 @@ popdef([AC_Lib_Name])dnl
|
||||
AC_DEFUN(AC_TRY_CPP,
|
||||
[AC_REQUIRE_CPP()dnl
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
@PND@line __oline__ "configure"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
[$1]
|
||||
EOF
|
||||
@ -2470,7 +2470,7 @@ AC_DEFUN(AC_EGREP_HEADER,
|
||||
AC_DEFUN(AC_EGREP_CPP,
|
||||
[AC_REQUIRE_CPP()dnl
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
@PND@line __oline__ "configure"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
[$2]
|
||||
EOF
|
||||
@ -2509,8 +2509,8 @@ AC_LANG_CASE([FORTRAN77],
|
||||
[$2]
|
||||
end],
|
||||
[dnl This sometimes fails to find confdefs.h, for some reason.
|
||||
dnl @PND@line __oline__ "[$]0"
|
||||
@PND@line __oline__ "configure"
|
||||
dnl @%:@line __oline__ "[$]0"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
[$1]
|
||||
int
|
||||
@ -2555,8 +2555,8 @@ AC_LANG_CASE([FORTRAN77],
|
||||
end
|
||||
],
|
||||
[dnl This sometimes fails to find confdefs.h, for some reason.
|
||||
dnl @PND@line __oline__ "[$]0"
|
||||
@PND@line __oline__ "configure"
|
||||
dnl @%:@line __oline__ "[$]0"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
[$1]
|
||||
int
|
||||
@ -2620,7 +2620,7 @@ fi
|
||||
# Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler.
|
||||
AC_DEFUN(AC_TRY_RUN_NATIVE,
|
||||
[cat >conftest.$ac_ext <<EOF
|
||||
@PND@line __oline__ "configure"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
AC_LANG_CASE(CPLUSPLUS, [#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
@ -3438,7 +3438,7 @@ dnl hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
||||
dnl so uname gets run too.
|
||||
# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
|
||||
#
|
||||
@PND@ [$]0 [$]ac_configure_args
|
||||
@%:@ [$]0 [$]ac_configure_args
|
||||
#
|
||||
# Compiler output produced by configure, useful for debugging
|
||||
# configure, is in ./config.log if it exists.
|
||||
@ -3515,7 +3515,7 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL"
|
||||
# If no file are specified by the user, then we need to provide default
|
||||
# value. By we need to know if files were specified by the user.
|
||||
ac_need_defaults=:
|
||||
while test [\$]@PND@ != 0
|
||||
while test [\$]@%:@ != 0
|
||||
do
|
||||
case "[\$]1" in
|
||||
--*=*)
|
||||
|
||||
@ -3012,7 +3012,7 @@ dnl Be optimistic at first.
|
||||
# AC_SYS_INTERPRETER
|
||||
# ------------------
|
||||
AC_DEFUN(AC_SYS_INTERPRETER,
|
||||
[AC_CACHE_CHECK(whether @PND@! works in shell scripts, ac_cv_sys_interpreter,
|
||||
[AC_CACHE_CHECK(whether @%:@! works in shell scripts, ac_cv_sys_interpreter,
|
||||
[echo '#! /bin/cat
|
||||
exit 69
|
||||
' >conftest
|
||||
|
||||
@ -240,10 +240,10 @@ case $task in
|
||||
{ print }' |
|
||||
sed '
|
||||
/__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
|
||||
s/@BKL@/[/g
|
||||
s/@BKR@/]/g
|
||||
s/@DLR@/$/g
|
||||
s/@PND@/#/g
|
||||
s/@<:@/[/g
|
||||
s/@:>@/]/g
|
||||
s/@S|@/$/g
|
||||
s/@%:@/#/g
|
||||
' >&4
|
||||
;; # End of the task script.
|
||||
|
||||
|
||||
@ -240,10 +240,10 @@ case $task in
|
||||
{ print }' |
|
||||
sed '
|
||||
/__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
|
||||
s/@BKL@/[/g
|
||||
s/@BKR@/]/g
|
||||
s/@DLR@/$/g
|
||||
s/@PND@/#/g
|
||||
s/@<:@/[/g
|
||||
s/@:>@/]/g
|
||||
s/@S|@/$/g
|
||||
s/@%:@/#/g
|
||||
' >&4
|
||||
;; # End of the task script.
|
||||
|
||||
|
||||
@ -240,10 +240,10 @@ case $task in
|
||||
{ print }' |
|
||||
sed '
|
||||
/__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
|
||||
s/@BKL@/[/g
|
||||
s/@BKR@/]/g
|
||||
s/@DLR@/$/g
|
||||
s/@PND@/#/g
|
||||
s/@<:@/[/g
|
||||
s/@:>@/]/g
|
||||
s/@S|@/$/g
|
||||
s/@%:@/#/g
|
||||
' >&4
|
||||
;; # End of the task script.
|
||||
|
||||
|
||||
@ -553,7 +553,7 @@ ac_includes_default="\
|
||||
#if HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
@PND@ Any additions from configure.in:])
|
||||
@%:@ Any additions from configure.in:])
|
||||
|
||||
|
||||
# AC_PREFIX_DEFAULT(PREFIX)
|
||||
@ -1054,9 +1054,9 @@ AC_DEFUN(AC_INIT_PREPARE,
|
||||
# 3 some systems may open it to /dev/tty
|
||||
# 4 used on the Kubota Titan
|
||||
define(AC_FD_MSG, 6)dnl
|
||||
@PND@ AC_FD_MSG checking for... messages and results
|
||||
@%:@ AC_FD_MSG checking for... messages and results
|
||||
define(AC_FD_CC, 5)dnl
|
||||
@PND@ AC_FD_CC compiler messages saved in config.log
|
||||
@%:@ AC_FD_CC compiler messages saved in config.log
|
||||
if test "$silent" = yes; then
|
||||
exec AC_FD_MSG>/dev/null
|
||||
else
|
||||
@ -1186,7 +1186,7 @@ AC_DEFUN(AC_ARG_ENABLE,
|
||||
ac_arg_enable_help="$ac_arg_enable_help
|
||||
[$2]"
|
||||
AC_DIVERT_POP()dnl
|
||||
@PND@ Check whether --enable-[$1] or --disable-[$1] was given.
|
||||
@%:@ Check whether --enable-[$1] or --disable-[$1] was given.
|
||||
if test "[${enable_]patsubst([$1], -, _)+set}" = set; then
|
||||
enableval="[$enable_]patsubst([$1], -, _)"
|
||||
ifelse([$3], , :, [$3])
|
||||
@ -1213,7 +1213,7 @@ AC_DEFUN(AC_ARG_WITH,
|
||||
ac_arg_with_help="$ac_arg_with_help
|
||||
[$2]"
|
||||
AC_DIVERT_POP()dnl
|
||||
@PND@ Check whether --with-[$1] or --without-[$1] was given.
|
||||
@%:@ Check whether --with-[$1] or --without-[$1] was given.
|
||||
if test "[${with_]patsubst([$1], -, _)+set}" = set; then
|
||||
withval="[$with_]patsubst([$1], -, _)"
|
||||
ifelse([$3], , :, [$3])
|
||||
@ -2277,7 +2277,7 @@ AC_DEFUN(AC_TRY_COMPILER,
|
||||
[cat >conftest.$ac_ext <<EOF
|
||||
AC_LANG_CASE([FORTRAN77], ,
|
||||
[
|
||||
@PND@line __oline__ "configure"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
])
|
||||
[$1]
|
||||
@ -2428,7 +2428,7 @@ popdef([AC_Lib_Name])dnl
|
||||
AC_DEFUN(AC_TRY_CPP,
|
||||
[AC_REQUIRE_CPP()dnl
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
@PND@line __oline__ "configure"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
[$1]
|
||||
EOF
|
||||
@ -2470,7 +2470,7 @@ AC_DEFUN(AC_EGREP_HEADER,
|
||||
AC_DEFUN(AC_EGREP_CPP,
|
||||
[AC_REQUIRE_CPP()dnl
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
@PND@line __oline__ "configure"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
[$2]
|
||||
EOF
|
||||
@ -2509,8 +2509,8 @@ AC_LANG_CASE([FORTRAN77],
|
||||
[$2]
|
||||
end],
|
||||
[dnl This sometimes fails to find confdefs.h, for some reason.
|
||||
dnl @PND@line __oline__ "[$]0"
|
||||
@PND@line __oline__ "configure"
|
||||
dnl @%:@line __oline__ "[$]0"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
[$1]
|
||||
int
|
||||
@ -2555,8 +2555,8 @@ AC_LANG_CASE([FORTRAN77],
|
||||
end
|
||||
],
|
||||
[dnl This sometimes fails to find confdefs.h, for some reason.
|
||||
dnl @PND@line __oline__ "[$]0"
|
||||
@PND@line __oline__ "configure"
|
||||
dnl @%:@line __oline__ "[$]0"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
[$1]
|
||||
int
|
||||
@ -2620,7 +2620,7 @@ fi
|
||||
# Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler.
|
||||
AC_DEFUN(AC_TRY_RUN_NATIVE,
|
||||
[cat >conftest.$ac_ext <<EOF
|
||||
@PND@line __oline__ "configure"
|
||||
@%:@line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
AC_LANG_CASE(CPLUSPLUS, [#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
@ -3438,7 +3438,7 @@ dnl hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
||||
dnl so uname gets run too.
|
||||
# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
|
||||
#
|
||||
@PND@ [$]0 [$]ac_configure_args
|
||||
@%:@ [$]0 [$]ac_configure_args
|
||||
#
|
||||
# Compiler output produced by configure, useful for debugging
|
||||
# configure, is in ./config.log if it exists.
|
||||
@ -3515,7 +3515,7 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL"
|
||||
# If no file are specified by the user, then we need to provide default
|
||||
# value. By we need to know if files were specified by the user.
|
||||
ac_need_defaults=:
|
||||
while test [\$]@PND@ != 0
|
||||
while test [\$]@%:@ != 0
|
||||
do
|
||||
case "[\$]1" in
|
||||
--*=*)
|
||||
|
||||
@ -3012,7 +3012,7 @@ dnl Be optimistic at first.
|
||||
# AC_SYS_INTERPRETER
|
||||
# ------------------
|
||||
AC_DEFUN(AC_SYS_INTERPRETER,
|
||||
[AC_CACHE_CHECK(whether @PND@! works in shell scripts, ac_cv_sys_interpreter,
|
||||
[AC_CACHE_CHECK(whether @%:@! works in shell scripts, ac_cv_sys_interpreter,
|
||||
[echo '#! /bin/cat
|
||||
exit 69
|
||||
' >conftest
|
||||
|
||||
@ -90,7 +90,7 @@ PERL = perl
|
||||
# - AC_PROG_(CC|CXX|F77)_(GNU|WORKS)
|
||||
# are used in AC_PROG_CC etc.
|
||||
# - AC_PATH_PROGS?
|
||||
# They produce `= val' because $1, the variable use to store the result,
|
||||
# They produce `= val' because $1, the variable used to store the result,
|
||||
# is empty.
|
||||
# - AC_TRY
|
||||
# Used in many places.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user