9.5.0b2

1 files changed, 164 insertions, 72 deletions

diff --git a/configure b/configure
index 1024c086..3401f47f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1996-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.418 2007/09/14 03:40:36 marka Exp $
+# $Id: configure,v 1.418.60.4 2008/01/24 02:41:48 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.432 .
+# From configure.in Revision: 1.432.60.5 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -978,6 +978,7 @@ ISC_PLATFORM_BRACEPTHREADONCEINIT
 ISC_PLATFORM_HAVESTRINGSH
 ISC_PLATFORM_HAVEIFNAMETOINDEX
 ISC_PLATFORM_HAVEXADD
+ISC_PLATFORM_HAVEXADDQ
 ISC_PLATFORM_HAVECMPXCHG
 ISC_PLATFORM_HAVEATOMICSTORE
 ISC_PLATFORM_USEGCCASM
@@ -1654,6 +1655,7 @@ Optional Packages:
                           both]
   --with-tags[=TAGS]      include additional configurations [automatic]
   --with-kame=PATH	use Kame IPv6 default path /usr/local/v6
+  --with-docbook-xsl=PATH    Specify path for Docbook-XSL stylesheets
   --with-idn=MPREFIX   enable IDN support using idnkit default PREFIX
   --with-libiconv=IPREFIX   GNU libiconv are in IPREFIX default PREFIX
   --with-iconv=LIBSPEC   specify iconv library default -liconv
@@ -4519,6 +4521,66 @@ _ACEOF
     ;;
 esac
 
+{ echo "$as_me:$LINENO: checking for working volatile" >&5
+echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; }
+if test "${ac_cv_c_volatile+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+volatile int x;
+int * volatile y = (int *) 0;
+return !x && !y;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_volatile=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_volatile=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
+echo "${ECHO_T}$ac_cv_c_volatile" >&6; }
+if test $ac_cv_c_volatile = no; then
+
+cat >>confdefs.h <<\_ACEOF
+#define volatile
+_ACEOF
+
+fi
+
 { echo "$as_me:$LINENO: checking for sysctlbyname" >&5
 echo $ECHO_N "checking for sysctlbyname... $ECHO_C" >&6; }
 if test "${ac_cv_func_sysctlbyname+set}" = set; then
@@ -9519,7 +9581,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9522 "configure"' > conftest.$ac_ext
+  echo '#line 9584 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11641,11 +11703,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11644: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11706: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11648: \$? = $ac_status" >&5
+   echo "$as_me:11710: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11884,11 +11946,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11887: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11949: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11891: \$? = $ac_status" >&5
+   echo "$as_me:11953: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11944,11 +12006,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11947: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12009: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11951: \$? = $ac_status" >&5
+   echo "$as_me:12013: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14092,7 +14154,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14095 "configure"
+#line 14157 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14190,7 +14252,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14193 "configure"
+#line 14255 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16383,11 +16445,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16386: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16448: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16390: \$? = $ac_status" >&5
+   echo "$as_me:16452: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -16443,11 +16505,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16446: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16508: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16450: \$? = $ac_status" >&5
+   echo "$as_me:16512: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17771,7 +17833,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17774 "configure"
+#line 17836 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17869,7 +17931,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17872 "configure"
+#line 17934 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18706,11 +18768,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18709: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18771: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18713: \$? = $ac_status" >&5
+   echo "$as_me:18775: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -18766,11 +18828,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18769: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18831: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18773: \$? = $ac_status" >&5
+   echo "$as_me:18835: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20800,11 +20862,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20803: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20865: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:20807: \$? = $ac_status" >&5
+   echo "$as_me:20869: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -21043,11 +21105,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21046: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21108: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21050: \$? = $ac_status" >&5
+   echo "$as_me:21112: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -21103,11 +21165,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21106: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21168: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:21110: \$? = $ac_status" >&5
+   echo "$as_me:21172: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -23251,7 +23313,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 23254 "configure"
+#line 23316 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -23349,7 +23411,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 23352 "configure"
+#line 23414 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -28886,6 +28948,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   arch=x86_64
+		have_xaddq=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
@@ -28900,6 +28963,7 @@ fi
 
 	;;
 	x86_64-*)
+		have_xaddq=yes
 		arch=x86_64
 	;;
 	alpha*-*)
@@ -29129,6 +29193,13 @@ else
 	ISC_PLATFORM_HAVEATOMICSTORE="#undef ISC_PLATFORM_HAVEATOMICSTORE"
 fi
 
