-($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,
#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
-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)
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.
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
/*
- * $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.
#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
#include <stdio.h>
#include <stdlib.h>
{
return syscall(__NR_quotactl, cmd, special, id, addr);
}
-#endif
+#endif /* NEED_QUOTACTL_WRAPPER */
#if defined(HAVE_SYS_MNTTAB_H) || defined(__svr4__)
+/*
+ * $Id: util.h,v 1.2 2001-06-20 14:51:13 rufustfirefly Exp $
+ */
+
#ifndef _ATALK_UTIL_H
#define _ATALK_UTIL_H 1
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 *));
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
+/*
+ * $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>
static int _mod_dummy;
-#ifdef NO_DLFCN_H
+#ifndef HAVE_DLFCN_H
#ifdef MACOSX_SERVER
#include <mach-o/dyld.h>
{
NSUnLinkModule(module, FALSE);
}
-#endif
+#endif /* MACOSX_SERVER */
-#else
+#else /* HAVE_DLFCN_H */
#ifdef DLSYM_PREPEND_UNDERSCORE
#include <dlfcn.h>
return symbol;
}
#endif /* DLSYM_PREPEND_UNDERSCORE */
-#endif /* NO_DLFCN */
+#endif /* HAVE_DLFCN_H */