Encapsulate all Appletalk stuff

diff --git a/bin/Makefile.am b/bin/Makefile.am
index d23a5e5e2dd8af358672e56ec114c0af66a70f5e..5e36848600c1dab9d3fcdfafc4e860dc1b99a1c2 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,3 +1,7 @@
 # Makefile.am for bin/
 
-SUBDIRS = adv1tov2 aecho afile afppasswd cnid getzones megatron nbp pap psorder uniconv misc
+SUBDIRS = adv1tov2 afile afppasswd cnid megatron uniconv misc
+
+if USE_APPLETALK
+SUBDIRS += aecho getzones nbp pap psorder
+endif

diff --git a/config/Makefile.am b/config/Makefile.am
index ab07e1134ffb7822389652be30c4cf3d36f2cabe..349b29cdbea76adccac6b990e9cd7e893cc4361a 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -5,11 +5,16 @@ SUFFIXES = .tmpl .
 
 GENFILES = afpd.conf AppleVolumes.default
 TMPLFILES = afpd.conf.tmpl AppleVolumes.default.tmpl
-CONFFILES = AppleVolumes.system atalkd.conf netatalk.conf papd.conf
+CONFFILES = AppleVolumes.system netatalk.conf
+
 if USE_NFSv4_ACLS
 CONFFILES += afp_ldap.conf
 endif
 
+if USE_APPLETALK
+CONFFILES += atalkd.conf papd.conf
+endif
+
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 EXTRA_DIST = $(CONFFILES) $(TMPLFILES) afp_ldap.conf
 CLEANFILES = $(GENFILES)

