Browse code

detect and define SENDMAIL_VERSION

git-svn: trunk@1549

Tomasz Kojm authored on 2005/05/16 09:57:58
Showing 16 changed files
... ...
@@ -1,3 +1,7 @@
1
+Mon May 16 02:51:03 CEST 2005 (tk)
2
+----------------------------------
3
+  * configure.in: detect and define SENDMAIL_VERSION
4
+
1 5
 Sun May 15 16:47:48 BST 2005 (njh)
2 6
 ----------------------------------
3 7
   * libclamav/message.c:	Fixed a problem where an email with more
... ...
@@ -170,7 +170,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
170 170
 PACKAGE_VERSION = @PACKAGE_VERSION@
171 171
 PATH_SEPARATOR = @PATH_SEPARATOR@
172 172
 RANLIB = @RANLIB@
173
-SENDMAIL = @SENDMAIL@
174 173
 SET_MAKE = @SET_MAKE@
175 174
 SHELL = @SHELL@
176 175
 STRIP = @STRIP@
... ...
@@ -211,6 +210,7 @@ oldincludedir = @oldincludedir@
211 211
 prefix = @prefix@
212 212
 program_transform_name = @program_transform_name@
213 213
 sbindir = @sbindir@
214
+sendmailprog = @sendmailprog@
214 215
 sharedstatedir = @sharedstatedir@
215 216
 sysconfdir = @sysconfdir@
216 217
 target = @target@
... ...
@@ -285,6 +285,12 @@
285 285
 /* scan buffer size */
286 286
 #undef SCANBUFF
287 287
 
288
+/* location of Sendmail binary */
289
+#undef SENDMAIL_BIN
290
+
291
+/* version of Sendmail */
292
+#undef SENDMAIL_VERSION
293
+
288 294
 /* Define to 1 if the `setpgrp' function takes no argument. */
289 295
 #undef SETPGRP_VOID
290 296
 
... ...
@@ -1,5 +1,5 @@
1 1
 #
2
-#  Copyright (C) 2003 - 2004 Tomasz Kojm <tkojm@clamav.net>
2
+#  Copyright (C) 2003 - 2005 Tomasz Kojm <tkojm@clamav.net>
3 3
 #
4 4
 #  This program is free software; you can redistribute it and/or modify
5 5
 #  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
37 37
 endif
38 38
 endif
39 39
 
40
-AM_CFLAGS = -DSENDMAIL_BIN=\"$(SENDMAIL)\"
41 40
 LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@
42 41
 INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared
43 42
 EXTRA_DIST = clamav-milter.c INSTALL
... ...
@@ -15,7 +15,7 @@
15 15
 @SET_MAKE@
16 16
 
17 17
 #
18
-#  Copyright (C) 2003 - 2004 Tomasz Kojm <tkojm@clamav.net>
18
+#  Copyright (C) 2003 - 2005 Tomasz Kojm <tkojm@clamav.net>
19 19
 #
20 20
 #  This program is free software; you can redistribute it and/or modify
21 21
 #  it under the terms of the GNU General Public License as published by
... ...
@@ -163,7 +163,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
163 163
 PACKAGE_VERSION = @PACKAGE_VERSION@
164 164
 PATH_SEPARATOR = @PATH_SEPARATOR@
165 165
 RANLIB = @RANLIB@
166
-SENDMAIL = @SENDMAIL@
167 166
 SET_MAKE = @SET_MAKE@
168 167
 SHELL = @SHELL@
169 168
 STRIP = @STRIP@
... ...
@@ -204,6 +203,7 @@ oldincludedir = @oldincludedir@
204 204
 prefix = @prefix@
205 205
 program_transform_name = @program_transform_name@
206 206
 sbindir = @sbindir@
207
+sendmailprog = @sendmailprog@
207 208
 sharedstatedir = @sharedstatedir@
208 209
 sysconfdir = @sysconfdir@
209 210
 target = @target@
... ...
@@ -223,7 +223,6 @@ target_vendor = @target_vendor@
223 223
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    clamav-milter.c
224 224
 
225 225
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
226
-AM_CFLAGS = -DSENDMAIL_BIN=\"$(SENDMAIL)\"
227 226
 INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared
228 227
 EXTRA_DIST = clamav-milter.c INSTALL
229 228
 all: all-am
... ...
@@ -169,7 +169,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
169 169
 PACKAGE_VERSION = @PACKAGE_VERSION@
170 170
 PATH_SEPARATOR = @PATH_SEPARATOR@
171 171
 RANLIB = @RANLIB@
