First patch import

[netatalk.git] / etc / afpd / Makefile.am

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index f4d04f1a907d6dc2506c5bc40c5af1a77ae41d88..f539d899d7a5506ca0f136ccc539e7e75be89efc 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -9,16 +9,15 @@ afpd_SOURCES = unix.c ofork.c main.c switch.c auth.c volume.c directory.c \
         file.c enumerate.c desktop.c filedir.c fork.c appl.c gettok.c \
         mangle.c status.c afp_options.c afp_asp.c afp_dsi.c messages.c  \
         afp_config.c nfsquota.c quota.c uam.c afs.c uid.c afp_util.c \
-       catsearch.c afprun.c hash.c extattrs.c dircache.c
+       catsearch.c afprun.c hash.c extattrs.c dircache.c \
+       afp_zeroconf.c afp_avahi.c
 
-if USE_NFSv4_ACLS
-afpd_SOURCES += acls.c
-endif
-
-afpd_LDADD =  $(top_builddir)/libatalk/cnid/libcnid.la $(top_builddir)/libatalk/libatalk.la @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@
+afpd_LDADD =  $(top_builddir)/libatalk/cnid/libcnid.la \
+       $(top_builddir)/libatalk/libatalk.la \
+       @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@
 afpd_LDFLAGS = -export-dynamic 
 afpd_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
-        @SLP_CFLAGS@ \
+        @SLP_CFLAGS@ @ZEROCONF_CFLAGS@ \
         -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
         -D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \
         -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
@@ -29,6 +28,11 @@ afpd_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
         -DAPPLCNAME \
         -DSERVERTEXT=\"$(SERVERTEXT)/\"
 
+if HAVE_ACLS
+afpd_SOURCES += acls.c
+endif
+
+
 noinst_HEADERS = auth.h afp_config.h desktop.h directory.h file.h \
         filedir.h fork.h globals.h icon.h mangle.h misc.h status.h switch.h \
         uam_auth.h uid.h unix.h volume.h hash.h acls.h acl_mappings.h extattrs.h \