Joe Clarke's fix for linux/quota.h checking, removed NO_DLFCN_H define

diff --git a/ChangeLog b/ChangeLog
index b9fbe8174418d4c6077989e90485c4cfe14e4095..423d865f159082a1b1a126bfc96dd295522797b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-($Id: ChangeLog,v 1.49 2001-06-19 18:04:39 rufustfirefly Exp $)
+($Id: ChangeLog,v 1.50 2001-06-20 14:51:12 rufustfirefly Exp $)
+
+2001-06-20  jeff b  <jeff@univrel.pr.uconn.edu>
+       * configure.in: check for linux/quota.h before enabling
+       QUOTACTL_WRAPPER (Joe Clarke) 
+
+       * acconfig.h, configure.in, include/atalk/util.h,
+       libatalk/util/module.c: removed NO_DLFCN_H in favor of
+       ifndef HAVE_DLFCN_H (Jeff)
 
 2001-06-19  jeff b  <jeff@univrel.pr.uconn.edu>
        * etc/afpd/file.c, etc/afpd/parse_mtab.c, etc/afpd/parse_mtab.h,

diff --git a/acconfig.h b/acconfig.h
index 0557907f32220c2e4ea0c02cf287402546d7ee1c..4f19421ac7ce7169e28b004c035cbefdf77daa24 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -21,7 +21,6 @@
 #undef NEED_QUOTACTL_WRAPPER
 #undef NO_CRYPT_H
 #undef NO_DDP
-#undef NO_DLFCN_H
 #undef NO_STRUCT_TM_GMTOFF
 #undef OPENSSL_DHX
 #undef SENDFILE_FLAVOR_BSD

diff --git a/configure.in b/configure.in
index bb8f5acb59b2b62ea2283e9f1f95f37cca8d26d1..431bca331da8f1c6d51c7054a2ffe391b9ee2744 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.90 2001-06-19 18:04:39 rufustfirefly Exp $
+dnl $Id: configure.in,v 1.91 2001-06-20 14:51:12 rufustfirefly Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -455,10 +455,19 @@ if test x"$this_os" = "xlinux"; then
        LDSHAREDFLAGS="-shared"
 
        dnl ----- check if we need the quotactl wrapper
-       AC_CHECK_HEADER(sys/quota.h,,
+       AC_CHECK_HEADER(sys/quota.h,
+               sys_quota=yes,
+               sys_quota=no
+       )
+       AC_CHECK_HEADER(linux/quota.h,
+               linux_quota=yes,
+               linux_quota=no
+       )
+
+       if test "x$linux_quota" = "xno" -a "x$sys_quota" = "xno"; then
                AC_MSG_RESULT([enabling quotactl wrapper])
                AC_DEFINE(NEED_QUOTACTL_WRAPPER)
-       )
+       fi
 
        dnl ----- as far as I can tell, dbtob always does the wrong thing
        dnl ----- on every single version of linux I've ever played with.
@@ -494,7 +503,7 @@ if test x"$this_os" = "xmacosx"; then
        AC_DEFINE(BSD4_4)
        AC_DEFINE(HAVE_BROKEN_CPP)
        AC_DEFINE(HAVE_2ARG_DBTOB)
-       AC_DEFINE(NO_DLFCN_H)
+       dnl AC_DEFINE(NO_DLFCN_H)
        AC_DEFINE(MACOSX_SERVER)
 
        dnl ----- Set -shared flag

diff --git a/etc/afpd/quota.c b/etc/afpd/quota.c
index c06a2130f9c87996dd22e2747b33d1ac38242b30..98e817b76a6ddffa149adbdb5f5b46305fa22a88 100644 (file)
--- a/etc/afpd/quota.c
+++ b/etc/afpd/quota.c
@@ -1,5 +1,5 @@
 /*
- * $Id: quota.c,v 1.7 2001-06-01 13:59:46 rufustfirefly Exp $
+ * $Id: quota.c,v 1.8 2001-06-20 14:51:13 rufustfirefly Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -7,7 +7,7 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,7 +31,7 @@ int quotactl(int cmd, const char *special, int id, caddr_t addr)
 {
   return syscall(__NR_quotactl, cmd, special, id, addr);
 }
-#endif
+#endif /* NEED_QUOTACTL_WRAPPER */
 
 
 #if defined(HAVE_SYS_MNTTAB_H) || defined(__svr4__)

