--- projects/cms/source/ihost/configure.in	2003/03/03 12:32:35	1.9
+++ projects/cms/source/ihost/configure.in	2003/03/29 18:09:01	1.19
@@ -2,15 +2,15 @@
 # Process this file with autoconf to produce a configure script.
 #
 # configure.in for i-scream ihost
-# $Id: configure.in,v 1.9 2003/03/03 12:32:35 tdb Exp $
+# $Id: configure.in,v 1.19 2003/03/29 18:09:01 tdb Exp $
 #
 
 # Change these to change the package name and version
-AC_INIT(ihost, 1.5, dev@i-scream.org.uk)
-AM_INIT_AUTOMAKE(ihost, 1.5)
+AC_INIT(ihost, 1.5.5, dev@i-scream.org.uk)
+AM_INIT_AUTOMAKE(ihost, 1.5.5)
 
 # Revision number (automatically updated)
-AC_REVISION($Revision: 1.9 $)
+AC_REVISION($Revision: 1.19 $)
 
 # 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}"
@@ -36,9 +36,23 @@ AC_ARG_WITH([libstatgrab-prefix],
 	]
 )
 
+# User specified libukcprog prefix
+AC_ARG_WITH([libukcprog-prefix],
+	[  --with-libukcprog-prefix=PATH         libukcprog is in PATH],
+	[
+		if test -d "$withval/lib"; then
+			LDFLAGS="-L${withval}/lib ${LDFLAGS}"
+		fi
+		if test -d "$withval/include"; then
+			CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
+		fi
+	]
+)
+
 # Checks for header files
 AC_HEADER_STDC
 AC_CHECK_HEADERS(statgrab.h,,[AC_MSG_ERROR([need statgrab.h])])
+AC_CHECK_HEADERS(ukcprog.h,,[AC_MSG_ERROR([need ukcprog.h])])
 
 # Checks for typedefs, structures, and compiler characteristics
 AC_C_CONST
@@ -47,7 +61,7 @@ AC_C_CONST
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_FUNC_FORK
-AC_CHECK_LIB(statgrab, get_general_stats,,[AC_MSG_ERROR([need libstatgrab])])
+AC_CHECK_FUNCS(strlcat)
 
 # Figure out details about the host - we need the OS
 AC_CANONICAL_HOST
@@ -61,22 +75,27 @@ AM_CONDITIONAL(SETGIDKMEM, false)
 case $host_os in
 solaris2.*)
 	AC_DEFINE(SOLARIS, , [Building on Solaris 2.x])
-	LDFLAGS="$LDFLAGS -lnsl -lsocket -lkstat"
+	LIBS="$LIBS -lnsl -lsocket -lkstat -Wl,-Bstatic -lstatgrab -lukcprog -Wl,-Bdynamic"
 	;;
 freebsd4.*)
 	AC_DEFINE(FREEBSD, , [Building on FreeBSD 4.x])
-	LDFLAGS="$LDFLAGS -lkvm"
+	LIBS="$LIBS -lkvm -lstatgrab -lukcprog -static"
 	# FreeBSD needs ihost to be setgid kmem
 	AM_CONDITIONAL(SETGIDKMEM, true)
 	;;
 linux-gnu)
 	AC_DEFINE(LINUX, , [Building on GNU/Linux])
+	LIBS="$LIBS -lstatgrab -lukcprog -static"
 	;;
 *)
 	AC_MSG_ERROR([Cannot build on unknown OS: $host_os])
 	;;
 esac
 
+# Library checks that need to be done after the OS specific stuff
+AC_CHECK_LIB(statgrab, get_general_stats,[:],[AC_MSG_ERROR([need libstatgrab])])
+AC_CHECK_LIB(ukcprog, fpgetline,[:],[AC_MSG_ERROR([need libukcprog])],[$LIBUKCPROGLIBS])
+
 # Check for the --with-pid-file option
 AC_ARG_WITH([pid-file], [  --with-pid-file=FILE    location of PID file (default: /var/tmp/.ihost.pid)], [pidfile=$withval], [pidfile=[/var/tmp/.ihost.pid]])
 AC_DEFINE_UNQUOTED([PID_FILE], ["$pidfile"], [Location of PID file])
@@ -90,6 +109,6 @@ AC_ARG_WITH([log-file], [  --with-log-file=FILE    loc
 AC_DEFINE_UNQUOTED([LOG_FILE], ["$logfile"], [Location of log file])
 
 # And finish by changing these files
-AC_CONFIG_FILES([Makefile libukcprog/Makefile])
+AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT