diff -Naur ./acinclude.m4 ./acinclude.m4
--- ./acinclude.m4	2006-02-19 22:21:48.000000000 +0100
+++ ./acinclude.m4	2006-02-19 22:22:53.000000000 +0100
@@ -22,8 +22,8 @@
   CFLAGS="$INCLUDES -Werror $CFLAGS"
   AC_MSG_CHECKING([if the second argument of pam_get_user() takes const pointer])
   AC_TRY_COMPILE([
-#include <pam_appl.h>
-#include <pam_modules.h>
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
   ], [
     const char *user;
     pam_get_user((void*)0, &user, (void*)0);
@@ -37,8 +37,8 @@
 
   AC_MSG_CHECKING([if the third argument of pam_get_data() takes const pointer])
   AC_TRY_COMPILE([
-#include <pam_appl.h>
-#include <pam_modules.h>
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
   ], [
     const void *data;
     pam_get_data((void*)0, (void*)0, &data);
@@ -52,8 +52,8 @@
 
   AC_MSG_CHECKING([if the third argument of pam_get_item() takes const pointer])
   AC_TRY_COMPILE([
-#include <pam_appl.h>
-#include <pam_modules.h>
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
   ], [
     const void *item;
     pam_get_item((void*)0, 0, &item);
@@ -67,8 +67,8 @@
 
   AC_MSG_CHECKING([if the second argument of pam_conv.conv() takes const pointer])
   AC_TRY_COMPILE([
-#include <pam_appl.h>
-#include <pam_modules.h>
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
   ], [
     int (*conv)(int num_msg, const struct pam_message **msg,
         struct pam_response **resp, void *appdata_ptr) = NULL;
@@ -90,34 +90,34 @@
   PAM_MYSQL_CHECK_CONST([PAM_CONV_AGAIN], [
     AC_DEFINE([HAVE_PAM_CONV_AGAIN], [1], [Define to 1 if PAM defines PAM_CONV_AGAIN constant.])
   ], [], [
-#include <pam_appl.h>
-#include <pam_modules.h>
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
   ])
 
   PAM_MYSQL_CHECK_CONST([PAM_INCOMPLETE], [
     AC_DEFINE([HAVE_PAM_INCOMPLETE], [1], [Define to 1 if PAM defines PAM_INCOMPLETE constant.])
   ], [], [
-#include <pam_appl.h>
-#include <pam_modules.h>
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
   ])
 
   PAM_MYSQL_CHECK_CONST([PAM_NEW_AUTHTOK_REQD], [
     AC_DEFINE([HAVE_PAM_NEW_AUTHTOK_REQD], [1], [Define to 1 if PAM defines PAM_NEW_AUTHTOK_REQD constant.])
   ], [], [
-#include <pam_appl.h>
-#include <pam_modules.h>
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
   ])
 
   PAM_MYSQL_CHECK_CONST([PAM_AUTHTOK_RECOVERY_ERR], [], [
     PAM_MYSQL_CHECK_CONST([PAM_AUTHTOK_RECOVER_ERR], [
       AC_DEFINE([LINUX_PAM_CONST_BUG], [1], [Define to 1 if the implementation does not define PAM_AUTHTOK_RECOVER_ERR])
     ], [], [
-#include <pam_appl.h>
-#include <pam_modules.h>
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
     ])
   ], [
-#include <pam_appl.h>
-#include <pam_modules.h>
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
   ])
 
   CPPFLAGS="$ac_save_CFLAGS"
@@ -135,12 +135,13 @@
         AC_CHECK_HEADERS([pam_appl.h], [
           AC_MSG_CHECKING([pam_modules.h usability])
           AC_TRY_COMPILE([
-          #include <pam_appl.h>
-          #include <pam_modules.h>
+          #include <security/pam_appl.h>
+          #include <security/pam_modules.h>
           ], [], [
             AC_MSG_RESULT([yes])
             pam_prefix="$_pfx"
             pam_include_path="$dir"
+            LIBS="$LIBS -lpam"
             break
           ], [
             AC_MSG_RESULT([no])
diff -Naur ./configure.in ./configure.in
--- ./configure.in	2006-02-19 22:21:48.000000000 +0100
+++ ./configure.in	2006-02-19 22:23:02.000000000 +0100
@@ -122,14 +122,14 @@
   PAM_MYSQL_CHECK_PAM(["$withval"])
 ], [
 dnl try autodetection...
-  PAM_MYSQL_CHECK_PAM([/usr /usr/local])
+  PAM_MYSQL_CHECK_PAM([/usr usr/include /usr/local])
 ])
 
 AC_ARG_WITH([pam_mods_dir], [  --with-pam-mods-dir=DIR specify PAM module installation path], [
   PAM_MODS_DIR="$withval"
 ], [
   PAM_MODS_DIR=
-  for dir in "/lib/security" "/lib/pam" "/usr/lib/security" "/usr/lib/pam" \
+  for dir in "/lib /lib/security" "/lib/pam" "/usr/lib/security" "/usr/lib/pam" \
              "$libdir/pam" "$libdir/security"; do
     if test -d "$dir"; then
       PAM_MODS_DIR="$dir"
diff -Naur ./pam_mysql.c ./pam_mysql.c
--- ./pam_mysql.c	2006-02-19 22:21:48.000000000 +0100
+++ ./pam_mysql.c	2006-02-19 22:22:47.000000000 +0100
@@ -152,8 +152,8 @@
 #define PAM_SM_SESSION
 #define PAM_SM_PASSWORD
 
-#include <pam_appl.h>
-#include <pam_modules.h>
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
 
 /* }}} */