m4: vararg.m4 - Modernize m4 syntax

diff --git a/m4/vararg.m4 b/m4/vararg.m4
index 6bc8dcc0fbe171ca566e7e8d99f783fb53c1860b..ff176b1459a6086de41f1ec339ef29571b6a024b 100644 (file)
--- a/m4/vararg.m4
+++ b/m4/vararg.m4
@@ -1,6 +1,6 @@
 AC_DEFUN([DOVECOT_VA_COPY], [
   AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
-          AC_RUN_IFELSE([AC_LANG_SOURCE([[
+          AC_RUN_IFELSE([AC_LANG_PROGRAM([[
           #include <stdarg.h>
           #include <stdlib.h>
           void f (int i, ...) {
@@ -11,15 +11,15 @@ AC_DEFUN([DOVECOT_VA_COPY], [
             exit (1);
           va_end (args1); va_end (args2);
           }
-          int main() {
+          ]], [[
             f (0, 42);
             return 0;
-          }]])],
+          ]])],
           [lib_cv_va_copy=yes],
           [lib_cv_va_copy=no],[])
   ])
   AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
-          AC_RUN_IFELSE([AC_LANG_SOURCE([[
+          AC_RUN_IFELSE([AC_LANG_PROGRAM([[
           #include <stdarg.h>
           #include <stdlib.h>
           void f (int i, ...) {
@@ -30,29 +30,28 @@ AC_DEFUN([DOVECOT_VA_COPY], [
             exit (1);
           va_end (args1); va_end (args2);
           }
-          int main() {
+          ]], [[
             f (0, 42);
             return 0;
-          }]])],
+          ]])],
           [lib_cv___va_copy=yes],
           [lib_cv___va_copy=no],[])
   ])
   
-  if test "x$lib_cv_va_copy" = "xyes"; then
+  AS_IF([test "$lib_cv_va_copy" = "yes"], [
     va_copy_func=va_copy
-  else if test "x$lib_cv___va_copy" = "xyes"; then
+  ], [test "$lib_cv___va_copy" = "yes"], [
     va_copy_func=__va_copy
-  fi
-  fi
+  ])
   
-  if test -n "$va_copy_func"; then
+  AS_IF([test -n "$va_copy_func"], [
     AC_DEFINE_UNQUOTED(VA_COPY,$va_copy_func,[A 'va_copy' style function])
-  fi
+  ])
 ])
 
 AC_DEFUN([DOVECOT_VA_COPY_BYVAL], [
   AC_CACHE_CHECK([whether va_lists can be copied by value],lib_cv_va_val_copy,[
-          AC_RUN_IFELSE([AC_LANG_SOURCE([[
+          AC_RUN_IFELSE([AC_LANG_PROGRAM([[
           #include <stdarg.h>
           #include <stdlib.h>
           void f (int i, ...) {
@@ -63,15 +62,15 @@ AC_DEFUN([DOVECOT_VA_COPY_BYVAL], [
             exit (1);
           va_end (args1); va_end (args2);
           }
-          int main() {
+         ]], [[
             f (0, 42);
             return 0;
-          }]])],
+          ]])],
           [lib_cv_va_val_copy=yes],
           [lib_cv_va_val_copy=no],[])
   ])
   
-  if test "x$lib_cv_va_val_copy" = "xno"; then
+  AS_IF([test "$lib_cv_va_val_copy" = "no"], [
     AC_DEFINE(VA_COPY_AS_ARRAY,1, ['va_lists' cannot be copied as values])
-  fi
+  ])
 ])