Added --enable-bind-install

4 files changed, 58 insertions, 2 deletions

diff --git a/RELNOTES b/RELNOTES
index 283d5a5e..2f845aea 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -117,6 +117,13 @@ by Eric Young (eay@cryptsoft.com).
   configure --with-libbind).
   [ISC-Bugs #43285]
 
+- Added --enable-bind-install to install embedded bind includes and
+  libraries. Default is to not install them (it was the previous
+  behavior). If you'd like to change the includedir and/or libdir
+  installation directories you must pass them using the
+  --with-bind-extra-config configuration arguments.
+  [ISC-Bugs #39318]
+
 			Changes since 4.3.0 (bug fixes)
 
 - Tidy up several small tickets.
diff --git a/configure b/configure
index 975ec212..1297e92e 100755
--- a/configure
+++ b/configure
@@ -627,6 +627,8 @@ LTLIBOBJS
 LIBOBJS
 LDAP_CFLAGS
 LDAP_LIBS
+INSTALL_BIND_FALSE
+INSTALL_BIND_TRUE
 HAVE_BINDDIR_FALSE
 HAVE_BINDDIR_TRUE
 DISTCHECK_LIBBIND_CONFIGURE_FLAG
@@ -785,6 +787,7 @@ enable_epoll
 enable_devpoll
 with_bind_extra_config
 with_libbind
+enable_bind_install
 with_ldap
 with_ldapcrypto
 with_ldap_gssapi
@@ -1451,6 +1454,7 @@ Optional Features:
   --enable-kqueue         use BSD kqueue (default is no)
   --enable-epoll          use Linux epoll (default is no)
   --enable-devpoll        use /dev/poll (default is no)
+  --enable-bind-install   install bind includes and libraries (default is no).
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -6983,6 +6987,24 @@ else
 fi
 
 
+# Check whether --enable-bind_install was given.
+if test "${enable_bind_install+set}" = set; then :
+  enableval=$enable_bind_install;
+fi
+
+if test "$enable_bind_install" = "yes" -a "$use_libbind" != "no"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-bind-install does nothing when --with-libbind is set" >&5
+$as_echo "$as_me: WARNING: --enable-bind-install does nothing when --with-libbind is set" >&2;}
+fi
+ if test "$enable_bind_install" = "yes"; then
+  INSTALL_BIND_TRUE=
+  INSTALL_BIND_FALSE='#'
+else
+  INSTALL_BIND_TRUE='#'
+  INSTALL_BIND_FALSE=
+fi
+
+
 # OpenLDAP support.
 
 # Check whether --with-ldap was given.
@@ -7516,6 +7538,10 @@ if test -z "${HAVE_BINDDIR_TRUE}" && test -z "${HAVE_BINDDIR_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_BINDDIR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${INSTALL_BIND_TRUE}" && test -z "${INSTALL_BIND_FALSE}"; then
+  as_fn_error $? "conditional \"INSTALL_BIND\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/configure.ac b/configure.ac
index 94cde26d..93864421 100644
--- a/configure.ac
+++ b/configure.ac
@@ -798,6 +798,13 @@ AC_SUBST(BINDLIBISCDIR)
 AC_SUBST(DISTCHECK_LIBBIND_CONFIGURE_FLAG)
 AM_CONDITIONAL(HAVE_BINDDIR, test "$use_libbind" = "no")
 
+AC_ARG_ENABLE(bind_install,
+	AS_HELP_STRING([--enable-bind-install],[install bind includes and libraries (default is no).]))
+if test "$enable_bind_install" = "yes" -a "$use_libbind" != "no"; then
+	AC_MSG_WARN([--enable-bind-install does nothing when --with-libbind is set])
+fi
+AM_CONDITIONAL(INSTALL_BIND, test "$enable_bind_install" = "yes")
+
 # OpenLDAP support.
 AC_ARG_WITH(ldap,
     AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]),
diff --git a/util/Makefile.bind.in b/util/Makefile.bind.in
index 91596524..b98e2bee 100644
--- a/util/Makefile.bind.in
+++ b/util/Makefile.bind.in
@@ -95,8 +95,24 @@ clean:
 	@echo Cleaning BIND library.
 	rm -rf ${bindsrcdir} ${cleandirs} ${cleanfiles}
 
+@INSTALL_BIND_FALSE@install:
+@INSTALL_BIND_TRUE@install: install-bind
+@INSTALL_BIND_FALSE@uninstall:
+@INSTALL_BIND_TRUE@uninstall: uninstall-bind
+
+install-bind: all
+	@for libdir in ${bindlibs} ; do   \
+	 (cd ${bindsrcdir}/lib/$$libdir ; \
+	  $(MAKE) install) ;              \
+	 done
+
+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 install installcheck uninstall:
-
+check distdir distclean dvi installcheck: