@@ -1,3 +1,8 @@

+Fri Feb 15 13:15:42 CET 2008 (acab)

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

+  * configure: provide a way to specify the version of sendmail

+  		patch from Steve Gran <steve*lobefin.net>

+

 Fri Feb 15 14:10:46 EET 2008 (edwin)

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

   * libclamav/textnorm.c: need to include clamav-config.h (thanks Nigel)

@@ -1532,6 +1532,7 @@ Optional Packages:

   --with-libbz2-prefix[=DIR]  search for libbz2 in DIR/include and DIR/lib

   --without-libbz2-prefix     don't search for libbz2 in includedir and libdir

   --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)

+  --with-sendmail-version=VERSION    specify version of Sendmail (default=auto find)

   --with-libgmp-prefix[=DIR]  search for libgmp in DIR/include and DIR/lib

   --without-libgmp-prefix     don't search for libgmp in includedir and libdir

   --with-user=uid	  name of the clamav user (default=clamav)

@@ -4762,7 +4763,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 4765 "configure"' > conftest.$ac_ext

+  echo '#line 4766 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -6852,11 +6853,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:6855: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:6856: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:6859: \$? = $ac_status" >&5

+   echo "$as_me:6860: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -7142,11 +7143,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7145: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7146: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7149: \$? = $ac_status" >&5

+   echo "$as_me:7150: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -7246,11 +7247,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7249: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7250: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:7253: \$? = $ac_status" >&5

+   echo "$as_me:7254: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -9623,7 +9624,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 9626 "configure"

+#line 9627 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -9723,7 +9724,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 9726 "configure"

+#line 9727 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -14871,7 +14872,18 @@ cat >>confdefs.h <<_ACEOF

 _ACEOF

-  sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`

+

+# Check whether --with-sendmail-version was given.

+if test "${with_sendmail_version+set}" = set; then

+  withval=$with_sendmail_version; sendmailvers=$with_sendmail_version

+else

+  sendmailvers=no

+fi

+

+

+  if test "$sendmailvers" = "no" ; then

+    sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`

+  fi

   if test -n "$sendmailver"; then

     sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`

@@ -483,7 +483,13 @@ if test "$have_milter" = "yes"; then

   AC_DEFINE_UNQUOTED([SENDMAIL_BIN], "$sendmailprog", [location of Sendmail binary])

-  sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`

+  AC_ARG_WITH(sendmail-version,

+  [  --with-sendmail-version=VERSION    specify version of Sendmail (default=auto find)],

+  sendmailvers=$with_sendmail_version, sendmailvers=no)

+

+  if test "$sendmailvers" = "no" ; then

+    sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`

+  fi

   if test -n "$sendmailver"; then

     sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`