X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=8ab5e62cedc32d16b4a3d9ff2152d22340bb0e9b;hb=refs%2Ftags%2FV6_5_0rc1;hp=dbf3414255a920f67acd34756adfc3368b3456f9;hpb=46c866d149f7e60135fb1cf5ad9979680b041bf3;p=modules%2Fgeom.git

diff --git a/configure.ac b/configure.ac
index dbf341425..8ab5e62ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,19 +318,6 @@ echo
 
 CHECK_CAS
 
-echo "OCC_VERSION_DEVELOPMENT = ${OCC_VERSION_DEVELOPMENT}"
-NMTDS_VAR=NMTDS
-NMTTools_VAR=NMTTools
-GEOMAlgo_VAR=GEOMAlgo
-if test "${OCC_VERSION_DEVELOPMENT}" == "1"; then
-  NMTDS_VAR=NMTDS_NEW
-  NMTTools_VAR=NMTTools_NEW
-  GEOMAlgo_VAR=GEOMAlgo_NEW
-fi
-AC_SUBST(NMTDS_VAR)
-AC_SUBST(NMTTools_VAR)
-AC_SUBST(GEOMAlgo_VAR)
-
 echo
 echo ---------------------------------------------
 echo Testing html generators
@@ -371,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 gui_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
+
+###
+# 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 $variables
+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
@@ -460,7 +500,6 @@ AC_OUTPUT([ \
   src/EntityGUI/Makefile \
   src/GEOM/Makefile \
   src/GEOMAlgo/Makefile \
-  src/GEOMAlgo_NEW/Makefile \
   src/GEOMBase/Makefile \
   src/GEOMClient/Makefile \
   src/GEOMFiltersSelection/Makefile \
@@ -480,9 +519,7 @@ AC_OUTPUT([ \
   src/IGESImport/Makefile \
   src/MeasureGUI/Makefile \
   src/NMTDS/Makefile \
-  src/NMTDS_NEW/Makefile \
   src/NMTTools/Makefile \
-  src/NMTTools_NEW/Makefile \
   src/OBJECT/Makefile \
   src/OCC2VTK/Makefile \
   src/OperationGUI/Makefile \