Fixed conflicts from merge

[netatalk.git] / libatalk / acl / Makefile.am

diff --git a/libatalk/acl/Makefile.am b/libatalk/acl/Makefile.am
index fe9f63011ea808e1fec7187200d5a2c37d1fad6a..43db9dfc9897fc8488d1a70a99a0b2aa686f3a39 100644 (file)
--- a/libatalk/acl/Makefile.am
+++ b/libatalk/acl/Makefile.am
@@ -2,8 +2,7 @@
 
 noinst_HEADERS = aclldap.h cache.h
 
-if USE_NFSv4_ACLS
-
+if HAVE_ACLS
 noinst_LTLIBRARIES = libacl.la
 libacl_la_SOURCES = \
        ldap.c          \
@@ -13,6 +12,5 @@ libacl_la_SOURCES = \
        unix.c
 
 libacl_la_LDFLAGS = -lldap
-
 endif