Merged rt43474 (before release tuning: -libisccc +uninstall)

diff --git a/configure.ac+lt b/configure.ac+lt
index 6fa7edba0d9334ba3c92764a4f43d3ae44953f0f..e8c0b16af2052c09e0a902aed674abf2482896c8 100644 (file)
--- a/configure.ac+lt
+++ b/configure.ac+lt
@@ -854,8 +854,7 @@ fi
 DHLIBS=LTLIBRARIES
 A=la
 BINDLT="--with-libtool --disable-symtable"
-# BIND does not provide uninstall
-DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool --disable-bind-install"
+DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool"
 
 
 AC_SUBST(DHLIBS)

diff --git a/configure.ac-base b/configure.ac-base
index 8cf37969f74e1ec1a2221caddf2fd2dcc2b131fc..89d3fbffd7cd552074d21001e9161d75dc2f2945 100644 (file)
--- a/configure.ac-base
+++ b/configure.ac-base
@@ -867,8 +867,7 @@ fi
 DHLIBS=LTLIBRARIES
 A=la
 BINDLT="--with-libtool --disable-symtable"
-# BIND does not provide uninstall
-DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool --disable-bind-install"
+DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool"
 @END WITH LIBTOOL
 
 @BEGIN WITHOUT LIBTOOL

diff --git a/util/Makefile.bind.in b/util/Makefile.bind.in
index 02be6ace55f6247e1f7e3d9f67d3e6c5b65d3837..bfb8bbf7afe37ad54ffb6f95e7fbd94d4bc2ba69 100644 (file)
--- a/util/Makefile.bind.in
+++ b/util/Makefile.bind.in
@@ -30,8 +30,7 @@ bindconfig = --without-openssl --without-libxml2 --without-libjson \
 @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf
 cleanfiles = ./configure.log ./build.log ./install.log
 
-# isccfg depends on isccc?!
-bindlibs = isc dns isccc isccfg irs
+bindlibs = isc dns isccfg irs
 installdirs = includedir=${binddir}/include libdir=${binddir}/lib
 
 @BIND_ATF_FALSE@all: bind1 bind2
@@ -106,7 +105,16 @@ install-bind: all
          $(MAKE) install) ;              \
         done
 
+@INSTALL_BIND_FALSE@uninstall:
+@INSTALL_BIND_TRUE@uninstall: uninstall-bind
+
+uninstall-bind: all
+       @for libdir in ${bindlibs} ; do   \
+        (cd ${bindsrcdir}/lib/$$libdir ; \
+         $(MAKE) uninstall) ;            \
+        done
+
 # Include the following so that this Makefile is happy when the parent
 # tries to use them.
 
-check distdir distclean dvi installcheck uninstall:
+check distdir distclean dvi installcheck: