From: Frank Lahm <franklahm@googlemail.com>
Date: Mon, 21 Mar 2011 12:48:34 +0000 (+0100)
Subject: Disable ad binaries if at funcs aren't available, nftw needs openat
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=84b396e0e5cdf8f321d9059da8d4b5a7c92315df

Disable ad binaries if at funcs aren't available, nftw needs openat
---

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 423e7e84..7c633f74 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,7 +1,11 @@
 # Makefile.am for bin/
 
-SUBDIRS = ad adv1tov2 afppasswd cnid megatron uniconv misc
+SUBDIRS = adv1tov2 afppasswd cnid megatron uniconv misc
 
 if USE_APPLETALK
 SUBDIRS += aecho getzones nbp pap psorder
 endif
+
+if HAVE_ATFUNCS
+SUBDIRS += ad
+endif
diff --git a/configure.in b/configure.in
index a24906f2..48449921 100644
--- a/configure.in
+++ b/configure.in
@@ -1262,6 +1262,7 @@ AM_CONDITIONAL(USE_DEBIAN, test x$sysv_style = xdebian)
 AM_CONDITIONAL(USE_UNDEF, test x$sysv_style = x)
 AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes)
 AM_CONDITIONAL(USE_APPLETALK, test x$netatalk_cv_ddp_enabled = xyes)
+AM_CONDITIONAL(HAVE_ATFUNCS, test x"$ac_neta_haveatfuncs" = x"yes")
 
 dnl --------------------- generate files
 
diff --git a/libatalk/util/Makefile.am b/libatalk/util/Makefile.am
index b844dc5a..4869bfb4 100644
--- a/libatalk/util/Makefile.am
+++ b/libatalk/util/Makefile.am
@@ -8,7 +8,6 @@ libutil_la_SOURCES = \
 	atalk_addr.c	\
 	bprint.c	\
 	fault.c		\
-	ftw.c		\
 	getiface.c	\
 	locking.c   \
 	logger.c	\
@@ -23,3 +22,7 @@ libutil_la_SOURCES = \
 	strlcpy.c	\
 	volinfo.c \
 	unix.c
+
+if HAVE_ATFUNCS
+libutil_la_SOURCES += ftw.c
+endif