[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit e3e1c4e5b9ff32a23a7404e3c3fc0d6f3fa695d2
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:35 2008 +0100

    Revert "Add configure patch for no real mail version directly."
    
    This reverts commit 213f9d84fb1df8511f058b12763b296cf0c66030.

diff --git a/configure b/configure
index 57a9617..94c3356 100755
--- a/configure
+++ b/configure
@@ -14908,42 +14908,21 @@ fi
     sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
     sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
 
-    case "$sendmailver_a" in
-      [[:digit:]]*) ;;
-      *) sendmailver_a= ;;
-    esac
-
-    case "$sendmailver_b" in
-      [[:digit:]]*) ;;
-      *) sendmailver_b= ;;
-    esac
-
-    case "$sendmailver_c" in
-      [[:digit:]]*) ;;
-      *) sendmailver_c= ;;
-    esac
-
-    if test -n "$sendmailver_a"; then
 
 cat >>confdefs.h <<_ACEOF
 #define SENDMAIL_VERSION_A $sendmailver_a
 _ACEOF
 
-    fi
-    if test -n "$sendmailver_b"; then
 
 cat >>confdefs.h <<_ACEOF
 #define SENDMAIL_VERSION_B $sendmailver_b
 _ACEOF
 
-    fi
-    if test -n "$sendmailver_c"; then
 
 cat >>confdefs.h <<_ACEOF
 #define SENDMAIL_VERSION_C $sendmailver_c
 _ACEOF
 
-    fi
   fi
 fi
 
diff --git a/configure.in b/configure.in
index 9e3a5aa..bc174f6 100644
--- a/configure.in
+++ b/configure.in
@@ -470,30 +470,9 @@ if test "$have_milter" = "yes"; then
     sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
     sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
 
-    case "$sendmailver_a" in
-      [[[:digit:]]]*) ;;
-      *) sendmailver_a= ;;
-    esac
-
-    case "$sendmailver_b" in
-      [[[:digit:]]]*) ;;
-      *) sendmailver_b= ;;
-    esac
-
-    case "$sendmailver_c" in
-      [[[:digit:]]]*) ;;
-      *) sendmailver_c= ;;
-    esac
-
-    if test -n "$sendmailver_a"; then
-      AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail])
-    fi
-    if test -n "$sendmailver_b"; then
-      AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail])
-    fi
-    if test -n "$sendmailver_c"; then
-      AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail])
-    fi
+    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_A], $sendmailver_a, [major version of Sendmail])
+    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_B], $sendmailver_b, [minor version of Sendmail])
+    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_C], $sendmailver_c, [subversion of Sendmail])
   fi
 fi
 

-- 
Debian repository for ClamAV