From f6c0a80247ed5cf166bbea74b0fdfd78fdc1e104 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 3 Jun 2013 08:38:26 -0600
Subject: [PATCH] Fix basic_pam_auth helper detection

The m4_include() for this helpers test script was omitted from rev.12782.
Add that in, and shuffle the PAM-specific configure tests into the helper
required.m4 script.
---
 configure.ac                       | 3 ---
 helpers/basic_auth/PAM/required.m4 | 5 ++++-
 helpers/basic_auth/modules.m4      | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index ff84540b1d..4f92468ee1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2202,7 +2202,6 @@ AC_CHECK_HEADERS( \
   shadow.h \
   regex.h \
   sched.h \
-  security/pam_appl.h \
   siginfo.h \
   signal.h \
   sstream \
@@ -2254,8 +2253,6 @@ AC_CHECK_HEADERS( \
   wchar.h
 )
 
-CHECK_STRUCT_PAM_CONV
-
 AC_CHECK_HEADERS(
   linux/netfilter_ipv4.h
 ,,,
diff --git a/helpers/basic_auth/PAM/required.m4 b/helpers/basic_auth/PAM/required.m4
index b5a20783bb..a59f77e1b0 100755
--- a/helpers/basic_auth/PAM/required.m4
+++ b/helpers/basic_auth/PAM/required.m4
@@ -1 +1,4 @@
-AC_CHECK_HEADERS([security/pam_appl.h],[BUILD_HELPER="PAM"])
+AC_CHECK_HEADERS([security/pam_appl.h],[
+  BUILD_HELPER="PAM"
+  CHECK_STRUCT_PAM_CONV
+])
diff --git a/helpers/basic_auth/modules.m4 b/helpers/basic_auth/modules.m4
index 763b7b822d..9abb40ce35 100644
--- a/helpers/basic_auth/modules.m4
+++ b/helpers/basic_auth/modules.m4
@@ -49,6 +49,9 @@ if test "x$enable_auth_basic" != "xno" ; then
       elif test "x$helper" = "xNIS" ; then
         m4_include([helpers/basic_auth/NIS/required.m4])
 
+      elif test "x$helper" = "xPAM" ; then
+        m4_include([helpers/basic_auth/PAM/required.m4])
+
       elif test "x$helper" = "xPOP3" ; then
         m4_include([helpers/basic_auth/POP3/required.m4])
 
-- 
2.47.2