From b8043c6073385da0924b4d41df3e998bd6e46a9c Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Wed, 23 Nov 2011 15:55:56 +0000
Subject: [PATCH] Fix make distcheck errors in without GUI mode

---
 configure.ac                               | 20 ++++++++++++++++----
 src/Tools/MeshCut/Makefile.am              | 16 ++++++++++------
 src/Tools/padder/spadderpy/Makefile.am     |  8 +++++++-
 src/Tools/padder/spadderpy/gui/Makefile.am |  2 --
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index e1922bfe9..f7569d1ce 100644
--- 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 62a1d8a4e..c1cecffd9 100644
--- 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 742cb5b70..68ec6d8e0 100644
--- 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 9187c7ec4..441333e84 100644
--- 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 $@
 
-- 
2.39.2