Check for sys/quota.h and include it if and only if this is defined in unix.h.

diff --git a/etc/afpd/unix.h b/etc/afpd/unix.h
index 70bdb16bf62557e9068505d0d0837141876defb3..a15cee23c031e6b76ca7194f6c4325b7bd5743fb 100644 (file)
--- a/etc/afpd/unix.h
+++ b/etc/afpd/unix.h
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id: unix.h,v 1.14 2003-12-15 04:49:56 srittau Exp $
+ * $Id: unix.h,v 1.15 2003-12-15 04:59:45 srittau Exp $

  */
 
 #ifndef AFPD_UNIX_H
  */
 
 #ifndef AFPD_UNIX_H


@@ -58,9 +58,9 @@ typedef int   mode_t;
 #define dqb_btimelimit  dqb_btime
 #endif /* ! __svr4__ || HAVE_DQB_BTIMELIMIT */
 
 #define dqb_btimelimit  dqb_btime
 #endif /* ! __svr4__ || HAVE_DQB_BTIMELIMIT */
 

-#if defined(linux) || defined(ultrix) || defined(HAVE_QUOTA_H)
+#if defined(HAVE_SYS_QUOTA_H)

 #include <sys/quota.h>
 #include <sys/quota.h>

-#endif /* linux || ultrix || HAVE_QUOTA_H */
+#endif /* HAVE_SYS_QUOTA_H */

 
 #ifdef __svr4__ 
 #include <sys/fs/ufs_quota.h>
 
 #ifdef __svr4__ 
 #include <sys/fs/ufs_quota.h>


@@ -74,10 +74,6 @@ typedef int  mode_t;
 #include <ufs/quota.h>
 #endif /* HAVE_UFS_QUOTA_H */
 
 #include <ufs/quota.h>
 #endif /* HAVE_UFS_QUOTA_H */
 

-#ifdef _IBMR2
-#include <jfs/quota.h>
-#endif /* _IBMR2 */
-

 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/macros/quota-check.m4 b/macros/quota-check.m4
index 3acff3a9c574bdccc027cf6d49a4a520bb676173..ae9ffa5763ebad181e143242566f089d34f401b8 100644 (file)
--- a/macros/quota-check.m4
+++ b/macros/quota-check.m4
@@ -1,9 +1,9 @@
-dnl $Id: quota-check.m4,v 1.2 2003-12-15 04:55:20 srittau Exp $
+dnl $Id: quota-check.m4,v 1.3 2003-12-15 04:59:45 srittau Exp $

 dnl Autoconf macro to check for quota support
 dnl FIXME: This is in now way complete.
 
 AC_DEFUN([AC_CHECK_QUOTA], [
 dnl Autoconf macro to check for quota support
 dnl FIXME: This is in now way complete.
 
 AC_DEFUN([AC_CHECK_QUOTA], [

-       AC_CHECK_HEADERS(ufs/quota.h)
+       AC_CHECK_HEADERS(sys/quota.h ufs/quota.h)

 
        QUOTA_LIBS=
        AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS=-lrpcsvc])
 
        QUOTA_LIBS=
        AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS=-lrpcsvc])