From 06e266745d3621a11da7860de45b6533de96f55c Mon Sep 17 00:00:00 2001
From: Tim King <taking@google.com>
Date: Mon, 1 Feb 2016 11:43:31 -0800
Subject: [PATCH] Removing the CVC4_NEEDS_REPLACEMENT_FUNCTIONS guard to have a
 simpler build process.

---
 src/Makefile.am        |  2 --
 src/compat/Makefile.am |  6 +-----
 src/lib/Makefile.am    |  3 +--
 src/main/Makefile.am   | 11 +++--------
 src/parser/Makefile.am |  6 +-----
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3f573f55e..fc346ded5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -437,10 +437,8 @@ libcvc4_la_LIBADD += \
 	@top_builddir@/proofs/signatures/libsignatures.la
 endif
 
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
 libcvc4_la_LIBADD += \
 	@builddir@/lib/libreplacements.la
-endif
 
 if CVC4_USE_GLPK
 libcvc4_la_LIBADD += $(GLPK_LIBS)
diff --git a/src/compat/Makefile.am b/src/compat/Makefile.am
index ebb13426d..df4603a9a 100644
--- a/src/compat/Makefile.am
+++ b/src/compat/Makefile.am
@@ -26,12 +26,8 @@ libcvc4compat_la_LDFLAGS = \
 
 libcvc4compat_la_LIBADD = \
 	@builddir@/../libcvc4.la \
-	@builddir@/../parser/libcvc4parser.la
-
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
-libcvc4compat_la_LIBADD += \
+	@builddir@/../parser/libcvc4parser.la \
 	@builddir@/../lib/libreplacements.la
-endif
 
 libcvc4compat_la_SOURCES = \
 	cvc3_compat.h \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 8d5d63924..8db3d664c 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -4,11 +4,10 @@ AM_CPPFLAGS = \
 AM_CFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
 noinst_LTLIBRARIES = libreplacements.la
-endif
 
 libreplacements_la_SOURCES =
+
 libreplacements_la_LIBADD = \
 	$(LTLIBOBJS)
 
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 478d3f3ee..372e817f6 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -30,11 +30,9 @@ pcvc4_LDADD = \
 	libmain.a \
 	@builddir@/../parser/libcvc4parser.la \
 	@builddir@/../libcvc4.la \
-	$(READLINE_LIBS)
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
-pcvc4_LDADD += \
+	$(READLINE_LIBS) \
 	@builddir@/../lib/libreplacements.la
-endif
+
 pcvc4_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) -DPORTFOLIO_BUILD
 pcvc4_LDADD += $(BOOST_THREAD_LIBS)
 pcvc4_LDADD += $(BOOST_THREAD_LDFLAGS)
@@ -54,11 +52,8 @@ cvc4_LDADD = \
 	libmain.a \
 	@builddir@/../parser/libcvc4parser.la \
 	@builddir@/../libcvc4.la \
-	$(READLINE_LIBS)
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
-cvc4_LDADD += \
+	$(READLINE_LIBS) \
 	@builddir@/../lib/libreplacements.la
-endif
 
 BUILT_SOURCES = \
 	$(TOKENS_FILES)
diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index 18e77fab3..ca10de684 100644
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -29,12 +29,8 @@ libcvc4parser_la_LIBADD = \
 	@builddir@/smt2/libparsersmt2.la \
 	@builddir@/tptp/libparsertptp.la \
 	@builddir@/cvc/libparsercvc.la \
-	@builddir@/../libcvc4.la
-
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
-libcvc4parser_la_LIBADD += \
+	@builddir@/../libcvc4.la \
 	@builddir@/../lib/libreplacements.la
-endif
 
 libcvc4parser_la_SOURCES = \
 	antlr_input.cpp \
-- 
2.30.2