nss-pam-ldapd commit: r1166 - in nss-pam-ldapd: . compat

["Commits of the nss-pam-ldapd project." <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sun Jul 18 13:40:55 2010
New Revision: 1166
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1166

Log:
compatibility improvement: also check for nss_common.h and see if enum 
nss_status exists

Modified:
   nss-pam-ldapd/compat/nss_compat.h
   nss-pam-ldapd/configure.ac

Modified: nss-pam-ldapd/compat/nss_compat.h
==============================================================================
--- nss-pam-ldapd/compat/nss_compat.h   Sun Jul 18 13:27:41 2010        (r1165)
+++ nss-pam-ldapd/compat/nss_compat.h   Sun Jul 18 13:40:55 2010        (r1166)
@@ -22,7 +22,12 @@
 #ifndef COMPAT__NSS_H
 #define COMPAT__NSS_H
 
+#ifdef HAVE_NSS_H
 #include <nss.h>
+#endif /* HAVE_NSS_H */
+#ifdef HAVE_NSS_COMMON_H
+#include <nss_common.h>
+#endif /* HAVE_NSS_COMMON_H */
 #ifdef HAVE_ALIASES_H
 #include <aliases.h>
 #endif

Modified: nss-pam-ldapd/configure.ac
==============================================================================
--- nss-pam-ldapd/configure.ac  Sun Jul 18 13:27:41 2010        (r1165)
+++ nss-pam-ldapd/configure.ac  Sun Jul 18 13:40:55 2010        (r1166)
@@ -209,7 +209,7 @@
 
 # checks for availability of header files
 AC_CHECK_HEADERS([ctype.h strings.h pthread.h fcntl.h limits.h])
-AC_CHECK_HEADERS([nss.h grp.h shadow.h aliases.h netdb.h rpc/rpcent.h])
+AC_CHECK_HEADERS([nss.h nss_common.h grp.h shadow.h aliases.h netdb.h 
rpc/rpcent.h])
 AC_CHECK_HEADERS([netinet/ether.h arpa/inet.h netinet/in.h])
 AC_CHECK_HEADERS([sys/socket.h sys/un.h sys/ucred.h ucred.h sys/param.h 
sys/time.h])
 AC_CHECK_HEADERS([getopt.h syslog.h])
@@ -310,6 +310,15 @@
       #include <rpc/rpcent.h>
       #endif])
 
+  # check for a definition of struct rpcent
+  AC_CHECK_TYPES(enum nss_status,,,[
+      #ifdef HAVE_NSS_H
+      #include <nss.h>
+      #endif
+      #ifdef HAVE_NSS_COMMON_H
+      #include <nss_common.h>
+      #endif])
+
   # restore CFLAGS and LIBS
   CFLAGS="$nss_save_CFLAGS"
   LIBS="$nss_save_LIBS"
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits