Finished merge of rt43227 (substitutions in Makefile.bind)

diff --cc RELNOTES
index 46bb33034f24d62e41922d79992b46e27864dee3,9d50e8ac53aa9ba600c2571cbd5c78cfac334e9f..f02df24b6dd20033b9d7e02168413aaa7fb52be3
--- 1/RELNOTES
--- 2/RELNOTES
+++ b/RELNOTES
@@@ -63,26 -63,14 +63,31 @@@ by Eric Young (eay@cryptsoft.com)
  - Removed an extraneous expression in omapi socket callback function. Prior
    to this change, the logic was techinically incorrect but other factors
    ensured the outcome itself was correct.  This change was made primarily
 -  for code clarity.
 +  for code clarity. Thanks to Ganesh Pinjala for bringing the issue to our
 +  attention.
    [ISC-Bugs #42834]
  
 +- Corrected a bug which could cause the server to sporadically crash while
 +  loading lease files with the lease-id-format is set to "hex".  Our thanks
 +  to Jay Ford, University of Iowa for reporting the issue.
 +  [ISC-Bugs #43185]
 +
 +- Pass configure arguments which begin with an upper case letter, e.g.
 +  CFLAGS, to the embedded bind configure, so it is no longer required
 +  to use environment variables to get the same effect.
 +  [ISC-Bugs #35143]
 +
 +- Added --enable-kqueue, --enable-epoll, --enable-devpoll and a more
 +  general --with-bind-extra-config to pass extra options to the
 +  embedded bind configure. Note we had mixed experiences with this
 +  so it is at the user risk, i.e., they are NOT SUPPORTED yet.
 +  [ISC-Bugs #20890]
 +
+ - Changed the way the embedded bind Makefile is updated by configure.
+   The only user visible side effect is that --with-libbind now requires
+   either "no" or an (absolute) path, i.e. "yes" is no longer valid.
+   [ISC-Bugs #43227]
+ 
                        Changes since 4.3.0 (bug fixes)
  
  - Tidy up several small tickets.

diff --cc configure
index 66f5b27800fb5f3a44441d0077d5d013d7b67630,e07023c6ecade90a7501b2898db91aea4db95c18..903354345c510c94db9b94898a45199e05413b77
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -627,9 -627,10 +627,11 @@@ LTLIBOBJ
  LIBOBJS
  LDAP_CFLAGS
  LDAP_LIBS
+ BINDVERSION
+ BINDBIND
  BINDSRCDIR
  BINDDIR
 +BINDIOMUX
  ac_prefix_program
  DISTCHECK_ATF_CONFIGURE_FLAG
  HAVE_ATF_FALSE
@@@ -1481,11 -1475,7 +1483,10 @@@ Optional Packages
                            File for dhcrelay6 process information (default is
                            LOCALSTATEDIR/run/dhcrelay6.pid)
    --with-randomdev=PATH   Path for random device (default is /dev/random)
-   --with-libbind=PATH     bind includes and libraries are in PATH (default is
-                           ./bind)
 +  --with-bind-extra-config
 +                          configure bind librairies with some extra options
 +                          (default is none)
+   --with-libbind=PATH     bind includes and libraries are in PATH
    --with-ldap             enable OpenLDAP support in dhcpd (default is no)
    --with-ldapcrypto       enable OpenLDAP crypto support in dhcpd (default is
                            no)

diff --cc configure.ac
Simple merge

diff --cc util/Makefile.bind.in
index 8620a20d0bcd787a7f14a8a430a40b66f671ff69,25cf5c3219a426cd584f8f539da5c3f84a5e981b..eb500d5c4bd00db8d9f234aecbe7c071e3acf403
--- 1/util/Makefile.bind.in
--- 2/util/Makefile.bind.in
+++ b/util/Makefile.bind.in
@@@ -15,23 -15,15 +15,16 @@@
  
  # Configure and build the bind libraries for use by DHCP
  
- include ./version.tmp
- version=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
- 
- # bindvar.tmp is constructed by configure, it has the paths for bind
- # if GMAKE is blank the shell script couldn't find a gmake to use.
- # binddir=
- # GMAKE=
- include ./bindvar.tmp
- 
+ binddir=@BINDBIND@
+ version=@BINDVERSION@
  bindsrcdir=bind-${version}
  
 -bindconfig = --disable-kqueue --disable-epoll --disable-devpoll \
 -      --without-openssl --without-libxml2 --enable-exportlib \
 -      --with-gssapi=no --enable-threads=no @BINDCONFIG@ \
 +bindconfig = --without-openssl --without-libxml2 \
 +      --without-gssapi --disable-threads \
 +      --enable-exportlib \
        --with-export-includedir=${binddir}/include \
 -      --with-export-libdir=${binddir}/lib
 +      --with-export-libdir=${binddir}/lib \
 +      @BINDIOMUX@ @BINDCONFIG@ --enable-full-report
  
  @BIND_ATF_FALSE@cleandirs = ./lib ./include
  @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf