Add more checks so that the new Apple print service quotas code compiles

on all versions of OS X.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@6370 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index da7c8a629f929abb71f9442c49f38e7c12950b5d..01a1e3dcb292777deee2a8f6f749f1fe8072abfa 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -216,8 +216,9 @@ case $uname in
                AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H))
                AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H))
 
-               dnl Check for the new membership functions in MacOSX 10.4 (Tiger)...
+               dnl Check for the new membership functions in MacOSX 10.4...
                AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
+               AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
                AC_CHECK_FUNCS(mbr_uid_to_uuid)
 
                dnl Need <dlfcn.h> header...

diff --git a/config.h.in b/config.h.in
index 7ee1ab046d62dad9823513a674633c1895c9c8c1..e70569d1e7087f2d6e99f075599b90e8909d3010 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -465,6 +465,7 @@
  */
 
 #undef HAVE_MEMBERSHIP_H
+#undef HAVE_MEMBERSHIPPRIV_H
 #undef HAVE_MBR_UID_TO_UUID
 
 

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 5f86f8642e8fb37f91887ddbc48e85b77ce0f722..1f0fcec06d8bc5d41d5b6d338d8e07e019463ed4 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -115,8 +115,14 @@
 
 #ifdef HAVE_MEMBERSHIP_H
 #  include <membership.h>
-#  include <membershipPriv.h>
 #endif /* HAVE_MEMBERSHIP_H */
+#ifdef HAVE_MEMBERSHIPPRIV_H
+#  include <membershipPriv.h>
+#else
+extern int mbr_user_name_to_uuid(const char* name, uuid_t uu);
+extern int mbr_group_name_to_uuid(const char* name, uuid_t uu);
+extern int mbr_check_membership_by_id(uuid_t user, gid_t group, int* ismember);
+#endif /* HAVE_MEMBERSHIPPRIV_H */
 
 
 /*