Browse code

yet another sendmail version fix

git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@1586 77e5149b-7576-45b1-b177-96237e5ba77b

Tomasz Kojm authored on 2005/05/26 21:24:14
Showing 3 changed files
... ...
@@ -288,8 +288,14 @@
288 288
 /* location of Sendmail binary */
289 289
 #undef SENDMAIL_BIN
290 290
 
291
-/* version of Sendmail */
292
-#undef SENDMAIL_VERSION
291
+/* major version of Sendmail */
292
+#undef SENDMAIL_VERSION_A
293
+
294
+/* minor version of Sendmail */
295
+#undef SENDMAIL_VERSION_B
296
+
297
+/* subversion of Sendmail */
298
+#undef SENDMAIL_VERSION_C
293 299
 
294 300
 /* Define to 1 if the `setpgrp' function takes no argument. */
295 301
 #undef SETPGRP_VOID
... ...
@@ -11184,13 +11184,27 @@ cat >>confdefs.h <<_ACEOF
11184 11184
 _ACEOF
11185 11185
 
11186 11186
 
11187
-  sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}' | awk -F. '{printf $1"."$2}'`
11187
+  sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`
11188
+  sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`
11189
+  sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
11190
+  sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
11188 11191
 
11189 11192
 
11190 11193
 cat >>confdefs.h <<_ACEOF
11191
-#define SENDMAIL_VERSION $sendmailver
11194
+#define SENDMAIL_VERSION_A $sendmailver_a
11192 11195
 _ACEOF
11193 11196
 
11197
+
11198
+cat >>confdefs.h <<_ACEOF
11199
+#define SENDMAIL_VERSION_B $sendmailver_b
11200
+_ACEOF
11201
+
11202
+
11203
+cat >>confdefs.h <<_ACEOF
11204
+#define SENDMAIL_VERSION_C $sendmailver_c
11205
+_ACEOF
11206
+
11207
+
11194 11208
 fi
11195 11209
 
11196 11210
 want_dsig="yes"
... ...
@@ -174,9 +174,15 @@ if test "$have_milter" = "yes"; then
174 174
 
175 175
   AC_DEFINE_UNQUOTED(SENDMAIL_BIN, "$sendmailprog", [location of Sendmail binary])
176 176
 
177
-  sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}' | awk -F. '{printf $1"."$2}'`
177
+  sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`
178
+  sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`
179
+  sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
180
+  sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
181
+
182
+  AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail])
183
+  AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail])
184
+  AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail])
178 185
 
179
-  AC_DEFINE_UNQUOTED(SENDMAIL_VERSION, $sendmailver, [version of Sendmail])
180 186
 fi
181 187
 
182 188
 want_dsig="yes"