mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-02-11 13:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove excess dnl from m4sh.

Browse Source 
* lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL, _AS_PREPARE)
(_AS_SHELL_FN_WORK, _AS_SHELL_SANITIZE, AS_IF, _AS_ECHO_LOG)
(AS_MESSAGE, AS_ERROR, AS_BASENAME, _AS_BASENAME_PREPARE)
(_AS_DIRNAME_EXPR, AS_DIRNAME, _AS_DIRNAME_PREPARE, AS_ECHO)
(AS_ECHO_N, AS_TEST_X, AS_EXECUTABLE_P, _AS_ME_PREPARE)
(_AS_LINENO_PREPARE, AS_LN_S, AS_MKDIR_P, _AS_PATH_WALK)
(AS_SET_CATFILE, AS_HELP_STRING, AS_TMPDIR, AS_VERSION_COMPARE)
(_AS_TR_SH_PREPARE, AS_TR_SH, _AS_TR_CPP_PREPARE, AS_TR_CPP)
(_AS_TR_PREPARE, AS_VAR_APPEND, AS_VAR_PUSHDEF)
(AS_INIT_GENERATED): Use fewer dnl in m4sh macro bodies.

Signed-off-by: Eric Blake <ebb9@byu.net>
This commit is contained in:
Eric Blake 2008-10-23 07:07:59 -06:00
parent f2f5427543
commit f6ca9fec69
2 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2008-10-23 Eric Blake <ebb9@byu.net>
Remove excess dnl from m4sh.
* lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL, _AS_PREPARE)
(_AS_SHELL_FN_WORK, _AS_SHELL_SANITIZE, AS_IF, _AS_ECHO_LOG)
(AS_MESSAGE, AS_ERROR, AS_BASENAME, _AS_BASENAME_PREPARE)
(_AS_DIRNAME_EXPR, AS_DIRNAME, _AS_DIRNAME_PREPARE, AS_ECHO)
(AS_ECHO_N, AS_TEST_X, AS_EXECUTABLE_P, _AS_ME_PREPARE)
(_AS_LINENO_PREPARE, AS_LN_S, AS_MKDIR_P, _AS_PATH_WALK)
(AS_SET_CATFILE, AS_HELP_STRING, AS_TMPDIR, AS_VERSION_COMPARE)
(_AS_TR_SH_PREPARE, AS_TR_SH, _AS_TR_CPP_PREPARE, AS_TR_CPP)
(_AS_TR_PREPARE, AS_VAR_APPEND, AS_VAR_PUSHDEF)
(AS_INIT_GENERATED): Use fewer dnl in m4sh macro bodies.
2008-10-23 Paolo Bonzini <bonzini@gnu.org> 2008-10-23 Paolo Bonzini <bonzini@gnu.org>
and Eric Blake <ebb9@byu.net> and Eric Blake <ebb9@byu.net>

170
lib/m4sugar/m4sh.m4
View File

