Salome HOME
Join modifications from branch OCC_development_for_3_2_0a2
authorjfa <jfa@opencascade.com>
Mon, 13 Mar 2006 16:25:01 +0000 (16:25 +0000)
committerjfa <jfa@opencascade.com>
Mon, 13 Mar 2006 16:25:01 +0000 (16:25 +0000)
Makefile.in
adm_local/Makefile.in [new file with mode: 0644]
adm_local/unix/config_files/check_COMPONENT.m4 [new file with mode: 0755]
adm_local/unix/config_files/check_med2.m4 [deleted file]
adm_local/unix/make_commence.in
build_configure
configure.in.base

index 48c0bdb412899af705527d32ff79bbcb63eb368a..2c0b562c19aa1c09cee54d9527d88da3c3744782 100644 (file)
@@ -13,7 +13,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 @COMMENCE@
 
-SUBDIRS = idl src
+SUBDIRS = idl src adm_local
 
 RESOURCES_FILES = \
        COMPONENTCatalog.xml
diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in
new file mode 100644 (file)
index 0000000..9b5e810
--- /dev/null
@@ -0,0 +1,41 @@
+# 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:
+
diff --git a/adm_local/unix/config_files/check_COMPONENT.m4 b/adm_local/unix/config_files/check_COMPONENT.m4
new file mode 100755 (executable)
index 0000000..a10234c
--- /dev/null
@@ -0,0 +1,52 @@
+#  Check availability of COMPONENT module binary distribution
+#
+#  Author : Marc Tajchman (CEA, 2002)
+#------------------------------------------------------------
+
+AC_DEFUN([CHECK_COMPONENT],[
+
+AC_CHECKING(for Component)
+
+Component_ok=no
+
+AC_ARG_WITH(comp,
+           --with-component=DIR root directory path of COMPONENT module installation,
+           COMPONENT_DIR="$withval",COMPONENT_DIR="")
+
+if test "x$COMPONENT_DIR" = "x" ; then
+
+# no --with-component option used
+
+  if test "x$COMPONENT_ROOT_DIR" != "x" ; then
+
+    # COMPONENT_ROOT_DIR environment variable defined
+    COMPONENT_DIR=$COMPONENT_ROOT_DIR
+
+  else
+
+    # search component binaries in PATH variable
+    AC_PATH_PROG(TEMP, libCalculatorEngine.so)
+    if test "x$TEMP" != "x" ; then
+      COMPONENT_DIR=`dirname $TEMP`
+    fi
+
+  fi
+
+fi
+
+if test -f ${COMPONENT_DIR}/lib/salome/libCalculatorEngine.so  ; then
+  Component_ok=yes
+  AC_MSG_RESULT(Using COMPONENT module distribution in ${COMPONENT_DIR})
+
+  if test "x$COMPONENT_ROOT_DIR" == "x" ; then
+    COMPONENT_ROOT_DIR=${COMPONENT_DIR}
+  fi
+  AC_SUBST(COMPONENT_ROOT_DIR)
+else
+  AC_MSG_WARN("Cannot find compiled COMPONENT module distribution")
+fi
+  
+AC_MSG_RESULT(for COMPONENT: $Component_ok)
+])dnl
diff --git a/adm_local/unix/config_files/check_med2.m4 b/adm_local/unix/config_files/check_med2.m4
deleted file mode 100644 (file)
index 82b1078..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-dnl  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-dnl  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-dnl 
-dnl  This library is free software; you can redistribute it and/or 
-dnl  modify it under the terms of the GNU Lesser General Public 
-dnl  License as published by the Free Software Foundation; either 
-dnl  version 2.1 of the License. 
-dnl 
-dnl  This library is distributed in the hope that it will be useful, 
-dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-dnl  Lesser General Public License for more details. 
-dnl 
-dnl  You should have received a copy of the GNU Lesser General Public 
-dnl  License along with this library; if not, write to the Free Software 
-dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-dnl 
-dnl  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-dnl
-dnl
-dnl
-
-AC_DEFUN([CHECK_MED2],[
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_REQUIRE([CHECK_HDF5])dnl
-
-AC_CHECKING(for MED2)
-
-AC_ARG_WITH(med2,
-    [  --with-med2=DIR                 root directory path to med2 installation ],
-    [MED2HOME="$withval"
-      AC_MSG_RESULT("select $withval as path to med2")
-    ])
-
-AC_SUBST(MED2_INCLUDES)
-AC_SUBST(MED2_LIBS)
-AC_SUBST(MED2_MT_LIBS)
-
-MED2_INCLUDES=""
-MED2_LIBS=""
-MED2_MT_LIBS=""
-
-med2_ok=no
-
-LOCAL_INCLUDES="$HDF5_INCLUDES"
-LOCAL_LIBS="-lmed $HDF5_LIBS"
-
-if test -z $MED2HOME
-then
-   AC_MSG_WARN(undefined MED2HOME variable which specify med2 installation directory)
-   AC_PATH_PROG(MDUMP, mdump)
-   if test "xMDUMP" != "x" ; then
-      MED2HOME=$MDUMP
-      MED2HOME=`echo ${MED2HOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-      MED2HOME=`echo ${MED2HOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-   fi
-fi
-if test ! -z $MED2HOME
-then
-   LOCAL_INCLUDES="$LOCAL_INCLUDES -I$MED2HOME/include"
-   if test "x$MED2HOME" = "x/usr"
-   then
-     LOCAL_LIBS="-lmed  $LOCAL_LIBS"
-   else
-     LOCAL_LIBS="-L$MED2HOME/lib $LOCAL_LIBS"
-   fi
-fi
-
-dnl check med2 header
-
-CPPFLAGS_old="$CPPFLAGS"
-dnl we must test system : linux = -DPCLINUX
-dnl we must test system : Alpha-OSF = -DOSF1
-case $host_os in
-   linux*)
-      CPPFLAGS="$CPPFLAGS -DPCLINUX $LOCAL_INCLUDES"
-      ;;
-   osf*)
-      CPPFLAGS="$CPPFLAGS -DOSF1 $LOCAL_INCLUDES"
-      ;;
-esac
-AC_CHECK_HEADER(med.h,med2_ok=yes ,med2_ok=no)
-CPPFLAGS="$CPPFLAGS_old"
-
-if  test "x$med2_ok" = "xyes"
-then
-
-dnl check med2 library
-
-  LIBS_old="$LIBS"
-  LIBS="$LIBS $LOCAL_LIBS"
-  AC_CHECK_LIB(med,MEDouvrir,med2_ok=yes,med2_ok=no)
-  LIBS="$LIBS_old"
-
-fi
-
-if  test "x$med2_ok" = "xyes"
-then
-case $host_os in
-   linux*)
-        MED2_INCLUDES="-DPCLINUX $LOCAL_INCLUDES"
-      ;;
-   osf*)
-      MED2_INCLUDES="-DOSF1 $LOCAL_INCLUDES"
-      ;;
-esac
-  MED2_LIBS="$LOCAL_LIBS"
-  MED2_MT_LIBS="$LOCAL_LIBS"
-fi
-
-AC_MSG_RESULT(for med2: $med2_ok)
-
-])dnl
index 63601d52819007a83e22ddb46af3beaf5dfc6540..1d2ee72102df834100b3f79b22e3ee65e09af53e 100644 (file)
@@ -252,13 +252,24 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
 
 
 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
