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

---
 .../unix/config_files/check_RANDOMIZER.m4     | 58 ++++++++-----------
 build_configure                               |  8 +++
 2 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/adm_local/unix/config_files/check_RANDOMIZER.m4 b/adm_local/unix/config_files/check_RANDOMIZER.m4
index 8b3c199..9d6682c 100755
--- a/adm_local/unix/config_files/check_RANDOMIZER.m4
+++ b/adm_local/unix/config_files/check_RANDOMIZER.m4
@@ -1,7 +1,10 @@
-#  Check availability of RANDOMIZER binary distribution
-#
-#  Author : Marc Tajchman (CEA, 2002)
-#------------------------------------------------------------
+###########################################################
+# 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],[
 
@@ -9,44 +12,31 @@ AC_CHECKING(for Randomizer)
 
 Randomizer_ok=no
 
-AC_ARG_WITH(rand,
-	    --with-randomizer=DIR  root directory path of RANDOMIZER build or installation,
+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-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
-
+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}/lib/salome/RANDOMIZER.py  ; then
-  Randomizer_ok=yes
-  AC_MSG_RESULT(Using RANDOMIZER module distribution in ${RANDOMIZER_DIR})
+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)
+   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")
+   AC_MSG_WARN("Cannot find Randomizer module sources")
 fi
   
-AC_MSG_RESULT(for RANDOMIZER: $Randomizer_ok)
+AC_MSG_RESULT(for Randomizer: $Randomizer_ok)
  
 ])dnl
  
diff --git a/build_configure b/build_configure
index a0a5d9e..180fec0 100755
--- a/build_configure
+++ b/build_configure
@@ -26,6 +26,14 @@ 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
+
 ########################################################################
 # find_in - utility function
 #
-- 
2.39.2