diff --git a/configure.in b/configure.in
index bbd60c1a49534a0555f7c77514596a98f1ce2a79..939bb2c4ab3c122bba5615e59946f736360571c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -232,19 +232,20 @@ AC_ARG_WITH(cracklib,
 AC_MSG_CHECKING([for cracklib support])
 AC_MSG_RESULT([$netatalk_cv_with_cracklib])
 
-netatalk_cv_ddp_enabled=yes
+netatalk_cv_ddp_enabled=no
 AC_MSG_CHECKING([whether to enable DDP])
 AC_ARG_ENABLE(ddp,
-       [  --disable-ddp           disable DDP],[
-       if test "$enableval" = "no"; then 
-               AC_DEFINE(NO_DDP, 1, [Define if DDP should be disabled])
-               AC_MSG_RESULT([no])
-               netatalk_cv_ddp_enabled=no
+       [  --enable-ddp           enable DDP],[
+       if test "$enableval" = "yes"; then 
+               AC_MSG_RESULT([yes])
+               netatalk_cv_ddp_enabled=yes
        else
                AC_MSG_RESULT([yes])
+               AC_DEFINE(NO_DDP, 1, [Define if DDP should be disabled])
        fi
        ],[
-               AC_MSG_RESULT([yes])
+               AC_MSG_RESULT([no])
+               AC_DEFINE(NO_DDP, 1, [Define if DDP should be disabled])
        ]
 )
 
@@ -1226,6 +1227,7 @@ AM_CONDITIONAL(USE_GENTOO, test x$sysv_style = xgentoo)
 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)
 
 dnl --------------------- generate files
 

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ae0ea4f003f6226870b7cda5e8766b5fbaaad15e..799369aec0960bc19be791cc0d3e792dca9f69a2 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,17 +1,17 @@
 # Makefile.am for contrib/
 
+SUBDIRS = macusers shell_utils
+
 if COMPILE_TIMELORD
-TIMELORD = timelord
-else
-TIMELORD =
+SUBDIRS += timelord
 endif
 
 if COMPILE_A2BOOT
-A2BOOT = a2boot
-else
-A2BOOT =
+SUBDIRS += a2boot
 endif
 
-SUBDIRS = macusers printing shell_utils ${TIMELORD} ${A2BOOT}
+if USE_APPLETALK
+SUBDIRS += printing
+endif
 
 EXTRA_DIST = ICDumpSuffixMap

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 7ed56ed6612fc957a815944cf3eaf610e0727de5..6ad182a5693bd5b7278f9804bf0c0708e52282ca 100644 (file)
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,3 +1,7 @@
 # Makefile.am for etc/
 
-SUBDIRS = afpd cnid_dbd atalkd papd psf uams
+SUBDIRS = afpd cnid_dbd uams
+
+if USE_APPLETALK
+SUBDIRS += atalkd papd psf
+endif

diff --git a/include/atalk/Makefile.am b/include/atalk/Makefile.am
index 739629bca470193346050a69dfe27fe7871e9bac..299d86ae9ddcd89f90797c54582939a55cdc7f66 100644 (file)
--- a/include/atalk/Makefile.am
+++ b/include/atalk/Makefile.am
@@ -2,9 +2,9 @@
 
 atalkincludedir = $(includedir)/atalk
 atalkinclude_HEADERS = \
-       adouble.h vfs.h aep.h afp.h asp.h atp.h boolean.h \
+       adouble.h vfs.h aep.h afp.h asp.h atp.h boolean.h bstradd.h \
        cnid.h compat.h ddp.h dsi.h ldapconfig.h list.h logger.h \
-       nbp.h netddp.h pap.h paths.h rtmp.h server_child.h \
+       nbp.h netddp.h pap.h paths.h queue.h rtmp.h server_child.h \
        server_ipc.h tdb.h uam.h unicode.h util.h uuid.h volinfo.h \
        zip.h ea.h acl.h unix.h directory.h hash.h volume.h
 

diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
index a9e39c1529d58bf570aeaad927bf3709c5631fe5..9ccb204f0f4ff4392860edee546e5249f0893649 100644 (file)
--- a/man/man1/Makefile.am
+++ b/man/man1/Makefile.am
@@ -16,27 +16,30 @@ GENERATED_MANS      = apple_cp.1 apple_mv.1 apple_rm.1 uniconv.1 asip-status.pl.1
 TEMPLATE_FILES = apple_cp.1.tmpl apple_mv.1.tmpl apple_rm.1.tmpl uniconv.1.tmpl asip-status.pl.1.tmpl
 NONGENERATED_MANS      =       achfile.1  \
                                ad.1 \
-                               aecho.1 \
                                afile.1 \
                                afppasswd.1 \
                                apple_dump.1 \
                                dbd.1 \
-                               getzones.1 \
                                hqx2bin.1 \
                                macbinary.1 \
                                megatron.1 \
+                               netatalk-config.1 \
+                               single2bin.1 \
+                               unbin.1 \
+                               unhex.1 \
+                               unsingle.1
+
+if USE_APPLETALK
+NONGENERATED_MANS += aecho.1 \
+                               getzones.1 \
                                nbp.1 \
                                nbplkup.1 \
                                nbprgstr.1 \
                                nbpunrgstr.1 \
-                               netatalk-config.1 \
                                pap.1 \
                                papstatus.1 \
-                               psorder.1 \
-                               single2bin.1 \
-                               unbin.1 \
-                               unhex.1 \
-                               unsingle.1
+                               psorder.1
+endif
 
 man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
 

diff --git a/man/man3/Makefile.am b/man/man3/Makefile.am
index 1569cfd7296d6eb254f24544583996bdda7d86d4..4212f267b4d0f98c15108cd0ca0b9574602b4b4e 100644 (file)
--- a/man/man3/Makefile.am
+++ b/man/man3/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am for man/man3
 
+if USE_APPLETALK
 man_MANS = atalk_aton.3 nbp_name.3
+endif
 
 EXTRA_DIST = $(man_MANS)

diff --git a/man/man4/Makefile.am b/man/man4/Makefile.am
index 944c3602ab2cfc1dad0e2b09bb738e9117da0e09..73e1610e39f1da61c58c32c5b6cf459ad59aa7e9 100644 (file)
--- a/man/man4/Makefile.am
+++ b/man/man4/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am for man/man4/
 
+if USE_APPLETALK
 man_MANS = atalk.4
+endif
 
 EXTRA_DIST = $(man_MANS)

diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am
index a1e28886df45aa60cca4ce65529e79ca207da133..3265d4be56f2f0a438decb50407fcbc6d64f6610 100644 (file)
--- a/man/man5/Makefile.am
+++ b/man/man5/Makefile.am
@@ -13,13 +13,22 @@ SUFFIXES = .tmpl .
            -e "s@:COMPILED_BACKENDS:@${compiled_backends}@g" \
            <$< >$@
 
-GENERATED_MANS = AppleVolumes.default.5 afpd.conf.5 \
-       atalkd.conf.5 netatalk.conf.5 papd.conf.5 \
-       afp_ldap.conf.5 afp_signature.conf.5
-
-TEMPLATE_FILES = AppleVolumes.default.5.tmpl afpd.conf.5.tmpl \
-       atalkd.conf.5.tmpl netatalk.conf.5.tmpl papd.conf.5.tmpl \
-       afp_ldap.conf.5.tmpl afp_signature.conf.5.tmpl
+GENERATED_MANS = AppleVolumes.default.5 \
+       afpd.conf.5 \
+       netatalk.conf.5 \
+       afp_ldap.conf.5 \
+       afp_signature.conf.5
+
+TEMPLATE_FILES = AppleVolumes.default.5.tmpl \
+       afpd.conf.5.tmpl \
+       netatalk.conf.5.tmpl \
+       afp_ldap.conf.5.tmpl \
+       afp_signature.conf.5.tmpl
+
+if USE_APPLETALK
+GENERATED_MANS += atalkd.conf.5 papd.conf.5
+TEMPLATE_FILES += atalkd.conf.5.tmpl papd.conf.5.tmpl
+endif
 
 NONGENERATED_MANS = AppleVolumes.5 AppleVolumes.system.5
 

diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
index 99d41e391b953aa99736dd2a5640640c4da69031..22b3d8d9a07f0eff5ecf49b6be67c65a2f9f81a8 100644 (file)
--- a/man/man8/Makefile.am
+++ b/man/man8/Makefile.am
@@ -14,9 +14,13 @@ SUFFIXES = .tmpl .
            <$< >$@
 
 NONGENERATED_MANS = timelord.8
-GENERATED_MANS    = afp_acls.8 afpd.8 atalkd.8 cnid_dbd.8 cnid_metad.8 papd.8 papstatus.8 psf.8
-TEMPLATE_FILES    = afp_acls.8.tmpl afpd.8.tmpl atalkd.8.tmpl cnid_dbd.8.tmpl \
-       cnid_metad.8.tmpl papd.8.tmpl papstatus.8.tmpl psf.8.tmpl
+GENERATED_MANS    = afp_acls.8 afpd.8 cnid_dbd.8 cnid_metad.8
+TEMPLATE_FILES    = afp_acls.8.tmpl afpd.8.tmpl cnid_dbd.8.tmpl cnid_metad.8.tmpl
+
+if USE_APPLETALK
+GENERATED_MANS += atalkd.8 papd.8 papstatus.8 psf.8
+TEMPLATE_FILES += atalkd.8.tmpl papd.8.tmpl papstatus.8.tmpl psf.8.tmpl
+endif
 
 man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
 

diff --git a/test/afpd/Makefile.am b/test/afpd/Makefile.am
index e8264cc719ed0d07704598804277664a0c605b38..bbd1c110ce0f04260f53aad249e9a5be657b5a1e 100644 (file)
--- a/test/afpd/Makefile.am
+++ b/test/afpd/Makefile.am
@@ -6,6 +6,8 @@ TESTS = test.sh test
 
 check_PROGRAMS = test
 noinst_HEADERS = test.h subtests.h afpfunc_helpers.h
+EXTRA_DIST = test.sh
+CLEANFILES = test.default test.conf
 
 test_SOURCES =  test.c subtests.c afpfunc_helpers.c \
                                $(top_builddir)/etc/afpd/afp_config.c \