Remove redundant AC_PREFIX_DEFAULT.

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index 9136a3e61a8316d319c7e7d6b936d3567538ea9e..e540007b2b5d8d3d47e2d54fea2226709860c250 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.142 2001-12-14 23:01:47 srittau Exp $
+dnl $Id: configure.in,v 1.144 2001-12-16 18:37:57 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -10,9 +10,6 @@ AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(netatalk, ${NETATALK_VERSION})
 AM_CONFIG_HEADER(config.h)
 
-dnl Reset locations to proper places
-AC_PREFIX_DEFAULT(/usr/local)
-
 dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
@@ -251,28 +248,10 @@ AC_ARG_WITH(message-dir,
                AC_SUBST(SERVERTEXT)
 )
 
-AC_ARG_ENABLE(srvloc,
-       [  --enable-srvloc         turn on Server Location Protocol support (EXPERIMENTAL)],
-       srvloc=$enableval,
-       srvloc=no
-)
-
-dnl Conditional for optional server location protocol support (used by OS X)
-AM_CONDITIONAL(USE_SRVLOC, test "x$srvloc" != "xno")
-if test "x$srvloc" != "xno"; then
-    for slpdir in "" $srvloc /usr /usr/local ; do
-               if test -f "$slpdir/include/slp.h" ; then
-                       LIBS="$LIBS -L$slpdir/lib -lslp"
-                       CFLAGS="$CFLAGS -I$slpdir/include"
-               AC_CHECK_LIB(slp,SLPOpen)
-               AC_CHECK_FUNCS(SLPReg SLPDereg SLPClose)
-               AC_DEFINE(USE_SRVLOC, 1)
-                       break
-               fi
-       done
-fi
+dnl Check for optional server location protocol support (used by MacOS X)
+NETATALK_SRVLOC
 
-# Check for PAM libs
+dnl Check for PAM libs
 AC_PATH_PAM([
        PAPD_LIBS="$PAPD_LIBS $PAM_LIBS"
        AFPD_LIBS="$AFPD_LIBS $PAM_LIBS"