remove SLP stuff

diff --git a/macros/Makefile.am b/macros/Makefile.am
index 1bad3027eb7113fb7a18fd559db97cd3e7395a09..6c541a8fe0e6fb42c6aecd76629029a3978e594b 100644 (file)
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -8,12 +8,11 @@ EXTRA_DIST = \
        iconv.m4                \
        largefile-check.m4      \
        libgcrypt.m4            \
-       netatalk.m4                     \
+       netatalk.m4             \
        pam-check.m4            \
        perl-check.m4           \
        ps-check.m4             \
        quota-check.m4          \
-       srvloc.m4               \
        ssl-check.m4            \
        summary.m4              \
        tcp-wrappers.m4         \

diff --git a/macros/summary.m4 b/macros/summary.m4
index 39d69cdceb12f5f5f1cb690133934191d6899252..55ee1267996f5c585db31d73897091d80b57a168 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -41,7 +41,6 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
        AC_MSG_RESULT([         clrtxt  ($uams_using_options)])
        AC_MSG_RESULT([         guest])
        AC_MSG_RESULT([    Options:])
-       AC_MSG_RESULT([         SLP support:             $netatalk_cv_srvloc])
        AC_MSG_RESULT([         Zeroconf support:        $netatalk_cv_zeroconf])
        AC_MSG_RESULT([         tcp wrapper support:     $netatalk_cv_tcpwrap])
 dnl    if test x"$netatalk_cv_linux_sendfile" != x; then
@@ -102,11 +101,6 @@ AC_DEFUN([AC_NETATALK_LIBS_SUMMARY], [
                AC_MSG_RESULT([        LIBS   = $GSSAPI_LIBS])
                AC_MSG_RESULT([        CFLAGS = $GSSAPI_CFLAGS])
        fi
-       if test x"$netatalk_cv_srvloc" = x"yes"; then
-               AC_MSG_RESULT([    SRVLOC:])
-               AC_MSG_RESULT([        LIBS   = $SLP_LIBS])
-               AC_MSG_RESULT([        CFLAGS = $SLP_CFLAGS])
-       fi
        if test x"$netatalk_cv_use_cups" = x"yes"; then
                AC_MSG_RESULT([    CUPS:])
                AC_MSG_RESULT([        LIBS   = $CUPS_LIBS])

diff --git a/test/afpd/Makefile.am b/test/afpd/Makefile.am
index ca379e0eec0fcd6c79f29c8d7164ed3f97ccc6ef..6a3fd294b2197978610efa1e295512670a5007ca 100644 (file)
--- a/test/afpd/Makefile.am
+++ b/test/afpd/Makefile.am
@@ -48,7 +48,7 @@ test_SOURCES += $(top_builddir)/etc/afpd/acls.c
 endif
 
 test_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/etc/afpd \
-        @SLP_CFLAGS@ @ZEROCONF_CFLAGS@ \
+        @ZEROCONF_CFLAGS@ \
         -DAPPLCNAME \
         -DSERVERTEXT=\"$(SERVERTEXT)/\" \
         -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
@@ -62,6 +62,6 @@ test_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/etc/afpd \
 
 test_LDADD = $(top_builddir)/libatalk/cnid/libcnid.la \
        $(top_builddir)/libatalk/libatalk.la \
-       @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@
+       @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@
 
 test_LDFLAGS = -export-dynamic