Author: pierre
Date: Sat Jun 25 03:30:15 2016
New Revision: 3867
Log:
Merge trunk up to revision 3866
Modified:
jhalfs/branches/new_features/Config.in
jhalfs/branches/new_features/common/libs/func_check_version.sh
jhalfs/branches/new_features/common/libs/func_install_blfs
Modified: jhalfs/branches/new_features/Config.in
==============================================================================
--- jhalfs/branches/new_features/Config.in Sat Jun 25 03:27:48 2016
(r3866)
+++ jhalfs/branches/new_features/Config.in Sat Jun 25 03:30:15 2016
(r3867)
@@ -512,10 +512,6 @@
bool "libxslt (required)"
default y
- config DEP_TIDY
- bool "tidy (required)"
- default y
-
config DEP_DBXML
bool "DocBook XML DTD (required)"
default y
Modified: jhalfs/branches/new_features/common/libs/func_check_version.sh
==============================================================================
--- jhalfs/branches/new_features/common/libs/func_check_version.sh Sat Jun
25 03:27:48 2016 (r3866)
+++ jhalfs/branches/new_features/common/libs/func_check_version.sh Sat Jun
25 03:30:15 2016 (r3867)
@@ -233,17 +233,14 @@
check_blfs_tools() { #
#----------------------------#
: << inline_doc
-In addition to the tools needed for the LFS part, tidy and docbook-xml
-are needed for installing the BLFS tools
+In addition to the tools needed for the LFS part, docbook-xml
+is needed for installing the BLFS tools
inline_doc
# Avoid translation of version strings
local LC_ALL=C
export LC_ALL
- tidyVer=$(tidy -V | cut -d " " -f9)
- check_version "2004" "${tidyVer}" "TIDY"
-
# Minimal docbook-xml code for testing
XML_FILE="<?xml version='1.0' encoding='ISO-8859-1'?>
<?xml-stylesheet type='text/xsl'
href='http://docbook.sourceforge.net/release/xsl/1.69.1/xhtml/docbook.xsl'?>
Modified: jhalfs/branches/new_features/common/libs/func_install_blfs
==============================================================================
--- jhalfs/branches/new_features/common/libs/func_install_blfs Sat Jun 25
03:27:48 2016 (r3866)
+++ jhalfs/branches/new_features/common/libs/func_install_blfs Sat Jun 25
03:30:15 2016 (r3867)
@@ -58,11 +58,6 @@
else
LINE_LIBXSLT='#CONFIG_libxslt is not set'
fi
-if [ "$DEP_TIDY" = y ]; then
- LINE_TIDY='CONFIG_html-tidy=y'
-else
- LINE_TIDY='#CONFIG_html-tidy is not set'
-fi
# DocBook is a rec dep of libxslt
# if [ "$DEP_DBXML" = y ]; then
# LINE_DBXML='CONFIG_DocBook=y'
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
