1 |
diff -up ypserv-2.32/acinclude.m4.aliases ypserv-2.32/acinclude.m4 |
2 |
--- ypserv-2.32/acinclude.m4.aliases 2005-04-07 14:38:44.000000000 +0200 |
3 |
+++ ypserv-2.32/acinclude.m4 2013-11-18 09:57:05.082162773 +0100 |
4 |
@@ -92,3 +92,18 @@ AC_DEFUN([TYPE_SOCKLEN_T], |
5 |
fi |
6 |
AC_MSG_RESULT($ac_cv___attribute__) |
7 |
]) |
8 |
+ |
9 |
+ |
10 |
+dnl |
11 |
+dnl Find where aliases file is located |
12 |
+dnl It can be in /etc/aliases or /etc/mail/aliases |
13 |
+dnl If file path is specified in argument and file path exists, it is used. |
14 |
+dnl |
15 |
+AC_DEFUN([FIND_ALIASES_PATH], [ |
16 |
+AC_MSG_CHECKING(for aliases file path) |
17 |
+tmp_aliases="$1" |
18 |
+test -f /etc/mail/aliases && tmp_aliases="/etc/mail/aliases" |
19 |
+test -f /etc/aliases && tmp_aliases="/etc/aliases" |
20 |
+AC_MSG_RESULT($tmp_aliases) |
21 |
+AC_SUBST(ALIASES, $tmp_aliases) |
22 |
+]) |
23 |
diff -up ypserv-2.32/configure.ac.aliases ypserv-2.32/configure.ac |
24 |
--- ypserv-2.32/configure.ac.aliases 2013-11-18 09:51:17.094758957 +0100 |
25 |
+++ ypserv-2.32/configure.ac 2013-11-18 09:52:07.859844276 +0100 |
26 |
@@ -151,7 +151,7 @@ fi |
27 |
AC_SUBST(MAKE) |
28 |
|
29 |
dnl Check for aliases path |
30 |
-AC_PATH_PROG(ALIASES, aliases, /etc/mail/aliases, /etc/mail:/etc) |
31 |
+FIND_ALIASES_PATH(/etc/aliases) |
32 |
|
33 |
dnl Should we use a gethostbyname after gethostname to use FQDN ? default yes |
34 |
AC_ARG_ENABLE(fqdn, AS_HELP_STRING([--disable-fqdn], |