Fix regressions from the last commits.

* configure.ac: Test for logwtmp needs -lutil in LIBS.
* modules/Makefile.am: Fix indentation of variable assignments causing
  creation of incorrect Makefile.

diff --git a/configure.ac b/configure.ac
index 4d1b1965b2006bde24247d00d349e387de84bebd..e9d4476904451d3fb09e819a0ef3d4772e28c8c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -534,7 +534,10 @@ AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r
 AC_CHECK_FUNCS(getgrouplist getline getdelim)
 AC_CHECK_FUNCS(inet_ntop inet_pton innetgr)
 AC_CHECK_FUNCS([ruserok_af ruserok], [break])
+BACKUP_LIBS=$LIBS
+LIBS="$LIBS -lutil"
 AC_CHECK_FUNCS([logwtmp])
+LIBS=$BACKUP_LIBS
 
 AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes -o "$ac_cv_func_ruserok" = yes])
 AM_CONDITIONAL([COND_BUILD_PAM_LASTLOG], [test "$ac_cv_func_logwtmp" = yes])

diff --git a/modules/Makefile.am b/modules/Makefile.am
index b98dc5c860762029d3dbefcef019dab6e8f7f4c3..612fc740abdb6034d50fde7c994f7d9b11a52381 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -3,11 +3,11 @@
 #
 
 if COND_BUILD_PAM_RHOSTS
-       MAYBE_PAM_RHOSTS = pam_rhosts
+ MAYBE_PAM_RHOSTS = pam_rhosts
 endif
 
 if COND_BUILD_PAM_LASTLOG
-       MAYBE_PAM_LASTLOG = pam_lastlog
+ MAYBE_PAM_LASTLOG = pam_lastlog
 endif
 
 SUBDIRS := pam_access pam_cracklib pam_debug pam_deny pam_echo \