fix last commit gcc options (-wunknown-pragmas ==> -Wno-unknown-pragmas)

diff --git a/Makefile.am b/Makefile.am
index fbd66a536f4f3bd4bbcfac8b57b65261b960a99d..4048b1b41d7ba284a9f82d5a2284faf38bd7341d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/doxygen.am
 
-AM_CXXFLAGS = -Wall -wunknown-pragmas
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas
 
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I config

diff --git a/src/Makefile.am b/src/Makefile.am
index 98b05e23c6abb89093b3d11a9ba385358670e87c..a805f8c85f62049ae7f1180b50bf1042f341feb7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ LIBCVC4_VERSION = @CVC4_LIBRARY_VERSION@
 AM_CPPFLAGS =
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/include -I@srcdir@
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 SUBDIRS = expr util context theory prop smt . parser main
 

diff --git a/src/context/Makefile.am b/src/context/Makefile.am
index 549cf54cfaa7ccffc049a2f7e56dbc2b18ffbc46..3d912e6855010b186a7498d8080c3b925376ae1c 100644 (file)
--- a/src/context/Makefile.am
+++ b/src/context/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libcontext.la
 

diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am
index fa1a1b082bc8bcfe234d81069c79f93a54022df6..2b5bdbdb3fd11846546872e479c9b03833549e87 100644 (file)
--- a/src/expr/Makefile.am
+++ b/src/expr/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libexpr.la
 

diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 6d6adade2acc981ed050a2c74a013347bdfdeec8..9ffa43ca0b97e853094285f2420122a1efbcd289 100644 (file)
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
        -I@srcdir@/../include -I@srcdir@/.. $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall -wunknown-pragmas
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas
 
 bin_PROGRAMS = cvc4
 

diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index 87b0f9f9d186faefab86f59936d60e5c3ffc40f7..a323ec3cbc4f2c21618b76bfb029a9e4fdfb76e0 100644 (file)
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -15,7 +15,7 @@ LIBCVC4PARSER_VERSION = @CVC4_PARSER_LIBRARY_VERSION@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4PARSERLIB \
        -I@srcdir@/../include -I@srcdir@/.. $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 SUBDIRS = smt smt2 cvc
 

diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am
index c08c6d694347ecaed3313d23bf59a644c519bfde..9754c1063a3403410e05029543ffa137bf3c1f59 100644 (file)
--- a/src/parser/cvc/Makefile.am
+++ b/src/parser/cvc/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4PARSERLIB \
        -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable
 
 # Compile generated C files using C++ compiler
 CC=$(CXX)

diff --git a/src/parser/smt/Makefile.am b/src/parser/smt/Makefile.am
index a349273e0d987057540f11b9692b23c489db1b5d..418b204dc912a3f694fd9890ead7f2f777604a03 100644 (file)
--- a/src/parser/smt/Makefile.am
+++ b/src/parser/smt/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4PARSERLIB \
        -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable
 
 # Compile generated C files using C++ compiler
 AM_CFLAGS = $(AM_CXXFLAGS)

diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am
index 97583c12ba3c6fa17f8ba38678fb7ab377db9076..3066f22474b83523466dff30ac48bd27a3dd1f00 100644 (file)
--- a/src/parser/smt2/Makefile.am
+++ b/src/parser/smt2/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4PARSERLIB \
        -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable
 
 # Compile generated C files using C++ compiler
 AM_CFLAGS = $(AM_CXXFLAGS)

diff --git a/src/prop/Makefile.am b/src/prop/Makefile.am
index a441773e8be0f65a4e7df6b816326800153f1a41..48c9c3fd2ef5ca89a007a5565ef5598aef8345ed 100644 (file)
--- a/src/prop/Makefile.am
+++ b/src/prop/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libprop.la
 