+if test "$have_xaddq" = "yes"; then
+        ISC_PLATFORM_HAVEXADDQ="#define ISC_PLATFORM_HAVEXADDQ 1"
+else
+        ISC_PLATFORM_HAVEXADDQ="#undef ISC_PLATFORM_HAVEXADDQ"
+fi
+
+
 
 
 
@@ -29500,13 +29571,33 @@ fi
 
 
 #
-# Look for Docbook-XSL stylesheets.  Location probably varies by
-# system.  Guessing where it might be found, based on where SGML stuff
-# lives on some systems.  FreeBSD is the only one I'm sure of at the
-# moment.
+# Look for Docbook-XSL stylesheets.  Location probably varies by system.
+# If it's not explicitly specified, guess where it might be found, based on
+# where SGML stuff lives on some systems (FreeBSD is the only one we're sure
+# of at the moment).
 #
+{ echo "$as_me:$LINENO: checking for Docbook-XSL path" >&5
+echo $ECHO_N "checking for Docbook-XSL path... $ECHO_C" >&6; }
 
-docbook_xsl_trees="/usr/pkg/share/xsl /usr/local/share/xsl /usr/share/xsl"
+# Check whether --with-docbook-xsl was given.
+if test "${with_docbook_xsl+set}" = set; then
+  withval=$with_docbook_xsl; docbook_path="$withval"
+else
+  docbook_path="auto"
+fi
+
+case "$docbook_path" in
+auto)
+	{ echo "$as_me:$LINENO: result: auto" >&5
+echo "${ECHO_T}auto" >&6; }
+	docbook_xsl_trees="/usr/pkg/share/xsl/docbook /usr/local/share/xsl/docbook /usr/share/xsl/docbook"
+	;;
+*)
+	docbook_xsl_trees="$withval"
+    	{ echo "$as_me:$LINENO: result: $docbook_xsl_trees" >&5
+echo "${ECHO_T}$docbook_xsl_trees" >&6; }
+	;;
+esac
 
 #
 # Look for stylesheets we need.
@@ -29514,11 +29605,11 @@ docbook_xsl_trees="/usr/pkg/share/xsl /usr/local/share/xsl /usr/share/xsl"
 
 
 XSLT_DOCBOOK_STYLE_HTML=""
-{ echo "$as_me:$LINENO: checking for docbook/html/docbook.xsl" >&5
-echo $ECHO_N "checking for docbook/html/docbook.xsl... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for html/docbook.xsl" >&5
+echo $ECHO_N "checking for html/docbook.xsl... $ECHO_C" >&6; }
 for d in $docbook_xsl_trees
 do
-	f=$d/docbook/html/docbook.xsl
+	f=$d/html/docbook.xsl
 	if test -f $f
 	then
 		XSLT_DOCBOOK_STYLE_HTML=$f
@@ -29531,17 +29622,17 @@ if test "X$XSLT_DOCBOOK_STYLE_HTML" = "X"
 then
 	{ echo "$as_me:$LINENO: result: \"not found\"" >&5
 echo "${ECHO_T}\"not found\"" >&6; };
-	XSLT_DOCBOOK_STYLE_HTML=docbook/html/docbook.xsl
+	XSLT_DOCBOOK_STYLE_HTML=html/docbook.xsl
 fi
 
 
 
 XSLT_DOCBOOK_STYLE_XHTML=""
-{ echo "$as_me:$LINENO: checking for docbook/xhtml/docbook.xsl" >&5
-echo $ECHO_N "checking for docbook/xhtml/docbook.xsl... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for xhtml/docbook.xsl" >&5
+echo $ECHO_N "checking for xhtml/docbook.xsl... $ECHO_C" >&6; }
 for d in $docbook_xsl_trees
 do
-	f=$d/docbook/xhtml/docbook.xsl
+	f=$d/xhtml/docbook.xsl
 	if test -f $f
 	then
 		XSLT_DOCBOOK_STYLE_XHTML=$f
@@ -29554,17 +29645,17 @@ if test "X$XSLT_DOCBOOK_STYLE_XHTML" = "X"
 then
 	{ echo "$as_me:$LINENO: result: \"not found\"" >&5
 echo "${ECHO_T}\"not found\"" >&6; };
-	XSLT_DOCBOOK_STYLE_XHTML=docbook/xhtml/docbook.xsl
+	XSLT_DOCBOOK_STYLE_XHTML=xhtml/docbook.xsl
 fi
 
 
 
 XSLT_DOCBOOK_STYLE_MAN=""
