fix a compile nfsquota problem with redhat based distros, rpcsvc/rquota.h is in a...

diff --git a/etc/afpd/nfsquota.c b/etc/afpd/nfsquota.c
index 63679aa596e6384bfd2fa329605d2e13841121ba..020a87ca403614ee12f7ad2c3312151b6eee978b 100644 (file)
--- a/etc/afpd/nfsquota.c
+++ b/etc/afpd/nfsquota.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nfsquota.c,v 1.10.8.1 2003-10-30 05:57:44 bfernhomberg Exp $
+ * $Id: nfsquota.c,v 1.10.8.2 2004-01-15 08:12:57 bfernhomberg Exp $
  *
  * parts of this are lifted from the bsd quota program and are
  * therefore under the following copyright:
@@ -18,8 +18,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifndef NO_QUOTA_SUPPORT
 #include <stdio.h>
-
 /* STDC check */
 #if STDC_HEADERS
 #include <string.h>
@@ -55,7 +55,6 @@ char *strchr (), *strrchr ();
 
 #include "unix.h"
 
-#ifndef NO_QUOTA_SUPPORT
 /* lifted (with modifications) from the bsd quota program */
 static int
 callaurpc(vol, prognum, versnum, procnum, inproc, in, outproc, out)

diff --git a/etc/afpd/quota.c b/etc/afpd/quota.c
index 4a7ab912110f89733e523793c0ad8ad4d0a7c7cb..7ff4a23d443b7dfb8cbc4b1fe8e7a6b6f082e485 100644 (file)
--- a/etc/afpd/quota.c
+++ b/etc/afpd/quota.c
@@ -1,5 +1,5 @@
 /*
- * $Id: quota.c,v 1.22.8.5 2003-10-30 05:57:44 bfernhomberg Exp $
+ * $Id: quota.c,v 1.22.8.6 2004-01-15 08:12:57 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -9,6 +9,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifndef NO_QUOTA_SUPPORT
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -49,7 +50,6 @@ char *strchr (), *strrchr ();
 #define WANT_USER_QUOTA 0
 #define WANT_GROUP_QUOTA 1
 
-#ifndef NO_QUOTA_SUPPORT
 #ifdef NEED_QUOTACTL_WRAPPER
 int quotactl(int cmd, const char *special, int id, caddr_t addr)
 {

diff --git a/macros/quota-check.m4 b/macros/quota-check.m4
index 6b3fda98e20bd197ca43fb063f2acb2ea02ddb81..a87f1c9529b926729ee95aa1b67253e3f51b642b 100644 (file)
--- a/macros/quota-check.m4
+++ b/macros/quota-check.m4
@@ -1,11 +1,17 @@
-dnl $Id: quota-check.m4,v 1.1.12.2 2003-11-01 07:45:56 bfernhomberg Exp $
+dnl $Id: quota-check.m4,v 1.1.12.3 2004-01-15 08:12:57 bfernhomberg Exp $
 dnl Autoconf macro to check for quota support
 dnl FIXME: This is in now way complete.
 
 AC_DEFUN([AC_CHECK_QUOTA], [
        QUOTA_LIBS=""
+       netatalk_cv_quotasupport="yes"
        AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS="-lrpcsvc"])
-       AC_CHECK_HEADERS(rpc/rpc.h)
+       AC_CHECK_HEADERS([rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h],[],[
+               QUOTA_LIBS=""
+               netatalk_cv_quotasupport="no"
+               AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])
+       ])
+
        AC_SUBST(QUOTA_LIBS)
 ])
 

diff --git a/macros/summary.m4 b/macros/summary.m4
index c0c5a3691ddf154af43a864407265911456b61db..aa108a36d7ee47a61eb9904714d55dbe31b380b3 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -40,6 +40,7 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
        if test x"$netatalk_cv_linux_sendfile" != x; then
                AC_MSG_RESULT([         Linux sendfile support: $netatalk_cv_linux_sendfile])
        fi
+       AC_MSG_RESULT([         quota support:          $netatalk_cv_quotasupport])
        AC_MSG_RESULT([         admin group support:    $netatalk_cv_admin_group])
        AC_MSG_RESULT([         valid shell check:      $netatalk_cv_use_shellcheck])
        AC_MSG_RESULT([         cracklib support:       $netatalk_cv_with_cracklib])
@@ -50,7 +51,7 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
                AC_MSG_RESULT([])
                AC_MSG_WARN([ PAM support was configured for your system, but the netatalk PAM configuration file])
                AC_MSG_WARN([ cannot be installed. Please install the config/netatalk.pamd file manually.])
-               AC_MSG_WARN([ If you're running solaris you'll have to edit /etc/pam.conf to get PAM working.])
+               AC_MSG_WARN([ If you're running Solaris or BSD you'll have to edit /etc/pam.conf to get PAM working.])
                AC_MSG_WARN([ You can also re-run configure and specify --without-pam to disable PAM support.])
        fi