Common update

[modules/geom.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 032af63cca44fce1c6537a6b763a49f5e2716d86..bef9adbe228438d4830ca988bd8c0a2cd17494f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -213,37 +213,65 @@ corba=make_$ORB
 CORBA=adm_local/unix/$corba
 
 fi
+
 echo
 echo ---------------------------------------------
-echo testing openGL
+echo testing msg2qm
 echo ---------------------------------------------
 echo
 
-CHECK_OPENGL
+CHECK_MSG2QM
 
-echo
-echo ---------------------------------------------
-echo testing QT
-echo ---------------------------------------------
-echo
 
-CHECK_QT
+GEOM_WITH_GUI=yes
 
-echo
-echo ---------------------------------------------
-echo testing msg2qm
-echo ---------------------------------------------
-echo
+AM_CONDITIONAL(GEOM_ENABLE_GUI, [test "${GEOM_WITH_GUI}" = "yes"])
 
-CHECK_MSG2QM
+if test "${GEOM_WITH_GUI}" = "yes"; then
+    echo
+    echo ---------------------------------------------
+    echo testing openGL
+    echo ---------------------------------------------
+    echo
 
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
+    CHECK_OPENGL
+
+    echo
+    echo ---------------------------------------------
+    echo testing QT
+    echo ---------------------------------------------
+    echo
+
+    CHECK_QT
 
-CHECK_VTK
+    echo
+    echo ---------------------------------------------
+    echo testing VTK
+    echo ---------------------------------------------
+    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
 echo ---------------------------------------------
@@ -277,26 +305,6 @@ 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 GEOM module necessary full GUI !"
-  exit
-fi
-
 echo
 echo ---------------------------------------------
 echo Testing Kernel
@@ -362,6 +370,8 @@ AC_OUTPUT([ \
   ./doc/Makefile \
   ./doc/salome/Makefile \
   ./doc/salome/gui/Makefile \
+  ./doc/salome/gui/GEOM/doxyfile \
+  ./doc/salome/gui/GEOM/doxyfile_py \
   ./doc/salome/tui/Makefile \
   ./doc/salome/tui/GEOM/doxyfile \
   ./doc/salome/tui/GEOM/sources/static/tree.js \
@@ -387,6 +397,7 @@ AC_OUTPUT([ \
   ./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 \