diff --git a/configure b/configure index 4ea6a22ff5..4748232a24 100755 --- a/configure +++ b/configure @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# From configure.in Revision: 1.189 +# From configure.in Revision: 1.191 ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- ## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc. @@ -4540,6 +4540,54 @@ EOF ;; esac + +# +# Look for jade, preferring openjade if installed. +# + +for ac_prog in openjade jade +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4554: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_JADE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$JADE" in + /*) + ac_cv_path_JADE="$JADE" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_JADE="$JADE" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_JADE="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +JADE="$ac_cv_path_JADE" +if test -n "$JADE"; then + echo "$ac_t""$JADE" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$JADE" && break +done +test -n "$JADE" || JADE="jade" + + + # # Look for SGML style sheets. NetBSD has them under /usr/pkg/share # (if installed), FreeBSD has them under /usr/local/share. @@ -4548,7 +4596,7 @@ esac SGMLDIR="" echo $ac_n "checking for SGML stylesheets""... $ac_c" 1>&6 -echo "configure:4552: checking for SGML stylesheets" >&5 +echo "configure:4600: checking for SGML stylesheets" >&5 for d in /usr/pkg/share/sgml /usr/local/share/sgml do if test -f $d/docbook/dsssl/modular/html/docbook.dsl @@ -4894,6 +4942,7 @@ s%@ISC_EXTRA_OBJS@%$ISC_EXTRA_OBJS%g s%@ISC_EXTRA_SRCS@%$ISC_EXTRA_SRCS%g s%@ISC_PLATFORM_LONGLONGEQUALLONG@%$ISC_PLATFORM_LONGLONGEQUALLONG%g s%@ISC_PLATFORM_BRACEPTHREADONCEINIT@%$ISC_PLATFORM_BRACEPTHREADONCEINIT%g +s%@JADE@%$JADE%g s%@SGMLDIR@%$SGMLDIR%g s%@BIND9_TOP_BUILDDIR@%$BIND9_TOP_BUILDDIR%g s%@BIND9_ISC_BUILDINCLUDE@%$BIND9_ISC_BUILDINCLUDE%g