diff --git a/cf/auth-modules.m4 b/cf/auth-modules.m4
index 96cf6718e..5fb105ced 100644
--- a/cf/auth-modules.m4
+++ b/cf/auth-modules.m4
@@ -5,12 +5,16 @@ dnl Figure what authentication modules should be built
 AC_DEFUN(AC_AUTH_MODULES,[
 AC_MSG_CHECKING(which authentication modules should be built)
 
+z='m4_ifval([$1], $1, [sia pam afskauthlib])'
 LIB_AUTH_SUBDIRS=
-
+for i in $z; do
+case $i in
+sia)
 if test "$ac_cv_header_siad_h" = yes; then
 	LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS sia"
 fi
-
+;;
+pam)
 case "${host}" in
 *-*-freebsd*)	ac_cv_want_pam_krb4=no ;;
 *)		ac_cv_want_pam_krb4=yes ;;
@@ -21,12 +25,19 @@ if test "$ac_cv_want_pam_krb4" = yes -a \
     "$enable_shared" = yes; then
 	LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS pam"
 fi
-
+;;
+afskauthlib)
 case "${host}" in
 *-*-irix[[56]]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
 esac
-
-AC_MSG_RESULT($LIB_AUTH_SUBDIRS)
+;;
+esac
+done
+if test "$LIB_AUTH_SUBDIRS"; then
+	AC_MSG_RESULT($LIB_AUTH_SUBDIRS)
+else
+	AC_MSG_RESULT(none)
+fi
 
 AC_SUBST(LIB_AUTH_SUBDIRS)dnl
 ])