@ -196,9 +196,9 @@ m4_define([_AS_DETECT_SUGGESTED_PRUNE],
# <http://lists.gnu.org/archive/html/autoconf-patches/2006-03/msg00081.html>. # <http://lists.gnu.org/archive/html/autoconf-patches/2006-03/msg00081.html>.
# #
m4_defun([_AS_DETECT_BETTER_SHELL], m4_defun([_AS_DETECT_BETTER_SHELL],
[if test "x$CONFIG_SHELL" = x; then
dnl Remove any tests from suggested that are also required dnl Remove any tests from suggested that are also required
m4_set_map([_AS_DETECT_SUGGESTED_BODY], [_AS_DETECT_SUGGESTED_PRUNE])dnl [m4_set_map([_AS_DETECT_SUGGESTED_BODY], [_AS_DETECT_SUGGESTED_PRUNE])]dnl
[if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="AS_ESCAPE(m4_expand([_AS_BOURNE_COMPATIBLE]))" as_bourne_compatible="AS_ESCAPE(m4_expand([_AS_BOURNE_COMPATIBLE]))"
as_required="AS_ESCAPE(m4_expand(m4_set_contents([_AS_DETECT_REQUIRED_BODY])))" as_required="AS_ESCAPE(m4_expand(m4_set_contents([_AS_DETECT_REQUIRED_BODY])))"
as_suggested="AS_ESCAPE(m4_expand(m4_set_contents([_AS_DETECT_SUGGESTED_BODY])))" as_suggested="AS_ESCAPE(m4_expand(m4_set_contents([_AS_DETECT_SUGGESTED_BODY])))"
@ -259,8 +259,8 @@ fi
# there are so many _AS_PREPARE_* below, and that's also why it is # there are so many _AS_PREPARE_* below, and that's also why it is
# important not to forget some: config.status needs them. # important not to forget some: config.status needs them.
m4_defun([_AS_PREPARE], m4_defun([_AS_PREPARE],
[m4_pushdef([AS_REQUIRE], [])dnl [m4_pushdef([AS_REQUIRE], [])]dnl
AS_FUNCTION_DESCRIBE([as_func_mkdir_p], [], [AS_FUNCTION_DESCRIBE([as_func_mkdir_p], [],
[Create "$as_dir" as a directory, including parents if necessary.]) [Create "$as_dir" as a directory, including parents if necessary.])
as_func_mkdir_p () as_func_mkdir_p ()
{ {
@ -272,7 +272,7 @@ _AS_BASENAME_PREPARE
_AS_DIRNAME_PREPARE _AS_DIRNAME_PREPARE
_AS_ME_PREPARE _AS_ME_PREPARE
_AS_LINENO_PREPARE _AS_LINENO_PREPARE
_AS_ECHO_N_PREPARE[]dnl We do not need this ourselves but user code might. _AS_ECHO_N_PREPARE
_AS_LN_S_PREPARE _AS_LN_S_PREPARE
_AS_MKDIR_P_PREPARE _AS_MKDIR_P_PREPARE
_AS_TEST_PREPARE _AS_TEST_PREPARE
@ -280,8 +280,7 @@ _AS_TR_CPP_PREPARE
_AS_TR_SH_PREPARE _AS_TR_SH_PREPARE
_AS_UNSET_PREPARE _AS_UNSET_PREPARE
_AS_VAR_APPEND_PREPARE _AS_VAR_APPEND_PREPARE
m4_popdef([AS_REQUIRE])dnl m4_popdef([AS_REQUIRE])])
])
# AS_PREPARE # AS_PREPARE
# ---------- # ----------
@ -304,8 +303,7 @@ AS_REQUIRE([_AS_TR_CPP_PREPARE])
AS_REQUIRE([_AS_TR_SH_PREPARE]) AS_REQUIRE([_AS_TR_SH_PREPARE])
AS_REQUIRE([_AS_UNSET_PREPARE]) AS_REQUIRE([_AS_UNSET_PREPARE])
AS_REQUIRE([_AS_VAR_APPEND_PREPARE], [], [M4SH-INIT-FN]) AS_REQUIRE([_AS_VAR_APPEND_PREPARE], [], [M4SH-INIT-FN])
m4_divert_pop[]dnl m4_divert_pop[]])
])
# AS_REQUIRE(NAME-TO-CHECK, [BODY-TO-EXPAND = NAME-TO-CHECK], # AS_REQUIRE(NAME-TO-CHECK, [BODY-TO-EXPAND = NAME-TO-CHECK],
@ -398,8 +396,7 @@ AS_IF([as_func_ret_failure],
AS_IF([( set x; as_func_ret_success y && test x = "[$]1" )], [], AS_IF([( set x; as_func_ret_success y && test x = "[$]1" )], [],
[exitcode=1 [exitcode=1
echo positional parameters were not saved.]) echo positional parameters were not saved.])
test x$exitcode = x0[]dnl test x$exitcode = x0[]])# _AS_SHELL_FN_WORK
])# _AS_SHELL_FN_WORK
# _AS_SHELL_SANITIZE # _AS_SHELL_SANITIZE
@ -444,8 +441,8 @@ fi
# suppresses any "Segmentation fault" message there. '((' could # suppresses any "Segmentation fault" message there. '((' could
# trigger a bug in pdksh 5.2.14. # trigger a bug in pdksh 5.2.14.
for as_var in BASH_ENV ENV MAIL MAILPATH for as_var in BASH_ENV ENV MAIL MAILPATH
do eval test x\${$as_var+set} = xset && dnl do eval test x\${$as_var+set} = xset \
( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done done
PS1='$ ' PS1='$ '
PS2='> ' PS2='> '
@ -540,11 +537,12 @@ m4_define([_AS_IF_ELSE],
[m4_ifvaln([$1], [m4_ifvaln([$1],
[else [else
$1])]) $1])])
m4_defun([AS_IF], m4_defun([AS_IF],
[if $1; then [if $1; then
m4_default([$2], [:]) m4_default([$2], [:])
m4_map_args_pair([_$0], [_$0_ELSE], m4_shift2($@))dnl m4_map_args_pair([_$0], [_$0_ELSE], m4_shift2($@))]dnl
fi])# AS_IF [fi[]])# AS_IF
# _AS_UNSET_PREPARE # _AS_UNSET_PREPARE
@ -651,8 +649,8 @@ m4_define([_AS_ECHO],
# -------------------- # --------------------
# Log the string to AS_MESSAGE_LOG_FD. # Log the string to AS_MESSAGE_LOG_FD.
m4_define([_AS_ECHO_LOG], m4_define([_AS_ECHO_LOG],
[AS_REQUIRE([_AS_LINENO_PREPARE])dnl [AS_REQUIRE([_AS_LINENO_PREPARE])]dnl
_AS_ECHO([$as_me:${as_lineno-$LINENO}: $1], [AS_MESSAGE_LOG_FD])]) [_AS_ECHO([$as_me:${as_lineno-$LINENO}: $1], [AS_MESSAGE_LOG_FD])])
# _AS_ECHO_N_PREPARE # _AS_ECHO_N_PREPARE
@ -688,12 +686,11 @@ m4_define([_AS_ECHO_N],
# AS_MESSAGE(STRING, [FD = AS_MESSAGE_FD]) # AS_MESSAGE(STRING, [FD = AS_MESSAGE_FD])
# ---------------------------------------- # ----------------------------------------
m4_define([AS_MESSAGE], m4_define([AS_MESSAGE],
[AS_REQUIRE([_AS_ME_PREPARE])dnl [AS_REQUIRE([_AS_ME_PREPARE])]dnl
m4_ifset([AS_MESSAGE_LOG_FD], [m4_ifset([AS_MESSAGE_LOG_FD],
[{ _AS_ECHO_LOG([$1]) [{ _AS_ECHO_LOG([$1])
_AS_ECHO([$as_me: $1], [$2]);}], _AS_ECHO([$as_me: $1], [$2]);}],
[_AS_ECHO([$as_me: $1], [$2])])[]dnl [_AS_ECHO([$as_me: $1], [$2])])[]])
])
# AS_WARN(PROBLEM) # AS_WARN(PROBLEM)
@ -706,8 +703,7 @@ m4_define([AS_WARN],
# ---------------------------------- # ----------------------------------
m4_define([AS_ERROR], m4_define([AS_ERROR],
[{ AS_MESSAGE([error: $1], [2]) [{ AS_MESSAGE([error: $1], [2])
AS_EXIT([$2]); }[]dnl AS_EXIT([$2]); }])# AS_ERROR
])# AS_ERROR
@ -762,8 +758,8 @@ m4_defun([_AS_BASENAME_SED],
s/.*/./; q']]) s/.*/./; q']])
m4_defun([AS_BASENAME], m4_defun([AS_BASENAME],
[AS_REQUIRE([_$0_PREPARE])dnl [AS_REQUIRE([_$0_PREPARE])]dnl
$as_basename -- $1 || [$as_basename -- $1 ||
_AS_BASENAME_EXPR([$1]) 2>/dev/null || _AS_BASENAME_EXPR([$1]) 2>/dev/null ||
_AS_BASENAME_SED([$1])]) _AS_BASENAME_SED([$1])])
@ -775,8 +771,8 @@ _AS_BASENAME_SED([$1])])
# to avoid problems when _AS_BASENAME is called from the M4SH-INIT diversion # to avoid problems when _AS_BASENAME is called from the M4SH-INIT diversion
# (AS_REQUIRE is nowhere near being as sophisticated as AC_REQUIRE). # (AS_REQUIRE is nowhere near being as sophisticated as AC_REQUIRE).
m4_defun([_AS_BASENAME_PREPARE], m4_defun([_AS_BASENAME_PREPARE],
[AS_REQUIRE([_AS_EXPR_PREPARE])dnl [AS_REQUIRE([_AS_EXPR_PREPARE])]dnl
if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then [if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename as_basename=basename
else else
as_basename=false as_basename=false
@ -796,8 +792,8 @@ fi
# substring is longer than 120 bytes. So fall back on echo|sed if # substring is longer than 120 bytes. So fall back on echo|sed if
# expr fails. # expr fails.
m4_defun([_AS_DIRNAME_EXPR], m4_defun([_AS_DIRNAME_EXPR],
[AS_REQUIRE([_AS_EXPR_PREPARE])dnl [AS_REQUIRE([_AS_EXPR_PREPARE])]dnl
$as_expr X[]$1 : 'X\(.*[[^/]]\)//*[[^/][^/]]*/*$' \| \ [$as_expr X[]$1 : 'X\(.*[[^/]]\)//*[[^/][^/]]*/*$' \| \
X[]$1 : 'X\(//\)[[^/]]' \| \ X[]$1 : 'X\(//\)[[^/]]' \| \
X[]$1 : 'X\(//\)$' \| \ X[]$1 : 'X\(//\)$' \| \
X[]$1 : 'X\(/\)' \| .]) X[]$1 : 'X\(/\)' \| .])
@ -823,8 +819,8 @@ m4_defun([_AS_DIRNAME_SED],
s/.*/./; q']]) s/.*/./; q']])
m4_defun([AS_DIRNAME], m4_defun([AS_DIRNAME],
[AS_REQUIRE([_$0_PREPARE])dnl [AS_REQUIRE([_$0_PREPARE])]dnl
$as_dirname -- $1 || [$as_dirname -- $1 ||
_AS_DIRNAME_EXPR([$1]) 2>/dev/null || _AS_DIRNAME_EXPR([$1]) 2>/dev/null ||
_AS_DIRNAME_SED([$1])]) _AS_DIRNAME_SED([$1])])
@ -832,8 +828,8 @@ _AS_DIRNAME_SED([$1])])
# _AS_DIRNAME_PREPARE # _AS_DIRNAME_PREPARE
# -------------------- # --------------------
m4_defun([_AS_DIRNAME_PREPARE], m4_defun([_AS_DIRNAME_PREPARE],
[AS_REQUIRE([_AS_EXPR_PREPARE])dnl [AS_REQUIRE([_AS_EXPR_PREPARE])]dnl
if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then [if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
as_dirname=dirname as_dirname=dirname
else else
as_dirname=false as_dirname=false
@ -847,16 +843,16 @@ fi
# (typically a quoted string). The bytes of WORD are output as-is, even # (typically a quoted string). The bytes of WORD are output as-is, even
# if it starts with "-" or contains "\". # if it starts with "-" or contains "\".
m4_defun([AS_ECHO], m4_defun([AS_ECHO],
[AS_REQUIRE([_$0_PREPARE])dnl [AS_REQUIRE([_$0_PREPARE])]dnl
$as_echo $1]) [$as_echo $1])
# AS_ECHO_N(WORD) # AS_ECHO_N(WORD)
# ------------- # -------------
# Like AS_ECHO(WORD), except do not output the trailing newline. # Like AS_ECHO(WORD), except do not output the trailing newline.
m4_defun([AS_ECHO_N], m4_defun([AS_ECHO_N],
[AS_REQUIRE([_AS_ECHO_PREPARE])dnl [AS_REQUIRE([_AS_ECHO_PREPARE])]dnl
$as_echo_n $1]) [$as_echo_n $1])
# _AS_ECHO_PREPARE # _AS_ECHO_PREPARE
@ -903,18 +899,16 @@ fi
# --------- # ---------
# Check whether a file has executable or search permissions. # Check whether a file has executable or search permissions.
m4_defun([AS_TEST_X], m4_defun([AS_TEST_X],
[AS_REQUIRE([_AS_TEST_PREPARE])dnl [AS_REQUIRE([_AS_TEST_PREPARE])]dnl
$as_test_x $1[]dnl [$as_test_x $1[]])# AS_TEST_X
])# AS_TEST_X
# AS_EXECUTABLE_P # AS_EXECUTABLE_P
# --------------- # ---------------
# Check whether a file is a regular file that has executable permissions. # Check whether a file is a regular file that has executable permissions.
m4_defun([AS_EXECUTABLE_P], m4_defun([AS_EXECUTABLE_P],
[AS_REQUIRE([_AS_TEST_PREPARE])dnl [AS_REQUIRE([_AS_TEST_PREPARE])]dnl
{ test -f $1 && AS_TEST_X([$1]); }dnl [{ test -f $1 && AS_TEST_X([$1]); }])# AS_EXECUTABLE_P
])# AS_EXECUTABLE_P
# _AS_EXPR_PREPARE # _AS_EXPR_PREPARE
@ -937,8 +931,8 @@ fi
# Define $as_me to the basename of the executable file's name. # Define $as_me to the basename of the executable file's name.
m4_defun([AS_ME_PREPARE], [AS_REQUIRE([_$0])]) m4_defun([AS_ME_PREPARE], [AS_REQUIRE([_$0])])
m4_defun([_AS_ME_PREPARE], m4_defun([_AS_ME_PREPARE],
[AS_REQUIRE([_AS_BASENAME_PREPARE])dnl [AS_REQUIRE([_AS_BASENAME_PREPARE])]dnl
as_me=`AS_BASENAME("$[0]")` [as_me=`AS_BASENAME("$[0]")`
]) ])
# _AS_LINENO_WORKS # _AS_LINENO_WORKS
@ -966,14 +960,12 @@ m4_define([_AS_LINENO_WORKS],
# configure. # configure.
m4_defun([AS_LINENO_PREPARE], [AS_REQUIRE([_$0])]) m4_defun([AS_LINENO_PREPARE], [AS_REQUIRE([_$0])])
m4_defun([_AS_LINENO_PREPARE], m4_defun([_AS_LINENO_PREPARE],
[AS_REQUIRE([_AS_CR_PREPARE])dnl [AS_REQUIRE([_AS_CR_PREPARE])]dnl
AS_REQUIRE([_AS_ME_PREPARE])dnl [AS_REQUIRE([_AS_ME_PREPARE])]dnl
_AS_DETECT_SUGGESTED([_AS_LINENO_WORKS])dnl [_AS_DETECT_SUGGESTED([_AS_LINENO_WORKS])]dnl
dnl Even if the logging fd is open, we don't want to use $LINENO in the dnl Even if the logging fd is open, we don't want to use $LINENO in the
dnl AS_ERROR complaining that LINENO is broken. dnl AS_ERROR complaining that LINENO is broken.
m4_pushdef([AS_MESSAGE_LOG_FD])dnl [m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
_AS_LINENO_WORKS || {
dnl Create $as_me.lineno as a copy of $as_myself, but with $LINENO dnl Create $as_me.lineno as a copy of $as_myself, but with $LINENO
dnl uniformly replaced by the line number. The first 'sed' inserts a dnl uniformly replaced by the line number. The first 'sed' inserts a
dnl line-number line after each line using $LINENO; the second 'sed' dnl line-number line after each line using $LINENO; the second 'sed'
@ -982,6 +974,7 @@ _AS_LINENO_WORKS || {
dnl trailing '-' during substitution so that $LINENO is not a special dnl trailing '-' during substitution so that $LINENO is not a special
dnl case at line end. (Raja R Harinath suggested sed '=', and Paul dnl case at line end. (Raja R Harinath suggested sed '=', and Paul
dnl Eggert wrote the scripts with optimization help from Paolo Bonzini). dnl Eggert wrote the scripts with optimization help from Paolo Bonzini).
[_AS_LINENO_WORKS || {
# Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n ' sed -n '
p p
@ -1008,8 +1001,7 @@ _AS_LINENO_WORKS || {
# Exit status is that of the last command. # Exit status is that of the last command.
exit exit
} }
m4_popdef([AS_MESSAGE_LOG_FD])dnl m4_popdef([AS_MESSAGE_LOG_FD])])# _AS_LINENO_PREPARE
])# _AS_LINENO_PREPARE
# _AS_LN_S_PREPARE # _AS_LN_S_PREPARE
@ -1054,9 +1046,8 @@ rmdir conf$$.dir 2>/dev/null
# FIXME: Should we add the glue code to handle properly relative symlinks # FIXME: Should we add the glue code to handle properly relative symlinks
# simulated with `ln' or `cp'? # simulated with `ln' or `cp'?
m4_defun([AS_LN_S], m4_defun([AS_LN_S],
[AS_REQUIRE([_AS_LN_S_PREPARE])dnl [AS_REQUIRE([_AS_LN_S_PREPARE])]dnl
$as_ln_s $1 $2 [$as_ln_s $1 $2])
])
# _AS_MKDIR_P # _AS_MKDIR_P
@ -1087,8 +1078,8 @@ m4_define([_AS_MKDIR_P],
# --------------- # ---------------
# Emulate `mkdir -p' with plain `mkdir' if needed. # Emulate `mkdir -p' with plain `mkdir' if needed.
m4_define([AS_MKDIR_P], m4_define([AS_MKDIR_P],
[AS_REQUIRE([_$0_PREPARE])dnl [AS_REQUIRE([_$0_PREPARE])]dnl
as_dir=$1; as_func_mkdir_p])# AS_MKDIR_P [as_dir=$1; as_func_mkdir_p])# AS_MKDIR_P
# _AS_MKDIR_P_PREPARE # _AS_MKDIR_P_PREPARE
@ -1136,8 +1127,8 @@ fi
# hole. Optimize it away when not needed, i.e., if there are no literal # hole. Optimize it away when not needed, i.e., if there are no literal
# path separators. # path separators.
m4_define([_AS_PATH_WALK], m4_define([_AS_PATH_WALK],
[AS_REQUIRE([_AS_PATH_SEPARATOR_PREPARE])dnl [AS_REQUIRE([_AS_PATH_SEPARATOR_PREPARE])]dnl
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR [as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
m4_bmatch([$1], [[:;]], m4_bmatch([$1], [[:;]],
[as_dummy="$1" [as_dummy="$1"
for as_dir in $as_dummy], for as_dir in $as_dummy],
@ -1164,8 +1155,7 @@ m4_define([AS_SET_CATFILE],
[[\\/]]* | ?:[[\\/]]* ) $1=$3;; [[\\/]]* | ?:[[\\/]]* ) $1=$3;;
*) $1=$2/$3;; *) $1=$2/$3;;
esac;; esac;;
esac[]dnl esac[]])# AS_SET_CATFILE
])# AS_SET_CATFILE
# _AS_TEST_PREPARE # _AS_TEST_PREPARE
@ -1319,8 +1309,7 @@ m4_define([AS_HELP_STRING],
[m4_text_wrap([$2], m4_cond([[$3]], [], [ ], [m4_text_wrap([$2], m4_cond([[$3]], [], [ ],
[m4_eval([$3]+0)], [0], [[$3]], [m4_eval([$3]+0)], [0], [[$3]],
[m4_format([[%*s]], [$3], [])]), [m4_format([[%*s]], [$3], [])]),
m4_expand([ $1 ]), [$4])dnl m4_expand([ $1 ]), [$4])])# AS_HELP_STRING
])# AS_HELP_STRING
# AS_IDENTIFIER_IF(EXPRESSION, IF-IDENT, IF-NOT-IDENT) # AS_IDENTIFIER_IF(EXPRESSION, IF-IDENT, IF-NOT-IDENT)
@ -1392,8 +1381,7 @@ m4_dquote(m4_dquote(m4_defn([m4_cr_symbols2])))[[,
# Create as safely as possible a temporary directory in DIRECTORY # Create as safely as possible a temporary directory in DIRECTORY
# which name is inspired by PREFIX (should be 2-4 chars max). # which name is inspired by PREFIX (should be 2-4 chars max).
m4_define([AS_TMPDIR], m4_define([AS_TMPDIR],
[AS_REQUIRE([_AS_ME_PREPARE])dnl [# Create a (secure) tmp directory for tmp files.
# Create a (secure) tmp directory for tmp files.
m4_if([$2], [], [: ${TMPDIR=/tmp}]) m4_if([$2], [], [: ${TMPDIR=/tmp}])
{ {
tmp=`(umask 077 && mktemp -d "m4_default([$2], [$TMPDIR])/$1XXXXXX") 2>/dev/null` && tmp=`(umask 077 && mktemp -d "m4_default([$2], [$TMPDIR])/$1XXXXXX") 2>/dev/null` &&
@ -1402,8 +1390,8 @@ m4_if([$2], [], [: ${TMPDIR=/tmp}])
{ {
tmp=m4_default([$2], [$TMPDIR])/$1$$-$RANDOM tmp=m4_default([$2], [$TMPDIR])/$1$$-$RANDOM
(umask 077 && mkdir "$tmp") (umask 077 && mkdir "$tmp")
} || AS_ERROR([cannot create a temporary directory in m4_default([$2], [$TMPDIR])])dnl } || AS_ERROR([cannot create a temporary directory in m4_default([$2],
])# AS_TMPDIR [$TMPDIR])])])# AS_TMPDIR
# AS_UNAME # AS_UNAME
@ -1507,18 +1495,18 @@ m4_defun([_AS_VERSION_COMPARE_PREPARE],
# [ACTION-IF-LESS], [ACTION-IF-EQUAL], [ACTION-IF-GREATER]) # [ACTION-IF-LESS], [ACTION-IF-EQUAL], [ACTION-IF-GREATER])
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Compare two strings possibly containing shell variables as version strings. # Compare two strings possibly containing shell variables as version strings.
#
# This usage is portable even to ancient awk,
# so don't worry about finding a "nice" awk version.
m4_defun([AS_VERSION_COMPARE], m4_defun([AS_VERSION_COMPARE],
[AS_REQUIRE([_$0_PREPARE])dnl [AS_REQUIRE([_$0_PREPARE])]dnl
as_arg_v1=$1 [as_arg_v1=$1
as_arg_v2=$2 as_arg_v2=$2
dnl This usage is portable even to ancient awk,
dnl so don't worry about finding a "nice" awk version.
awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
AS_CASE([$?], AS_CASE([$?],
[1], [$3], [1], [$3],
[0], [$4], [0], [$4],
[2], [$5])[]dnl [2], [$5])])# AS_VERSION_COMPARE
])# AS_VERSION_COMPARE
@ -1549,8 +1537,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
# _AS_TR_SH_PREPARE # _AS_TR_SH_PREPARE
# ----------------- # -----------------
m4_defun([_AS_TR_SH_PREPARE], m4_defun([_AS_TR_SH_PREPARE],
[AS_REQUIRE([_AS_CR_PREPARE])dnl [AS_REQUIRE([_AS_CR_PREPARE])]dnl
# Sed expression to map a string onto a valid variable name. [# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[[^_$as_cr_alnum]]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[[^_$as_cr_alnum]]%_%g'"
]) ])
@ -1570,8 +1558,8 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[[^_$as_cr_alnum]]%_%g'"
# #
# For speed, we inline the literal definitions that can be computed up front. # For speed, we inline the literal definitions that can be computed up front.
m4_defun([AS_TR_SH], m4_defun([AS_TR_SH],
[AS_REQUIRE([_$0_PREPARE])dnl [AS_REQUIRE([_$0_PREPARE])]dnl
AS_LITERAL_IF([$1], [AS_LITERAL_IF([$1],
[m4_translit([$1], [*+[]]]]dnl [m4_translit([$1], [*+[]]]]dnl
m4_dquote(m4_dquote(m4_defn([m4_cr_not_symbols2])))[[, m4_dquote(m4_dquote(m4_defn([m4_cr_not_symbols2])))[[,
[pp[]]]]dnl [pp[]]]]dnl
@ -1583,8 +1571,8 @@ m4_dquote(m4_dquote(m4_for(,1,255,,[[_]])))[[)],
# _AS_TR_CPP_PREPARE # _AS_TR_CPP_PREPARE
# ------------------ # ------------------
m4_defun([_AS_TR_CPP_PREPARE], m4_defun([_AS_TR_CPP_PREPARE],
[AS_REQUIRE([_AS_CR_PREPARE])dnl [AS_REQUIRE([_AS_CR_PREPARE])]dnl
# Sed expression to map a string onto a valid CPP name. [# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[[^_$as_cr_alnum]]%_%g'" as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[[^_$as_cr_alnum]]%_%g'"
]) ])
@ -1597,8 +1585,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[[^_$as_cr_alnum]]%_%g
# #
# See implementation comments in AS_TR_SH. # See implementation comments in AS_TR_SH.
m4_defun([AS_TR_CPP], m4_defun([AS_TR_CPP],
[AS_REQUIRE([_$0_PREPARE])dnl [AS_REQUIRE([_$0_PREPARE])]dnl
AS_LITERAL_IF([$1], [AS_LITERAL_IF([$1],
[m4_translit([$1], [*[]]]]dnl [m4_translit([$1], [*[]]]]dnl
m4_dquote(m4_dquote(m4_defn([m4_cr_letters])m4_defn([m4_cr_not_symbols2])))[[, m4_dquote(m4_dquote(m4_defn([m4_cr_letters])m4_defn([m4_cr_not_symbols2])))[[,
[P[]]]]dnl [P[]]]]dnl
@ -1609,9 +1597,7 @@ m4_dquote(m4_dquote(m4_defn([m4_cr_LETTERS])m4_for(,1,255,,[[_]])))[[)],
# _AS_TR_PREPARE # _AS_TR_PREPARE
# -------------- # --------------
m4_defun([_AS_TR_PREPARE], m4_defun([_AS_TR_PREPARE],
[AS_REQUIRE([_AS_TR_SH_PREPARE])dnl [AS_REQUIRE([_AS_TR_SH_PREPARE])AS_REQUIRE([_AS_TR_CPP_PREPARE])])
AS_REQUIRE([_AS_TR_CPP_PREPARE])dnl
])
@ -1674,9 +1660,9 @@ m4_define([_AS_VAR_APPEND_WORKS],
# Note that unlike AS_VAR_SET, VALUE must be properly quoted to avoid # Note that unlike AS_VAR_SET, VALUE must be properly quoted to avoid
# field splitting and file name expansion. # field splitting and file name expansion.
m4_define([AS_VAR_APPEND], m4_define([AS_VAR_APPEND],
[_AS_DETECT_SUGGESTED([_AS_VAR_APPEND_WORKS])dnl [_AS_DETECT_SUGGESTED([_AS_VAR_APPEND_WORKS])]dnl
AS_REQUIRE([_AS_VAR_APPEND_PREPARE], [], [M4SH-INIT-FN])dnl [AS_REQUIRE([_AS_VAR_APPEND_PREPARE], [], [M4SH-INIT-FN])]dnl
as_func_append $1 $2]) [as_func_append $1 $2])
# AS_VAR_COPY(DEST, SOURCE) # AS_VAR_COPY(DEST, SOURCE)
@ -1756,8 +1742,8 @@ m4_define([AS_VAR_POPDEF],
# expansion inside an argument collection context, where diversions # expansion inside an argument collection context, where diversions
# don't work. Therefore, we must require the preparation ourselves. # don't work. Therefore, we must require the preparation ourselves.
m4_define([AS_VAR_PUSHDEF], m4_define([AS_VAR_PUSHDEF],
[AS_REQUIRE([_AS_TR_SH_PREPARE])dnl [AS_REQUIRE([_AS_TR_SH_PREPARE])]dnl
AS_LITERAL_IF([$2], [AS_LITERAL_IF([$2],
[m4_pushdef([$1], [AS_TR_SH($2)])], [m4_pushdef([$1], [AS_TR_SH($2)])],
[as_$1=AS_TR_SH($2) [as_$1=AS_TR_SH($2)
m4_pushdef([$1], [$as_[$1]])])]) m4_pushdef([$1], [$as_[$1]])])])
@ -1804,8 +1790,8 @@ m4_define([AS_VAR_TEST_SET],
# generated with `#! $SHELL'; see the manual or autoconf/status.m4 # generated with `#! $SHELL'; see the manual or autoconf/status.m4
# for more detail. # for more detail.
m4_defun([AS_INIT_GENERATED], m4_defun([AS_INIT_GENERATED],
[m4_require([AS_PREPARE])dnl [m4_require([AS_PREPARE])]dnl
_AS_SHELL_SANITIZE [_AS_SHELL_SANITIZE
_AS_PREPARE]) _AS_PREPARE])
# AS_INIT # AS_INIT