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

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 423e7e84621bca9bc9a667bc7e1046352c0c8418..7c633f748f409ed1fecf5ba637ebfa75d7ce572b 100644 (file)
--- 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 a24906f2040403a8c82ac9ee8cfc5d1109a478f2..48449921b926c766497b252d458c08cb237e17e0 100644 (file)
--- 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 b844dc5abbd3b87d1d153a99babeb2438e7cf756..4869bfb45ee0b78cd0694ff84bd55f513d3707e0 100644 (file)
--- 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