From: srittau <srittau>
Date: Wed, 5 Dec 2001 08:43:38 +0000 (+0000)
Subject: Back-port from trunk: Don't link to -lcom_err, -lresolv, and -l?
X-Git-Tag: netatalk-1-5-rc1~8
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=09c25cb319fba607055d717ff3cd210990aa16cc

Back-port from trunk: Don't link to -lcom_err, -lresolv, and -l?
by default.
---

diff --git a/configure.in b/configure.in
index 98d00c13..18470b22 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.126.2.4 2001-11-30 05:54:33 srittau Exp $
+dnl $Id: configure.in,v 1.126.2.5 2001-12-05 08:43:38 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -36,8 +36,6 @@ dnl Replace `main' with a function in -lauth:
 AC_CHECK_LIB(auth, main)
 dnl Replace `main' with a function in -lcmd:
 AC_CHECK_LIB(cmd, main)
-dnl Replace `main' with a function in -lcom_err:
-AC_CHECK_LIB(com_err, main)
 dnl Replace `main' with a function in -lcrypt:
 AC_CHECK_LIB(crypt, main)
 dnl Replace `main' with a function in -ld:
@@ -56,10 +54,6 @@ dnl Replace `main' with a function in -lnsl:
 AC_CHECK_LIB(nsl, main)
 dnl Replace `main' with a function in -lprot:
 AC_CHECK_LIB(prot, main)
-dnl Replace `main' with a function in -lresolv:
-AC_CHECK_LIB(resolv, main)
-dnl Replace `main' with a function in -lrpcsvc:
-AC_CHECK_LIB(rpcsvc, main)
 dnl Replace `main' with a function in -lrx:
 AC_CHECK_LIB(rx, main)
 dnl Replace `main' with a function in -lrxkad:
@@ -258,6 +252,9 @@ if test "x$db3_required" = "xyes"; then
 	AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])])
 fi
 
+dnl Check for quota support
+AC_CHECK_QUOTA
+
 msg_dir=""
 AC_ARG_WITH(message-dir,
 	[  --with-message-dir=PATH path to message files [[PKGCONF/msg]]],
diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 17a2f060..138c17e4 100644
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -23,7 +23,7 @@ noinst_HEADERS = auth.h codepage.h afp_config.h desktop.h directory.h file.h \
 	 filedir.h fork.h globals.h icon.h misc.h status.h switch.h uam_auth.h \
 	 uid.h unix.h volume.h parse_mtab.h
 
-LIBS = @LIBS@ @AFPD_LIBS@
+LIBS = @LIBS@ @AFPD_LIBS@ @QUOTA_LIBS@
 
 CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
 	 @CFLAGS@ \
diff --git a/macros/Makefile.am b/macros/Makefile.am
index 1346e3c8..f779ffda 100644
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = \
 	db3-check.m4		\
 	pam-check.m4		\
+	quota-check.m4		\
 	ssl-check.m4
diff --git a/macros/quota-check.m4 b/macros/quota-check.m4
new file mode 100644
index 00000000..d6697005
--- /dev/null
+++ b/macros/quota-check.m4
@@ -0,0 +1,10 @@
+dnl $Id: quota-check.m4,v 1.1.2.1 2001-12-05 08:43:39 srittau Exp $
+dnl Autoconf macro to check for quota support
+dnl FIXME: This is in now way complete.
+
+AC_DEFUN([AC_CHECK_QUOTA], [
+	QUOTA_LIBS=
+	AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS=-lrpcsvc])
+	AC_SUBST(QUOTA_LIBS)
+])
+