Imported Upstream version 2.6.1

[debian/amanda] / config / amanda / progs.m4

diff --git a/config/amanda/progs.m4 b/config/amanda/progs.m4
index 79babba8ab6bdd980c24f965e2dd74b347be54e1..c816b75e350a74b229ef4ca734c63e7be9e4f0dc 100644 (file)
--- a/config/amanda/progs.m4
+++ b/config/amanda/progs.m4
@@ -111,10 +111,11 @@ AC_DEFUN([AMANDA_PROG_LINT],
       AC_PATH_PROG(AMLINT,splint,,$SYSLOCPATH)
       if test ! -z "$AMLINT"; then
        AMLINT="splint"
+        AMLINTFLAGS='+show-scan +unixlib -weak -globs +usedef +usereleased +impouts -paramimptemp -varuse -warnposix -redef -preproc -fixedformalarray -retval -unrecog -usevarargs -formatcode'
       else
        AMLINT='echo "Error: LINT is not installed" ; false'
+        AMLINTFLAGS=''
       fi
-      AMLINTFLAGS='+show-scan +unixlib -weak -globs +usedef +usereleased +impouts -paramimptemp -varuse -warnposix -redef -preproc -fixedformalarray -retval -unrecog -usevarargs -formatcode'
     fi
     AC_SUBST(AMLINTFLAGS)
 ])
@@ -283,10 +284,13 @@ AC_DEFUN([AMANDA_PROG_MAILER],
     AC_PATH_PROGS(MAILER,Mail mailx mail,NONE)
     if test x"$MAILER" = x"NONE"; then
         AMANDA_MSG_WARN([WARNING: Amanda cannot send mail reports without a mailer.])
+       DEFAULT_MAILER=""
     else
-        AC_DEFINE_UNQUOTED(MAILER,"$MAILER",
-                [A program that understands -s "subject" user < message_file])
+       DEFAULT_MAILER="$MAILER"
     fi
+    AC_DEFINE_UNQUOTED(DEFAULT_MAILER,"$DEFAULT_MAILER",
+                [A program that understands -s "subject" user < message_file])
+    AC_SUBST(DEFAULT_MAILER)
 ])
 
 # SYNOPSIS