From 36545f27def59878a71673c71e584fab3d0a9555 Mon Sep 17 00:00:00 2001
From: nds <nds@opencascade.com>
Date: Fri, 10 Mar 2006 08:40:18 +0000
Subject: [PATCH] Canges in configure scripts.

---
 Makefile.in                                   |   2 +-
 adm_local/Makefile.in                         |  41 +++++++
 adm_local/unix/config_files/check_Med.m4      |  43 -------
 adm_local/unix/config_files/check_Med2.m4     | 114 ------------------
 .../unix/config_files/check_Randomizer.m4     |  42 -------
 .../unix/config_files/check_SIERPINSKY.m4     |  52 ++++++++
 adm_local/unix/config_files/check_Visu.m4     |  42 -------
 adm_local/unix/make_commence.in               |  33 +++--
 build_configure                               |  43 ++++++-
 configure.in.base                             |  28 +++++
 10 files changed, 184 insertions(+), 256 deletions(-)
 create mode 100644 adm_local/Makefile.in
 delete mode 100644 adm_local/unix/config_files/check_Med.m4
 delete mode 100644 adm_local/unix/config_files/check_Med2.m4
 delete mode 100644 adm_local/unix/config_files/check_Randomizer.m4
 create mode 100755 adm_local/unix/config_files/check_SIERPINSKY.m4
 delete mode 100644 adm_local/unix/config_files/check_Visu.m4

diff --git a/Makefile.in b/Makefile.in
index 04e0ad6..504e999 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 = \
 	SIERPINSKYCatalog.xml \
diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in
new file mode 100644
index 0000000..9b5e810
--- /dev/null
+++ b/adm_local/Makefile.in
@@ -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_Med.m4 b/adm_local/unix/config_files/check_Med.m4
deleted file mode 100644
index 18d3ccd..0000000
--- a/adm_local/unix/config_files/check_Med.m4
+++ /dev/null
@@ -1,43 +0,0 @@
-###########################################################
-# File    : check_Med.m4
-# Author  : Vadim SANDLER (OCN)
-# Created : 13/07/05
-# Copyright (C) 2005 Open CASCADE
-# Check availability of MED binary distribution
-###########################################################
-
-AC_DEFUN([CHECK_MED],[
-
-AC_CHECKING(for Med)
-
-Med_ok=no
-
-AC_ARG_WITH(med,
-	    [  --with-med=DIR root directory path of MED installation ],
-	    MED_DIR="$withval",MED_DIR="")
-
-if test "x$MED_DIR" == "x" ; then
-   # no --with-med-dir option used
-   if test "x$MED_ROOT_DIR" != "x" ; then
-      # MED_ROOT_DIR environment variable defined
-      MED_DIR=$MED_ROOT_DIR
-   fi
-fi
-
-if test -f ${MED_DIR}/idl/salome/MED.idl ; then
-   Med_ok=yes
-   AC_MSG_RESULT(Using Med module distribution in ${MED_DIR})
-
-   if test "x$MED_ROOT_DIR" == "x" ; then
-      MED_ROOT_DIR=${MED_DIR}
-   fi
-   AC_SUBST(MED_ROOT_DIR)
-
-else
-   AC_MSG_WARN("Cannot find Med module sources")
-fi
-  
-AC_MSG_RESULT(for Med: $Med_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
index 82b1078..0000000
--- a/adm_local/unix/config_files/check_Med2.m4
+++ /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
diff --git a/adm_local/unix/config_files/check_Randomizer.m4 b/adm_local/unix/config_files/check_Randomizer.m4
deleted file mode 100644
index 9d6682c..0000000
--- a/adm_local/unix/config_files/check_Randomizer.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-###########################################################
-# File    : check_Randomizer.m4
-# Author  : Vadim SANDLER (OCN)
-# Created : 13/07/05
-# Copyright (C) 2005 Open CASCADE
-# Check availability of Randomizer binary distribution
-###########################################################
-
-AC_DEFUN([CHECK_RANDOMIZER],[
-
-AC_CHECKING(for Randomizer)
-
-Randomizer_ok=no
-
-AC_ARG_WITH(rnd,
-	    [  --with-rnd=DIR root directory path of RANDOMIZER module installation ],
-	    RANDOMIZER_DIR="$withval",RANDOMIZER_DIR="")
-
-if test "x$RANDOMIZER_DIR" == "x" ; then
-   # no --with-rnd-dir option used
-   if test "x$RANDOMIZER_ROOT_DIR" != "x" ; then
-      # RANDOMIZER_ROOT_DIR environment variable defined
-      RANDOMIZER_DIR=$RANDOMIZER_ROOT_DIR
-   fi
-fi
-
-if test -f ${RANDOMIZER_DIR}/idl/salome/Randomizer.idl ; then
-   Randomizer_ok=yes
-   AC_MSG_RESULT(Using Randomizer module distribution in ${RANDOMIZER_DIR})
-
-   if test "x$RANDOMIZER_ROOT_DIR" == "x" ; then
-      RANDOMIZER_ROOT_DIR=${RANDOMIZER_DIR}
-   fi
-   AC_SUBST(RANDOMIZER_ROOT_DIR)
-else
-   AC_MSG_WARN("Cannot find Randomizer module sources")
-fi
-  
-AC_MSG_RESULT(for Randomizer: $Randomizer_ok)
- 
-])dnl
- 
diff --git a/adm_local/unix/config_files/check_SIERPINSKY.m4 b/adm_local/unix/config_files/check_SIERPINSKY.m4
new file mode 100755
index 0000000..2b64e64
--- /dev/null
+++ b/adm_local/unix/config_files/check_SIERPINSKY.m4
@@ -0,0 +1,52 @@
+#  Check availability of SIERPINSKY binary distribution
+#
+#  Author : Marc Tajchman (CEA, 2002)
+#------------------------------------------------------------
+
+AC_DEFUN([CHECK_SIERPINSKY],[
+
+AC_CHECKING(for Sierpinsky)
+
+Sierpinsky_ok=no
+
+AC_ARG_WITH(sier,
+	    --with-sierpinsky=DIR  root directory path of SIERPINSKY build or installation,
+	    SIERPINSKY_DIR="$withval",SIERPINSKY_DIR="")
+
+if test "x$SIERPINSKY_DIR" = "x" ; then
+
+# no --with-gui-dir option used
+
+  if test "x$SIERPINSKY_ROOT_DIR" != "x" ; then
+
+    # SALOME_ROOT_DIR environment variable defined
+    SIERPINSKY_DIR=$SIERPINSKY_ROOT_DIR
+
+  else
+
+    # search Salome binaries in PATH variable
+    AC_PATH_PROG(TEMP, libSIERPINSKY.so)
+    if test "x$TEMP" != "x" ; then
+      SIERPINSKY_DIR=`dirname $TEMP`
+    fi
+
+  fi
+
+fi
+
+if test -f ${SIERPINSKY_DIR}/lib/salome/libSIERPINSKY.so  ; then
+  Sierpinsky_ok=yes
+  AC_MSG_RESULT(Using SIERPINSKY module distribution in ${SIERPINSKY_DIR})
+
+  if test "x$SIERPINSKY_ROOT_DIR" == "x" ; then
+    SIERPINSKY_ROOT_DIR=${SIERPINSKY_DIR}
+  fi
+  AC_SUBST(SIERPINSKY_ROOT_DIR)
+else
+  AC_MSG_WARN("Cannot find compiled SIERPINSKY module distribution")
+fi
+  
+AC_MSG_RESULT(for SIERPINSKY: $Sierpinsky_ok)
+ 
+])dnl
+ 
diff --git a/adm_local/unix/config_files/check_Visu.m4 b/adm_local/unix/config_files/check_Visu.m4
deleted file mode 100644
index 7700fb5..0000000
--- a/adm_local/unix/config_files/check_Visu.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-###########################################################
-# File    : check_Visu.m4
-# Author  : Vadim SANDLER (OCN)
-# Created : 13/07/05
-# Copyright (C) 2005 Open CASCADE
-# Check availability of VISU binary distribution
-###########################################################
-
-AC_DEFUN([CHECK_VISU],[
-
-AC_CHECKING(for VISU)
-
-Visu_ok=no
-
-AC_ARG_WITH(visu,
-	    [  --with-visu=DIR root directory path of VISU module installation ],
-	    VISU_DIR="$withval",VISU_DIR="")
-
-if test "x$VISU_DIR" == "x" ; then
-   # no --with-visu-dir option used
-   if test "x$VISU_ROOT_DIR" != "x" ; then
-      # VISU_ROOT_DIR environment variable defined
-      VISU_DIR=$VISU_ROOT_DIR
-   fi
-fi
-
-if test -f ${VISU_DIR}/idl/salome/VISU_Gen.idl ; then
-   Visu_ok=yes
-   AC_MSG_RESULT(Using VISU module distribution in ${VISU_DIR})
-
-   if test "x$VISU_ROOT_DIR" == "x" ; then
-      VISU_ROOT_DIR=${VISU_DIR}
-   fi
-   AC_SUBST(VISU_ROOT_DIR)
-else
-   AC_MSG_WARN("Cannot find VISU module sources")
-fi
-  
-AC_MSG_RESULT(for VISU: $Visu_ok)
- 
-])dnl
- 
diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 28dbe9e..d74ac23 100644
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -267,18 +267,29 @@ $(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      \
-check_boost.m4
-
-ACLOCAL_SRC1 = \
-check_Med.m4	check_Med2.m4	check_Randomizer.m4 \
-check_Visu.m4	check_gd.m4
-
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) $(ACLOCAL_SRC1:%=$(top_srcdir)/adm_local/unix/config_files/%)
-	cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files
+ac_cc_warnings.m4                 check_swig.m4      check_boost.m4
+
+ACLOCAL_GUI = \
+check_vtk.m4                      check_opengl.m4    check_qt.m4	\
+check_GUI.m4                      check_corba_in_GUI.m4
+
+ACLOCAL_MED =                     check_Med.m4       check_Med2.m4
+ACLOCAL_RAND =                    check_RANDOMIZER.m4
+ACLOCAL_VISU =                    check_VISU.m4
+ACLOCAL_CUR =                     check_gd.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/%)
+					$(ACLOCAL_VISU:%=@VISU_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 \
+									-I @RANDOMIZER_ROOT_DIR@/adm_local/unix/config_files \
+									-I @VISU_ROOT_DIR@/adm_local/unix/config_files
diff --git a/build_configure b/build_configure
index 21340d7..9c76e6a 100755
--- a/build_configure
+++ b/build_configure
@@ -20,6 +20,38 @@ if test ! -d "${KERNEL_ROOT_DIR}"; then
     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
+
+########################################################################
+# Test if the RANDOMIZER_ROOT_DIR is set correctly
+
+if test ! -d "${RANDOMIZER_ROOT_DIR}"; then
+    echo "failed : RANDOMIZER_ROOT_DIR variable is not correct !"
+    exit
+fi
+
+########################################################################
+# Test if the VISU_ROOT_DIR is set correctly
+
+if test ! -d "${VISU_ROOT_DIR}"; then
+    echo "failed : VISU_ROOT_DIR variable is not correct !"
+    exit
+fi
+
 # Test if the KERNEL_SRC is set correctly
 
 #if test ! -d "${KERNEL_SRC}"; then
@@ -55,6 +87,7 @@ find_in()
 
   case $1 in
     */CVS) return ;;
+    */adm_local/*) return ;;
     *) ;;
   esac
 
@@ -147,9 +180,9 @@ 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 '/^...\/adm_local/d'  \
 	-e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
 
 echo  "])" >> configure.in_tmp1
@@ -212,7 +245,11 @@ else
 	echo -n "Creating 'configure' script ...  "
 fi
 
-aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+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 \
+					    -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files \
+					    -I ${VISU_ROOT_DIR}/adm_local/unix/config_files
 if autoconf
 then
 	echo "done"
diff --git a/configure.in.base b/configure.in.base
index e61a9bb..9858e28 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -273,6 +273,26 @@ echo
 
 CHECK_GDLIB
 
+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
@@ -289,6 +309,14 @@ echo
 
 CHECK_MED
 
+echo
+echo ---------------------------------------------
+echo testing MED2
+echo ---------------------------------------------
+echo
+
+CHECK_MED2
+
 echo
 echo ---------------------------------------------
 echo Testing Visu
-- 
2.30.2