@@ -1,3 +1,7 @@

+Mon Dec  8 19:51:23 CET 2003 (tk)

+---------------------------------

+  * configure: locate the sendmail executable

+

 Sun Dec  7 22:46:15 CET 2003 (tk)

 ---------------------------------

   * freshclam: use the TCPAddr parameter (patch from David S. Madole)

@@ -107,6 +107,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.14 2003/12/02 22:48:56 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.15 2003/12/08 18:57:39 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.14 2003/12/02 22:48:56 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.15 2003/12/08 18:57:39 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -30,7 +30,7 @@ man_MANS = ../docs/man/clamav-milter.8

 endif

 endif

-DEFS = @DEFS@

+DEFS = @DEFS@ -DSENDMAIL_BIN=\"@SENDMAIL@\"

 # CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd

 LIBS = -L../libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMD_LIBS@

 INCLUDES = -I../clamd -I../libclamav -I../clamscan

@@ -107,6 +107,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

@@ -124,7 +125,7 @@ install_sh = @install_sh@

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = ../docs/man/clamav-milter.8

-DEFS = @DEFS@

+DEFS = @DEFS@ -DSENDMAIL_BIN=\"@SENDMAIL@\"

 # CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd

 LIBS = -L../libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMD_LIBS@

 INCLUDES = -I../clamd -I../libclamav -I../clamscan

@@ -107,6 +107,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

@@ -107,6 +107,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

@@ -108,6 +108,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

@@ -9576,6 +9576,50 @@ _ACEOF

 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

+for as_dir in $PATH:/usr/lib:/usr/sbin:/etc:/usr/local/lib:/usr/local/sbin:/usr/bin:/usr/local/bin

+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

+

 if test "$test_clamav" = "yes"

 then

@@ -10760,6 +10804,7 @@ s,@BUILD_CLAMD_TRUE@,$BUILD_CLAMD_TRUE,;t t

 s,@BUILD_CLAMD_FALSE@,$BUILD_CLAMD_FALSE,;t t

 s,@HAVE_MILTER_TRUE@,$HAVE_MILTER_TRUE,;t t

 s,@HAVE_MILTER_FALSE@,$HAVE_MILTER_FALSE,;t t

+s,@SENDMAIL@,$SENDMAIL,;t t

 s,@GETENT@,$GETENT,;t t

 s,@CLAMAVUSER@,$CLAMAVUSER,;t t

 s,@CLAMAVGROUP@,$CLAMAVGROUP,;t t

@@ -355,6 +355,11 @@ then

     AC_DEFINE(BUILD_CLAMD)

 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 for clamav in /etc/passwd

 if test "$test_clamav" = "yes"

@@ -109,6 +109,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

@@ -107,6 +107,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

@@ -109,6 +109,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

@@ -108,6 +108,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

@@ -107,6 +107,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

@@ -107,6 +107,7 @@ LN_S = @LN_S@

 OBJDUMP = @OBJDUMP@

 PACKAGE = @PACKAGE@

 RANLIB = @RANLIB@

+SENDMAIL = @SENDMAIL@

 STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@