[SCM] conflict-driven nogood learning answer set solver branch, master, updated. 68d97c5e70994d5565f68dd1e5ad06dcb6587914

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit 5d13dde173501f281b55c7452f4e09d389f98880
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Fri Jul 1 06:27:56 2011 +0200

    New upstream release.

diff --git a/debian/patches/clasp-ld-as-needed.patch b/debian/patches/clasp-ld-as-needed.patch
deleted file mode 100644
index 17669f4..0000000
--- a/debian/patches/clasp-ld-as-needed.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Fix build failure with ld --as-needed.
-Author: Stefano Rivera <stefanor at ubuntu.com>
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3324430&group_id=238741&atid=1107486
-Last-Update: 2011-06-22
---- a/configure.sh
-+++ b/configure.sh
-@@ -11,6 +11,7 @@
- CONFIG=""
- # CONFIGURATION
- LDFLAGS=""
-+LIBS=""
- BUILDPATH=""
- CXXFLAGS=""
- INSTALLPATH=""
-@@ -166,7 +167,7 @@
- 		exit 1
- 	fi
- 	CXXFLAGS="${CXXFLAGS} -I${TBB_INCLUDE}"
--	LDFLAGS="${LDFLAGS} -ltbb -L${TBB_LIB}"
-+	LIBS="${LIBS} -ltbb -L${TBB_LIB}"
- 	if [[ $rpath == 1 ]]; then
- 		LDFLAGS="${LDFLAGS} -Xlinker \"--rpath=${TBB_LIB}\""
- 	fi
-@@ -195,6 +196,7 @@
- ROOTPATH="../.."
- LIB_CLASP="libclasp"
- LIB_OPTS="libprogram_opts"
-+LIBS="${LIB_CLASP}/lib/${LIB_CLASP}.a ${LIB_OPTS}/lib/${LIB_OPTS}.a ${LIBS}"
- mkdir -p $BUILDPATH/app
- mkdir -p $BUILDPATH/bin
- mkdir -p $BUILDPATH/$LIB_CLASP/lib
-@@ -213,6 +215,7 @@
- echo "CXXFLAGS    := ${CXXFLAGS}" >> FLAGS
- echo "WARNFLAGS   := -W -Wall"    >> FLAGS
- echo "LDFLAGS     := ${LDFLAGS}"  >> FLAGS
-+echo "LIBS        := ${LIBS}"     >> FLAGS
- echo ""                           >> FLAGS
- 
- # create Makefiles
-@@ -231,7 +234,7 @@
- echo "OUT_DIR      := app"                  >> .CONFIG
- echo "INCLUDES     := -I\$(PROJECT_ROOT)/${LIB_CLASP} -I\$(PROJECT_ROOT)/${LIB_OPTS}" >> .CONFIG
- echo "SUBDIRS      := ${LIB_CLASP} ${LIB_OPTS}"  >> .CONFIG
--echo "LIBS         := ${LIB_CLASP}/lib/${LIB_CLASP}.a ${LIB_OPTS}/lib/${LIB_OPTS}.a" >> .CONFIG
-+echo "LIBS         := ${LIBS}"              >> .CONFIG
- echo "INSTALL_DIR  := ${INSTALLPATH}"       >> .CONFIG
- if [ ! -z "$POST_BUILD" ]; then
- echo "POST_BUILD  := $POST_BUILD"           >> .CONFIG

-- 
conflict-driven nogood learning answer set solver