--- projects/cms/source/ihost/configure.in	2003/03/09 00:21:22	1.12
+++ projects/cms/source/ihost/configure.in	2003/03/09 13:04:47	1.13
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 # configure.in for i-scream ihost
-# $Id: configure.in,v 1.12 2003/03/09 00:21:22 tdb Exp $
+# $Id: configure.in,v 1.13 2003/03/09 13:04:47 tdb Exp $
 #
 
 # Change these to change the package name and version
@@ -10,7 +10,7 @@ AC_INIT(ihost, 1.6, dev@i-scream.org.uk)
 AM_INIT_AUTOMAKE(ihost, 1.6)
 
 # Revision number (automatically updated)
-AC_REVISION($Revision: 1.12 $)
+AC_REVISION($Revision: 1.13 $)
 
 # Might work with older autoconfs... but tested on 2.57
 AC_PREREQ(2.57)
@@ -28,7 +28,7 @@ AC_ARG_WITH([libstatgrab-prefix],
 	[  --with-libstatgrab-prefix=PATH        libstatgrab is in PATH],
 	[
 		if test -d "$withval/lib"; then
-			LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
+			LDFLAGS="-L${withval}/lib ${LDFLAGS}"
 		fi
 		if test -d "$withval/include"; then
 			CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
@@ -48,7 +48,7 @@ AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_FUNC_FORK
 AC_CHECK_FUNCS(strlcat)
-AC_CHECK_LIB(statgrab, get_general_stats,[LIBS="-Wl,-Bstatic -lstatgrab -Wl,-Bdynamic $LIBS"],[AC_MSG_ERROR([need libstatgrab])])
+AC_CHECK_LIB(statgrab, get_general_stats,[:],[AC_MSG_ERROR([need libstatgrab])])
 
 # Figure out details about the host - we need the OS
 AC_CANONICAL_HOST
@@ -62,16 +62,17 @@ AM_CONDITIONAL(SETGIDKMEM, false)
 case $host_os in
 solaris2.*)
 	AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
-	LIBS="$LIBS -lnsl -lsocket -lkstat"
+	LIBS="$LIBS -lnsl -lsocket -lkstat -Wl,-Bstatic -lstatgrab -Wl,-Bdynamic"
 	;;
 freebsd4.*)
 	AC_DEFINE(FREEBSD, , [Building on FreeBSD 4.x])
-	LIBS="$LIBS -lkvm"
+	LIBS="$LIBS -lkvm -lstatgrab -static"
 	# FreeBSD needs ihost to be setgid kmem
 	AM_CONDITIONAL(SETGIDKMEM, true)
 	;;
 linux-gnu)
 	AC_DEFINE(LINUX, , [Building on GNU/Linux])
+	LIBS="$LIBS -lstatgrab -static"
 	;;
 *)
 	AC_MSG_ERROR([Cannot build on unknown OS: $host_os])