Fix for two things:

(1) General: Using --enable-srvloc results in compile-time errors when
libslp.a is not installed in a standard location searched by the linker.
This is due to the missing third argument in AC_CHECK_LIB(slp,
SLPOpen, , AC_MSG_ERROR([SLP installation not found])) on line  32 in
macros/srvloc.m4: This sets LIBS="-lslp $LIBS" globally in configure,
instead of just setting SLP_LIBS and SLP_CFLAGS.

(2) Tru64-specific: In libatalk/utils/logger.c, the function vsnprintf()
is used. Up to and including version 4.0F, Tru64 doesn't have this
function in its standard C library, although the DEC C compiler has a
prototype for it. Instead, vsnprintf() is contained in libdb.a (not to
be confused with libdb3.a), which must be given as a separate flag to
the linker.

Submitted by Burkhard Schmidt <bs@cpfs.mpg.de>.

diff --git a/configure.in b/configure.in
index d4b2242c4625238fe4332a6b752595726ff83d5a..cc1d7933a8ec5b39da026ecd749202de25d64336 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.152 2002-02-07 05:09:59 jmarcus Exp $
+dnl $Id: configure.in,v 1.153 2002-02-08 16:42:31 jmarcus Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -561,6 +561,7 @@ if test x"$this_os" = "xtru64"; then
        dnl AC_DEFINE(USE_UFS_QUOTA_H)
        AC_DEFINE(TRU64)
        AC_CHECK_LIB(security,set_auth_parameters)
+       AC_CHECK_LIB(db,main)
        CFLAGS="-I\$(top_srcdir)/sys/tru64 $CFLAGS"
        need_dash_r=no
        sysv_style=tru64

diff --git a/macros/srvloc.m4 b/macros/srvloc.m4
index 64ec02478714d1b24f66bce2733640ac77c8d874..dfa262d15795ea0d09af1fccae5a788ad531d7d1 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.3 2002-01-15 16:33:25 jmarcus Exp $
+dnl $Id: srvloc.m4,v 1.4 2002-02-08 16:42:34 jmarcus Exp $
 
 AC_DEFUN([NETATALK_SRVLOC], [
 
@@ -29,10 +29,11 @@ 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$srvloc/lib -lslp"
-               SLP_CFLAGS="-I$srvloc/include"
                AC_DEFINE(USE_SRVLOC, 1)
 
                CPPFLAGS="$savedcppflags"