+
+ACLOCAL_MED =                     check_Med2.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/%) \
+                         $(ACLOCAL_MED:%=@MED_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 \
+                                                                      -I @MED_ROOT_DIR@/adm_local/unix/config_files
+                                                                      
\ No newline at end of file
index 6ae0a342f136baea6ad767f94ac36a54178e9c4f..5e75cdd0cfa1bf230c3bf5ae07e0a9bb76ccc0bb 100755 (executable)
@@ -26,6 +26,22 @@ fi
 #    echo "failed : KERNEL_SRC variable is not correct !"
 #    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
+
+########################################################################
+# Test if the MED_ROOT_DIR is set correctly
+
+if test ! -d "${MED_ROOT_DIR}"; then
+    echo "failed : MED_ROOT_DIR variable is not correct !"
+    exit
+fi
+
 ########################################################################
 # find_in - utility function
 #
@@ -55,6 +71,7 @@ find_in()
 
   case $1 in
     */CVS) return ;;
+    */adm_local/*) return ;;
     *) ;;
   esac
 
@@ -147,9 +164,8 @@ find_in . configure.in_tmp2
 
 # _CS_gbo_100204 Mise à jour du filtre pour prise en compte des
 # restrictions imposées par les versions récente de autoconf.
-    sed -e '/^ \.\/salome_adm/d' \
+    sed -e '/^...salome_adm/d' \
        -e '/configure.in/d'      \
-       -e '/^  \.\/adm_local/d'  \
        -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
 
 echo  "])" >> configure.in_tmp1
@@ -212,7 +228,9 @@ else
        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 \
+                                       -I ${MED_ROOT_DIR}/adm_local/unix/config_files
 if autoconf
 then
        echo "done"
index efa2e986a9354e6dd2eb9e84396a076c9a0aa51b..b4a000cac4a8b59220d6b3525f5acb5fd85f2390 100644 (file)
@@ -226,6 +226,13 @@ echo
 CHECK_HDF5
 
 #echo
+echo ---------------------------------------------
+echo testing MED
+echo ---------------------------------------------
+echo
+
+CHECK_MED
+
 echo ---------------------------------------------
 echo testing MED2
 echo ---------------------------------------------
@@ -249,6 +256,26 @@ echo
 
 CHECK_HTML_GENERATORS
 
+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 COMPONENT module necessary full GUI !"
+  exit
+fi
+
 echo
 echo ---------------------------------------------
 echo Testing Kernel