Cope with error header being named kadm_err.h for MIT.

diff --git a/configure.ac b/configure.ac
index 2d5225d4620c5346d907860dd5cb6feabe8c0274..1581b915a15ae35bc43d7a9ea9a25c4a41564212 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
-AC_INIT(pam-krb5-migrate, 0.0.9, [jelmer@samba.org])
+AC_INIT(pam-krb5-migrate, 0.0.10, [jelmer@samba.org])
 AC_PROG_CC
 AC_ARG_VAR(KRB5CONFIG, [Path to krb5-config script])
-AC_PATH_PROGS(KRB5CONFIG, $ac_cv_env_KRB5CONFIG_value, krb5-config krb5-config.heimdal)
+AC_PATH_PROGS(KRB5CONFIG, $ac_cv_env_KRB5CONFIG_value krb5-config krb5-config.heimdal)
 AC_CHECK_LIB(pam, pam_get_item, [], [AC_MSG_ERROR([pam not found])])
 save_LIBS="$LIBS"
 save_CFLAGS="$CFLAGS"
@@ -9,6 +9,7 @@ LIBS="$LIBS `$ac_cv_path_KRB5CONFIG --libs kadm-client`"
 CFLAGS="$CFLAGS `$ac_cv_path_KRB5CONFIG --cflags kadm-client`"
 AC_CHECK_FUNCS(kadm5_get_policy)
 PKG_CHECK_MODULES(COM_ERR, com_err)
+AC_CHECK_HEADERS(kadm5/kadm_err.h)
 AC_COMPILE_CHECK([number of arguments to kadm5_free_policy_ent],
 [
 #include <stdio.h>

diff --git a/pam_krb5_migrate.h b/pam_krb5_migrate.h
index 2738a38450cc91b11905a4f74628e141f31ea87e..eeb405b58ee9074b0107b4e9c289c7336bda55fa 100644 (file)
--- a/pam_krb5_migrate.h
+++ b/pam_krb5_migrate.h
@@ -32,7 +32,11 @@
 #include <pwd.h>
 #include <krb5.h>
 #include <kadm5/admin.h>
+#ifdef HAVE_KADM5_KADM_ERR_H
+#include <kadm5/kadm_err.h>
+#else
 #include <kadm5/kadm5_err.h>
+#endif
 
 #ifndef LINUX