Fix make distcheck errors in without GUI mode

diff --git a/configure.ac b/configure.ac
index e1922bfe9702e3f31f778463ed7d353099c45261..f7569d1ce96b8d0bd5230f5afd55d64419d4320b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -301,10 +301,22 @@ if test "${gui_ok}" = "yes"; then
     echo
 
     CHECK_QT
-    AC_PATH_PROG(PYUIC, pyuic4)
-    AC_SUBST(PYUIC)
-    AC_PATH_PROG(PYRCC, pyrcc4)
-    AC_SUBST(PYRCC)
+
+    echo
+    echo ---------------------------------------------
+    echo testing sip
+    echo ---------------------------------------------
+    echo
+
+    CHECK_SIP
+
+    echo
+    echo ---------------------------------------------
+    echo testing pyqt
+    echo ---------------------------------------------
+    echo
+
+    CHECK_PYQT
 
     echo
     echo ---------------------------------------------

diff --git a/src/Tools/MeshCut/Makefile.am b/src/Tools/MeshCut/Makefile.am
index 62a1d8a4eb3487526816b1e4e34dd2e0e1676ad2..c1cecffd9f5296ea9c94bcd433041b59f924ef8e 100644 (file)
--- a/src/Tools/MeshCut/Makefile.am
+++ b/src/Tools/MeshCut/Makefile.am
@@ -45,11 +45,15 @@ MeshCut_LDFLAGS =  $(MED2_LIBS) $(HDF5_LIBS)
 
 
 UIPY_FILES =  MeshCutDialog.py
-BUILT_SOURCES = $(UIPY_FILES)
-bin_SCRIPTS = $(UIPY_FILES) meshcut_plugin.py
-clean-local:
-       rm -f $(UIPY_FILES)
-EXTRA_DIST += MeshCutDialog.ui meshcut_plugin.py
+
+if SMESH_ENABLE_GUI
+  dist_salomescript_SCRIPTS   = meshcut_plugin.py
+  nodist_salomescript_SCRIPTS = $(UIPY_FILES)
+endif
+
+CLEANFILES = $(UIPY_FILES)
+
+EXTRA_DIST += $(UIPY_FILES:%.py=%.ui)
 
 %.py : %.ui
-       pyuic4 $< -o $@
+       $(PYUIC) $< -o $@

diff --git a/src/Tools/padder/spadderpy/Makefile.am b/src/Tools/padder/spadderpy/Makefile.am
index 742cb5b70ffb5ce5f5169be263ec858265a1ab96..68ec6d8e0dd09c8b8e8cf5a1878bea2ef35282e0 100644 (file)
--- a/src/Tools/padder/spadderpy/Makefile.am
+++ b/src/Tools/padder/spadderpy/Makefile.am
@@ -1,6 +1,12 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-SUBDIRS = gui plugin
+SUBDIRS = 
+
+if SMESH_ENABLE_GUI
+SUBDIRS += gui plugin
+endif
+
+DIST_SUBDIRS = gui plugin
 
 spadderpydir=$(smeshpypkgdir)/spadder
 spadderpy_PYTHON = \

diff --git a/src/Tools/padder/spadderpy/gui/Makefile.am b/src/Tools/padder/spadderpy/gui/Makefile.am
index 9187c7ec422a4ac0ee5d3fcd8b73c188411485c7..441333e845da3693edc55d9730ee0791e670a940 100644 (file)
--- a/src/Tools/padder/spadderpy/gui/Makefile.am
+++ b/src/Tools/padder/spadderpy/gui/Makefile.am
@@ -32,11 +32,9 @@ dist_spadderpy_DATA= \
        concrete.png \
        steelbar.png
 
-PYUIC = @PYUIC@
 %_ui.py:%.ui
        $(PYUIC) -x $< -o $@
 
-PYRCC = @PYRCC@
 %_rc.py:%.qrc
        $(PYRCC) $< -o $@