# HG changeset patch
# User carl
# Date 1170203296 28800
# Node ID f9e8bbf33a2aad7ffa366f2bbe9668d953c1a091
# Parent  48880e61ce5e49c389c0642b629d8dfb9534faae
more fixes for solaris


diff -r 48880e61ce5e -r f9e8bbf33a2a ChangeLog
--- a/ChangeLog	Wed Jan 03 22:28:27 2007 -0800
+++ b/ChangeLog	Tue Jan 30 16:28:16 2007 -0800
@@ -1,5 +1,9 @@
     $Id$
 
+1.3 2007-01-30
+    More fixes for solaris, use an autoconf macro for posix thread
+    detection.
+
 1.2 2007-01-03
     Add patches to enable build on solaris.
 
diff -r 48880e61ce5e -r f9e8bbf33a2a Makefile.am
--- a/Makefile.am	Wed Jan 03 22:28:27 2007 -0800
+++ b/Makefile.am	Tue Jan 30 16:28:16 2007 -0800
@@ -1,9 +1,11 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src man html info
 hackdir = $(sysconfdir)/sm-archive
 hack_SCRIPTS = sm-archive
 hack_DATA = sm-archive.conf
 CLEANFILES = sm-archive xml/sm-archive xml/Makefile
-EXTRA_DIST = sm-archive.rc $(hack_DATA) sm-archive.spec $(wildcard xml/h*) $(wildcard xml/M*) $(wildcard xml/sm*)
+EXTRA_DIST = sm-archive.rc $(hack_DATA) sm-archive.spec $(wildcard m4/*) $(wildcard xml/h*) $(wildcard xml/M*) $(wildcard xml/sm*)
 
 sm-archive: $(srcdir)/sm-archive.rc
 	   rm -f sm-archive
diff -r 48880e61ce5e -r f9e8bbf33a2a Makefile.cvs
--- a/Makefile.cvs	Wed Jan 03 22:28:27 2007 -0800
+++ b/Makefile.cvs	Tue Jan 30 16:28:16 2007 -0800
@@ -1,7 +1,7 @@
 default: all
 
 all:
-	aclocal
+	aclocal -I m4
 	autoheader
 	automake
 	autoconf
diff -r 48880e61ce5e -r f9e8bbf33a2a NEWS
--- a/NEWS	Wed Jan 03 22:28:27 2007 -0800
+++ b/NEWS	Tue Jan 30 16:28:16 2007 -0800
@@ -1,5 +1,6 @@
     $Id$
 
+1.3  2007-01-30 more fixes for solaris
 1.2  2007-01-03 patches to build on solaris
 1.1  2006-12-22 better autoconf setup for portability
 1.0  2006-03-10 initial version
diff -r 48880e61ce5e -r f9e8bbf33a2a configure.in
--- a/configure.in	Wed Jan 03 22:28:27 2007 -0800
+++ b/configure.in	Tue Jan 30 16:28:16 2007 -0800
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(sm-archive,1.2,carl@five-ten-sg.com)
+AC_INIT(sm-archive,1.3,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 
@@ -29,6 +29,9 @@
 AC_FUNC_STAT
 AC_CHECK_FUNCS([memset socket strchr strdup strncasecmp strtol daemon])
 
+# check for posix threads
+ACX_PTHREAD
+
 AC_CONFIG_FILES([Makefile
                  sm-archive.spec
                  html/Makefile
diff -r 48880e61ce5e -r f9e8bbf33a2a src/Makefile.am
--- a/src/Makefile.am	Wed Jan 03 22:28:27 2007 -0800
+++ b/src/Makefile.am	Tue Jan 30 16:28:16 2007 -0800
@@ -6,9 +6,9 @@
 INCLUDES= $(all_includes)
 
 # the library search path.
-smarchive_LDFLAGS = -pthread
+smarchive_LDFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 smarchive_LDADD   = $(all_libraries) -lmilter
 
 # default compile flags
-smarchive_CXXFLAGS = -pthread
+smarchive_CXXFLAGS = $(PTHREAD_CFLAGS)
 
diff -r 48880e61ce5e -r f9e8bbf33a2a src/sm-archive.cpp
--- a/src/sm-archive.cpp	Wed Jan 03 22:28:27 2007 -0800
+++ b/src/sm-archive.cpp	Tue Jan 30 16:28:16 2007 -0800
@@ -45,7 +45,7 @@
 	#include "daemon.c"
 #endif
 
-static char* smarchive_version="$Id$";
+static const char* smarchive_version="$Id$";
 
 
 extern "C" {
@@ -273,7 +273,7 @@
 //	and reload when needed. we also cleanup old
 //	configs whose reference count has gone to zero.
 //
-void* config_loader(void *arg);
+extern "C" {void* config_loader(void *arg);}
 void* config_loader(void *arg) {
 	typedef set<CONFIG *> configp_set;
 	configp_set old_configs;