Description: Use minisat from Debian package
Author: Michael Tautschnig <mt@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- cbmc-4.0.orig/src/cbmc/Makefile	2011-05-18 15:20:44.000000000 +0200
+++ cbmc-4.0/src/cbmc/Makefile	2011-06-14 19:33:36.000000000 +0200
@@ -54,7 +54,7 @@
 
 INCLUDES= -I ..
 
-LIBS =
+LIBS = -lminisat
 
 CBMC_VERSION_FILES = cbmc_solvers$(OBJEXT)
 
--- cbmc-4.4.orig/src/goto-instrument/Makefile
+++ cbmc-4.4/src/goto-instrument/Makefile
@@ -92,7 +92,7 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \

 INCLUDES= -I ..

-LIBS =
+LIBS = -lminisat

 CLEANFILES = goto-instrument$(EXEEXT) goto-instrument$(LIBEXT)

include ../config.inc
include ../common
--- cbmc-4.0.orig/src/solvers/Makefile	2011-05-11 13:27:04.000000000 +0200
+++ cbmc-4.0/src/solvers/Makefile	2011-06-14 19:33:36.000000000 +0200
@@ -17,7 +17,6 @@
 ifneq ($(MINISAT2),)
   MINISAT2_SRC=sat/satcheck_minisat2.cpp
   MINISAT2_INCLUDE=-I $(MINISAT2)
-  MINISAT2_LIB=$(MINISAT2)/minisat/simp/SimpSolver$(OBJEXT) $(MINISAT2)/minisat/core/Solver$(OBJEXT)
   CP_CXXFLAGS += -DHAVE_MINISAT2 -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
   CLEANFILES += $(MINISAT2_LIB) $(patsubst %$(OBJEXT), %.d, $(MINISAT2_LIB))
 endif
@@ -219,7 +218,7 @@
 ###############################################################################
 
 solvers$(LIBEXT): $(OBJ) $(SOLVER_LIB)
-	$(LINKLIB) $(LIBSOLVER)
+	$(LINKLIB)
 
 smt2_solver$(EXEEXT): $(OBJ) smt2/smt2_solver$(OBJEXT) \
 	../util/util$(LIBEXT) ../langapi/langapi$(LIBEXT) ../big-int/big-int$(LIBEXT) $(SOLVER_LIB)
--- cbmc-4.0.orig/jbmc/src/jbmc/Makefile	2011-05-11 13:27:04.000000000 +0200
+++ cbmc-4.0/jbmc/src/jbmc/Makefile	2011-06-14 19:33:36.000000000 +0200
@@ -53,7 +53,7 @@

 INCLUDES= -I .. -I ../$(CPROVER_DIR)/src

-LIBS =
+LIBS = -lminisat

 include ../config.inc
 include ../$(CPROVER_DIR)/src/config.inc
