From: Michal Nowikowski <godfryd@isc.org>
Date: Tue, 16 Jul 2019 17:02:04 +0000 (+0200)
Subject: disabled discovery of old tools in ./configure
X-Git-Tag: Kea-1.6.1~10^2~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c15d974bc2dfae62845ae21e1393f5a902f9ed4;p=thirdparty%2Fkea.git

disabled discovery of old tools in ./configure
---

diff --git a/configure.ac b/configure.ac
index 416dece115..1170caca7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1455,41 +1455,41 @@ if test "x$enable_generate_docs" != xno ; then
     AC_MSG_RESULT(yes (found in $SPHINXBUILD))
   fi
 
-# xsltproc --nonet parameter
-  NONET="--nonet"
-  AC_ARG_VAR(XSLTPROC_NET, [xsltproc uses the Internet to fetch DTDs, entities or documents.])
-  if test "x$XSLTPROC_NET" != x ; then
-    NONET=
-  fi
-  AC_SUBST(NONET)
+## xsltproc --nonet parameter
+#  NONET="--nonet"
+#  AC_ARG_VAR(XSLTPROC_NET, [xsltproc uses the Internet to fetch DTDs, entities or documents.])
+#  if test "x$XSLTPROC_NET" != x ; then
+#    NONET=
+#  fi
+#  AC_SUBST(NONET)
 
 # Check for xsltproc
-  AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    AC_MSG_ERROR("xsltproc not found; it is required for --enable-generate-docs")
-  else
-    AC_MSG_CHECKING([if $XSLTPROC works])
-    # run xsltproc to see if works
-    $XSLTPROC --novalid --xinclude $NONET http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
-    if test $? -ne 0 ; then
-      AC_MSG_ERROR("Error with $XSLTPROC using release/xsl/current/manpages/docbook.xsl")
-    fi
-    $XSLTPROC --novalid --xinclude $NONET http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
-    if test $? -ne 0 ; then
-      AC_MSG_ERROR("Error with $XSLTPROC using release/xsl/current/html/docbook.xsl")
-    fi
-    AC_MSG_RESULT(yes)
-  fi
-
-  AC_PATH_PROG([ELINKS], [elinks])
-  if test -z "$ELINKS"; then
-    AC_MSG_ERROR("elinks not found; it is required for --enable-generate-docs")
-  fi
+#  AC_PATH_PROG([XSLTPROC], [xsltproc])
+#  if test -z "$XSLTPROC"; then
+#    AC_MSG_ERROR("xsltproc not found; it is required for --enable-generate-docs")
+#  else
+#    AC_MSG_CHECKING([if $XSLTPROC works])
+#    # run xsltproc to see if works
+#    $XSLTPROC --novalid --xinclude $NONET http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+#    if test $? -ne 0 ; then
+#      AC_MSG_ERROR("Error with $XSLTPROC using release/xsl/current/manpages/docbook.xsl")
+#    fi
+#    $XSLTPROC --novalid --xinclude $NONET http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
+#    if test $? -ne 0 ; then
+#      AC_MSG_ERROR("Error with $XSLTPROC using release/xsl/current/html/docbook.xsl")
+#    fi
+#    AC_MSG_RESULT(yes)
+#  fi
+
+#  AC_PATH_PROG([ELINKS], [elinks])
+#  if test -z "$ELINKS"; then
+#    AC_MSG_ERROR("elinks not found; it is required for --enable-generate-docs")
+#  fi
 fi
 
 # Don't fail here if not found, used to generate PDF documentation.
-AC_PATH_PROG([DBLATEX], [dblatex])
-AM_CONDITIONAL(HAVE_DBLATEX, test "x$DBLATEX" != "x")
+#AC_PATH_PROG([DBLATEX], [dblatex])
+#AM_CONDITIONAL(HAVE_DBLATEX, test "x$DBLATEX" != "x")
 
 AM_CONDITIONAL(GENERATE_DOCS, test x$enable_generate_docs != xno)