From 7872d6860c3095e7bed4e95dc1828503c9eb6690 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Sat, 12 May 2012 11:32:20 +0000
Subject: [PATCH] Small correction for configure procedure: OpenCV is optional
 product

---
 adm_local/unix/config_files/check_OpenCV.m4 |  2 +-
 configure.ac                                | 75 ++++++++++++++++++---
 2 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/adm_local/unix/config_files/check_OpenCV.m4 b/adm_local/unix/config_files/check_OpenCV.m4
index 84ee1c7fc..b70ddd91e 100644
--- a/adm_local/unix/config_files/check_OpenCV.m4
+++ b/adm_local/unix/config_files/check_OpenCV.m4
@@ -81,7 +81,7 @@ fi
 if test "x$opencv_ok" == xno ; then
   AC_MSG_RESULT([for OPENCV: no])
   AC_MSG_WARN([OPENCV includes or libraries are not found or are not properly installed])
-  AC_MSG_WARN([Cannot build without OPENCV. Use --with-opencv option to define OPENCV installation.])
+  AC_MSG_WARN([Use --with-opencv option to define OPENCV installation.])
 else
   OPENCV_INCLUDES=$LOCAL_INCLUDES
   OPENCV_LIBS=$LOCAL_LIBS
diff --git a/configure.ac b/configure.ac
index 622794357..4e2b7017c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -358,24 +358,77 @@ echo Summary
 echo ---------------------------------------------
 echo
 
-echo Configure
-
-if test "${gui_ok}" = "yes"; then
-  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok sphinx_ok opencv_ok Kernel_ok gui_ok"
-elif test "${SalomeGUI_need}" != "no"; then
-  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok opencv_ok Kernel_ok gui_ok"
+if test "${SalomeGUI_need}" == "no"; then
+  echo "* Configuration options (without GUI):"
 else
-  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok opencv_ok Kernel_ok"
+  echo "* Configuration options:"
+fi
+echo
+
+obligatory_vars="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok"
+optional_vars="opencv_ok"
+gui_vars="OpenGL_ok qt_ok"
+
+###
+# mandatory products
+###
+
+echo "--- Mandatory products:"
+
+missing_obligatory=no
+for var in $obligatory_vars
+do
+  eval toto=\$$var
+  if test x$toto == "x"; then toto="no" ; fi
+  if test x$toto == "xno"; then missing_obligatory=yes ; fi
+    printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
+    eval echo \$$var
+  #fi
+done
+if test x$missing_obligatory == "xyes"; then 
+  AC_MSG_ERROR([one or more obligatory product is missing])
 fi
 
-for var in $variables
+###
+# gui products
+###
+
+if test "${SalomeGUI_need}" == "yes"; then
+  # SALOME GUI is mandatory
+  if test "${gui_ok}" != "yes"; then
+    AC_MSG_ERROR([SALOME GUI is missing])
+  fi
+fi
+
+if test "${SalomeGUI_need}" != "no"; then
+  echo "--- GUI products (optional):"
+  
+  for var in $gui_vars
+  do
+    eval toto=\$$var
+    if test x$toto == "x"; then toto="no"; fi
+    printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
+    eval echo \$toto
+  done
+fi
+
+###
+# optional products
+###
+
+echo "--- Other products (optional):"
+
+for var in $optional_vars
 do
-   printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
-   eval echo \$$var
+   eval toto=\$$var
+   if test x$toto != "x"; then
+     printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
+     eval echo \$$var
+   fi
 done
 
 echo
-echo "Default ORB   : $DEFAULT_ORB"
+echo "* Default ORB : $DEFAULT_ORB"
 echo
 
 dnl We don t need to say when we re entering directories if we re using
-- 
2.39.2