172
-SENDMAIL = @SENDMAIL@
173 172
 SET_MAKE = @SET_MAKE@
174 173
 SHELL = @SHELL@
175 174
 STRIP = @STRIP@
... ...
@@ -210,6 +209,7 @@ oldincludedir = @oldincludedir@
210 210
 prefix = @prefix@
211 211
 program_transform_name = @program_transform_name@
212 212
 sbindir = @sbindir@
213
+sendmailprog = @sendmailprog@
213 214
 sharedstatedir = @sharedstatedir@
214 215
 sysconfdir = @sysconfdir@
215 216
 target = @target@
... ...
@@ -160,7 +160,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
160 160
 PACKAGE_VERSION = @PACKAGE_VERSION@
161 161
 PATH_SEPARATOR = @PATH_SEPARATOR@
162 162
 RANLIB = @RANLIB@
163
-SENDMAIL = @SENDMAIL@
164 163
 SET_MAKE = @SET_MAKE@
165 164
 SHELL = @SHELL@
166 165
 STRIP = @STRIP@
... ...
@@ -201,6 +200,7 @@ oldincludedir = @oldincludedir@
201 201
 prefix = @prefix@
202 202
 program_transform_name = @program_transform_name@
203 203
 sbindir = @sbindir@
204
+sendmailprog = @sendmailprog@
204 205
 sharedstatedir = @sharedstatedir@
205 206
 sysconfdir = @sysconfdir@
206 207
 target = @target@
... ...
@@ -153,7 +153,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
153 153
 PACKAGE_VERSION = @PACKAGE_VERSION@
154 154
 PATH_SEPARATOR = @PATH_SEPARATOR@
155 155
 RANLIB = @RANLIB@
156
-SENDMAIL = @SENDMAIL@
157 156
 SET_MAKE = @SET_MAKE@
158 157
 SHELL = @SHELL@
159 158
 STRIP = @STRIP@
... ...
@@ -194,6 +193,7 @@ oldincludedir = @oldincludedir@
194 194
 prefix = @prefix@
195 195
 program_transform_name = @program_transform_name@
196 196
 sbindir = @sbindir@
197
+sendmailprog = @sendmailprog@
197 198
 sharedstatedir = @sharedstatedir@
198 199
 sysconfdir = @sysconfdir@
199 200
 target = @target@
... ...
@@ -468,7 +468,7 @@ ac_includes_default="\
468 468
 # include <unistd.h>
469 469
 #endif"
470 470
 
471
-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'
471
+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'
472 472
 ac_subst_files=''
473 473
 
474 474
 # Initialize some variables set by options.
... ...
@@ -1041,6 +1041,7 @@ Optional Packages:
1041 1041
   --with-pic              try to use only PIC/non-PIC objects default=use both
1042 1042
   --with-zlib=DIR	  path to directory containing zlib library (default=
1043 1043
 			  /usr/local or /usr if not found in /usr/local)
1044
+  --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)
1044 1045
   --with-libcurl	  support URLs downloading with libcurl (default=auto)
1045 1046
   --with-user=uid	  name of the clamav user (default=clamav)
1046 1047
   --with-group=gid	  name of the clamav group (default=clamav)
... ...
@@ -5035,7 +5036,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
5035 5035
 case $host in
5036 5036
 *-*-irix6*)
5037 5037
   # Find out which ABI we are using.
5038
-  echo '#line 5038 "configure"' > conftest.$ac_ext
5038
+  echo '#line 5039 "configure"' > conftest.$ac_ext
5039 5039
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5040 5040
   (eval $ac_compile) 2>&5
5041 5041
   ac_status=$?
... ...
@@ -5626,7 +5627,7 @@ chmod -w .
5626 5626
 save_CFLAGS="$CFLAGS"
5627 5627
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
5628 5628
 compiler_c_o=no
