Merge master

[netatalk.git] / macros / srvloc.m4

diff --git a/macros/srvloc.m4 b/macros/srvloc.m4
index 04d338daf79af1ce7487b1865bafb18eeee0b2bd..99f24f4b99ea2190701e4299b42b06c166269235 100644 (file)
--- a/macros/srvloc.m4
+++ b/macros/srvloc.m4
@@ -1,8 +1,6 @@
 dnl Check for optional server location protocol support (used by MacOS X)
 
-dnl $Id: srvloc.m4,v 1.9 2005-04-28 20:50:05 bfernhomberg Exp $
-
-AC_DEFUN([NETATALK_SRVLOC], [
+AC_DEFUN([AC_NETATALK_SRVLOC], [
 
        SLP_LIBS=""
        SLP_CFLAGS=""
@@ -10,9 +8,9 @@ AC_DEFUN([NETATALK_SRVLOC], [
        srvlocdir=""
 
        AC_ARG_ENABLE(srvloc,
-               [  --enable-srvloc[[=DIR]]   enable Server Location Protocol (SLP) support [[auto]]],
+               [  --enable-srvloc[[=DIR]]   enable Server Location Protocol (SLP) support],
                [srvloc=$enableval],
-               [srvloc=try]
+               [srvloc=no]
        )
 
     dnl make sure atalk_libname is defined beforehand
@@ -22,7 +20,7 @@ AC_DEFUN([NETATALK_SRVLOC], [
 
                savedcppflags="$CPPFLAGS"
                savedldflags="$LDFLAGS"
-               if test "x$srvloc" = "xyes" -o "x$srvloc" = "xtry"; then
+               if test "x$srvloc" = "xyes" ; then
                        srvlocdir="/usr"
                else
                        srvlocdir="$srvloc"
@@ -63,7 +61,7 @@ AC_DEFUN([NETATALK_SRVLOC], [
                netatalk_cv_srvloc=yes
        else
                AC_MSG_RESULT([no])
-               if test "x$srvloc" != "xno" -a "x$srvloc" != "xtry"; then
+               if test "x$srvloc" != "xno" -a "x$srvloc" != "xyes"; then
                        AC_MSG_ERROR([SLP installation not found])
                fi
        fi