anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +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-16 23:14:19 +01:00
parent 4e2f8dbbeb
commit 901356fd58
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/lyxinclude.m4
View File

@ -939,3 +939,16 @@ AC_DEFUN([LYX_SET_VERSION_INFO],
AC_SUBST(LYX_USERDIR_VER,"$lyx_userdir_ver") AC_SUBST(LYX_USERDIR_VER,"$lyx_userdir_ver")
]) ])
AC_DEFUN([LYX_CHECK_WITH_SAXON],
[
lyx_use_saxon=true
AC_ARG_WITH(saxon, AS_HELP_STRING([--without-saxon],[do not install saxon library (epub export)]))
test "$with_saxon" = "no" && lyx_use_saxon=false
if $lyx_use_saxon ; then
AC_MSG_RESULT(Set to installing internal saxon.)
fi
AM_CONDITIONAL(SAXON_INSTALL, $lyx_use_saxon)
])

2
configure.ac
View File

@ -196,6 +196,8 @@ AC_FUNC_SELECT_ARGTYPES
LYX_CHECK_SPELL_ENGINES LYX_CHECK_SPELL_ENGINES
LYX_USE_INCLUDED_MYTHES LYX_USE_INCLUDED_MYTHES
LYX_CHECK_WITH_SAXON
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.
save_LIBS="$LIBS" save_LIBS="$LIBS"

8
lib/Makefile.am
View File

@ -2872,10 +2872,16 @@ dist_xtemplates_DATA = \
dist_scripts_DATA += scripts/docbook2epub.py dist_scripts_DATA += scripts/docbook2epub.py
#2) xslt processor - Saxon 6.5.5 #2) xslt processor - Saxon 6.5.5
dist_scripts_DATA += \ SAXON_FILES = \
scripts/saxon6.LICENSE.txt \ scripts/saxon6.LICENSE.txt \
scripts/saxon6.5.5.jar scripts/saxon6.5.5.jar
if SAXON_INSTALL
dist_scripts_DATA += $(SAXON_FILES)
else
dist_noinst_DATA += $(SAXON_FILES)
endif
#3) xslt Stylesheets 1.79.2 #3) xslt Stylesheets 1.79.2
docbookdir = $(pkgdatadir)/docbook docbookdir = $(pkgdatadir)/docbook
dist_docbook_DATA = \ dist_docbook_DATA = \