aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-19 21:47:47 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-19 22:44:12 +0000
commit01405546b62b06ae323c80c35d13b66530f6994a (patch)
tree57e8bdb8694020bd56f9d43b0cee943684eee031
parent9919f58a2a62926488d6502dd86c42a2c408d064 (diff)
downloadpaludis-01405546b62b06ae323c80c35d13b66530f6994a.tar.gz
paludis-01405546b62b06ae323c80c35d13b66530f6994a.tar.xz
New resolver is no longer optional
-rw-r--r--configure.ac11
-rw-r--r--paludis/resolver/Makefile.am2
2 files changed, 0 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index a743bb3..5f195a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,6 @@ dnl }}}
need_xml_check=
need_pcrecpp_check=
need_libarchive_check=
-need_resolver=
need_sqlite3_check=
need_jansson_check=
need_stripper_check=
@@ -1559,7 +1558,6 @@ AC_SUBST([ALL_CLIENTS_HTML])
AC_SUBST([BUILD_CLIENTS])
if echo $clients | tr ' ' '\n' | grep '^cave$' >/dev/null ; then
- need_resolver=yes
need_pcrecpp_check=yes
fi
dnl }}}
@@ -1582,15 +1580,6 @@ fi
dnl }}}
-dnl {{{ new resolver
-
-if test "x$need_resolver" = "xyes" ; then
- AC_DEFINE([ENABLE_NEW_RESOLVER], [1], [Enable new resolver])
-fi
-AM_CONDITIONAL([ENABLE_NEW_RESOLVER], test "x$need_resolver" = "xyes")
-
-dnl }}}
-
dnl {{{ libxml2 check
NEED_XML=$need_xml_check
if test "x$need_xml_check" = "xyes" ; then
diff --git a/paludis/resolver/Makefile.am b/paludis/resolver/Makefile.am
index 0e38b03..db13db6 100644
--- a/paludis/resolver/Makefile.am
+++ b/paludis/resolver/Makefile.am
@@ -175,7 +175,6 @@ if ENABLE_VIRTUALS_REPOSITORY
virtuals_tests = resolver_TEST_virtuals
endif
-if ENABLE_NEW_RESOLVER
noinst_LIBRARIES = libpaludisresolver.a
TESTS = \
@@ -191,7 +190,6 @@ TESTS = \
resolver_TEST_fetches \
resolver_TEST_purges \
$(virtuals_tests)
-endif
check_PROGRAMS = $(TESTS)