zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge trunk up to revision 3866

Browse source
This commit is contained in:
Pierre Labastie 2016-06-25 10:30:15 +00:00
parent 7bd0866514
commit 04952c6322
3 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Config.in
View file

@ -512,10 +512,6 @@ menu "--- BOOK Settings"
bool "libxslt (required)" bool "libxslt (required)"
default y default y
config DEP_TIDY
bool "tidy (required)"
default y
config DEP_DBXML config DEP_DBXML
bool "DocBook XML DTD (required)" bool "DocBook XML DTD (required)"
default y default y

7
common/libs/func_check_version.sh
View file

@ -233,17 +233,14 @@ inline_doc
check_blfs_tools() { # check_blfs_tools() { #
#----------------------------# #----------------------------#
: << inline_doc : << inline_doc
In addition to the tools needed for the LFS part, tidy and docbook-xml In addition to the tools needed for the LFS part, docbook-xml
are needed for installing the BLFS tools is needed for installing the BLFS tools
inline_doc inline_doc
# Avoid translation of version strings # Avoid translation of version strings
local LC_ALL=C local LC_ALL=C
export LC_ALL export LC_ALL
tidyVer=$(tidy -V | cut -d " " -f9)
check_version "2004" "${tidyVer}" "TIDY"
# Minimal docbook-xml code for testing # Minimal docbook-xml code for testing
XML_FILE="<?xml version='1.0' encoding='ISO-8859-1'?> 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'?> <?xml-stylesheet type='text/xsl' href='http://docbook.sourceforge.net/release/xsl/1.69.1/xhtml/docbook.xsl'?>

5
common/libs/func_install_blfs
View file

@ -58,11 +58,6 @@ if [ "$DEP_LIBXSLT" = y ]; then
else else
LINE_LIBXSLT='#CONFIG_libxslt is not set' LINE_LIBXSLT='#CONFIG_libxslt is not set'
fi 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 # DocBook is a rec dep of libxslt
# if [ "$DEP_DBXML" = y ]; then # if [ "$DEP_DBXML" = y ]; then
# LINE_DBXML='CONFIG_DocBook=y' # LINE_DBXML='CONFIG_DocBook=y'