detect and define SENDMAIL_VERSION

git-svn: trunk@1549
remotes/push_mirror/metadata
Tomasz Kojm 20 years ago
parent 2ece6169fe
commit f5c8329009
  1. 4
      clamav-devel/ChangeLog
  2. 2
      clamav-devel/Makefile.in
  3. 6
      clamav-devel/clamav-config.h.in
  4. 3
      clamav-devel/clamav-milter/Makefile.am
  5. 5
      clamav-devel/clamav-milter/Makefile.in
  6. 2
      clamav-devel/clamd/Makefile.in
  7. 2
      clamav-devel/clamdscan/Makefile.in
  8. 2
      clamav-devel/clamscan/Makefile.in
  9. 128
      clamav-devel/configure
  10. 22
      clamav-devel/configure.in
  11. 2
      clamav-devel/database/Makefile.in
  12. 2
      clamav-devel/docs/Makefile.in
  13. 2
      clamav-devel/etc/Makefile.in
  14. 2
      clamav-devel/freshclam/Makefile.in
  15. 2
      clamav-devel/libclamav/Makefile.in
  16. 2
      clamav-devel/sigtool/Makefile.in

@ -1,3 +1,7 @@
Mon May 16 02:51:03 CEST 2005 (tk)
----------------------------------
* configure.in: detect and define SENDMAIL_VERSION
Sun May 15 16:47:48 BST 2005 (njh) Sun May 15 16:47:48 BST 2005 (njh)
---------------------------------- ----------------------------------
* libclamav/message.c: Fixed a problem where an email with more * libclamav/message.c: Fixed a problem where an email with more

@ -170,7 +170,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -211,6 +210,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@

@ -285,6 +285,12 @@
/* scan buffer size */ /* scan buffer size */
#undef SCANBUFF #undef SCANBUFF
/* location of Sendmail binary */
#undef SENDMAIL_BIN
/* version of Sendmail */
#undef SENDMAIL_VERSION
/* Define to 1 if the `setpgrp' function takes no argument. */ /* Define to 1 if the `setpgrp' function takes no argument. */
#undef SETPGRP_VOID #undef SETPGRP_VOID

@ -1,5 +1,5 @@
# #
# Copyright (C) 2003 - 2004 Tomasz Kojm <tkojm@clamav.net> # Copyright (C) 2003 - 2005 Tomasz Kojm <tkojm@clamav.net>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -37,7 +37,6 @@ man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
endif endif
endif endif
AM_CFLAGS = -DSENDMAIL_BIN=\"$(SENDMAIL)\"
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@
INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared
EXTRA_DIST = clamav-milter.c INSTALL EXTRA_DIST = clamav-milter.c INSTALL

@ -15,7 +15,7 @@
@SET_MAKE@ @SET_MAKE@
# #
# Copyright (C) 2003 - 2004 Tomasz Kojm <tkojm@clamav.net> # Copyright (C) 2003 - 2005 Tomasz Kojm <tkojm@clamav.net>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -163,7 +163,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -204,6 +203,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@
@ -223,7 +223,6 @@ target_vendor = @target_vendor@
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ clamav-milter.c @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ clamav-milter.c
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_srcdir)/docs/man/clamav-milter.8 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
AM_CFLAGS = -DSENDMAIL_BIN=\"$(SENDMAIL)\"
INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared
EXTRA_DIST = clamav-milter.c INSTALL EXTRA_DIST = clamav-milter.c INSTALL
all: all-am all: all-am

@ -169,7 +169,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -210,6 +209,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@

@ -160,7 +160,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -201,6 +200,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@

@ -153,7 +153,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -194,6 +193,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@

@ -468,7 +468,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBCLAMAV_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO EGREP RANLIB ac_ct_RANLIB CPP LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DBDIR CFGDIR LIBCLAMAV_LIBS CLAMD_LIBS CLAMAV_MILTER_LIBS FRESHCLAM_LIBS TH_SAFE ADDITIONAL_LIBS BUILD_CLAMD_TRUE BUILD_CLAMD_FALSE HAVE_MILTER_TRUE HAVE_MILTER_FALSE SENDMAIL GETENT CLAMAVUSER CLAMAVGROUP LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBCLAMAV_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO EGREP RANLIB ac_ct_RANLIB CPP LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT sendmailprog DBDIR CFGDIR LIBCLAMAV_LIBS CLAMD_LIBS CLAMAV_MILTER_LIBS FRESHCLAM_LIBS TH_SAFE ADDITIONAL_LIBS BUILD_CLAMD_TRUE BUILD_CLAMD_FALSE HAVE_MILTER_TRUE HAVE_MILTER_FALSE GETENT CLAMAVUSER CLAMAVGROUP LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -1041,6 +1041,7 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects default=use both --with-pic try to use only PIC/non-PIC objects default=use both
--with-zlib=DIR path to directory containing zlib library (default= --with-zlib=DIR path to directory containing zlib library (default=
/usr/local or /usr if not found in /usr/local) /usr/local or /usr if not found in /usr/local)
--with-sendmail=PATH specify location of Sendmail binary (default=auto find)
--with-libcurl support URLs downloading with libcurl (default=auto) --with-libcurl support URLs downloading with libcurl (default=auto)
--with-user=uid name of the clamav user (default=clamav) --with-user=uid name of the clamav user (default=clamav)
--with-group=gid name of the clamav group (default=clamav) --with-group=gid name of the clamav group (default=clamav)
@ -5035,7 +5036,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 5038 "configure"' > conftest.$ac_ext echo '#line 5039 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
@ -5626,7 +5627,7 @@ chmod -w .
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no compiler_c_o=no
if { (eval echo configure:5629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then if { (eval echo configure:5630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
if test -s out/conftest.err; then if test -s out/conftest.err; then
@ -7560,7 +7561,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7563 "configure" #line 7564 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -7658,7 +7659,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7661 "configure" #line 7662 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -11122,6 +11123,76 @@ else
have_milter="no" have_milter="no"
fi; fi;
if test "$have_milter" = "yes"; then
sendmailprog=no
# Check whether --with-sendmail or --without-sendmail was given.
if test "${with_sendmail+set}" = set; then
withval="$with_sendmail"
sendmailprog=$with_sendmail
else
sendmailprog=no
fi;
if test "$sendmailprog" = "no" ; then
# Extract the first word of "sendmail", so it can be a program name with args.
set dummy sendmail; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_sendmailprog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $sendmailprog in
[\\/]* | ?:[\\/]*)
ac_cv_path_sendmailprog="$sendmailprog" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_dummy="$PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_sendmailprog="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
test -z "$ac_cv_path_sendmailprog" && ac_cv_path_sendmailprog="no"
;;
esac
fi
sendmailprog=$ac_cv_path_sendmailprog
if test -n "$sendmailprog"; then
echo "$as_me:$LINENO: result: $sendmailprog" >&5
echo "${ECHO_T}$sendmailprog" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
cat >>confdefs.h <<\_ACEOF
#define SENDMAIL_BIN $sendmailprog
_ACEOF
sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`
cat >>confdefs.h <<\_ACEOF
#define SENDMAIL_VERSION $sendmailver
_ACEOF
fi
want_dsig="yes" want_dsig="yes"
# Check whether --enable-dsig or --disable-dsig was given. # Check whether --enable-dsig or --disable-dsig was given.
if test "${enable_dsig+set}" = set; then if test "${enable_dsig+set}" = set; then
@ -12448,51 +12519,6 @@ _ACEOF
fi fi
if test "$have_milter" = "yes"
then
# Extract the first word of "sendmail", so it can be a program name with args.
set dummy sendmail; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_SENDMAIL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $SENDMAIL in
[\\/]* | ?:[\\/]*)
ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_dummy="$PATH:/usr/lib:/usr/sbin:/etc:/usr/local/lib:/usr/local/sbin:/usr/bin:/usr/local/bin"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
test -z "$ac_cv_path_SENDMAIL" && ac_cv_path_SENDMAIL="/usr/lib/sendmail"
;;
esac
fi
SENDMAIL=$ac_cv_path_SENDMAIL
if test -n "$SENDMAIL"; then
echo "$as_me:$LINENO: result: $SENDMAIL" >&5
echo "${ECHO_T}$SENDMAIL" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
for ac_func in recvmsg sendmsg for ac_func in recvmsg sendmsg
@ -14969,6 +14995,7 @@ s,@LIBTOOL@,$LIBTOOL,;t t
s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
s,@MAINT@,$MAINT,;t t s,@MAINT@,$MAINT,;t t
s,@sendmailprog@,$sendmailprog,;t t
s,@DBDIR@,$DBDIR,;t t s,@DBDIR@,$DBDIR,;t t
s,@CFGDIR@,$CFGDIR,;t t s,@CFGDIR@,$CFGDIR,;t t
s,@LIBCLAMAV_LIBS@,$LIBCLAMAV_LIBS,;t t s,@LIBCLAMAV_LIBS@,$LIBCLAMAV_LIBS,;t t
@ -14981,7 +15008,6 @@ s,@BUILD_CLAMD_TRUE@,$BUILD_CLAMD_TRUE,;t t
s,@BUILD_CLAMD_FALSE@,$BUILD_CLAMD_FALSE,;t t s,@BUILD_CLAMD_FALSE@,$BUILD_CLAMD_FALSE,;t t
s,@HAVE_MILTER_TRUE@,$HAVE_MILTER_TRUE,;t t s,@HAVE_MILTER_TRUE@,$HAVE_MILTER_TRUE,;t t
s,@HAVE_MILTER_FALSE@,$HAVE_MILTER_FALSE,;t t s,@HAVE_MILTER_FALSE@,$HAVE_MILTER_FALSE,;t t
s,@SENDMAIL@,$SENDMAIL,;t t
s,@GETENT@,$GETENT,;t t s,@GETENT@,$GETENT,;t t
s,@CLAMAVUSER@,$CLAMAVUSER,;t t s,@CLAMAVUSER@,$CLAMAVUSER,;t t
s,@CLAMAVGROUP@,$CLAMAVGROUP,;t t s,@CLAMAVGROUP@,$CLAMAVGROUP,;t t

@ -162,6 +162,23 @@ AC_ARG_ENABLE(milter,
[ --enable-milter build clamav-milter], [ --enable-milter build clamav-milter],
have_milter=$enableval,have_milter="no") have_milter=$enableval,have_milter="no")
if test "$have_milter" = "yes"; then
sendmailprog=no
AC_ARG_WITH(sendmail,
[ --with-sendmail=PATH specify location of Sendmail binary (default=auto find)],
sendmailprog=$with_sendmail, sendmailprog=no)
if test "$sendmailprog" = "no" ; then
AC_PATH_PROG(sendmailprog, sendmail, no, $PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec)
fi
AC_DEFINE(SENDMAIL_BIN, $sendmailprog, [location of Sendmail binary])
sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`
AC_DEFINE(SENDMAIL_VERSION, $sendmailver, [version of Sendmail])
fi
want_dsig="yes" want_dsig="yes"
AC_ARG_ENABLE(dsig, AC_ARG_ENABLE(dsig,
[ --disable-dsig disable support for digital signatures], [ --disable-dsig disable support for digital signatures],
@ -552,11 +569,6 @@ then
AC_DEFINE(BUILD_CLAMD, 1, "build clamd") AC_DEFINE(BUILD_CLAMD, 1, "build clamd")
fi fi
if test "$have_milter" = "yes"
then
AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail, $PATH:/usr/lib:/usr/sbin:/etc:/usr/local/lib:/usr/local/sbin:/usr/bin:/usr/local/bin)
fi
dnl Check if we can do fd passing dnl Check if we can do fd passing
dnl Submitted by Richard Lyons <frob-clamav@webcentral.com.au> dnl Submitted by Richard Lyons <frob-clamav@webcentral.com.au>
AC_CHECK_FUNCS(recvmsg sendmsg) AC_CHECK_FUNCS(recvmsg sendmsg)

@ -128,7 +128,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -169,6 +168,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@

@ -133,7 +133,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -174,6 +173,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@

@ -126,7 +126,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -167,6 +166,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@

@ -153,7 +153,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -194,6 +193,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@

@ -168,7 +168,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -209,6 +208,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@

@ -151,7 +151,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
@ -192,6 +191,7 @@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
sbindir = @sbindir@ sbindir = @sbindir@
sendmailprog = @sendmailprog@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target = @target@ target = @target@

Loading…
Cancel
Save