From trunk: Fix macro to always define CPPFLAGS and LDFLAGS.

diff --git a/macros/srvloc.m4 b/macros/srvloc.m4
index 27a0886b7843a89313d27b397bf6a8db35ed7239..926fe6e09ae9a3586f98c95d9acc77af85424b57 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.2.2.3 2002-02-08 16:43:26 jmarcus Exp $
+dnl $Id: srvloc.m4,v 1.2.2.4 2002-03-12 16:24:03 srittau Exp $
 
 AC_DEFUN([NETATALK_SRVLOC], [
 
@@ -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])],