From: Dejan Jovanović <dejan.jovanovic@gmail.com>
Date: Fri, 30 Mar 2012 01:44:43 +0000 (+0000)
Subject: fixing some build systme warnings
X-Git-Tag: cvc5-1.0.0~8250
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4a9a8b6368393f50cefae5ef19719fe717ea0b8e;p=cvc5.git

fixing some build systme warnings
---

diff --git a/config/antlr.m4 b/config/antlr.m4
index 27e9200e5..18b2eff73 100644
--- a/config/antlr.m4
+++ b/config/antlr.m4
@@ -59,7 +59,7 @@ AC_DEFUN([AC_LIB_ANTLR],[
   do
     CPPFLAGS="$OLD_CPPFLAGS -I$antlr_prefix/include"
     LIBS="$OLD_LIBS -L$antlr_prefix/lib -lantlr3c"
-    AC_LINK_IFELSE(
+    AC_LINK_IFELSE([AC_LANG_SOURCE(
       [
         #include <antlr3.h>
 
@@ -67,7 +67,7 @@ AC_DEFUN([AC_LIB_ANTLR],[
           pANTLR3_TOKEN_FACTORY factory = antlr3TokenFactoryNew((pANTLR3_INPUT_STREAM) NULL);
           return 0;
         }
-      ],
+      ])],
       [
         AC_MSG_RESULT(found in $antlr_prefix)
         ANTLR_INCLUDES="-I$antlr_prefix/include"
@@ -82,7 +82,7 @@ AC_DEFUN([AC_LIB_ANTLR],[
   done
 
   AC_MSG_CHECKING([for presence of older antlr3AsciiFileStreamNew()])
-  AC_LINK_IFELSE(
+  AC_LINK_IFELSE([AC_LANG_SOURCE(
     [
       #include <antlr3.h>
 
@@ -91,7 +91,7 @@ AC_DEFUN([AC_LIB_ANTLR],[
         pANTLR3_INPUT_STREAM input = antlr3AsciiFileStreamNew(fName);
         return 0;
       }
-    ],
+    ])],
     [
       AC_MSG_RESULT([found it (must be antlr3 3.2 or similar)])
       CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_ANTLR3_OLD_INPUT_STREAM"
@@ -99,7 +99,7 @@ AC_DEFUN([AC_LIB_ANTLR],[
         [
           AC_MSG_RESULT(failed)
           AC_MSG_CHECKING([for presence of newer antlr3FileStreamNew()])
-          AC_LINK_IFELSE(
+          AC_LINK_IFELSE([AC_LANG_SOURCE(
             [
               #include <antlr3.h>
 
@@ -108,7 +108,7 @@ AC_DEFUN([AC_LIB_ANTLR],[
                 pANTLR3_INPUT_STREAM input = antlr3FileStreamNew(fName, ANTLR3_ENC_8BIT);
                 return 0;
               }
-            ],
+            ])],
             [
               AC_MSG_RESULT([found it (must be antlr3 3.4 or similar)])
             ],
diff --git a/config/cvc4.m4 b/config/cvc4.m4
index 58ab990b3..c530b8543 100644
--- a/config/cvc4.m4
+++ b/config/cvc4.m4
@@ -96,7 +96,7 @@ AC_MSG_CHECKING([whether $CXX supports $1])
 cvc4_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS $1"
 AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([int main() { return 0; }],
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])],
                   [AC_MSG_RESULT([yes]); $2='$1'],
                   [AC_MSG_RESULT([no])])
 AC_LANG_POP([C++])
diff --git a/config/readline.m4 b/config/readline.m4
index 42c85d47d..6cfe6a982 100644
--- a/config/readline.m4
+++ b/config/readline.m4
@@ -33,8 +33,8 @@ else
       cvc4_save_LDFLAGS="$LDFLAGS"
       LDFLAGS="-static $LDFLAGS"
       LIBS="$READLINE_LIBS $LIBS"
-      AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <readline/readline.h>],
-                                     [readline("")]),
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <readline/readline.h>],
+                                     [readline("")])],
         [ AC_MSG_RESULT([yes, it works])
           with_readline=yes ],
         [ AC_MSG_RESULT([no])