[dovecot-cvs] dovecot acconfig.h,1.17,1.18 configure.in,1.59,1.60

[cras at procontrol.fi]

Update of /home/cvs/dovecot
In directory danu:/tmp/cvs-serv28045

Modified Files:
	acconfig.h configure.in 
Log Message:
OSX puts PAM includes into pam/ directory instead of security. Detect that.



Index: acconfig.h
===================================================================
RCS file: /home/cvs/dovecot/acconfig.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- acconfig.h	26 Nov 2002 18:47:43 -0000	1.17
+++ acconfig.h	26 Nov 2002 20:55:44 -0000	1.18
@@ -30,8 +30,11 @@
 #undef USERINFO_PAM
 #undef USERINFO_VPOPMAIL
 
+/* PAM stuff */
 #undef AUTH_PAM_USERPASS
 #undef HAVE_PAM_SETCRED
+#undef HAVE_SECURITY_PAM_APPL_H
+#undef HAVE_PAM_PAM_APPL_H
 
 /* How to implement I/O loop */
 #undef IOLOOP_SELECT

Index: configure.in
===================================================================
RCS file: /home/cvs/dovecot/configure.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- configure.in	26 Nov 2002 20:09:47 -0000	1.59
+++ configure.in	26 Nov 2002 20:55:44 -0000	1.60
@@ -471,7 +471,18 @@
 
 if test $want_pam = yes; then
 	AC_CHECK_LIB(pam, pam_start, [
+		have_pam=no
 		AC_CHECK_HEADER(security/pam_appl.h, [
+			AC_DEFINE(HAVE_SECURITY_PAM_APPL_H)
+			have_pam=yes
+		])
+
+		AC_CHECK_HEADER(pam/pam_appl.h, [
+			AC_DEFINE(HAVE_PAM_PAM_APPL_H)
+			have_pam=yes
+		])
+
+		if test "$have_pam" = "yes"; then
 			USERINFO_LIBS="$USERINFO_LIBS -lpam"
 			AC_DEFINE(USERINFO_PAM)
 			auths="$auths pam"
@@ -479,7 +490,7 @@
 			AC_CHECK_LIB(pam, pam_setcred, [
 				AC_DEFINE(HAVE_PAM_SETCRED)
 			])
-		])
+		fi
 	])
 fi