Merge master

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

diff --git a/macros/pam-check.m4 b/macros/pam-check.m4
index f900cd45bacd1eeaac321f99a3b2463eb4be1bd3..6bc40cbad841562161bf2c1a6a1f3cd776cdb5e4 100644 (file)
--- a/macros/pam-check.m4
+++ b/macros/pam-check.m4
@@ -1,7 +1,8 @@
-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], [
+AC_DEFUN([AC_NETATALK_PATH_PAM], [
+    netatalk_cv_use_pam=no
        AC_ARG_WITH(pam, [  --with-pam[[=PATH]]       specify path to PAM installation [[auto]]],
                [
                        require_pam="yes"
@@ -90,6 +91,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 +116,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
@@ -116,10 +126,14 @@ AC_DEFUN([AC_PATH_PAM], [
        else
                AC_MSG_RESULT([yes])
                ifelse([$1], , :, [$1])
+        use_pam_so=yes
+           compile_pam=yes
+           netatalk_cv_use_pam=yes
+           AC_DEFINE(USE_PAM, 1, [Define to enable PAM support])
        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)