From a5a99b3e22a60588c60e5a81989b4495b0348e13 Mon Sep 17 00:00:00 2001
From: hsn <>
Date: Tue, 26 Oct 2004 17:06:45 +0000
Subject: [PATCH] beta 20

---
 ChangeLog           |  4 ++--
 clients/Makefile.am |  3 ++-
 configure.ac        | 19 +++++++++++--------
 contrib/Makefile.am |  2 +-
 server/Makefile.am  |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44310ad..fbf71dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Version - not yet released
+version 2.8.1b20 - 26 Oct 2004
 	Added pidfile.[c|h] from FreeBSD and modified it to fit in (hoaxter)
 	Added pidfile support, config option is 'pidlogname' (hoaxter)
 	Replaced .file information from INSTALL with a hint to man 1 fspd (hoaxter)
@@ -55,7 +55,7 @@ Version - not yet released
 	lamerz guide added
 	text rotate tool added
 
-Version 2.8.1b19 - 11 Jan 2004
+version 2.8.1b19 - 11 jan 2004
 	sven has added fspget URL command to setup.sh.
 	fixed case for mklargefile.py in tests/Makefile.am
 	added --enable-debug switch to configure for enabling extra
diff --git a/clients/Makefile.am b/clients/Makefile.am
index acc73f4..a3f0081 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -4,7 +4,8 @@ bin_PROGRAMS=fcatcmd fcdcmd fducmd ffindcmd fgetcmd fgrabcmd fhostcmd \
              flscmd fmkdir fprocmd fput frmcmd frmdircmd fver fspmerge \
 	     fstatcmd
 
-LDADD=-L../common -L../bsd_src -L../client -lclient -lcommon -lbsdfsp
+LDADD=-L../common -L../bsd_src -L../client -lclient -lcommon -lbsdfsp $(EX_LIBS)
+
 fspmerge_SOURCES=merge.c printpro.c fspprof.l
 fcdcmd_SOURCES=fcdcmd.c printpro.c
 fprocmd_SOURCES=printpro.c fprocmd.c
diff --git a/configure.ac b/configure.ac
index d65116d..4570373 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,14 +16,17 @@ AC_MSG_RESULT(yes)
 else
 AC_MSG_RESULT(no)
 fi
-AC_MSG_CHECKING([if building for SunOS 5])
-if test "x$build_os" = "xsolaris2" ; then
-EX_LIBS="-lsocket -lnsl"
-AC_SUBST(EX_LIBS)
-AC_MSG_RESULT(yes)
-else
-AC_MSG_RESULT(no)
-fi
+AC_MSG_CHECKING([if building for Solaris 2.x])
+case $build_os in
+     solaris2*)
+	EX_LIBS="-lsocket -lnsl"
+	AC_SUBST(EX_LIBS)
+	AC_MSG_RESULT(yes)
+	;;
+	*)
+	AC_MSG_RESULT(no)
+	;;
+esac
 AC_MSG_CHECKING([if building for Cygwin])
 case $host_os in
            *cygwin* ) AC_DEFINE(OS_CYGWIN,1,[Define if you are building for cygwin]) AC_MSG_RESULT(yes);;
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 0a6fa1d..1bdba09 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,3 @@
 bin_PROGRAMS=fspscan
-EXTRA_DIST=auto_del.csh
+EXTRA_DIST=auto_del.csh rotate.py
 noinst_HEADERS=fspscan.h
diff --git a/server/Makefile.am b/server/Makefile.am
index 1a20185..a520446 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -5,6 +5,6 @@ bin_PROGRAMS=fspd
 fspd_SOURCES=file.c host.c main.c conf.c server.c fifocache.c \
 	     log.c iprange.c acl.c path.c random.c pidfile.c
 fspd_CFLAGS=-DSYSCONFDIR="\"@sysconfdir@\"" $(AM_CFLAGS)
-fspd_LDADD=-L../common -lcommon
+fspd_LDADD=-L../common -lcommon $(EX_LIBS)
 
 noinst_HEADERS=fifocache.h pidfile.h