5629
-if { (eval echo configure:5629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
5629
+if { (eval echo configure:5630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
5630 5630
   # The compiler can only warn and ignore the option if not recognized
5631 5631
   # So say no if there are warnings
5632 5632
   if test -s out/conftest.err; then
... ...
@@ -7560,7 +7561,7 @@ else
7560 7560
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7561 7561
   lt_status=$lt_dlunknown
7562 7562
   cat > conftest.$ac_ext <<EOF
7563
-#line 7563 "configure"
7563
+#line 7564 "configure"
7564 7564
 #include "confdefs.h"
7565 7565
 
7566 7566
 #if HAVE_DLFCN_H
... ...
@@ -7658,7 +7659,7 @@ else
7658 7658
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7659 7659
   lt_status=$lt_dlunknown
7660 7660
   cat > conftest.$ac_ext <<EOF
7661
-#line 7661 "configure"
7661
+#line 7662 "configure"
7662 7662
 #include "confdefs.h"
7663 7663
 
7664 7664
 #if HAVE_DLFCN_H
... ...
@@ -11122,6 +11123,76 @@ else
11122 11122
   have_milter="no"
11123 11123
 fi;
11124 11124
 
11125
+if test "$have_milter" = "yes"; then
11126
+  sendmailprog=no
11127
+
11128
+# Check whether --with-sendmail or --without-sendmail was given.
11129
+if test "${with_sendmail+set}" = set; then
11130
+  withval="$with_sendmail"
11131
+  sendmailprog=$with_sendmail
11132
+else
11133
+  sendmailprog=no
11134
+fi;
11135
+
11136
+  if test "$sendmailprog" = "no" ; then
11137
+    # Extract the first word of "sendmail", so it can be a program name with args.
11138
+set dummy sendmail; ac_word=$2
11139
+echo "$as_me:$LINENO: checking for $ac_word" >&5
11140
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
11141
+if test "${ac_cv_path_sendmailprog+set}" = set; then
11142
+  echo $ECHO_N "(cached) $ECHO_C" >&6
11143
+else
11144
+  case $sendmailprog in
11145
+  [\\/]* | ?:[\\/]*)
11146
+  ac_cv_path_sendmailprog="$sendmailprog" # Let the user override the test with a path.
11147
+  ;;
11148
+  *)
11149
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11150
+as_dummy="$PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec"
11151
+for as_dir in $as_dummy
11152
+do
11153
+  IFS=$as_save_IFS
11154
+  test -z "$as_dir" && as_dir=.
11155
+  for ac_exec_ext in '' $ac_executable_extensions; do
11156
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11157
+    ac_cv_path_sendmailprog="$as_dir/$ac_word$ac_exec_ext"
11158
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11159
+    break 2
11160
+  fi
11161
+done
11162
+done
11163
+
11164
+  test -z "$ac_cv_path_sendmailprog" && ac_cv_path_sendmailprog="no"
11165
+  ;;
11166
+esac
11167
+fi
11168
+sendmailprog=$ac_cv_path_sendmailprog
11169
+
11170
+if test -n "$sendmailprog"; then
11171
+  echo "$as_me:$LINENO: result: $sendmailprog" >&5
11172
+echo "${ECHO_T}$sendmailprog" >&6
11173
+else
11174
+  echo "$as_me:$LINENO: result: no" >&5
11175
+echo "${ECHO_T}no" >&6
11176
+fi
11177
+
11178
+  fi
11179
+
11180
+
11181
+cat >>confdefs.h <<\_ACEOF
11182
+#define SENDMAIL_BIN $sendmailprog
11183
+_ACEOF
11184
+
11185
+
11186
+  sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`
11187
+
11188
+
11189
+cat >>confdefs.h <<\_ACEOF
11190
+#define SENDMAIL_VERSION $sendmailver
11191
+_ACEOF
11192
+
11193
+fi
11194
+
11125 11195
 want_dsig="yes"
11126 11196
 # Check whether --enable-dsig or --disable-dsig was given.
11127 11197
 if test "${enable_dsig+set}" = set; then
... ...
@@ -12448,51 +12519,6 @@ _ACEOF
12448 12448
 
12449 12449
 fi
12450 12450
 
12451
-if test "$have_milter" = "yes"
12452
-then
12453
-    # Extract the first word of "sendmail", so it can be a program name with args.
12454
-set dummy sendmail; ac_word=$2
12455
-echo "$as_me:$LINENO: checking for $ac_word" >&5
12456
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
12457
-if test "${ac_cv_path_SENDMAIL+set}" = set; then
12458
-  echo $ECHO_N "(cached) $ECHO_C" >&6
12459
-else
12460
-  case $SENDMAIL in
12461
-  [\\/]* | ?:[\\/]*)
12462
-  ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path.
12463
-  ;;
12464
-  *)
12465
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12466
-as_dummy="$PATH:/usr/lib:/usr/sbin:/etc:/usr/local/lib:/usr/local/sbin:/usr/bin:/usr/local/bin"
12467
-for as_dir in $as_dummy
12468
-do
12469
-  IFS=$as_save_IFS
12470
-  test -z "$as_dir" && as_dir=.
12471
-  for ac_exec_ext in '' $ac_executable_extensions; do
12472
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12473
-    ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
12474
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12475
-    break 2
12476
-  fi
12477
-done
12478
-done
12479
-
12480
-  test -z "$ac_cv_path_SENDMAIL" && ac_cv_path_SENDMAIL="/usr/lib/sendmail"
12481
-  ;;
12482
-esac
12483
-fi
12484
-SENDMAIL=$ac_cv_path_SENDMAIL
12485
-
12486
-if test -n "$SENDMAIL"; then
12487
-  echo "$as_me:$LINENO: result: $SENDMAIL" >&5
12488
-echo "${ECHO_T}$SENDMAIL" >&6
12489
-else
12490
-  echo "$as_me:$LINENO: result: no" >&5
12491
-echo "${ECHO_T}no" >&6
12492
-fi
12493
-
12494
-fi
12495
-
12496 12451
 
12497 12452
 
12498 12453
 for ac_func in recvmsg sendmsg
... ...
@@ -14969,6 +14995,7 @@ s,@LIBTOOL@,$LIBTOOL,;t t
14969 14969
 s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
14970 14970
 s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
14971 14971
 s,@MAINT@,$MAINT,;t t
14972
+s,@sendmailprog@,$sendmailprog,;t t
14972 14973
 s,@DBDIR@,$DBDIR,;t t
14973 14974
 s,@CFGDIR@,$CFGDIR,;t t
14974 14975
 s,@LIBCLAMAV_LIBS@,$LIBCLAMAV_LIBS,;t t
... ...
@@ -14981,7 +15008,6 @@ s,@BUILD_CLAMD_TRUE@,$BUILD_CLAMD_TRUE,;t t
14981 14981
 s,@BUILD_CLAMD_FALSE@,$BUILD_CLAMD_FALSE,;t t
14982 14982
 s,@HAVE_MILTER_TRUE@,$HAVE_MILTER_TRUE,;t t
14983 14983
 s,@HAVE_MILTER_FALSE@,$HAVE_MILTER_FALSE,;t t
14984
-s,@SENDMAIL@,$SENDMAIL,;t t
14985 14984
 s,@GETENT@,$GETENT,;t t
14986 14985
 s,@CLAMAVUSER@,$CLAMAVUSER,;t t
14987 14986
 s,@CLAMAVGROUP@,$CLAMAVGROUP,;t t
... ...
@@ -162,6 +162,23 @@ AC_ARG_ENABLE(milter,
162 162
 [  --enable-milter	  build clamav-milter],
163 163
 have_milter=$enableval,have_milter="no")
164 164
 
165
+if test "$have_milter" = "yes"; then
166
+  sendmailprog=no
167
+  AC_ARG_WITH(sendmail,
168
+  [  --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)],
169
+  sendmailprog=$with_sendmail, sendmailprog=no)
170
+
171
+  if test "$sendmailprog" = "no" ; then
172
+    AC_PATH_PROG(sendmailprog, sendmail, no, $PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec)
173
+  fi
174
+
175
+  AC_DEFINE(SENDMAIL_BIN, $sendmailprog, [location of Sendmail binary])
176
+
177
+  sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`
178
+
179
+  AC_DEFINE(SENDMAIL_VERSION, $sendmailver, [version of Sendmail])
180
+fi
181
+
165 182
 want_dsig="yes"
166 183
 AC_ARG_ENABLE(dsig,
167 184
 [  --disable-dsig	  disable support for digital signatures],
... ...
@@ -552,11 +569,6 @@ then
552 552
     AC_DEFINE(BUILD_CLAMD, 1, "build clamd")
553 553
 fi
554 554
 
555
-if test "$have_milter" = "yes"
556
-then
557
-    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)
558
-fi
559
-
560 555
 dnl Check if we can do fd passing
561 556
 dnl Submitted by Richard Lyons <frob-clamav@webcentral.com.au>
562 557
 AC_CHECK_FUNCS(recvmsg sendmsg)
... ...
@@ -128,7 +128,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
128 128
 PACKAGE_VERSION = @PACKAGE_VERSION@
129 129
 PATH_SEPARATOR = @PATH_SEPARATOR@
130 130
 RANLIB = @RANLIB@
131
-SENDMAIL = @SENDMAIL@
132 131
 SET_MAKE = @SET_MAKE@
133 132
 SHELL = @SHELL@
134 133
 STRIP = @STRIP@
... ...
@@ -169,6 +168,7 @@ oldincludedir = @oldincludedir@
169 169
 prefix = @prefix@
170 170
 program_transform_name = @program_transform_name@
171 171
 sbindir = @sbindir@
172
+sendmailprog = @sendmailprog@
172 173
 sharedstatedir = @sharedstatedir@
173 174
 sysconfdir = @sysconfdir@
174 175
 target = @target@
... ...
@@ -133,7 +133,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
133 133
 PACKAGE_VERSION = @PACKAGE_VERSION@
134 134
 PATH_SEPARATOR = @PATH_SEPARATOR@
135 135
 RANLIB = @RANLIB@
136
-SENDMAIL = @SENDMAIL@
137 136
 SET_MAKE = @SET_MAKE@
138 137
 SHELL = @SHELL@
139 138
 STRIP = @STRIP@
... ...
@@ -174,6 +173,7 @@ oldincludedir = @oldincludedir@
174 174
 prefix = @prefix@
175 175
 program_transform_name = @program_transform_name@
176 176
 sbindir = @sbindir@
177
+sendmailprog = @sendmailprog@
177 178
 sharedstatedir = @sharedstatedir@
178 179
 sysconfdir = @sysconfdir@
179 180
 target = @target@
... ...
@@ -126,7 +126,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
126 126
 PACKAGE_VERSION = @PACKAGE_VERSION@
127 127
 PATH_SEPARATOR = @PATH_SEPARATOR@
128 128
 RANLIB = @RANLIB@
129
-SENDMAIL = @SENDMAIL@
130 129
 SET_MAKE = @SET_MAKE@
131 130
 SHELL = @SHELL@
132 131
 STRIP = @STRIP@
... ...
@@ -167,6 +166,7 @@ oldincludedir = @oldincludedir@
167 167
 prefix = @prefix@
168 168
 program_transform_name = @program_transform_name@
169 169
 sbindir = @sbindir@
170
+sendmailprog = @sendmailprog@
170 171
 sharedstatedir = @sharedstatedir@
171 172
 sysconfdir = @sysconfdir@
172 173
 target = @target@
... ...
@@ -153,7 +153,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
153 153
 PACKAGE_VERSION = @PACKAGE_VERSION@
154 154
 PATH_SEPARATOR = @PATH_SEPARATOR@
155 155
 RANLIB = @RANLIB@
156
-SENDMAIL = @SENDMAIL@
157 156
 SET_MAKE = @SET_MAKE@
158 157
 SHELL = @SHELL@
159 158
 STRIP = @STRIP@
... ...
@@ -194,6 +193,7 @@ oldincludedir = @oldincludedir@
194 194
 prefix = @prefix@
195 195
 program_transform_name = @program_transform_name@
196 196
 sbindir = @sbindir@
197
+sendmailprog = @sendmailprog@
197 198
 sharedstatedir = @sharedstatedir@
198 199
 sysconfdir = @sysconfdir@
199 200
 target = @target@
... ...
@@ -168,7 +168,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
168 168
 PACKAGE_VERSION = @PACKAGE_VERSION@
169 169
 PATH_SEPARATOR = @PATH_SEPARATOR@
170 170
 RANLIB = @RANLIB@
171
-SENDMAIL = @SENDMAIL@
172 171
 SET_MAKE = @SET_MAKE@
173 172
 SHELL = @SHELL@
174 173
 STRIP = @STRIP@
... ...
@@ -209,6 +208,7 @@ oldincludedir = @oldincludedir@
209 209
 prefix = @prefix@
210 210
 program_transform_name = @program_transform_name@
211 211
 sbindir = @sbindir@
212
+sendmailprog = @sendmailprog@
212 213
 sharedstatedir = @sharedstatedir@
213 214
 sysconfdir = @sysconfdir@
214 215
 target = @target@
... ...
@@ -151,7 +151,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
151 151
 PACKAGE_VERSION = @PACKAGE_VERSION@
152 152
 PATH_SEPARATOR = @PATH_SEPARATOR@
153 153
 RANLIB = @RANLIB@
154
-SENDMAIL = @SENDMAIL@
155 154
 SET_MAKE = @SET_MAKE@
156 155
 SHELL = @SHELL@
157 156
 STRIP = @STRIP@
... ...
@@ -192,6 +191,7 @@ oldincludedir = @oldincludedir@
192 192
 prefix = @prefix@
193 193
 program_transform_name = @program_transform_name@
194 194
 sbindir = @sbindir@
195
+sendmailprog = @sendmailprog@
195 196
 sharedstatedir = @sharedstatedir@
196 197
 sysconfdir = @sysconfdir@
197 198
 target = @target@