Update of /cvsroot/mahogany/M/lib/dspam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20493
Modified Files:
Makefile.M Makefile.in configure
Log Message:
fixed dspam module on unix
Index: Makefile.M
===================================================================
RCS file: /cvsroot/mahogany/M/lib/dspam/Makefile.M,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- Makefile.M 28 Oct 2004 21:49:46 -0000 1.5
+++ Makefile.M 9 Nov 2004 01:14:15 -0000 1.6
@@ -25,4 +25,6 @@
error.o \
decode.o \
+ config_shared.o \
+ bnr.o \
sqlite_drv.o
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mahogany/M/lib/dspam/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- Makefile.in 3 Oct 2004 22:23:44 -0000 1.3
+++ Makefile.in 9 Nov 2004 01:14:15 -0000 1.4
@@ -1,3 +1,3 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
# @configure_input@
@@ -15,7 +15,14 @@
@SET_MAKE@
+# $Id$
#
# Makefile.am
-# Written by Andrew W. Nosenko <[EMAIL PROTECTED]>
+# Jonathan A. Zdziarski <[EMAIL PROTECTED]>
+# Andrew W. Nosenko <[EMAIL PROTECTED]>
+#
+# autoconf (GNU Autoconf) 2.59
+# ltmain.sh (GNU libtool) 1.5.6
+# automake (GNU automake) 1.9.2
+
@@ -50,5 +57,5 @@
$(srcdir)/auto-config.h.in $(srcdir)/dspam-uninstalled.pc.in \
$(srcdir)/dspam.pc.in $(top_srcdir)/configure config.guess \
- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
+ config.sub depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -64,23 +71,28 @@
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(mkdir_p)
CONFIG_HEADER = auto-config.h
CONFIG_CLEAN_FILES = dspam.pc dspam-uninstalled.pc
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(etcdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)"
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
am_libdspam_la_OBJECTS = libdspam.lo tbt.lo lht.lo base64.lo buffer.lo \
- util.lo nodetree.lo error.lo decode.lo
+ util.lo nodetree.lo error.lo decode.lo pref.lo bnr.lo \
+ config_shared.lo
libdspam_la_OBJECTS = $(am_libdspam_la_OBJECTS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am_dspam_OBJECTS = dspam.$(OBJEXT) md5.$(OBJEXT)
+am_dspam_OBJECTS = dspam.$(OBJEXT) md5.$(OBJEXT) read_config.$(OBJEXT)
dspam_OBJECTS = $(am_dspam_OBJECTS)
dspam_DEPENDENCIES = libdspam.la
+etcSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(etc_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
[EMAIL PROTECTED]@DEP_FILES = ./$(DEPDIR)/base64.Plo ./$(DEPDIR)/buffer.Plo \
[EMAIL PROTECTED]@DEP_FILES = ./$(DEPDIR)/base64.Plo ./$(DEPDIR)/bnr.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/buffer.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/config_shared.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/decode.Plo ./$(DEPDIR)/dspam.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/error.Plo ./$(DEPDIR)/lht.Plo \
@@ -90,4 +102,5 @@
@AMDEP_TRUE@ ./$(DEPDIR)/mysql_drv.Plo ./$(DEPDIR)/nodetree.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/ora_drv.Plo ./$(DEPDIR)/pgsql_drv.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/pref.Plo ./$(DEPDIR)/read_config.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/sqlite_drv.Plo ./$(DEPDIR)/tbt.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/util.Plo
@@ -111,4 +124,5 @@
uninstall-recursive
man1dir = $(mandir)/man1
+man3dir = $(mandir)/man3
NROFF = nroff
MANS = $(man_MANS)
@@ -149,5 +163,7 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@ -DDSPAM_HOME=\"$(dspam_home)\"
+DEFS = @DEFS@ -DLOGDIR=\"$(logdir)\"
-DCONFIG_DEFAULT=\"$(sysconfdir)/dspam.conf\"\
+ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+
DEPDIR = @DEPDIR@
ECHO = @ECHO@
@@ -204,4 +220,5 @@
build_vendor = @build_vendor@
datadir = @datadir@
+delivery_agent = @delivery_agent@
dspam_group = @dspam_group@
dspam_home = @dspam_home@
@@ -223,4 +240,5 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
+logdir = @logdir@
mandir = @mandir@
mkdir_p = @mkdir_p@
@@ -237,17 +255,22 @@
DIST_SUBDIRS = . tools cgi m4 \
tools.libdb3_drv tools.libdb4_drv tools.mysql_drv tools.ora_drv \
- tools.pgsql_drv tools.sqlite_drv txt
+ tools.pgsql_drv tools.sqlite_drv txt win32
-# doc
man_MANS = dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 dspam_dump.1 \
- dspam_merge.1
+ dspam_merge.1 libdspam.3
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dspam.pc
+etcdir = $(sysconfdir)
+etc_SCRIPTS = dspam_conf
+
+# Defaults from dspam.conf
EXTRA_DIST = autogen.sh RELEASE.NOTES CHANGELOG LICENSE example.c \
dspam-button.gif dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 \
- dspam_dump.1 dspam_merge.1 \
- dspam.pc.in dspam-uninstalled.pc.in
+ dspam_dump.1 dspam_merge.1 dspam.pc.in dspam-uninstalled.pc.in dspam.conf.in
\
+ libdspam.3 README README.sendmail README.exim README.courier README.postfix \
+ README.pop3filter README.qmail
+CLEANFILES = dspam.conf
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 auto-config.h.in \
config.guess config.sub configure depcomp install-sh \
@@ -273,7 +296,10 @@
error.c error.h \
decode.c decode.h \
- storage_driver.h
+ storage_driver.h \
+ pref.c pref.h \
+ bnr.c bnr.h \
+ config_shared.c config_shared.h
-libdspam_la_LIBADD = $(storage_drv_objects) -lm
+libdspam_la_LIBADD = $(storage_drv_objects) -lm $(NETLIBS)
libdspam_la_DEPENDENCIES = $(storage_drv_objects)
EXTRA_libdspam_la_SOURCES = \
@@ -288,5 +314,5 @@
# Libtools veriooning scheme is:
# current:revision:age
-libdspam_la_LDFLAGS = -version-info 5:0:0
+libdspam_la_LDFLAGS = -version-info 6:0:0
dspam_SOURCES = \
config.h libdspam.h language.h \
@@ -294,9 +320,15 @@
buffer.h \
storage_driver.h \
- md5.c md5.h
+ md5.c md5.h \
+ read_config.c read_config.h
dspam_LDADD = libdspam.la
dspam_LDFLAGS = -static
ACLOCAL_AMFLAGS = -I m4
+sed_substitute_variables = \
+ dspam_transformed=`echo dspam | sed '$(transform)'`; \
+ sed -e 's,@dspam_home\@,$(dspam_home),g' \
+ -e 's,@delivery_agent\@,$(delivery_agent),g'
+
all: auto-config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -381,5 +413,5 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" = "$$p" && dir=.; \
+ test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
@@ -418,4 +450,23 @@
@rm -f dspam$(EXEEXT)
$(LINK) $(dspam_LDFLAGS) $(dspam_OBJECTS) $(dspam_LDADD) $(LIBS)
+install-etcSCRIPTS: $(etc_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(etcdir)" || $(mkdir_p) "$(DESTDIR)$(etcdir)"
+ @list='$(etc_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(etcSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(etcdir)/$$f'"; \
+ $(etcSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(etcdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-etcSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(etc_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(etcdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(etcdir)/$$f"; \
+ done
mostlyclean-compile:
@@ -426,5 +477,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -439,4 +492,6 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -521,4 +576,49 @@
rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
done
+install-man3: $(man3_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.3*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 3*) ;; \
+ *) ext='3' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
+uninstall-man3:
+ @$(NORMAL_UNINSTALL)
+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.3*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 3*) ;; \
+ *) ext='3' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
@@ -629,12 +729,14 @@
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
+ test ! -f $$subdir/TAGS || \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
@@ -646,7 +748,9 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) auto-config.h.in
$(TAGS_DEPENDENCIES) \
@@ -757,5 +861,5 @@
uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
@@ -814,11 +918,11 @@
check-am: all-am
check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS) \
- auto-config.h
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
+ $(HEADERS) auto-config.h
install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)";
do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(etcdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)"
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
@@ -840,4 +944,5 @@
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -870,6 +975,8 @@
info-am:
-install-data-am: install-includeHEADERS install-man \
+install-data-am: install-etcSCRIPTS install-includeHEADERS install-man \
install-pkgconfigDATA
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
@@ -879,5 +986,5 @@
install-info: install-info-recursive
-install-man: install-man1
+install-man: install-man1 install-man3
installcheck-am:
@@ -903,11 +1010,13 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
- uninstall-info-am uninstall-libLTLIBRARIES uninstall-man \
- uninstall-pkgconfigDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-etcSCRIPTS \
+ uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES uninstall-man uninstall-pkgconfigDATA
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-info: uninstall-info-recursive
-uninstall-man: uninstall-man1
+uninstall-man: uninstall-man1 uninstall-man3
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
@@ -920,16 +1029,17 @@
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am \
- install-includeHEADERS install-info install-info-am \
- install-libLTLIBRARIES install-man install-man1 \
- install-pkgconfigDATA install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-includeHEADERS \
- uninstall-info-am uninstall-libLTLIBRARIES uninstall-man \
- uninstall-man1 uninstall-pkgconfigDATA
+ install-data-am install-etcSCRIPTS install-exec \
+ install-exec-am install-includeHEADERS install-info \
+ install-info-am install-libLTLIBRARIES install-man \
+ install-man1 install-man3 install-pkgconfigDATA install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-etcSCRIPTS \
+ uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES uninstall-man uninstall-man1 \
+ uninstall-man3 uninstall-pkgconfigDATA
@@ -944,5 +1054,44 @@
# target have no chances to be executed under automake-1.7.3 (at least).
#
+# Solaris' ln seems to have a problem with -sf and existing symlinks.
+install-data-hook:
+ rm -f $(mandir)/man3/dspam_init.3
+ rm -f $(mandir)/man3/dspam_create.3
+ rm -f $(mandir)/man3/dspam_addattribute.3
+ rm -f $(mandir)/man3/dspam_attach.3
+ rm -f $(mandir)/man3/dspam_process.3
+ rm -f $(mandir)/man3/dspam_getsource.3
+ rm -f $(mandir)/man3/dspam_destroy.3
+ rm -f $(mandir)/man3/dspam_detach.3
+ ln -s $(mandir)/man3/libdspam.3 $(mandir)/man3/dspam_init.3
+ ln -s $(mandir)/man3/libdspam.3 $(mandir)/man3/dspam_create.3
+ ln -s $(mandir)/man3/libdspam.3 $(mandir)/man3/dspam_addattribute.3
+ ln -s $(mandir)/man3/libdspam.3 $(mandir)/man3/dspam_attach.3
+ ln -s $(mandir)/man3/libdspam.3 $(mandir)/man3/dspam_process.3
+ ln -s $(mandir)/man3/libdspam.3 $(mandir)/man3/dspam_getsource.3
+ ln -s $(mandir)/man3/libdspam.3 $(mandir)/man3/dspam_destroy.3
+ ln -s $(mandir)/man3/libdspam.3 $(mandir)/man3/dspam_detach.3
+
+uninstall-hook:
+ rm -f $(mandir)/man3/dspam_init.3
+ rm -f $(mandir)/man3/dspam_create.3
+ rm -f $(mandir)/man3/dspam_addattribute.3
+ rm -f $(mandir)/man3/dspam_attach.3
+ rm -f $(mandir)/man3/dspam_process.3
+ rm -f $(mandir)/man3/dspam_getsource.3
+ rm -f $(mandir)/man3/dspam_destroy.3
+ rm -f $(mandir)/man3/dspam_detach.3
+
install-exec-hook:
+ -if test ! -d $(sysconfdir); then \
+ mkdir -p $(sysconfdir); \
+ chmod 755 $(sysconfdir); \
+ fi
+ -if test ! -f $(sysconfdir)/dspam.conf; then \
+ cp dspam.conf $(sysconfdir)/dspam.conf; \
+ chmod 750 $(sysconfdir)/dspam.conf; \
+ chown "$(dspam_owner)" $(sysconfdir)/dspam.conf; \
+ chgrp "$(dspam_group)" $(sysconfdir)/dspam.conf; \
+ fi
-if test x"$(dspam_owner)" != xnone; then \
chown "$(dspam_owner)" $(DESTDIR)$(bindir)/dspam; \
@@ -954,14 +1103,19 @@
chmod "$(dspam_mode)" $(DESTDIR)$(bindir)/dspam; \
fi
- $(mkinstalldirs) $(DESTDIR)$(dspam_home)
- -if test x"$(dspam_home_owner)" != xnone; then \
+ -if test ! -d $(DESTDIR)$(dspam_home); then \
+ $(mkinstalldirs) $(DESTDIR)$(dspam_home); \
+ if test x"$(dspam_home_owner)" != xnone; then \
chown "$(dspam_home_owner)" $(DESTDIR)$(dspam_home); \
- fi
- -if test x"$(dspam_home_group)" != xnone; then \
+ fi; \
+ if test x"$(dspam_home_group)" != xnone; then \
chgrp "$(dspam_home_group)" $(DESTDIR)$(dspam_home); \
- fi
- -if test x"$(dspam_home_mode)" != xnone; then \
+ fi; \
+ if test x"$(dspam_home_mode)" != xnone; then \
chmod "$(dspam_home_mode)" $(DESTDIR)$(dspam_home); \
+ fi; \
fi
+
+dspam_conf: dspam.conf.in Makefile
+ ${sed_substitute_variables} < $(srcdir)/dspam.conf.in > dspam.conf
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/lib/dspam/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- configure 3 Oct 2004 22:23:44 -0000 1.3
+++ configure 9 Nov 2004 01:14:15 -0000 1.4
@@ -1,9 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dspam 3.0.0.20040629.0800.
+# Generated by GNU Autoconf 2.59 for dspam 3.2.0.
#
# Report bugs to <[EMAIL PROTECTED]>.
#
-# Copyright (C) 2004 Network Dweebs Corporation
+# Copyright (C) 2002-2004 Network Dweebs Corporation
#
# Copyright (C) 2003 Free Software Foundation, Inc.
[...2606 lines suppressed...]
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -26882,4 +26965,5 @@
"dspam.pc" ) CONFIG_FILES="$CONFIG_FILES dspam.pc" ;;
"dspam-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES dspam-uninstalled.pc" ;;
+ "win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"auto-config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS auto-config.h" ;;
@@ -27040,4 +27124,6 @@
s,@dspam_owner@,$dspam_owner,;t t
s,@dspam_group@,$dspam_group,;t t
+s,@delivery_agent@,$delivery_agent,;t t
+s,@logdir@,$logdir,;t t
s,@storage_drv_objects@,$storage_drv_objects,;t t
s,@storage_drv_subdirs@,$storage_drv_subdirs,;t t
@@ -27766,4 +27852,2 @@
-
-
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
