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 dae7a000de74566dc387f41791d0fd601fc8e453..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.1 2001-12-16 18:36:02 srittau 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 (EXPERIMENTAL)],
+               [  --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])],
@@ -29,11 +31,12 @@ AC_DEFUN([NETATALK_SRVLOC], [
                                AC_MSG_ERROR([SLP installation not found])
                        ]
                )
-               AC_CHECK_LIB(slp, SLPOpen, , AC_MSG_ERROR([SLP installation not found]))
+               AC_CHECK_LIB(slp, SLPOpen, [
+                       SLP_LIBS="-L$srvloc/lib -lslp"
+                       SLP_CFLAGS="-I$srvloc/include"
+               ], AC_MSG_ERROR([SLP installation not found]))
 
-               SLP_LIBS="-L$slpdir/lib -lslp"
-               SLP_CFLAGS="-I$slpdir/include"
-               AC_DEFINE(USE_SRVLOC, 1)
+               AC_DEFINE(USE_SRVLOC, 1, [Define to enable SLP support])
 
                CPPFLAGS="$savedcppflags"
                LDFLAGS="$savedldflags"