Merge branch-2-1

[netatalk.git] / macros / pam-check.m4

diff --git a/macros/pam-check.m4 b/macros/pam-check.m4
index f900cd45bacd1eeaac321f99a3b2463eb4be1bd3..e5663db347fb0f5e3b08884791014305e5c3dbc4 100644 (file)
--- a/macros/pam-check.m4
+++ b/macros/pam-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: pam-check.m4,v 1.4 2009-11-23 18:29:50 franklahm Exp $
+dnl $Id: pam-check.m4,v 1.6 2010-01-11 13:06:02 franklahm Exp $
 dnl PAM finding macro
 
 AC_DEFUN([AC_PATH_PAM], [
@@ -90,6 +90,14 @@ AC_DEFUN([AC_PATH_PAM], [
            PAM_ACCOUNT=system-auth
            PAM_PASSWORD=system-auth
            PAM_SESSION=system-auth
+        dnl FreeBSD
+        elif test -f "$pampath/system" ; then
+           PAM_DIRECTIVE=include
+           PAM_AUTH=system
+           PAM_ACCOUNT=system
+           PAM_PASSWORD=system
+           PAM_SESSION=system
+        dnl Fallback
         else
            PAM_DIRECTIVE=required
            PAM_AUTH=pam_unix.so
@@ -107,6 +115,7 @@ AC_DEFUN([AC_PATH_PAM], [
 
        AC_MSG_CHECKING([whether to enable PAM support])
        if test "x$pam_found" = "xno"; then
+               netatalk_cv_install_pam=no
                if test "x$require_pam" = "xyes"; then
                        AC_MSG_ERROR([PAM support missing])
                else
@@ -118,8 +127,8 @@ AC_DEFUN([AC_PATH_PAM], [
                ifelse([$1], , :, [$1])
        fi
 
-        LIB_REMOVE_USR_LIB(PAM_LIBS)
-        CFLAGS_REMOVE_USR_INCLUDE(PAM_CFLAGS)
+    LIB_REMOVE_USR_LIB(PAM_LIBS)
+    CFLAGS_REMOVE_USR_INCLUDE(PAM_CFLAGS)
        AC_SUBST(PAMDIR)
        AC_SUBST(PAM_CFLAGS)
        AC_SUBST(PAM_LIBS)