diff --git a/src/prop/minisat/Makefile.am b/src/prop/minisat/Makefile.am
index 829a705f530e64eac8805c614d51d51fb4b2b828..77d1d602e6c047fc2e604878fae7ecb2318721aa 100644 (file)
--- a/src/prop/minisat/Makefile.am
+++ b/src/prop/minisat/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/mtl -I@srcdir@/core -I@srcdir@/../.. -I@srcdir@/../../include
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -DNDEBUG
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -DNDEBUG
 
 noinst_LTLIBRARIES = libminisat.la
 libminisat_la_SOURCES = \

diff --git a/src/smt/Makefile.am b/src/smt/Makefile.am
index 21140e86d079aa0f4ebbbe49f2f1156f8659fc06..72dd8f3dff9d59cd63de8fc3c1170e22778a6a42 100644 (file)
--- a/src/smt/Makefile.am
+++ b/src/smt/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libsmt.la
 

diff --git a/src/theory/Makefile.am b/src/theory/Makefile.am
index ca0ade6cd403593fdc14c86e38885a384f01d179..7cfc1571b976562902c8423943c2cbb9463f85cc 100644 (file)
--- a/src/theory/Makefile.am
+++ b/src/theory/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libtheory.la
 

diff --git a/src/theory/arith/Makefile.am b/src/theory/arith/Makefile.am
index 51b63acd3579fc3e622152b5245161b475db3120..83d44e285a2dd2a04b67264d0bf12804607ddcd3 100644 (file)
--- a/src/theory/arith/Makefile.am
+++ b/src/theory/arith/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../../include -I@srcdir@/../..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libarith.la
 

diff --git a/src/theory/arrays/Makefile.am b/src/theory/arrays/Makefile.am
index 34d29c23725a7016e80d901e4b74324d4ab7beb7..84b9faaf42d2c041daa14bebebd97b8d5d11e23c 100644 (file)
--- a/src/theory/arrays/Makefile.am
+++ b/src/theory/arrays/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../../include -I@srcdir@/../..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libarrays.la
 

diff --git a/src/theory/booleans/Makefile.am b/src/theory/booleans/Makefile.am
index 5de781b7f040507543316e253ad40e2f9833d6c6..478fca1cf9d8c7642cd30ee0cf3c76582234c015 100644 (file)
--- a/src/theory/booleans/Makefile.am
+++ b/src/theory/booleans/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../../include -I@srcdir@/../..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libbooleans.la
 

diff --git a/src/theory/bv/Makefile.am b/src/theory/bv/Makefile.am
index cf1012e8690dbc28728bac2ca51aa0b96b3f6fa3..94941d406e0f4b245e7e8d47c966a91e6f02be91 100644 (file)
--- a/src/theory/bv/Makefile.am
+++ b/src/theory/bv/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../../include -I@srcdir@/../..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libbv.la
 

diff --git a/src/theory/uf/Makefile.am b/src/theory/uf/Makefile.am
index 2dadef309e2d2cadae38090e84ffb051b4d41ff2..39586345be7644d6f3d8697505bc81e2c94b570e 100644 (file)
--- a/src/theory/uf/Makefile.am
+++ b/src/theory/uf/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../../include -I@srcdir@/../..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libuf.la
 

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index b60d61e994a21e3410b76a68940ed50eeca6ee31..88d4fc56ebd700f28fa66e119b5f7c3b8c167092 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4LIB \
        -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libutil.la
 

diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index a5ba6b3a1e67f3299447f1454577581242b14d4a..9f8379d5437156fcec5a23f81607eb4d9369ec0f 100644 (file)
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -45,7 +45,7 @@ if HAVE_CXXTESTGEN
 AM_CPPFLAGS = \
        -I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src" \
        $(ANTLR_INCLUDES) $(TEST_CPPFLAGS)
-AM_CXXFLAGS = -Wall -wunknown-pragmas $(TEST_CXXFLAGS)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(TEST_CXXFLAGS)
 AM_LDFLAGS = $(TEST_LDFLAGS)
 
 AM_CXXFLAGS_WHITE = -fno-access-control -D__BUILDING_CVC4LIB_UNIT_TEST -D__BUILDING_CVC4PARSERLIB_UNIT_TEST