X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fsrvloc.m4;h=99f24f4b99ea2190701e4299b42b06c166269235;hb=8658ae6f5b6d37c769c722c84b1bc09408a34285;hp=d56f33f4ef847cb10f814d086f6b87b682c15505;hpb=8c15fa798c0f68f0d5bbe416848569474df4570d;p=netatalk.git

diff --git a/macros/srvloc.m4 b/macros/srvloc.m4
index d56f33f4..99f24f4b 100644
--- a/macros/srvloc.m4
+++ b/macros/srvloc.m4
@@ -1,47 +1,75 @@
 dnl Check for optional server location protocol support (used by MacOS X)
 
-dnl $Id: srvloc.m4,v 1.7 2003-01-29 00:16:31 srittau Exp $
-
-AC_DEFUN([NETATALK_SRVLOC], [
+AC_DEFUN([AC_NETATALK_SRVLOC], [
 
 	SLP_LIBS=""
 	SLP_CFLAGS=""
+	found_slp=no
+	srvlocdir=""
 
 	AC_ARG_ENABLE(srvloc,
-		[  --enable-srvloc[=DIR]     turn on Server Location Protocol support],
+		[  --enable-srvloc[[=DIR]]   enable Server Location Protocol (SLP) support],
 		[srvloc=$enableval],
 		[srvloc=no]
 	)
 
+    dnl make sure atalk_libname is defined beforehand
+    [[ -n "$atalk_libname" ]] || AC_MSG_ERROR([internal error, atalk_libname undefined])
+
 	if test "x$srvloc" != "xno"; then
 
 		savedcppflags="$CPPFLAGS"
 		savedldflags="$LDFLAGS"
-		if test "x$srvloc" = "xyes"; then
-			srvloc="/usr"
+		if test "x$srvloc" = "xyes" ; then
+			srvlocdir="/usr"
+		else
+			srvlocdir="$srvloc"
 		fi
-		CPPFLAGS="$CPPFLAGS -I$srvloc/include"
-		LDFLAGS="$LDFLAGS -L$srvloc/lib"
+		CPPFLAGS="$CPPFLAGS -I$srvlocdir/include"
+		LDFLAGS="$LDFLAGS -L$srvlocdir/$atalk_libname"
 
 		AC_MSG_CHECKING([for slp.h])
 		AC_TRY_CPP([#include <slp.h>],
-			[AC_MSG_RESULT([yes])],
+			[
+				AC_MSG_RESULT([yes])
+				found_slp=yes
+			],
 			[
 				AC_MSG_RESULT([no])
-				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]))
-
-		AC_DEFINE(USE_SRVLOC, 1, [Define to enable SLP support])
+		
+		if test "x$found_slp" = "xyes"; then
+			AC_CHECK_LIB(slp, SLPOpen, [
+		    	   SLP_LIBS="-L$srvlocdir/$atalk_libname -lslp"
+		    	   SLP_CFLAGS="-I$srvlocdir/include"
+			],[ 
+		    	   AC_MSG_RESULT([no])
+			   found_slp=no
+			])
+		fi
 
 		CPPFLAGS="$savedcppflags"
 		LDFLAGS="$savedldflags"
 	fi
+	
+	netatalk_cv_srvloc=no
+	AC_MSG_CHECKING([whether to enable srvloc (SLP) support])
+	if test "x$found_slp" = "xyes"; then
+		AC_MSG_RESULT([yes])
+		AC_DEFINE(USE_SRVLOC, 1, [Define to enable SLP support])
+		netatalk_cv_srvloc=yes
+	else
+		AC_MSG_RESULT([no])
+		if test "x$srvloc" != "xno" -a "x$srvloc" != "xyes"; then
+			AC_MSG_ERROR([SLP installation not found])
+		fi
+	fi
+		
+
 
+	LIB_REMOVE_USR_LIB(SLP_LIBS)
+	CFLAGS_REMOVE_USR_INCLUDE(SLP_CFLAGS)
 	AC_SUBST(SLP_LIBS)
 	AC_SUBST(SLP_CFLAGS)
 ])