Fixed conflicts from merge

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

diff --git a/libatalk/acl/Makefile.am b/libatalk/acl/Makefile.am
index d9c81990a88026bdcbe540e0ed2dbad7f7ba2744..43db9dfc9897fc8488d1a70a99a0b2aa686f3a39 100644 (file)
--- a/libatalk/acl/Makefile.am
+++ b/libatalk/acl/Makefile.am
@@ -8,7 +8,9 @@ libacl_la_SOURCES = \
        ldap.c          \
        uuid.c          \
        cache.c         \
-       ldap_config.c
+       ldap_config.c \
+       unix.c
+
 libacl_la_LDFLAGS = -lldap
 endif