mirror of
https://github.com/sudo-project/sudo.git
synced 2025-08-22 09:57:41 +00:00
Quote first argument to AC_DEFUN(); from Elan Ruusamae
This commit is contained in:
parent
8c975b2785
commit
c739a7052a
36
aclocal.m4
vendored
36
aclocal.m4
vendored
@ -10,7 +10,7 @@ dnl checks for programs
|
|||||||
dnl
|
dnl
|
||||||
dnl check for sendmail in well-known locations
|
dnl check for sendmail in well-known locations
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_PROG_SENDMAIL, [AC_MSG_CHECKING([for sendmail])
|
AC_DEFUN([SUDO_PROG_SENDMAIL], [AC_MSG_CHECKING([for sendmail])
|
||||||
found=no
|
found=no
|
||||||
for p in "/usr/sbin/sendmail" "/usr/lib/sendmail" "/usr/etc/sendmail" "/usr/ucblib/sendmail" "/usr/local/lib/sendmail" "/usr/local/bin/sendmail"; do
|
for p in "/usr/sbin/sendmail" "/usr/lib/sendmail" "/usr/etc/sendmail" "/usr/ucblib/sendmail" "/usr/local/lib/sendmail" "/usr/local/bin/sendmail"; do
|
||||||
if test -f "$p"; then
|
if test -f "$p"; then
|
||||||
@ -28,7 +28,7 @@ fi
|
|||||||
dnl
|
dnl
|
||||||
dnl check for vi in well-known locations
|
dnl check for vi in well-known locations
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_PROG_VI, [AC_MSG_CHECKING([for vi])
|
AC_DEFUN([SUDO_PROG_VI], [AC_MSG_CHECKING([for vi])
|
||||||
found=no
|
found=no
|
||||||
for editor in "/usr/bin/vi" "/bin/vi" "/usr/ucb/vi" "/usr/bsd/vi" "/usr/local/bin/vi"; do
|
for editor in "/usr/bin/vi" "/bin/vi" "/usr/ucb/vi" "/usr/bsd/vi" "/usr/local/bin/vi"; do
|
||||||
if test -f "$editor"; then
|
if test -f "$editor"; then
|
||||||
@ -46,7 +46,7 @@ fi
|
|||||||
dnl
|
dnl
|
||||||
dnl check for mv in well-known locations
|
dnl check for mv in well-known locations
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_PROG_MV, [AC_MSG_CHECKING([for mv])
|
AC_DEFUN([SUDO_PROG_MV], [AC_MSG_CHECKING([for mv])
|
||||||
found=no
|
found=no
|
||||||
for p in "/usr/bin/mv" "/bin/mv" "/usr/ucb/mv" "/usr/sbin/mv"; do
|
for p in "/usr/bin/mv" "/bin/mv" "/usr/ucb/mv" "/usr/sbin/mv"; do
|
||||||
if test -f "$p"; then
|
if test -f "$p"; then
|
||||||
@ -64,7 +64,7 @@ fi
|
|||||||
dnl
|
dnl
|
||||||
dnl check for bourne shell in well-known locations
|
dnl check for bourne shell in well-known locations
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_PROG_BSHELL, [AC_MSG_CHECKING([for bourne shell])
|
AC_DEFUN([SUDO_PROG_BSHELL], [AC_MSG_CHECKING([for bourne shell])
|
||||||
found=no
|
found=no
|
||||||
for p in "/bin/sh" "/usr/bin/sh" "/sbin/sh" "/usr/sbin/sh" "/bin/ksh" "/usr/bin/ksh" "/bin/bash" "/usr/bin/bash"; do
|
for p in "/bin/sh" "/usr/bin/sh" "/sbin/sh" "/usr/sbin/sh" "/bin/ksh" "/usr/bin/ksh" "/bin/bash" "/usr/bin/bash"; do
|
||||||
if test -f "$p"; then
|
if test -f "$p"; then
|
||||||
@ -82,7 +82,7 @@ fi
|
|||||||
dnl
|
dnl
|
||||||
dnl check for utmp file
|
dnl check for utmp file
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_PATH_UTMP, [AC_MSG_CHECKING([for utmp file path])
|
AC_DEFUN([SUDO_PATH_UTMP], [AC_MSG_CHECKING([for utmp file path])
|
||||||
found=no
|
found=no
|
||||||
for p in "/var/run/utmp" "/var/adm/utmp" "/etc/utmp"; do
|
for p in "/var/run/utmp" "/var/adm/utmp" "/etc/utmp"; do
|
||||||
if test -r "$p"; then
|
if test -r "$p"; then
|
||||||
@ -100,7 +100,7 @@ fi
|
|||||||
dnl
|
dnl
|
||||||
dnl Where the log file goes, use /var/log if it exists, else /{var,usr}/adm
|
dnl Where the log file goes, use /var/log if it exists, else /{var,usr}/adm
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_LOGFILE, [AC_MSG_CHECKING(for log file location)
|
AC_DEFUN([SUDO_LOGFILE], [AC_MSG_CHECKING(for log file location)
|
||||||
if test -n "$with_logpath"; then
|
if test -n "$with_logpath"; then
|
||||||
AC_MSG_RESULT($with_logpath)
|
AC_MSG_RESULT($with_logpath)
|
||||||
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LOGFILE, "$with_logpath")
|
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LOGFILE, "$with_logpath")
|
||||||
@ -121,7 +121,7 @@ fi
|
|||||||
dnl
|
dnl
|
||||||
dnl Where the timestamp files go.
|
dnl Where the timestamp files go.
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_TIMEDIR, [AC_MSG_CHECKING(for timestamp file location)
|
AC_DEFUN([SUDO_TIMEDIR], [AC_MSG_CHECKING(for timestamp file location)
|
||||||
timedir="$with_timedir"
|
timedir="$with_timedir"
|
||||||
if test -z "$timedir"; then
|
if test -z "$timedir"; then
|
||||||
for d in /var/db /var/lib /var/adm /usr/adm; do
|
for d in /var/db /var/lib /var/adm /usr/adm; do
|
||||||
@ -139,7 +139,7 @@ dnl
|
|||||||
dnl Where the I/O log files go, use /var/log/sudo-io if
|
dnl Where the I/O log files go, use /var/log/sudo-io if
|
||||||
dnl /var/log exists, else /{var,usr}/adm/sudo-io
|
dnl /var/log exists, else /{var,usr}/adm/sudo-io
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_IO_LOGDIR, [
|
AC_DEFUN([SUDO_IO_LOGDIR], [
|
||||||
AC_MSG_CHECKING(for I/O log dir location)
|
AC_MSG_CHECKING(for I/O log dir location)
|
||||||
if test "${with_iologdir-yes}" != "yes"; then
|
if test "${with_iologdir-yes}" != "yes"; then
|
||||||
iolog_dir="$with_iologdir"
|
iolog_dir="$with_iologdir"
|
||||||
@ -160,7 +160,7 @@ dnl
|
|||||||
dnl SUDO_CHECK_TYPE(TYPE, DEFAULT)
|
dnl SUDO_CHECK_TYPE(TYPE, DEFAULT)
|
||||||
dnl XXX - should require the check for unistd.h...
|
dnl XXX - should require the check for unistd.h...
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_CHECK_TYPE,
|
AC_DEFUN([SUDO_CHECK_TYPE],
|
||||||
[AC_REQUIRE([AC_HEADER_STDC])dnl
|
[AC_REQUIRE([AC_HEADER_STDC])dnl
|
||||||
AC_MSG_CHECKING(for $1)
|
AC_MSG_CHECKING(for $1)
|
||||||
AC_CACHE_VAL(sudo_cv_type_$1,
|
AC_CACHE_VAL(sudo_cv_type_$1,
|
||||||
@ -181,31 +181,31 @@ fi
|
|||||||
dnl
|
dnl
|
||||||
dnl Check for size_t declation
|
dnl Check for size_t declation
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_TYPE_SIZE_T,
|
AC_DEFUN([SUDO_TYPE_SIZE_T],
|
||||||
[SUDO_CHECK_TYPE(size_t, int)])
|
[SUDO_CHECK_TYPE(size_t, int)])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Check for ssize_t declation
|
dnl Check for ssize_t declation
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_TYPE_SSIZE_T,
|
AC_DEFUN([SUDO_TYPE_SSIZE_T],
|
||||||
[SUDO_CHECK_TYPE(ssize_t, int)])
|
[SUDO_CHECK_TYPE(ssize_t, int)])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Check for dev_t declation
|
dnl Check for dev_t declation
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_TYPE_DEV_T,
|
AC_DEFUN([SUDO_TYPE_DEV_T],
|
||||||
[SUDO_CHECK_TYPE(dev_t, int)])
|
[SUDO_CHECK_TYPE(dev_t, int)])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Check for ino_t declation
|
dnl Check for ino_t declation
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_TYPE_INO_T,
|
AC_DEFUN([SUDO_TYPE_INO_T],
|
||||||
[SUDO_CHECK_TYPE(ino_t, unsigned int)])
|
[SUDO_CHECK_TYPE(ino_t, unsigned int)])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl check for working fnmatch(3)
|
dnl check for working fnmatch(3)
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_FUNC_FNMATCH,
|
AC_DEFUN([SUDO_FUNC_FNMATCH],
|
||||||
[AC_MSG_CHECKING([for working fnmatch with FNM_CASEFOLD])
|
[AC_MSG_CHECKING([for working fnmatch with FNM_CASEFOLD])
|
||||||
AC_CACHE_VAL(sudo_cv_func_fnmatch,
|
AC_CACHE_VAL(sudo_cv_func_fnmatch,
|
||||||
[rm -f conftestdata; > conftestdata
|
[rm -f conftestdata; > conftestdata
|
||||||
@ -255,7 +255,7 @@ AC_DEFUN([SUDO_FUNC_UNSETENV_VOID],
|
|||||||
dnl
|
dnl
|
||||||
dnl check for sa_len field in struct sockaddr
|
dnl check for sa_len field in struct sockaddr
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_SOCK_SA_LEN, [
|
AC_DEFUN([SUDO_SOCK_SA_LEN], [
|
||||||
AC_CHECK_MEMBER([struct sockaddr.sa_len],
|
AC_CHECK_MEMBER([struct sockaddr.sa_len],
|
||||||
[AC_DEFINE(HAVE_SA_LEN, 1, [Define if your struct sockadr has an sa_len field.])],
|
[AC_DEFINE(HAVE_SA_LEN, 1, [Define if your struct sockadr has an sa_len field.])],
|
||||||
[],
|
[],
|
||||||
@ -268,7 +268,7 @@ dnl check for max length of uid_t in string representation.
|
|||||||
dnl we can't really trust UID_MAX or MAXUID since they may exist
|
dnl we can't really trust UID_MAX or MAXUID since they may exist
|
||||||
dnl only for backwards compatibility.
|
dnl only for backwards compatibility.
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_UID_T_LEN,
|
AC_DEFUN([SUDO_UID_T_LEN],
|
||||||
[AC_REQUIRE([AC_TYPE_UID_T])
|
[AC_REQUIRE([AC_TYPE_UID_T])
|
||||||
AC_MSG_CHECKING(max length of uid_t)
|
AC_MSG_CHECKING(max length of uid_t)
|
||||||
AC_CACHE_VAL(sudo_cv_uid_t_len,
|
AC_CACHE_VAL(sudo_cv_uid_t_len,
|
||||||
@ -301,7 +301,7 @@ AC_DEFINE_UNQUOTED(MAX_UID_T_LEN, $sudo_cv_uid_t_len, [Define to the max length
|
|||||||
dnl
|
dnl
|
||||||
dnl append a libpath to an LDFLAGS style variable
|
dnl append a libpath to an LDFLAGS style variable
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_APPEND_LIBPATH, [
|
AC_DEFUN([SUDO_APPEND_LIBPATH], [
|
||||||
if test X"$with_rpath" = X"yes"; then
|
if test X"$with_rpath" = X"yes"; then
|
||||||
case "$host" in
|
case "$host" in
|
||||||
*-*-hpux*) $1="${$1} -L$2 -Wl,+b,$2"
|
*-*-hpux*) $1="${$1} -L$2 -Wl,+b,$2"
|
||||||
@ -321,7 +321,7 @@ dnl
|
|||||||
dnl Determine the mail spool location
|
dnl Determine the mail spool location
|
||||||
dnl NOTE: must be run *after* check for paths.h
|
dnl NOTE: must be run *after* check for paths.h
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(SUDO_MAILDIR, [
|
AC_DEFUN([SUDO_MAILDIR], [
|
||||||
maildir=no
|
maildir=no
|
||||||
if test X"$ac_cv_header_paths_h" = X"yes"; then
|
if test X"$ac_cv_header_paths_h" = X"yes"; then
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
|
||||||
|
Loading…
x
Reference in New Issue
Block a user