fixing some build systme warnings
authorDejan Jovanović <dejan.jovanovic@gmail.com>
Fri, 30 Mar 2012 01:44:43 +0000 (01:44 +0000)
committerDejan Jovanović <dejan.jovanovic@gmail.com>
Fri, 30 Mar 2012 01:44:43 +0000 (01:44 +0000)
config/antlr.m4
config/cvc4.m4
config/readline.m4

index 27e9200e5714efcafc28be3ed82effbe78405235..18b2eff733000d0fdc0545fde64769754f210d64 100644 (file)
@@ -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)])
             ],
index 58ab990b38ba5913b8e6987cba264f77ce2e4d97..c530b8543a12832c3c9fa92d211657d5adafd832 100644 (file)
@@ -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++])
index 42c85d47d11b569506ca12aa0a9d19c0f6f9682e..6cfe6a982a4dde8051735808d79942a4b40a8558 100644 (file)
@@ -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])