Changed in configuration scripts

diff --git a/Makefile.in b/Makefile.in
index 90f03cce469ad050245c459182890c6787eafd2a..613445cedd2f533450b0edbeec9dad68d8b8ceb0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 @COMMENCE@
 
-SUBDIRS = idl src doc
+SUBDIRS = idl src doc adm_local
 
 RESOURCES_FILES = \
 components.png \

diff --git a/adm_local/unix/config_files/check_SUPERV.m4 b/adm_local/unix/config_files/check_SUPERV.m4
new file mode 100755 (executable)
index 0000000..0ac2ba0
--- /dev/null
+++ b/adm_local/unix/config_files/check_SUPERV.m4
@@ -0,0 +1,53 @@
+#  Check availability of SUPERV module binary distribution
+#
+#  Author : Marc Tajchman (CEA, 2002)
+#------------------------------------------------------------
+
+AC_DEFUN([CHECK_SUPERV],[
+
+AC_CHECKING(for Superv)
+
+Superv_ok=no
+
+AC_ARG_WITH(superv,
+           --with-superv=DIR root directory path of SUPERV installation,
+           SUPERV_DIR="$withval",SUPERV_DIR="")
+
+if test "x$SUPERV_DIR" = "x" ; then
+
+# no --with-gui-dir option used
+
+  if test "x$SUPERV_ROOT_DIR" != "x" ; then
+
+    # SUPERV_ROOT_DIR environment variable defined
+    SUPERV_DIR=$SUPERV_ROOT_DIR
+
+  else
+
+    # search SUPERV binaries in PATH variable
+    AC_PATH_PROG(TEMP, libSUPERV.so)
+    if test "x$TEMP" != "x" ; then
+      SUPERV_BIN_DIR=`dirname $TEMP`
+      SUPERV_DIR=`dirname $SUPERV_BIN_DIR`
+    fi
+
+  fi
+#
+fi
+
+if test -f ${SUPERV_DIR}/lib/salome/libSUPERV.so  ; then
+  Superv_ok=yes
+  AC_MSG_RESULT(Using SUPERV distribution in ${SUPERV_DIR})
+
+  if test "x$SUPERV_ROOT_DIR" == "x" ; then
+    SUPERV_ROOT_DIR=${SUPERV_DIR}
+  fi
+  AC_SUBST(SUPERV_ROOT_DIR)
+else
+  AC_MSG_WARN("Cannot find compiled SUPERV distribution")
+fi
+  
+AC_MSG_RESULT(for SUPERV: $Superv_ok)
+ 
+])dnl
+ 

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 04d424ab24ec4b02ccf15a575fda577296344440..6c4587da5d7d533bb415fb4a22406e6a761b380a 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -252,13 +252,19 @@ $(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 
+
+$(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

diff --git a/build_configure b/build_configure
index 734930e9e643872b3a2dcd6e2994dfbab4c60fac..9ae321e37e17ddc1f830f83acfd8b32be7d42437 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -203,7 +203,8 @@ 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
 if autoconf
 then
        echo "done"

diff --git a/configure.in.base b/configure.in.base
index 7ec53a53aa91e49aea291508b0d44a514505ae15..05fcae2f4c34ee0c4bacffb5b3fa759fa0e9b689 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -258,6 +258,26 @@ echo
 CHECK_HTML_GENERATORS
 
 echo
+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 SUPERV module necessary full GUI !"
+  exit
+fi
+
 echo ---------------------------------------------
 echo Testing Kernel
 echo ---------------------------------------------