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>

Index: cbmc-4.0/src/config.inc
===================================================================
--- cbmc-4.0.orig/src/config.inc	2011-06-14 19:33:12.000000000 +0200
+++ cbmc-4.0/src/config.inc	2011-06-14 19:34:06.000000000 +0200
@@ -8,6 +8,6 @@
 #CHAFF = ../../zChaff
 #BOOLEFORCE = ../../booleforce-0.4
 #MINISAT = ../../MiniSat-p_v1.14
-MINISAT2 = ../../../../minisat-2.2.0
+MINISAT2 = /usr/include/minisat
 #SMVSAT =
 
Index: cbmc-4.0/src/cbmc/Makefile
===================================================================
--- 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
@@ -17,7 +17,7 @@
 
 INCLUDES= -I .. -I ../util
 
-LIBS =
+LIBS = -lminisat
 
 include ../config.inc
 include ../common
Index: cbmc-4.0/src/solvers/Makefile
===================================================================
--- 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,7 @@
 ifneq ($(MINISAT2),)
   MINISAT2_SRC=sat/satcheck_minisat2.cpp
   MINISAT2_INCLUDE=-I $(MINISAT2)
-  MINISAT2_LIB=$(MINISAT2)/simp/SimpSolver$(OBJEXT) $(MINISAT2)/core/Solver$(OBJEXT)
+  # MINISAT2_LIB=$(MINISAT2)/simp/SimpSolver$(OBJEXT) $(MINISAT2)/core/Solver$(OBJEXT)
   CP_CXXFLAGS += -DHAVE_MINISAT2 -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
   CXXFLAGS := $(filter-out -pedantic, $(CXXFLAGS))
 endif
