Fix make distcheck error (merge from V6_4_BR)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f48046a3c061e078af1b331aa6996c66fc66865f..f6dc56cf42f2503b9330cab76ff88c020dec6fe8 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,8 +22,8 @@
 # Date : 30/11/2001
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 #
-#SUBDIRS = salome docutils
-SUBDIRS = salome
+SUBDIRS = salome docutils
+#SUBDIRS = salome
 
 usr_docs:
        (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs)

diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 7e0f8bfc849dec270c4770a7450d84e02984f609..a4b8c336853aefb7d71402a73448609cc5efd7f6 100644 (file)
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -38,9 +38,17 @@ SPHINXBUILD     = sphinx-build
 PAPEROPT_a4     = -D latex_paper_size=a4
 ALLSPHINXOPTS   = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR)
 
+if GEOM_ENABLE_GUI
+SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(GUI_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages
+else !GEOM_ENABLE_GUI
 SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages
+endif
 
+if GEOM_ENABLE_GUI
+SPHINX_LD_LIBRARY_PATH = $(GUI_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib
+else !GEOM_ENABLE_GUI
 SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib
+endif
 
 
 .PHONY: latex

diff --git a/src/GEOM_PY/geomtools.py b/src/GEOM_PY/geomtools.py
index 8b243a9b617ef3de7e9ff0f764df629ec3a03987..27fc960e53284799ea894663a68ac654ad9679d3 100644 (file)
--- a/src/GEOM_PY/geomtools.py
+++ b/src/GEOM_PY/geomtools.py
@@ -31,8 +31,11 @@ from salome.kernel import termcolor
 logger = Logger("salome.geom.geomtools", color = termcolor.RED)
 
 from salome.kernel.studyedit import getActiveStudyId, getStudyEditor
-from salome.gui import helper
 from salome.kernel.services import IDToObject
+try:
+    from salome.gui import helper
+except ImportError:
+    pass
 
 _geompys = {}