@COMMENCE@
-SUBDIRS = idl src
+SUBDIRS = idl src adm_local
RESOURCES_FILES = HELLOCatalog.xml HELLO.png ExecHELLO.png
--- /dev/null
+# source path
+top_srcdir=@top_srcdir@
+top_builddir=..
+srcdir=@srcdir@
+VPATH=.:$(srcdir)/adm_local
+
+
+all: resources
+
+install:
+ cp -rf @top_srcdir@/adm_local @prefix@
+
+bin:
+
+resources :
+ cp -rf @top_srcdir@/adm_local $(top_builddir)
+
+inc:
+
+lib:
+
+depend:
+
+depend_idl:
+
+install-end:
+
+install-include:
+
+install-bin:
+
+uninstall:
+
+uninstall-idl:
+
+distclean:
+
+clean:
+
+distclean-other:
+
+++ /dev/null
-# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
-#
-#------------------------------------------------------------
-# Check availability of Salome binary distribution
-#
-# Author : Marc Tajchman (CEA, 2002)
-#------------------------------------------------------------
-
-AC_DEFUN([CHECK_SALOME_GUI],[
-
-AC_CHECKING(for Salome GUI)
-
-SalomeGUI_ok=no
-
-AC_ARG_WITH(gui,
- --with-salome_gui=DIR root directory path of SALOME GUI installation,
- SALOME_GUI_DIR="$withval",SALOME_GUI_DIR="")
-
-if test "x$SALOME_GUI_DIR" = "x" ; then
- if test "x$GUI_ROOT_DIR" != "x" ; then
- SALOME_GUI_DIR=$GUI_ROOT_DIR
- else
- # search Salome binaries in PATH variable
- AC_PATH_PROG(TEMP, SUITApp)
- if test "x$TEMP" != "x" ; then
- SALOME_GUI_BIN_DIR=`dirname $TEMP`
- SALOME_GUI_DIR=`dirname $SALOME_GUI_BIN_DIR`
- fi
- fi
-fi
-
-if test "x$SALOME_GUI_DIR" != "x" ; then
- if test -f ${SALOME_GUI_DIR}/bin/salome/SUITApp ; then
- SalomeGUI_ok=yes
- AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR})
- GUI_ROOT_DIR=${SALOME_GUI_DIR}
- fi
-fi
-if test "x$SalomeGUI_ok" == "xno" ; then
- AC_MSG_WARN("Cannot find compiled SALOME GUI distribution")
-fi
-
-AC_SUBST(GUI_ROOT_DIR)
-
-AC_MSG_RESULT(for SALOME GUI: $SalomeGUI_ok)
-
-])dnl
-
--- /dev/null
+# Check availability of HELLO module binary distribution
+#
+# Author : Marc Tajchman (CEA, 2002)
+#------------------------------------------------------------
+
+AC_DEFUN([CHECK_HELLO],[
+
+AC_CHECKING(for Hello)
+
+Hello_ok=no
+
+AC_ARG_WITH(hello,
+ --with-hello=DIR root directory path of HELLO installation,
+ HELLO_DIR="$withval",HELLO_DIR="")
+
+if test "x$HELLO_DIR" = "x" ; then
+
+# no --with-gui-dir option used
+
+ if test "x$HELLO1_ROOT_DIR" != "x" ; then
+
+ # HELLO1_ROOT_DIR environment variable defined
+ HELLO_DIR=$HELLO1_ROOT_DIR
+
+ else
+
+ # search hello binaries in PATH variable
+ AC_PATH_PROG(TEMP, libHELLO.so)
+ if test "x$TEMP" != "x" ; then
+ HELLO_BIN_DIR=`dirname $TEMP`
+ HELLO_DIR=`dirname $HELLO_BIN_DIR`
+ fi
+
+ fi
+#
+fi
+
+if test -f ${HELLO_DIR}/lib/salome/libHELLO.so ; then
+ Hello_ok=yes
+ AC_MSG_RESULT(Using HELLO distribution in ${HELLO_DIR})
+
+ if test "x$HELLO1_ROOT_DIR" == "x" ; then
+ HELLO1_ROOT_DIR=${HELLO_DIR}
+ fi
+ AC_SUBST(HELLO1_ROOT_DIR)
+else
+ AC_MSG_WARN("Cannot find compiled HELLO distribution")
+fi
+
+AC_MSG_RESULT(for HELLO: $Hello_ok)
+
+])dnl
+
ACLOCAL_SRC = \
-ac_cxx_bool.m4 check_corba.m4 check_vtk.m4 \
+ac_cxx_bool.m4 check_corba.m4 \
ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \
ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \
ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \
-ac_cxx_partial_specialization.m4 check_opengl.m4 python.m4 \
+ac_cxx_partial_specialization.m4 python.m4 \
ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \
-ac_cc_warnings.m4 check_qt.m4 check_swig.m4
+ac_cc_warnings.m4 check_swig.m4
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
- cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files
+ACLOCAL_GUI = \
+check_vtk.m4 check_opengl.m4 check_qt.m4 \
+check_GUI.m4 check_corba_in_GUI.m4
+
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+ $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%)
+ cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
+ -I @GUI_ROOT_DIR@/adm_local/unix/config_files
exit
fi
+########################################################################
+# Test if the GUI_ROOT_DIR is set correctly
+
+if test ! -d "${GUI_ROOT_DIR}"; then
+ echo "failed : GUI_ROOT_DIR variable is not correct !"
+ exit
+fi
+
########################################################################
# find_in - utility function
#
case $1 in
*/CVS) return ;;
+ */adm_local/*) return ;;
*) ;;
esac
touch configure.in_tmp2
find_in . configure.in_tmp2
-sed -e '/^.\/salome_adm/d' \
+sed -e '/^...salome_adm/d' \
-e '/configure.in/d' \
- -e '/^.\/adm_local/d' \
+ -e '/^...adm_local/d' \
-e 's/.in / /' \
configure.in_tmp2 >> configure.in_tmp1
echo -n "Creating 'configure' script ... "
fi
-aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+ -I ${GUI_ROOT_DIR}/adm_local/unix/config_files
if autoconf
then
echo "done"
corba=make_$ORB
CORBA=adm_local/unix/$corba
+echo
+echo ---------------------------------------------
+echo Testing GUI
+echo ---------------------------------------------
+echo
+
+CHECK_SALOME_GUI
+
+echo
+echo ---------------------------------------------
+echo Testing full GUI
+echo ---------------------------------------------
+echo
+
+CHECK_CORBA_IN_GUI
+if test "x${CORBA_IN_GUI}" != "xyes"; then
+ echo "failed : For configure HELLO1 module necessary full GUI !"
+ exit
+fi
+
echo
echo ---------------------------------------------
echo Testing Kernel
