anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow bundled saxon not to be installed.

Browse Source
This commit is contained in:
Pavel Sanda 2021-03-17 21:51:01 +01:00
parent 34ffa80c4c
commit 833863c477
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/lyxinclude.m4
View File

@ -952,3 +952,16 @@ AC_DEFUN([LYX_CHECK_WITH_SAXON],
AM_CONDITIONAL(SAXON_INSTALL, $lyx_use_saxon) AM_CONDITIONAL(SAXON_INSTALL, $lyx_use_saxon)
]) ])
AC_DEFUN([LYX_CHECK_WITH_XSLT_SHEETS],
[
lyx_use_xslt_stylesheets=true
AC_ARG_WITH(xslt-stylesheets, AS_HELP_STRING([--without-xslt-stylesheets],[do not install XSLT Stylesheets (epub export)]))
test "$with_xslt_stylesheets" = "no" && lyx_use_xslt_stylesheets=false
if $lyx_use_xslt_stylesheets ; then
AC_MSG_RESULT(Set to installing XSLT Stylesheets.)
fi
AM_CONDITIONAL(XSLT_SHEETS_INSTALL, $lyx_use_xslt_stylesheets)
])

1
configure.ac
View File

@ -197,6 +197,7 @@ LYX_CHECK_SPELL_ENGINES
LYX_USE_INCLUDED_MYTHES LYX_USE_INCLUDED_MYTHES
LYX_CHECK_WITH_SAXON LYX_CHECK_WITH_SAXON
LYX_CHECK_WITH_XSLT_SHEETS
lyx_client_subdir=true lyx_client_subdir=true
dnl LIBS already contains some X extra libs that may interfere. dnl LIBS already contains some X extra libs that may interfere.

28
lib/Makefile.am
View File

@ -2884,14 +2884,14 @@ endif
#3) xslt Stylesheets 1.79.2 #3) xslt Stylesheets 1.79.2
docbookdir = $(pkgdatadir)/docbook docbookdir = $(pkgdatadir)/docbook
dist_docbook_DATA = \ docbook_FILES = \
docbook/COPYING \ docbook/COPYING \
docbook/source.txt \ docbook/source.txt \
docbook/VERSION \ docbook/VERSION \
docbook/VERSION.xsl docbook/VERSION.xsl
docbookcommondir = $(pkgdatadir)/docbook/common docbookcommondir = $(pkgdatadir)/docbook/common
dist_docbookcommon_DATA = \ docbookcommon_FILES = \
docbook/common/addns.xsl \ docbook/common/addns.xsl \
docbook/common/af.xml \ docbook/common/af.xml \
docbook/common/am.xml \ docbook/common/am.xml \
@ -2996,7 +2996,7 @@ dist_docbookcommon_DATA = \
docbook/common/zh.xml docbook/common/zh.xml
docbookepub3dir = $(pkgdatadir)/docbook/epub3 docbookepub3dir = $(pkgdatadir)/docbook/epub3
dist_docbookepub3_DATA = \ docbookepub3_FILES = \
docbook/epub3/build.xml \ docbook/epub3/build.xml \
docbook/epub3/chunkfast.xsl \ docbook/epub3/chunkfast.xsl \
docbook/epub3/chunk.xsl \ docbook/epub3/chunk.xsl \
@ -3011,12 +3011,12 @@ dist_docbookepub3_DATA = \
docbook/epub3/titlepage.templates.xsl docbook/epub3/titlepage.templates.xsl
docbooklibdir = $(pkgdatadir)/docbook/lib docbooklibdir = $(pkgdatadir)/docbook/lib
dist_docbooklib_DATA = \ docbooklib_FILES = \
docbook/lib/build.xml \ docbook/lib/build.xml \
docbook/lib/lib.xsl docbook/lib/lib.xsl
docbookxhtml5dir = $(pkgdatadir)/docbook/xhtml5 docbookxhtml5dir = $(pkgdatadir)/docbook/xhtml5
dist_docbookxhtml5_DATA = \ docbookxhtml5_FILES = \
docbook/xhtml5/build.xml \ docbook/xhtml5/build.xml \
docbook/xhtml5/chunkfast.xsl \ docbook/xhtml5/chunkfast.xsl \
docbook/xhtml5/chunk.xsl \ docbook/xhtml5/chunk.xsl \
@ -3033,7 +3033,7 @@ dist_docbookxhtml5_DATA = \
docbook/xhtml5/xhtml-profile-docbook.xsl docbook/xhtml5/xhtml-profile-docbook.xsl
docbookxhtmldir = $(pkgdatadir)/docbook/xhtml docbookxhtmldir = $(pkgdatadir)/docbook/xhtml
dist_docbookxhtml_DATA = \ docbookxhtml_FILES = \
docbook/xhtml/admon.xsl \ docbook/xhtml/admon.xsl \
docbook/xhtml/annotations.xsl \ docbook/xhtml/annotations.xsl \
docbook/xhtml/autoidx-kimber.xsl \ docbook/xhtml/autoidx-kimber.xsl \
@ -3099,6 +3099,22 @@ dist_docbookxhtml_DATA = \
docbook/xhtml/verbatim.xsl \ docbook/xhtml/verbatim.xsl \
docbook/xhtml/xref.xsl docbook/xhtml/xref.xsl
if XSLT_SHEETS_INSTALL
dist_docbook_DATA = $(docbook_FILES)
dist_docbookcommon_DATA = $(docbookcommon_FILES)
dist_docbookepub3_DATA = $(docbookepub3_FILES)
dist_docbooklib_DATA = $(docbooklib_FILES)
dist_docbookxhtml5_DATA = $(docbookxhtml5_FILES)
dist_docbookxhtml_DATA = $(docbookxhtml_FILES)
else
dist_noinst_DATA += $(docbook_FILES)
dist_noinst_DATA += $(docbookcommon_FILES)
dist_noinst_DATA += $(docbookepub3_FILES)
dist_noinst_DATA += $(docbooklib_FILES)
dist_noinst_DATA += $(docbookxhtml5_FILES)
dist_noinst_DATA += $(docbookxhtml_FILES)
endif
if INSTALL_POSIX if INSTALL_POSIX
# install application icons. The 'hicolor' theme is the default theme # install application icons. The 'hicolor' theme is the default theme