X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=aclocal.m4;h=e83926cf9a4419545355efeb967b583175f24c76;hb=refs%2Ftags%2Fdebian%2F1.8.3p1-1;hp=1a6d9904931fa66f450f84d43fa17b448c99ec50;hpb=83dab3b7ab098ba1c093964e7ff862f287c8a12c;p=debian%2Fsudo diff --git a/aclocal.m4 b/aclocal.m4 index 1a6d990..e83926c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ dnl Local m4 macros for autoconf (used by sudo) dnl -dnl Copyright (c) 1994-1996, 1998-2005, 2007-2009 +dnl Copyright (c) 1994-1996, 1998-2005, 2007-2011 dnl Todd C. Miller dnl dnl XXX - should cache values in all cases!!! @@ -8,114 +8,99 @@ dnl dnl checks for programs dnl -dnl check for sendmail -dnl -AC_DEFUN(SUDO_PROG_SENDMAIL, [AC_MSG_CHECKING(for sendmail) -if test -f "/usr/sbin/sendmail"; then - AC_MSG_RESULT(/usr/sbin/sendmail) - SUDO_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/sbin/sendmail") -elif test -f "/usr/lib/sendmail"; then - AC_MSG_RESULT(/usr/lib/sendmail) - SUDO_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/lib/sendmail") -elif test -f "/usr/etc/sendmail"; then - AC_MSG_RESULT(/usr/etc/sendmail) - SUDO_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/etc/sendmail") -elif test -f "/usr/ucblib/sendmail"; then - AC_MSG_RESULT(/usr/ucblib/sendmail) - SUDO_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/ucblib/sendmail") -elif test -f "/usr/local/lib/sendmail"; then - AC_MSG_RESULT(/usr/local/lib/sendmail) - SUDO_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/local/lib/sendmail") -elif test -f "/usr/local/bin/sendmail"; then - AC_MSG_RESULT(/usr/local/bin/sendmail) - SUDO_DEFINE(_PATH_SUDO_SENDMAIL, "/usr/local/bin/sendmail") -else - AC_MSG_RESULT(not found) +dnl check for sendmail in well-known locations +dnl +AC_DEFUN([SUDO_PROG_SENDMAIL], [AC_MSG_CHECKING([for sendmail]) +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 + if test -f "$p"; then + found=yes + AC_MSG_RESULT([$p]) + SUDO_DEFINE_UNQUOTED(_PATH_SUDO_SENDMAIL, "$p") + break + fi +done +if test X"$found" != X"yes"; then + AC_MSG_RESULT([not found]) fi ])dnl dnl -dnl check for vi -dnl -AC_DEFUN(SUDO_PROG_VI, [AC_MSG_CHECKING(for vi) -if test -f "/usr/bin/vi"; then - AC_MSG_RESULT(/usr/bin/vi) - SUDO_DEFINE(_PATH_VI, "/usr/bin/vi") -elif test -f "/usr/ucb/vi"; then - AC_MSG_RESULT(/usr/ucb/vi) - SUDO_DEFINE(_PATH_VI, "/usr/ucb/vi") -elif test -f "/usr/bsd/vi"; then - AC_MSG_RESULT(/usr/bsd/vi) - SUDO_DEFINE(_PATH_VI, "/usr/bsd/vi") -elif test -f "/bin/vi"; then - AC_MSG_RESULT(/bin/vi) - SUDO_DEFINE(_PATH_VI, "/bin/vi") -elif test -f "/usr/local/bin/vi"; then - AC_MSG_RESULT(/usr/local/bin/vi) - SUDO_DEFINE(_PATH_VI, "/usr/local/bin/vi") -else - AC_MSG_RESULT(not found) +dnl check for vi in well-known locations +dnl +AC_DEFUN([SUDO_PROG_VI], [AC_MSG_CHECKING([for vi]) +found=no +for editor in "/usr/bin/vi" "/bin/vi" "/usr/ucb/vi" "/usr/bsd/vi" "/usr/local/bin/vi"; do + if test -f "$editor"; then + found=yes + AC_MSG_RESULT([$editor]) + SUDO_DEFINE_UNQUOTED(_PATH_VI, "$editor") + break + fi +done +if test X"$found" != X"yes"; then + AC_MSG_RESULT([not found]) fi ])dnl dnl -dnl check for mv -dnl -AC_DEFUN(SUDO_PROG_MV, [AC_MSG_CHECKING(for mv) -if test -f "/usr/bin/mv"; then - AC_MSG_RESULT(/usr/bin/mv) - SUDO_DEFINE(_PATH_MV, "/usr/bin/mv") -elif test -f "/bin/mv"; then - AC_MSG_RESULT(/bin/mv) - SUDO_DEFINE(_PATH_MV, "/bin/mv") -elif test -f "/usr/ucb/mv"; then - AC_MSG_RESULT(/usr/ucb/mv) - SUDO_DEFINE(_PATH_MV, "/usr/ucb/mv") -elif test -f "/usr/sbin/mv"; then - AC_MSG_RESULT(/usr/sbin/mv) - SUDO_DEFINE(_PATH_MV, "/usr/sbin/mv") -else - AC_MSG_RESULT(not found) +dnl check for mv in well-known locations +dnl +AC_DEFUN([SUDO_PROG_MV], [AC_MSG_CHECKING([for mv]) +found=no +for p in "/usr/bin/mv" "/bin/mv" "/usr/ucb/mv" "/usr/sbin/mv"; do + if test -f "$p"; then + found=yes + AC_MSG_RESULT([$p]) + SUDO_DEFINE_UNQUOTED(_PATH_MV, "$p") + break + fi +done +if test X"$found" != X"yes"; then + AC_MSG_RESULT([not found]) fi ])dnl dnl -dnl check for bourne shell -dnl -AC_DEFUN(SUDO_PROG_BSHELL, [AC_MSG_CHECKING(for bourne shell) -if test -f "/bin/sh"; then - AC_MSG_RESULT(/bin/sh) - SUDO_DEFINE(_PATH_BSHELL, "/bin/sh") -elif test -f "/usr/bin/sh"; then - AC_MSG_RESULT(/usr/bin/sh) - SUDO_DEFINE(_PATH_BSHELL, "/usr/bin/sh") -elif test -f "/sbin/sh"; then - AC_MSG_RESULT(/sbin/sh) - SUDO_DEFINE(_PATH_BSHELL, "/sbin/sh") -elif test -f "/usr/sbin/sh"; then - AC_MSG_RESULT(/usr/sbin/sh) - SUDO_DEFINE(_PATH_BSHELL, "/usr/sbin/sh") -elif test -f "/bin/ksh"; then - AC_MSG_RESULT(/bin/ksh) - SUDO_DEFINE(_PATH_BSHELL, "/bin/ksh") -elif test -f "/usr/bin/ksh"; then - AC_MSG_RESULT(/usr/bin/ksh) - SUDO_DEFINE(_PATH_BSHELL, "/usr/bin/ksh") -elif test -f "/bin/bash"; then - AC_MSG_RESULT(/bin/bash) - SUDO_DEFINE(_PATH_BSHELL, "/bin/bash") -elif test -f "/usr/bin/bash"; then - AC_MSG_RESULT(/usr/bin/bash) - SUDO_DEFINE(_PATH_BSHELL, "/usr/bin/bash") -else - AC_MSG_RESULT(not found) +dnl check for bourne shell in well-known locations +dnl +AC_DEFUN([SUDO_PROG_BSHELL], [AC_MSG_CHECKING([for bourne shell]) +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 + if test -f "$p"; then + found=yes + AC_MSG_RESULT([$p]) + SUDO_DEFINE_UNQUOTED(_PATH_BSHELL, "$p") + break + fi +done +if test X"$found" != X"yes"; then + AC_MSG_RESULT([not found]) +fi +])dnl + +dnl +dnl check for utmp file +dnl +AC_DEFUN([SUDO_PATH_UTMP], [AC_MSG_CHECKING([for utmp file path]) +found=no +for p in "/var/run/utmp" "/var/adm/utmp" "/etc/utmp"; do + if test -r "$p"; then + found=yes + AC_MSG_RESULT([$p]) + SUDO_DEFINE_UNQUOTED(_PATH_UTMP, "$p") + break + fi +done +if test X"$found" != X"yes"; then + AC_MSG_RESULT([not found]) fi ])dnl dnl dnl Where the log file goes, use /var/log if it exists, else /{var,usr}/adm 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 AC_MSG_RESULT($with_logpath) SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LOGFILE, "$with_logpath") @@ -134,33 +119,48 @@ fi ])dnl dnl -dnl Where the log file goes, use /var/log if it exists, else /{var,usr}/adm -dnl -AC_DEFUN(SUDO_TIMEDIR, [AC_MSG_CHECKING(for timestamp file location) -if test -n "$with_timedir"; then - AC_MSG_RESULT($with_timedir) - SUDO_DEFINE_UNQUOTED(_PATH_SUDO_TIMEDIR, "$with_timedir") - timedir="$with_timedir" -elif test -d "/var/run"; then - AC_MSG_RESULT(/var/run/sudo) - SUDO_DEFINE(_PATH_SUDO_TIMEDIR, "/var/run/sudo") - timedir="/var/run/sudo" -elif test -d "/var/adm"; then - AC_MSG_RESULT(/var/adm/sudo) - SUDO_DEFINE(_PATH_SUDO_TIMEDIR, "/var/adm/sudo") - timedir="/var/adm/sudo" -else - AC_MSG_RESULT(/usr/adm/sudo) - SUDO_DEFINE(_PATH_SUDO_TIMEDIR, "/usr/adm/sudo") - timedir="/usr/adm/sudo" +dnl Where the timestamp files go. +dnl +AC_DEFUN([SUDO_TIMEDIR], [AC_MSG_CHECKING(for timestamp file location) +timedir="$with_timedir" +if test -z "$timedir"; then + for d in /var/db /var/lib /var/adm /usr/adm; do + if test -d "$d"; then + timedir="$d/sudo" + break + fi + done fi +AC_MSG_RESULT([$timedir]) +SUDO_DEFINE_UNQUOTED(_PATH_SUDO_TIMEDIR, "$timedir") +])dnl + +dnl +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 +AC_DEFUN([SUDO_IO_LOGDIR], [ + AC_MSG_CHECKING(for I/O log dir location) + if test "${with_iologdir-yes}" != "yes"; then + iolog_dir="$with_iologdir" + elif test -d "/var/log"; then + iolog_dir="/var/log/sudo-io" + elif test -d "/var/adm"; then + iolog_dir="/var/adm/sudo-io" + else + iolog_dir="/usr/adm/sudo-io" + fi + if test "${with_iologdir}" != "no"; then + SUDO_DEFINE_UNQUOTED(_PATH_SUDO_IO_LOGDIR, "$iolog_dir") + fi + AC_MSG_RESULT($iolog_dir) ])dnl dnl dnl SUDO_CHECK_TYPE(TYPE, DEFAULT) dnl XXX - should require the check for unistd.h... dnl -AC_DEFUN(SUDO_CHECK_TYPE, +AC_DEFUN([SUDO_CHECK_TYPE], [AC_REQUIRE([AC_HEADER_STDC])dnl AC_MSG_CHECKING(for $1) AC_CACHE_VAL(sudo_cv_type_$1, @@ -181,31 +181,31 @@ fi dnl dnl Check for size_t declation dnl -AC_DEFUN(SUDO_TYPE_SIZE_T, +AC_DEFUN([SUDO_TYPE_SIZE_T], [SUDO_CHECK_TYPE(size_t, int)]) dnl dnl Check for ssize_t declation dnl -AC_DEFUN(SUDO_TYPE_SSIZE_T, +AC_DEFUN([SUDO_TYPE_SSIZE_T], [SUDO_CHECK_TYPE(ssize_t, int)]) dnl dnl Check for dev_t declation dnl -AC_DEFUN(SUDO_TYPE_DEV_T, +AC_DEFUN([SUDO_TYPE_DEV_T], [SUDO_CHECK_TYPE(dev_t, int)]) dnl dnl Check for ino_t declation dnl -AC_DEFUN(SUDO_TYPE_INO_T, +AC_DEFUN([SUDO_TYPE_INO_T], [SUDO_CHECK_TYPE(ino_t, unsigned int)]) dnl dnl check for working fnmatch(3) dnl -AC_DEFUN(SUDO_FUNC_FNMATCH, +AC_DEFUN([SUDO_FUNC_FNMATCH], [AC_MSG_CHECKING([for working fnmatch with FNM_CASEFOLD]) AC_CACHE_VAL(sudo_cv_func_fnmatch, [rm -f conftestdata; > conftestdata @@ -245,56 +245,30 @@ AC_DEFUN([SUDO_FUNC_UNSETENV_VOID], ], [sudo_cv_func_unsetenv_void=no], [sudo_cv_func_unsetenv_void=yes], - [sudo_cv_func_unsetenv_void=yes])]) + [sudo_cv_func_unsetenv_void=no])]) if test $sudo_cv_func_unsetenv_void = yes; then AC_DEFINE(UNSETENV_VOID, 1, [Define to 1 if the `unsetenv' function returns void instead of `int'.]) fi ]) -dnl -dnl check putenv() argument for const -dnl -AC_DEFUN([SUDO_FUNC_PUTENV_CONST], -[AC_CACHE_CHECK([whether putenv has a const argument], -sudo_cv_func_putenv_const, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT -int putenv(const char *string) {return 0;}], [])], - [sudo_cv_func_putenv_const=yes], - [sudo_cv_func_putenv_const=no]) - ]) - if test $sudo_cv_func_putenv_const = yes; then - AC_DEFINE(PUTENV_CONST, 1, [Define to 1 if the `putenv' has a const argument.]) - fi -]) - dnl dnl check for sa_len field in struct sockaddr dnl -AC_DEFUN(SUDO_SOCK_SA_LEN, -[AC_MSG_CHECKING(for sa_len field in struct sockaddr) -AC_CACHE_VAL(sudo_cv_sock_sa_len, -[AC_TRY_RUN([#include -#include -main() { -struct sockaddr s; -s.sa_len = 0; -exit(0); -}], sudo_cv_sock_sa_len=yes, sudo_cv_sock_sa_len=no, - sudo_cv_sock_sa_len=no) -rm -f core core.* *.core])dnl -AC_MSG_RESULT($sudo_cv_sock_sa_len) -if test $sudo_cv_sock_sa_len = yes; then - AC_DEFINE(HAVE_SA_LEN, 1, [Define if your struct sockadr has an sa_len field.]) -fi -]) - +AC_DEFUN([SUDO_SOCK_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.])], + [], + [ #include + #include ] + )] +) dnl 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 only for backwards compatibility. dnl -AC_DEFUN(SUDO_UID_T_LEN, +AC_DEFUN([SUDO_UID_T_LEN], [AC_REQUIRE([AC_TYPE_UID_T]) AC_MSG_CHECKING(max length of uid_t) AC_CACHE_VAL(sudo_cv_uid_t_len, @@ -317,39 +291,24 @@ main() { (void) fprintf(f, "%d\n", strlen(b)); (void) fclose(f); exit(0); -}], sudo_cv_uid_t_len=`cat conftestdata`, sudo_cv_uid_t_len=10) +}], sudo_cv_uid_t_len=`cat conftestdata`, sudo_cv_uid_t_len=10, sudo_cv_uid_t_len=10) ]) rm -f conftestdata AC_MSG_RESULT($sudo_cv_uid_t_len) AC_DEFINE_UNQUOTED(MAX_UID_T_LEN, $sudo_cv_uid_t_len, [Define to the max length of a uid_t in string context (excluding the NUL).]) ]) -dnl -dnl Check for presence of long long and for sizeof(long long) == sizeof(long) -dnl -AC_DEFUN(SUDO_TYPE_LONG_LONG, -[AC_CHECK_TYPES(long long, [AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your compiler supports the "long long" type.])] -[AC_MSG_CHECKING(for long and long long equivalence) -AC_CACHE_VAL(sudo_cv_type_long_is_quad, -[AC_TRY_RUN([ -main() { -if (sizeof(long long) == sizeof(long)) exit(0); -else exit(1); -}], [sudo_cv_type_long_is_quad=yes], -[sudo_cv_type_long_is_quad=no], [sudo_cv_type_long_is_quad=no]) -rm -f core core.* *.core])dnl -AC_MSG_RESULT($sudo_cv_type_long_is_quad) -if test $sudo_cv_type_long_is_quad = yes; then - AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).]) -fi -])]) - dnl dnl append a libpath to an LDFLAGS style variable dnl -AC_DEFUN(SUDO_APPEND_LIBPATH, [ +AC_DEFUN([SUDO_APPEND_LIBPATH], [ if test X"$with_rpath" = X"yes"; then - $1="${$1} -L$2 -R$2" + case "$host" in + *-*-hpux*) $1="${$1} -L$2 -Wl,+b,$2" + ;; + *) $1="${$1} -L$2 -Wl,-R$2" + ;; + esac else $1="${$1} -L$2" fi @@ -358,6 +317,39 @@ AC_DEFUN(SUDO_APPEND_LIBPATH, [ fi ]) +dnl +dnl Determine the mail spool location +dnl NOTE: must be run *after* check for paths.h +dnl +AC_DEFUN([SUDO_MAILDIR], [ +maildir=no +if test X"$ac_cv_header_paths_h" = X"yes"; then +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT +#include ], +[char *p = _PATH_MAILDIR;])], [maildir=yes], []) +fi +if test $maildir = no; then + # Solaris has maillock.h which defines MAILDIR + AC_CHECK_HEADERS(maillock.h, [ + SUDO_DEFINE(_PATH_MAILDIR, MAILDIR) + maildir=yes + ]) + if test $maildir = no; then + for d in /var/mail /var/spool/mail /usr/spool/mail; do + if test -d "$d"; then + maildir=yes + SUDO_DEFINE_UNQUOTED(_PATH_MAILDIR, "$d") + break + fi + done + if test $maildir = no; then + # unable to find mail dir, hope for the best + SUDO_DEFINE_UNQUOTED(_PATH_MAILDIR, "/var/mail") + fi + fi +fi +]) + dnl dnl private versions of AC_DEFINE and AC_DEFINE_UNQUOTED that don't support dnl tracing that we use to define paths for pathnames.h so autoheader doesn't @@ -374,3 +366,12 @@ m4_define([SUDO_DEFINE_UNQUOTED], [@%:@define] $1 m4_if($#, 2, [$2], $#, 3, [$2], 1) EOF ]) + +dnl +dnl Pull in libtool macros +dnl +m4_include([libtool.m4]) +m4_include([ltoptions.m4]) +m4_include([ltsugar.m4]) +m4_include([ltversion.m4]) +m4_include([lt~obsolete.m4])