0020012: EDF 831 GEOM : API for points representation in 3D viewer

[modules/geom.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2c6a8897bef0e7993690cc400c7b70d7cc93674a..69057767537254d2708c7e9f4177e0977c75728d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,11 +26,11 @@
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project GEOM module], [5.1.1], [webmaster.salome@opencascade.com], [SalomeGEOM])
-AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
+AC_INIT([Salome2 Project GEOM module], [5.1.3], [webmaster.salome@opencascade.com], [SalomeGEOM])
+AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([tar-pax])
+AM_INIT_AUTOMAKE([tar-pax -Wno-portability])
 
 
 XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
@@ -82,6 +82,7 @@ echo
 
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+AC_LOCAL_INSTALL
 dnl
 dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques !
 
@@ -108,7 +109,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the
 dnl full-path to the binary instead.
 case "$INSTALL" in
    *install-sh*)
-      INSTALL='\${ROOT_BUILDDIR}'/salome_adm/unix/config_files/install-sh
+      INSTALL='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh
       ;;
 esac
 
@@ -232,11 +233,34 @@ CORBA=adm_local/unix/$corba
 
 fi
 
-GEOM_WITH_GUI=yes
+echo
+echo ---------------------------------------------
+echo Testing GUI
+echo ---------------------------------------------
+echo
+
+CHECK_GUI_MODULE
 
-AM_CONDITIONAL(GEOM_ENABLE_GUI, [test "${GEOM_WITH_GUI}" = "yes"])
+gui_ok=no
+if test "${SalomeGUI_need}" != "no" -a "${FullGUI_ok}" = "yes" ; then 
+  gui_ok=yes
+fi
 
-if test "${GEOM_WITH_GUI}" = "yes"; then
+AM_CONDITIONAL(GEOM_ENABLE_GUI, [test "${gui_ok}" = "yes"])
+
+if test "${SalomeGUI_need}" == "yes"; then
+  if test "${FullGUI_ok}" != "yes"; then
+    AC_MSG_WARN(For configure GEOM module necessary full GUI!)
+  fi
+elif test "${SalomeGUI_need}" == "auto"; then
+  if test "${FullGUI_ok}" != "yes"; then
+    AC_MSG_WARN(Full GUI not found. Build will be done without GUI!)
+  fi
+elif test "${SalomeGUI_need}" == "no"; then
+  echo Build without GUI option has been chosen
+fi
+
+if test "${gui_ok}" = "yes"; then
     echo
     echo ---------------------------------------------
     echo testing openGL
@@ -260,26 +284,6 @@ if test "${GEOM_WITH_GUI}" = "yes"; then
     echo
 
     CHECK_VTK
-
-    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 GEOM module necessary full GUI !"
-      exit
-    fi
 fi
 
 echo
@@ -330,11 +334,12 @@ echo
 
 echo Configure
 
-if test "${GEOM_WITH_GUI}" = "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 Kernel_ok SalomeGUI_ok"
-fi
-if test "${GEOM_WITH_GUI}" = "no"; then
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+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 Kernel_ok gui_ok"
+elif test "${SalomeGUI_need}" != "no"; then
+  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok"
+else
+  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
 fi
 
 for var in $variables
