Changes in configure scripts

diff --git a/Makefile.in b/Makefile.in
index d4cf539e7c20a401c2511aa6e1c13fd9143af02c..b98d42fc4f827ae8a116bc1f0482c4a2acc2a228 100644 (file)
--- 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 = RANDOMIZERCatalog.xml
 

diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in
new file mode 100644 (file)
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_RANDOMIZER.m4 b/adm_local/unix/config_files/check_RANDOMIZER.m4
new file mode 100755 (executable)
index 0000000..8b3c199
--- /dev/null
+++ b/adm_local/unix/config_files/check_RANDOMIZER.m4
@@ -0,0 +1,52 @@
+#  Check availability of RANDOMIZER binary distribution
+#
+#  Author : Marc Tajchman (CEA, 2002)
+#------------------------------------------------------------
+
+AC_DEFUN([CHECK_RANDOMIZER],[
+
+AC_CHECKING(for Randomizer)
+
+Randomizer_ok=no
+
+AC_ARG_WITH(rand,
+           --with-randomizer=DIR  root directory path of RANDOMIZER build or installation,
+           RANDOMIZER_DIR="$withval",RANDOMIZER_DIR="")
+
+if test "x$RANDOMIZER_DIR" = "x" ; then
+
+# no --with-gui-dir option used
+
+  if test "x$RANDOMIZER_ROOT_DIR" != "x" ; then
+
+    # SALOME_ROOT_DIR environment variable defined
+    RANDOMIZER_DIR=$RANDOMIZER_ROOT_DIR
+
+  else
+
+    # search Salome binaries in PATH variable
+    AC_PATH_PROG(TEMP, RANDOMIZER.py)
+    if test "x$TEMP" != "x" ; then
+      RANDOMIZER_DIR=`dirname $TEMP`
+    fi
+
+  fi
+
+fi
+
+if test -f ${RANDOMIZER_DIR}/lib/salome/RANDOMIZER.py  ; 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 compiled RANDOMIZER module distribution")
+fi
+  
+AC_MSG_RESULT(for RANDOMIZER: $Randomizer_ok)
+ 
+])dnl
+ 

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 61115078138329ff634c0b16fcda2b887c98c6de..61e0b55e7623975445d6b1ebe6fe16d9cba5c5e9 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -152,13 +152,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 21340d7677e96a91e73a7afab7d590a0a30f47c9..a0a5d9eec0d0702058b2dea2f826a66e58aaee5b 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -55,6 +55,7 @@ find_in()
 
   case $1 in
     */CVS) return ;;
+    */adm_local/*) return ;;
     *) ;;
   esac
 
@@ -147,13 +148,13 @@ 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
 
+
 # delete the link created for AC_OUTPUT
 echo "" >> configure.in_tmp1
 #echo 'rm -f ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
@@ -212,7 +213,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 3374e9f9c7953c473bb9445f6ddb00e3ccfeb5c1..8fa7493e0e51bf7a303f1465c7d3d613b53a5e48 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -123,6 +123,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 CALCULATOR module necessary full GUI !"
+  exit
+fi
+
 echo
 echo ---------------------------------------------
 echo Testing Kernel