Use three-argument AC_DEFINE and AC_DEFINE_UNQUOTED to fix a deprecation

[netatalk.git] / macros / srvloc.m4

diff --git a/macros/srvloc.m4 b/macros/srvloc.m4
index dfa262d15795ea0d09af1fccae5a788ad531d7d1..d56f33f4ef847cb10f814d086f6b87b682c15505 100644 (file)
--- a/macros/srvloc.m4
+++ b/macros/srvloc.m4
@@ -1,6 +1,6 @@
 dnl Check for optional server location protocol support (used by MacOS X)
 
-dnl $Id: srvloc.m4,v 1.4 2002-02-08 16:42:34 jmarcus Exp $
+dnl $Id: srvloc.m4,v 1.7 2003-01-29 00:16:31 srittau Exp $
 
 AC_DEFUN([NETATALK_SRVLOC], [
 
@@ -8,7 +8,7 @@ AC_DEFUN([NETATALK_SRVLOC], [
        SLP_CFLAGS=""
 
        AC_ARG_ENABLE(srvloc,
-               [  --enable-srvloc[=DIR]   turn on Server Location Protocol support],
+               [  --enable-srvloc[=DIR]     turn on Server Location Protocol support],
                [srvloc=$enableval],
                [srvloc=no]
        )
@@ -17,10 +17,12 @@ AC_DEFUN([NETATALK_SRVLOC], [
 
                savedcppflags="$CPPFLAGS"
                savedldflags="$LDFLAGS"
-               if test "x$srvloc" != "xyes"; then
-                       CPPFLAGS="$CPPFLAGS -I$srvloc/include"
-                       LDFLAGS="$LDFLAGS -L$srvloc/lib"
+               if test "x$srvloc" = "xyes"; then
+                       srvloc="/usr"
                fi
+               CPPFLAGS="$CPPFLAGS -I$srvloc/include"
+               LDFLAGS="$LDFLAGS -L$srvloc/lib"
+
                AC_MSG_CHECKING([for slp.h])
                AC_TRY_CPP([#include <slp.h>],
                        [AC_MSG_RESULT([yes])],
@@ -34,7 +36,7 @@ AC_DEFUN([NETATALK_SRVLOC], [
                        SLP_CFLAGS="-I$srvloc/include"
                ], AC_MSG_ERROR([SLP installation not found]))
 
-               AC_DEFINE(USE_SRVLOC, 1)
+               AC_DEFINE(USE_SRVLOC, 1, [Define to enable SLP support])
 
                CPPFLAGS="$savedcppflags"
                LDFLAGS="$savedldflags"