3 @@ -135,67 +135,26 @@ ac_cv_libc_shadowgrp=yes,ac_cv_libc_shad
4 if test "$ac_cv_libc_shadowgrp" = "yes"; then
5 AC_DEFINE(HAVE_SHADOWGRP)
9 -AC_MSG_CHECKING(location of shared mail directory)
10 -for maildir in /var/spool/mail /var/mail /usr/spool/mail /usr/mail NONE; do
11 - if test "$maildir" = "NONE"; then
13 - elif test -d $maildir; then
14 - AC_DEFINE_UNQUOTED(MAIL_SPOOL_DIR, "$maildir")
15 - AC_MSG_RESULT($maildir)
20 -AC_MSG_CHECKING(location of user mail file)
21 -for mailfile in Mailbox mailbox Mail mail .mail NONE; do
22 - if test "$mailfile" = "NONE"; then
24 - elif test -f $HOME/$mailfile; then
25 - AC_DEFINE_UNQUOTED(MAIL_SPOOL_FILE, "$mailfile")
26 - AC_MSG_RESULT($mailfile)
31 -AC_MSG_CHECKING(location of utmp)
32 -for utmpdir in /var/run /var/adm /usr/adm /etc NONE; do
33 - if test "$utmpdir" = "NONE"; then
34 - AC_MSG_WARN(utmp file not found)
35 - elif test -f $utmpdir/utmp; then
36 - AC_DEFINE_UNQUOTED(_UTMP_FILE, "$utmpdir/utmp")
37 - AC_MSG_RESULT($utmpdir)
42 -AC_MSG_CHECKING(location of faillog/lastlog/wtmp)
43 -for logdir in /var/log /var/adm /usr/adm /etc; do
44 - if test -d $logdir; then
45 - AC_DEFINE_UNQUOTED(_WTMP_FILE, "$logdir/wtmp")
46 - AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$logdir/lastlog")
47 - AC_DEFINE_UNQUOTED(FAILLOG_FILE, "$logdir/faillog")
48 - AC_MSG_RESULT($logdir)
53 -AC_MSG_CHECKING(location of the passwd program)
54 -if test -f /usr/bin/passwd; then
58 +AC_CACHE_CHECK(for shadow password support,
59 +ac_cv_shadow_support, AC_TRY_COMPILE([#include <shadow.h>],
60 +[ struct spwd *spw = getspnam("root"); ],
61 +ac_cv_shadow_support=yes, ac_cv_shadow_support=no))
63 +if test "$ac_cv_shadow_support" = "yes"; then
64 + AC_DEFINE(SHADOWPWD)
67 -AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$passwd_dir/passwd")
68 -AC_MSG_RESULT($passwd_dir)
70 dnl XXX - quick hack, should disappear before anyone notices :).
76 +AC_DEFINE_UNQUOTED(_WTMP_FILE, "/var/log/wtmp")
77 +AC_DEFINE_UNQUOTED(LASTLOG_FILE, "/var/log/lastlog")
78 +AC_DEFINE_UNQUOTED(FAILLOG_FILE, "/var/log/faillog")
79 +AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "/usr/bin/passwd")
81 dnl Use our own version of getpass(), which handles long passwords
82 dnl (unlike many systems which have a limit of 8 characters), and can
83 @@ -282,25 +241,8 @@ else
87 -ALL_LINGUAS="cs de el fr ja ko pl sv uk"
111 @@ -111,8 +111,8 @@ EXTRA_DIST = NEWS README TODO shadow.spe
113 AUTOMAKE_OPTIONS = 1.5 dist-bzip2 foreign
115 -SUBDIRS = intl po man libmisc lib src \
116 - contrib debian doc etc
117 +SUBDIRS = libmisc lib src \
121 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
124 @@ -4,5 +4,5 @@ EXTRA_DIST = NEWS README TODO shadow.spe
126 AUTOMAKE_OPTIONS = 1.5 dist-bzip2 foreign
128 -SUBDIRS = intl po man libmisc lib src \
129 - contrib debian doc etc
130 +SUBDIRS = libmisc lib src \