shadowpw belongs in configure.ac at the end

diff --git a/configure.ac b/configure.ac
index 30aa8cf4d66535174757e9bef91c3fa74055efc5..0a1606dfc0f4af9421112574c0b5ba1ee356502c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -212,6 +212,7 @@ AM_CONDITIONAL(USE_PGP, test x$compile_pgp = xyes)
 AM_CONDITIONAL(DEFAULT_HOOK, test x$neta_cv_have_libgcrypt != xyes && test x$neta_cv_have_openssl != xyes)
 AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes)
 AM_CONDITIONAL(HAVE_ATFUNCS, test x"$ac_neta_haveatfuncs" = x"yes")
+AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
 
 dnl Enable silent Automake rules if present                                                                           
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index f7421ab55b3d38b0068f40ba22d1b58a0531e3a7..dfc56d7427a1f47d2b3a2fe44a52aa779c2119a8 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -270,8 +270,6 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [
     AM_CONDITIONAL(USE_NETBSD, test x$init_style = xnetbsd)
     AM_CONDITIONAL(USE_REDHAT_SYSV, test x$init_style = xredhat-sysv)
     AM_CONDITIONAL(USE_SUSE_SYSV, test x$init_style = xsuse-sysv)
-    AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
-    AM_CONDITIONAL(USE_TRU64, test x$init_style = xtru64)
     AM_CONDITIONAL(USE_SOLARIS, test x$init_style = xsolaris)
     AM_CONDITIONAL(USE_GENTOO, test x$init_style = xgentoo)
     AM_CONDITIONAL(USE_DEBIAN, test x$init_style = xdebian)