Allow bundled saxon not to be installed.

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 5d6bb1da86ae0e42d4c6d2de7d8678c3faec64fd..b7abe0db64d1379ecbfe3c1fbaed647d0feb1266 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -939,3 +939,16 @@ AC_DEFUN([LYX_SET_VERSION_INFO],
  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)
+    ])
+

diff --git a/configure.ac b/configure.ac
index f258db9adf1365803c4432f0f195490d969b453c..d7a49c5d41e189cc3e1878b5639aec042b213247 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -196,6 +196,8 @@ AC_FUNC_SELECT_ARGTYPES
 LYX_CHECK_SPELL_ENGINES
 LYX_USE_INCLUDED_MYTHES
 
+LYX_CHECK_WITH_SAXON
+
 lyx_client_subdir=true
 dnl LIBS already contains some X extra libs that may interfere.
 save_LIBS="$LIBS"

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7aec1370fe1693524f3566cb4c0bfada5981c0f1..ae02d702eff163fa5fe2097752912d2485c0d671 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2872,10 +2872,16 @@ dist_xtemplates_DATA = \
 dist_scripts_DATA += scripts/docbook2epub.py
 
 #2) xslt processor - Saxon 6.5.5
-dist_scripts_DATA += \
+SAXON_FILES = \
        scripts/saxon6.LICENSE.txt \
        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
 docbookdir = $(pkgdatadir)/docbook
 dist_docbook_DATA = \