diff --git a/include/atalk/util.h b/include/atalk/util.h
index 01309beb6bfef29194f8457bf698bd2f9c5ab984..ff623310ed4902df643b32973dbc0b896de9ada6 100644 (file)
--- a/include/atalk/util.h
+++ b/include/atalk/util.h
@@ -1,3 +1,7 @@
+/*
+ * $Id: util.h,v 1.2 2001-06-20 14:51:13 rufustfirefly Exp $
+ */
+
 #ifndef _ATALK_UTIL_H
 #define _ATALK_UTIL_H 1
 
@@ -11,7 +15,6 @@ extern unsigned const char _diacasemap[], _dialowermap[];
 extern char **getifacelist(void);
 extern void freeifacelist(char **);
 
-
 #define diatolower(x)     _dialowermap[(x)]
 #define diatoupper(x)     _diacasemap[(x)]
 extern int atalk_aton     __P((char *, struct at_addr *));
@@ -23,24 +26,26 @@ extern pid_t server_lock  __P((char * /*program*/, char * /*file*/,
                               int /*debug*/));
 #define server_unlock(x)  (unlink(x))
 
-#ifdef NO_DLFCN_H
+#ifndef HAVE_DLFCN_H
 extern void *mod_open    __P((const char *));
 extern void *mod_symbol  __P((void *, const char *));
 extern void mod_close    __P((void *));
 #define mod_error()      ""
-#else
+#else /* ! HAVE_DLFCN_H */
 #include <dlfcn.h>
 #ifndef RTLD_NOW
 #define RTLD_NOW 1
-#endif
+#endif /* ! RTLD_NOW */
+
 #define mod_open(a)      dlopen(a, RTLD_NOW)
+
 #ifndef DLSYM_PREPEND_UNDERSCORE
 #define mod_symbol(a, b) dlsym(a, b)
-#else
+#else /* ! DLSYM_PREPEND_UNDERSCORE */
 extern void *mod_symbol  __P((void *, const char *));
-#endif
+#endif /* ! DLSYM_PREPEND_UNDERSCORE */
 #define mod_error()      dlerror()
 #define mod_close(a)     dlclose(a)
-#endif
+#endif /* ! HAVE_DLFCN_H */
 
 #endif

diff --git a/libatalk/util/module.c b/libatalk/util/module.c
index afe2c027fa40f415c60ecdf67a5f2b4837fb545b..984e7ff9a0261d11f32a9e97fa1cd4107d1415d6 100644 (file)
--- a/libatalk/util/module.c
+++ b/libatalk/util/module.c
@@ -1,6 +1,10 @@
+/*
+ * $Id: module.c,v 1.3 2001-06-20 14:51:13 rufustfirefly Exp $
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <stdlib.h>
 #include <string.h>
@@ -8,7 +12,7 @@
 
 static int _mod_dummy;
 
-#ifdef NO_DLFCN_H
+#ifndef HAVE_DLFCN_H
 #ifdef MACOSX_SERVER
 #include <mach-o/dyld.h>
 
@@ -41,9 +45,9 @@ void mod_close(void *module)
 {
   NSUnLinkModule(module, FALSE);
 }
-#endif
+#endif /* MACOSX_SERVER */
 
-#else
+#else /* HAVE_DLFCN_H */
 
 #ifdef DLSYM_PREPEND_UNDERSCORE
 #include <dlfcn.h>
@@ -67,4 +71,4 @@ void *mod_symbol(void *module, const char *name)
    return symbol;
 }
 #endif /* DLSYM_PREPEND_UNDERSCORE */
-#endif /* NO_DLFCN */
+#endif /* HAVE_DLFCN_H */