Mercurial > sm-archive
changeset 10:f9e8bbf33a2a
more fixes for solaris
| author | carl |
|---|---|
| date | Tue, 30 Jan 2007 16:28:16 -0800 |
| parents | 48880e61ce5e |
| children | 61a4e8773e2e |
| files | ChangeLog Makefile.am Makefile.cvs NEWS configure.in src/Makefile.am src/sm-archive.cpp |
| diffstat | 7 files changed, 17 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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;