]>
Commit | Line | Data |
---|---|---|
39da297c ER |
1 | --- sudo-1.7.5/acinclude.m4 2011-03-28 12:28:08.108758654 +0300 |
2 | +++ sudo-1.7.5/acinclude.m4 2011-03-28 12:30:12.972047695 +0300 | |
3 | @@ -10,7 +10,7 @@ | |
4 | dnl | |
5 | dnl check for sendmail in well-known locations | |
6 | dnl | |
7 | -AC_DEFUN(SUDO_PROG_SENDMAIL, [AC_MSG_CHECKING([for sendmail]) | |
8 | +AC_DEFUN([SUDO_PROG_SENDMAIL], [AC_MSG_CHECKING([for sendmail]) | |
9 | found=no | |
10 | for p in "/usr/sbin/sendmail" "/usr/lib/sendmail" "/usr/etc/sendmail" "/usr/ucblib/sendmail" "/usr/local/lib/sendmail" "/usr/local/bin/sendmail"; do | |
11 | if test -f "$p"; then | |
12 | @@ -28,7 +28,7 @@ | |
13 | dnl | |
14 | dnl check for vi in well-known locations | |
15 | dnl | |
16 | -AC_DEFUN(SUDO_PROG_VI, [AC_MSG_CHECKING([for vi]) | |
17 | +AC_DEFUN([SUDO_PROG_VI], [AC_MSG_CHECKING([for vi]) | |
18 | found=no | |
19 | for editor in "/usr/bin/vi" "/bin/vi" "/usr/ucb/vi" "/usr/bsd/vi" "/usr/local/bin/vi"; do | |
20 | if test -f "$editor"; then | |
21 | @@ -46,7 +46,7 @@ | |
22 | dnl | |
23 | dnl check for mv in well-known locations | |
24 | dnl | |
25 | -AC_DEFUN(SUDO_PROG_MV, [AC_MSG_CHECKING([for mv]) | |
26 | +AC_DEFUN([SUDO_PROG_MV], [AC_MSG_CHECKING([for mv]) | |
27 | found=no | |
28 | for p in "/usr/bin/mv" "/bin/mv" "/usr/ucb/mv" "/usr/sbin/mv"; do | |
29 | if test -f "$p"; then | |
30 | @@ -64,7 +64,7 @@ | |
31 | dnl | |
32 | dnl check for bourne shell in well-known locations | |
33 | dnl | |
34 | -AC_DEFUN(SUDO_PROG_BSHELL, [AC_MSG_CHECKING([for bourne shell]) | |
35 | +AC_DEFUN([SUDO_PROG_BSHELL], [AC_MSG_CHECKING([for bourne shell]) | |
36 | found=no | |
37 | for p in "/bin/sh" "/usr/bin/sh" "/sbin/sh" "/usr/sbin/sh" "/bin/ksh" "/usr/bin/ksh" "/bin/bash" "/usr/bin/bash"; do | |
38 | if test -f "$p"; then | |
39 | @@ -82,7 +82,7 @@ | |
40 | dnl | |
41 | dnl Where the log file goes, use /var/log if it exists, else /{var,usr}/adm | |
42 | dnl | |
43 | -AC_DEFUN(SUDO_LOGFILE, [AC_MSG_CHECKING(for log file location) | |
44 | +AC_DEFUN([SUDO_LOGFILE], [AC_MSG_CHECKING(for log file location) | |
45 | if test -n "$with_logpath"; then | |
46 | AC_MSG_RESULT($with_logpath) | |
47 | SUDO_DEFINE_UNQUOTED(_PATH_SUDO_LOGFILE, "$with_logpath") | |
48 | @@ -103,7 +103,7 @@ | |
49 | dnl | |
50 | dnl Where the timestamp files go. | |
51 | dnl | |
52 | -AC_DEFUN(SUDO_TIMEDIR, [AC_MSG_CHECKING(for timestamp file location) | |
53 | +AC_DEFUN([SUDO_TIMEDIR], [AC_MSG_CHECKING(for timestamp file location) | |
54 | timedir="$with_timedir" | |
55 | if test -z "$timedir"; then | |
56 | for d in /var/db /var/lib /var/adm /usr/adm; do | |
57 | @@ -121,7 +121,7 @@ | |
58 | dnl Where the I/O log files go, use /var/log/sudo-io if | |
59 | dnl /var/log exists, else /{var,usr}/adm/sudo-io | |
60 | dnl | |
61 | -AC_DEFUN(SUDO_IO_LOGDIR, [ | |
62 | +AC_DEFUN([SUDO_IO_LOGDIR], [ | |
63 | AC_MSG_CHECKING(for I/O log dir location) | |
64 | if test "${with_iologdir-yes}" != "yes"; then | |
65 | iolog_dir="$with_iologdir" | |
66 | @@ -142,7 +142,7 @@ | |
67 | dnl SUDO_CHECK_TYPE(TYPE, DEFAULT) | |
68 | dnl XXX - should require the check for unistd.h... | |
69 | dnl | |
70 | -AC_DEFUN(SUDO_CHECK_TYPE, | |
71 | +AC_DEFUN([SUDO_CHECK_TYPE], | |
72 | [AC_REQUIRE([AC_HEADER_STDC])dnl | |
73 | AC_MSG_CHECKING(for $1) | |
74 | AC_CACHE_VAL(sudo_cv_type_$1, | |
75 | @@ -163,31 +163,31 @@ | |
76 | dnl | |
77 | dnl Check for size_t declation | |
78 | dnl | |
79 | -AC_DEFUN(SUDO_TYPE_SIZE_T, | |
80 | +AC_DEFUN([SUDO_TYPE_SIZE_T], | |
81 | [SUDO_CHECK_TYPE(size_t, int)]) | |
82 | ||
83 | dnl | |
84 | dnl Check for ssize_t declation | |
85 | dnl | |
86 | -AC_DEFUN(SUDO_TYPE_SSIZE_T, | |
87 | +AC_DEFUN([SUDO_TYPE_SSIZE_T], | |
88 | [SUDO_CHECK_TYPE(ssize_t, int)]) | |
89 | ||
90 | dnl | |
91 | dnl Check for dev_t declation | |
92 | dnl | |
93 | -AC_DEFUN(SUDO_TYPE_DEV_T, | |
94 | +AC_DEFUN([SUDO_TYPE_DEV_T], | |
95 | [SUDO_CHECK_TYPE(dev_t, int)]) | |
96 | ||
97 | dnl | |
98 | dnl Check for ino_t declation | |
99 | dnl | |
100 | -AC_DEFUN(SUDO_TYPE_INO_T, | |
101 | +AC_DEFUN([SUDO_TYPE_INO_T], | |
102 | [SUDO_CHECK_TYPE(ino_t, unsigned int)]) | |
103 | ||
104 | dnl | |
105 | dnl check for working fnmatch(3) | |
106 | dnl | |
107 | -AC_DEFUN(SUDO_FUNC_FNMATCH, | |
108 | +AC_DEFUN([SUDO_FUNC_FNMATCH], | |
109 | [AC_MSG_CHECKING([for working fnmatch with FNM_CASEFOLD]) | |
110 | AC_CACHE_VAL(sudo_cv_func_fnmatch, | |
111 | [rm -f conftestdata; > conftestdata | |
112 | @@ -253,7 +253,7 @@ | |
113 | dnl | |
114 | dnl check for sa_len field in struct sockaddr | |
115 | dnl | |
116 | -AC_DEFUN(SUDO_SOCK_SA_LEN, [ | |
117 | +AC_DEFUN([SUDO_SOCK_SA_LEN], [ | |
118 | AC_CHECK_MEMBER([struct sockaddr.sa_len], | |
119 | [AC_DEFINE(HAVE_SA_LEN, 1, [Define if your struct sockadr has an sa_len field.])], | |
120 | [], | |
121 | @@ -266,7 +266,7 @@ | |
122 | dnl we can't really trust UID_MAX or MAXUID since they may exist | |
123 | dnl only for backwards compatibility. | |
124 | dnl | |
125 | -AC_DEFUN(SUDO_UID_T_LEN, | |
126 | +AC_DEFUN([SUDO_UID_T_LEN], | |
127 | [AC_REQUIRE([AC_TYPE_UID_T]) | |
128 | AC_MSG_CHECKING(max length of uid_t) | |
129 | AC_CACHE_VAL(sudo_cv_uid_t_len, | |
130 | @@ -299,7 +299,7 @@ | |
131 | dnl | |
132 | dnl append a libpath to an LDFLAGS style variable | |
133 | dnl | |
134 | -AC_DEFUN(SUDO_APPEND_LIBPATH, [ | |
135 | +AC_DEFUN([SUDO_APPEND_LIBPATH], [ | |
136 | if test X"$with_rpath" = X"yes"; then | |
137 | case "$host" in | |
138 | *-*-hpux*) $1="${$1} -L$2 -Wl,+b,$2" | |
139 | @@ -319,7 +319,7 @@ | |
140 | dnl Determine the mail spool location | |
141 | dnl NOTE: must be run *after* check for paths.h | |
142 | dnl | |
143 | -AC_DEFUN(SUDO_MAILDIR, [ | |
144 | +AC_DEFUN([SUDO_MAILDIR], [ | |
145 | maildir=no | |
146 | if test X"$ac_cv_header_paths_h" = X"yes"; then | |
147 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT |