fix warnings with autoconf 2.68

visionworkbench · Oct 4, 2010 · c4bf350 · c4bf350
1 parent 1af676c
commit c4bf350
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/configure.ac b/configure.ac
@@ -364,14 +364,14 @@ old_LDFLAGS="$LDFLAGS"
 CXXFLAGS="$CXXFLAGS $PKG_RABBITMQ_C_CPPFLAGS"
 LDFLAGS="$LDFLAGS $PKG_RABBITMQ_C_LIBS"
 if test x"$HAVE_PKG_RABBITMQ_C" = "xyes"; then
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
     #include <stdlib.h>
     #include <stdint.h>
     #include <amqp.h>
   ]], [[
     amqp_rpc_reply_t x;
     x.library_error;
-  ]]), [], [
+  ]])], [], [
     HAVE_PKG_RABBITMQ_C="no:current version is too old"
     AX_PKG(RABBITMQ_C, [], [-lrabbitmq], [stdlib.h stdint.h amqp.h])])
 fi

diff --git a/m4/ax_check_attribute.m4 b/m4/ax_check_attribute.m4
@@ -12,9 +12,9 @@ AC_DEFUN([AX_CHECK_FUNCTION_ATTRIBUTE],
     AS_VAR_PUSHDEF([ac_var], ac_cv_func_attribute_[[$1]])dnl
     AC_CACHE_CHECK([whether the current compiler supports $1], ac_var,
     [
-        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
           int f(int i) __attribute__(($1));
-        ]], []), [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
+        ]], [])], [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
     ])
     AS_IF([test x"$ac_var" = "xyes"],
       [AC_DEFINE([COMPILER_HAS_ATTRIBUTE_]AS_TR_CPP($1), [1], [does the compiler support function __attribute__(($1))?])],

diff --git a/m4/ax_check_functions.m4 b/m4/ax_check_functions.m4
@@ -25,7 +25,7 @@ AC_DEFUN([AX_CHECK_FUNCTIONS],
     echo ["Checking for $func in $LIBS"] >&AS_MESSAGE_LOG_FD
 
     AC_LINK_IFELSE(
-      AC_LANG_CALL([],[$func]),
+      [AC_LANG_CALL([],[$func])],
       [check_function_got_it=yes],
       [
         check_function_missing_libs=yes

diff --git a/m4/ax_pkg.m4 b/m4/ax_pkg.m4
@@ -133,7 +133,7 @@ AC_DEFUN([AX_PKG],
         dnl check for the headers and libs. if found, keep going.
         dnl otherwise, check next path
         AC_LINK_IFELSE(
-          AC_LANG_PROGRAM([#include "conftest.h"],[]),
+          [AC_LANG_PROGRAM([#include "conftest.h"],[])],
           [ HAVE_PKG_$1=yes ], [continue] )
 
         m4_ifval([$7],

diff --git a/m4/ax_pkg_boost_lib.m4 b/m4/ax_pkg_boost_lib.m4
@@ -103,8 +103,8 @@ AC_DEFUN([AX_PKG_BOOST_LIB],
         LIBS="$ax_pkg_old_libs $PKG_BOOST_$1_LIBS"
 
         AC_LINK_IFELSE(
-          AC_LANG_PROGRAM(m4_foreach_w([header], [$6 $3], [@%:@include <header>
-]), [[$4]]), [ HAVE_PKG_BOOST_$1=yes; break; ], [ continue ] )
+          [AC_LANG_PROGRAM(m4_foreach_w([header], [$6 $3], [@%:@include <header>
+]), [[$4]])], [ HAVE_PKG_BOOST_$1=yes; break; ], [ continue ] )
       done
 
       CPPFLAGS="$ax_pkg_old_cppflags"

diff --git a/m4/ax_try_cppflags.m4 b/m4/ax_try_cppflags.m4
@@ -16,7 +16,7 @@ AC_DEFUN([AX_TRY_CPPFLAGS],
     [
         save_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $1"
-        AC_LINK_IFELSE(AC_LANG_PROGRAM(), [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
+        AC_LINK_IFELSE([AC_LANG_PROGRAM()], [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
         CPPFLAGS="$save_CPPFLAGS"
     ])
     AS_IF([test AS_VAR_GET(ac_var) = yes], [m4_default([$2], [CPPFLAGS="$CPPFLAGS $1"])], [$3])