-{ echo "$as_me:$LINENO: checking for docbook/manpages/docbook.xsl" >&5
-echo $ECHO_N "checking for docbook/manpages/docbook.xsl... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for manpages/docbook.xsl" >&5
+echo $ECHO_N "checking for manpages/docbook.xsl... $ECHO_C" >&6; }
 for d in $docbook_xsl_trees
 do
-	f=$d/docbook/manpages/docbook.xsl
+	f=$d/manpages/docbook.xsl
 	if test -f $f
 	then
 		XSLT_DOCBOOK_STYLE_MAN=$f
@@ -29577,17 +29668,17 @@ if test "X$XSLT_DOCBOOK_STYLE_MAN" = "X"
 then
 	{ echo "$as_me:$LINENO: result: \"not found\"" >&5
 echo "${ECHO_T}\"not found\"" >&6; };
-	XSLT_DOCBOOK_STYLE_MAN=docbook/manpages/docbook.xsl
+	XSLT_DOCBOOK_STYLE_MAN=manpages/docbook.xsl
 fi
 
 
 
 XSLT_DOCBOOK_CHUNK_HTML=""
-{ echo "$as_me:$LINENO: checking for docbook/html/chunk.xsl" >&5
-echo $ECHO_N "checking for docbook/html/chunk.xsl... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for html/chunk.xsl" >&5
+echo $ECHO_N "checking for html/chunk.xsl... $ECHO_C" >&6; }
 for d in $docbook_xsl_trees
 do
-	f=$d/docbook/html/chunk.xsl
+	f=$d/html/chunk.xsl
 	if test -f $f
 	then
 		XSLT_DOCBOOK_CHUNK_HTML=$f
@@ -29600,17 +29691,17 @@ if test "X$XSLT_DOCBOOK_CHUNK_HTML" = "X"
 then
 	{ echo "$as_me:$LINENO: result: \"not found\"" >&5
 echo "${ECHO_T}\"not found\"" >&6; };
-	XSLT_DOCBOOK_CHUNK_HTML=docbook/html/chunk.xsl
+	XSLT_DOCBOOK_CHUNK_HTML=html/chunk.xsl
 fi
 
 
 
 XSLT_DOCBOOK_CHUNK_XHTML=""
-{ echo "$as_me:$LINENO: checking for docbook/xhtml/chunk.xsl" >&5
-echo $ECHO_N "checking for docbook/xhtml/chunk.xsl... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for xhtml/chunk.xsl" >&5
+echo $ECHO_N "checking for xhtml/chunk.xsl... $ECHO_C" >&6; }
 for d in $docbook_xsl_trees
 do
-	f=$d/docbook/xhtml/chunk.xsl
+	f=$d/xhtml/chunk.xsl
 	if test -f $f
 	then
 		XSLT_DOCBOOK_CHUNK_XHTML=$f
@@ -29623,17 +29714,17 @@ if test "X$XSLT_DOCBOOK_CHUNK_XHTML" = "X"
 then
 	{ echo "$as_me:$LINENO: result: \"not found\"" >&5
 echo "${ECHO_T}\"not found\"" >&6; };
-	XSLT_DOCBOOK_CHUNK_XHTML=docbook/xhtml/chunk.xsl
+	XSLT_DOCBOOK_CHUNK_XHTML=xhtml/chunk.xsl
 fi
 
 
 
 XSLT_DOCBOOK_CHUNKTOC_HTML=""
-{ echo "$as_me:$LINENO: checking for docbook/html/chunktoc.xsl" >&5
-echo $ECHO_N "checking for docbook/html/chunktoc.xsl... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for html/chunktoc.xsl" >&5
+echo $ECHO_N "checking for html/chunktoc.xsl... $ECHO_C" >&6; }
 for d in $docbook_xsl_trees
 do
-	f=$d/docbook/html/chunktoc.xsl
+	f=$d/html/chunktoc.xsl
 	if test -f $f
 	then
 		XSLT_DOCBOOK_CHUNKTOC_HTML=$f
@@ -29646,17 +29737,17 @@ if test "X$XSLT_DOCBOOK_CHUNKTOC_HTML" = "X"
 then
 	{ echo "$as_me:$LINENO: result: \"not found\"" >&5
 echo "${ECHO_T}\"not found\"" >&6; };
-	XSLT_DOCBOOK_CHUNKTOC_HTML=docbook/html/chunktoc.xsl
+	XSLT_DOCBOOK_CHUNKTOC_HTML=html/chunktoc.xsl
 fi
 
 
 
 XSLT_DOCBOOK_CHUNKTOC_XHTML=""
