This commit was generated by cvs2git to create branch 'WPdev'.

Sprout from master 2006-02-08 09:49:09 UTC jfa <jfa@opencascade.com> 'Update version to 3.2.0a1'
Cherrypick from master 2006-05-06 09:10:50 UTC jfa <jfa@opencascade.com> 'Join modifications from branch OCC_debug_for_3_2_0b1':
    adm_local/unix/config_files/check_PYHELLO.m4
    resources/SalomeApp.xml

diff --git a/adm_local/unix/config_files/check_PYHELLO.m4 b/adm_local/unix/config_files/check_PYHELLO.m4
new file mode 100755 (executable)
index 0000000..6cb9c9d
--- /dev/null
+++ b/adm_local/unix/config_files/check_PYHELLO.m4
@@ -0,0 +1,53 @@
+#  Check availability of PYHELLO binary distribution
+#
+#  Author : Marc Tajchman (CEA, 2002)
+#------------------------------------------------------------
+
+AC_DEFUN([CHECK_PYHELLO],[
+
+AC_CHECKING(for PyHello)
+
+PyHello_ok=no
+
+AC_ARG_WITH(pyHello,
+           --with-py-hello=DIR root directory path of PYHELLO installation,
+           PYHELLO_DIR="$withval",PYHELLO_DIR="")
+
+if test "x$PYHELLO_DIR" = "x" ; then
+
+# no --with-py-hello option used
+
+  if test "x$PYHELLO_ROOT_DIR" != "x" ; then
+
+    # PYHELLO_ROOT_DIR environment variable defined
+    PYHELLO_DIR=$PYHELLO_ROOT_DIR
+
+  else
+
+    # search PyHello binaries in PATH variable
+    AC_PATH_PROG(TEMP, PYHELLOGUI.py)
+    if test "x$TEMP" != "x" ; then
+      PYHELLO_BIN_DIR=`dirname $TEMP`
+      PYHELLO_DIR=`dirname $PYHELLO_BIN_DIR`
+    fi
+
+  fi
+#
+fi
+
+if test -f ${PYHELLO_DIR}/bin/salome/PYHELLOGUI.py  ; then
+  PyHello_ok=yes
+  AC_MSG_RESULT(Using PYHELLO distribution in ${PYHELLO_DIR})
+
+  if test "x$PYHELLO_ROOT_DIR" == "x" ; then
+    PYHELLO_ROOT_DIR=${PYHELLO_DIR}
+  fi
+  AC_SUBST(PYHELLO_ROOT_DIR)
+else
+  AC_MSG_WARN("Cannot find compiled PYHELLO distribution")
+fi
+  
+AC_MSG_RESULT(for PYHELLO: $PyHello_ok)
+ 
+])dnl
+ 

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
new file mode 100644 (file)
index 0000000..7ec465c
--- /dev/null
+++ b/resources/SalomeApp.xml
@@ -0,0 +1,12 @@
+<document>
+  <section name="PYHELLO">
+    <!-- Major module parameters -->
+    <parameter name="name"    value="PyHello"/>
+    <parameter name="icon"    value="PYHELLO.png"/>
+    <parameter name="library" value="SalomePyQtGUI"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="PYHELLO" value="${PYHELLO_ROOT_DIR}/share/salome/resources"/>
+  </section>
+</document>