@@ -370,65 +375,64 @@ echo
 # autoscan, the Makefile list is generated in the output file configure.scan.
 # This could be helpfull to update de configuration.
 AC_OUTPUT([ \
-  ./salome_adm/unix/SALOMEconfig.h \
-  ./adm_local/Makefile \
-  ./adm_local/cmake_files/Makefile \
-  ./adm_local/unix/Makefile \
-  ./adm_local/unix/config_files/Makefile \
-  ./bin/VERSION \
-  ./bin/Makefile \
-  ./GEOM_version.h \
-  ./doc/Makefile \
-  ./doc/salome/Makefile \
-  ./doc/salome/gui/Makefile \
-  ./doc/salome/gui/GEOM/Makefile \
-  ./doc/salome/gui/GEOM/doxyfile \
-  ./doc/salome/gui/GEOM/doxyfile_py \
-  ./doc/salome/gui/GEOM/doxyfile_tui \
-  ./doc/salome/tui/Makefile \
-  ./doc/salome/tui/doxyfile \
-  ./src/Makefile \
-  ./src/ARCHIMEDE/Makefile \
-  ./src/BREPExport/Makefile \
-  ./src/BREPImport/Makefile \
-  ./src/BasicGUI/Makefile \
-  ./src/BlocksGUI/Makefile \
-  ./src/BooleanGUI/Makefile \
-  ./src/BuildGUI/Makefile \
-  ./src/DisplayGUI/Makefile \
-  ./src/DlgRef/Makefile \
-  ./src/EntityGUI/Makefile \
-  ./src/GEOM/Makefile \
-  ./src/GEOMAlgo/Makefile \
-  ./src/GEOMBase/Makefile \
-  ./src/GEOMClient/Makefile \
-  ./src/GEOMFiltersSelection/Makefile \
-  ./src/GEOMGUI/Makefile \
-  ./src/GEOMImpl/Makefile \
-  ./src/GEOMToolsGUI/Makefile \
-  ./src/GEOM_I/Makefile \
-  ./src/GEOM_I_Superv/Makefile \
-  ./src/GEOM_SWIG/Makefile \
-  ./src/GEOM_SWIG_WITHIHM/Makefile \
-  ./src/GenerationGUI/Makefile \
-  ./src/GroupGUI/Makefile \
-  ./src/IGESExport/Makefile \
-  ./src/IGESImport/Makefile \
-  ./src/MeasureGUI/Makefile \
-  ./src/NMTDS/Makefile \
-  ./src/NMTTools/Makefile \
-  ./src/OBJECT/Makefile \
-  ./src/OperationGUI/Makefile \
-  ./src/PrimitiveGUI/Makefile \
-  ./src/RepairGUI/Makefile \
-  ./src/SKETCHER/Makefile \
-  ./src/STEPExport/Makefile \
-  ./src/STEPImport/Makefile \
-  ./src/STLExport/Makefile \
-  ./src/ShHealOper/Makefile \
-  ./src/TransformationGUI/Makefile \
-  ./resources/Makefile \
-  ./resources/GEOMCatalog.xml \
-  ./idl/Makefile \
+  adm_local/Makefile \
+  adm_local/cmake_files/Makefile \
+  adm_local/unix/Makefile \
+  adm_local/unix/config_files/Makefile \
+  bin/VERSION \
+  bin/Makefile \
+  GEOM_version.h \
+  doc/Makefile \
+  doc/salome/Makefile \
+  doc/salome/gui/Makefile \
+  doc/salome/gui/GEOM/Makefile \
+  doc/salome/gui/GEOM/doxyfile \
+  doc/salome/gui/GEOM/doxyfile_py \
+  doc/salome/gui/GEOM/doxyfile_tui \
+  doc/salome/tui/Makefile \
+  doc/salome/tui/doxyfile \
+  src/Makefile \
+  src/ARCHIMEDE/Makefile \
+  src/BREPExport/Makefile \
+  src/BREPImport/Makefile \
+  src/BasicGUI/Makefile \
+  src/BlocksGUI/Makefile \
+  src/BooleanGUI/Makefile \
+  src/BuildGUI/Makefile \
+  src/DisplayGUI/Makefile \
+  src/DlgRef/Makefile \
+  src/EntityGUI/Makefile \
+  src/GEOM/Makefile \
+  src/GEOMAlgo/Makefile \
+  src/GEOMBase/Makefile \
+  src/GEOMClient/Makefile \
+  src/GEOMFiltersSelection/Makefile \
+  src/GEOMGUI/Makefile \
+  src/GEOMImpl/Makefile \
+  src/GEOMToolsGUI/Makefile \
+  src/GEOM_I/Makefile \
+  src/GEOM_I_Superv/Makefile \
+  src/GEOM_SWIG/Makefile \
+  src/GEOM_SWIG_WITHIHM/Makefile \
+  src/GenerationGUI/Makefile \
+  src/GroupGUI/Makefile \
+  src/IGESExport/Makefile \
+  src/IGESImport/Makefile \
+  src/MeasureGUI/Makefile \
+  src/NMTDS/Makefile \
+  src/NMTTools/Makefile \
+  src/OBJECT/Makefile \
+  src/OperationGUI/Makefile \
+  src/PrimitiveGUI/Makefile \
+  src/RepairGUI/Makefile \
+  src/SKETCHER/Makefile \
+  src/STEPExport/Makefile \
+  src/STEPImport/Makefile \
+  src/STLExport/Makefile \
+  src/ShHealOper/Makefile \
+  src/TransformationGUI/Makefile \
+  resources/Makefile \
+  resources/GEOMCatalog.xml \
+  idl/Makefile \
   Makefile \
 ])