-{ echo "$as_me:$LINENO: checking for docbook/xhtml/chunktoc.xsl" >&5
-echo $ECHO_N "checking for docbook/xhtml/chunktoc.xsl... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for xhtml/chunktoc.xsl" >&5
+echo $ECHO_N "checking for xhtml/chunktoc.xsl... $ECHO_C" >&6; }
 for d in $docbook_xsl_trees
 do
-	f=$d/docbook/xhtml/chunktoc.xsl
+	f=$d/xhtml/chunktoc.xsl
 	if test -f $f
 	then
 		XSLT_DOCBOOK_CHUNKTOC_XHTML=$f
@@ -29669,17 +29760,17 @@ if test "X$XSLT_DOCBOOK_CHUNKTOC_XHTML" = "X"
 then
 	{ echo "$as_me:$LINENO: result: \"not found\"" >&5
 echo "${ECHO_T}\"not found\"" >&6; };
-	XSLT_DOCBOOK_CHUNKTOC_XHTML=docbook/xhtml/chunktoc.xsl
+	XSLT_DOCBOOK_CHUNKTOC_XHTML=xhtml/chunktoc.xsl
 fi
 
 
 
 XSLT_DOCBOOK_MAKETOC_HTML=""
-{ echo "$as_me:$LINENO: checking for docbook/html/maketoc.xsl" >&5
-echo $ECHO_N "checking for docbook/html/maketoc.xsl... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for html/maketoc.xsl" >&5
+echo $ECHO_N "checking for html/maketoc.xsl... $ECHO_C" >&6; }
 for d in $docbook_xsl_trees
 do
-	f=$d/docbook/html/maketoc.xsl
+	f=$d/html/maketoc.xsl
 	if test -f $f
 	then
 		XSLT_DOCBOOK_MAKETOC_HTML=$f
@@ -29692,17 +29783,17 @@ if test "X$XSLT_DOCBOOK_MAKETOC_HTML" = "X"
 then
 	{ echo "$as_me:$LINENO: result: \"not found\"" >&5
 echo "${ECHO_T}\"not found\"" >&6; };
-	XSLT_DOCBOOK_MAKETOC_HTML=docbook/html/maketoc.xsl
+	XSLT_DOCBOOK_MAKETOC_HTML=html/maketoc.xsl
 fi
 
 
 
 XSLT_DOCBOOK_MAKETOC_XHTML=""
-{ echo "$as_me:$LINENO: checking for docbook/xhtml/maketoc.xsl" >&5
-echo $ECHO_N "checking for docbook/xhtml/maketoc.xsl... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for xhtml/maketoc.xsl" >&5
+echo $ECHO_N "checking for xhtml/maketoc.xsl... $ECHO_C" >&6; }
 for d in $docbook_xsl_trees
 do
-	f=$d/docbook/xhtml/maketoc.xsl
+	f=$d/xhtml/maketoc.xsl
 	if test -f $f
 	then
 		XSLT_DOCBOOK_MAKETOC_XHTML=$f
@@ -29715,7 +29806,7 @@ if test "X$XSLT_DOCBOOK_MAKETOC_XHTML" = "X"
 then
 	{ echo "$as_me:$LINENO: result: \"not found\"" >&5
 echo "${ECHO_T}\"not found\"" >&6; };
-	XSLT_DOCBOOK_MAKETOC_XHTML=docbook/xhtml/maketoc.xsl
+	XSLT_DOCBOOK_MAKETOC_XHTML=xhtml/maketoc.xsl
 fi
 
 
@@ -31968,6 +32059,7 @@ ISC_PLATFORM_BRACEPTHREADONCEINIT!$ISC_PLATFORM_BRACEPTHREADONCEINIT$ac_delim
 ISC_PLATFORM_HAVESTRINGSH!$ISC_PLATFORM_HAVESTRINGSH$ac_delim
 ISC_PLATFORM_HAVEIFNAMETOINDEX!$ISC_PLATFORM_HAVEIFNAMETOINDEX$ac_delim
 ISC_PLATFORM_HAVEXADD!$ISC_PLATFORM_HAVEXADD$ac_delim
+ISC_PLATFORM_HAVEXADDQ!$ISC_PLATFORM_HAVEXADDQ$ac_delim
 ISC_PLATFORM_HAVECMPXCHG!$ISC_PLATFORM_HAVECMPXCHG$ac_delim
 ISC_PLATFORM_HAVEATOMICSTORE!$ISC_PLATFORM_HAVEATOMICSTORE$ac_delim
 ISC_PLATFORM_USEGCCASM!$ISC_PLATFORM_USEGCCASM$ac_delim
@@ -32016,7 +32108,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5