Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace obsolete packages by new ones
[modules/geom.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 15d84b478f8c5ac63cdce3ccd9ca86ddd4dc140d..6227943577b5ae84dd467b9621dfa598cca38980 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,4
+1,4
@@
-# Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-24,7
+24,7
@@
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Created from configure.in.base
#
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Created from configure.in.base
#
-AC_INIT([Salome2 Project GEOM module], [6.
3.1
], [webmaster.salome@opencascade.com], [SalomeGEOM])
+AC_INIT([Salome2 Project GEOM module], [6.
5.0
], [webmaster.salome@opencascade.com], [SalomeGEOM])
AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
@@
-33,6
+33,8
@@
AM_INIT_AUTOMAKE([tar-pax -Wno-portability])
XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
AC_SUBST(XVERSION)
XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
AC_SUBST(XVERSION)
+VERSION_DEV=0
+AC_SUBST(VERSION_DEV)
# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
MODULE_NAME=geom
# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
MODULE_NAME=geom
@@
-331,6
+333,17
@@
echo ---------------------------------------------
echo
CHECK_SPHINX
echo
CHECK_SPHINX
+echo
+echo ---------------------------------------------
+echo testing Opencv
+echo ---------------------------------------------
+echo
+CHECK_OPENCV
+if test "${opencv_ok}" = "yes"; then
+ AC_DEFINE_UNQUOTED(WITH_OPENCV,${WITH_OPENCV})
+fi
+
+
echo
echo ---------------------------------------------
echo Testing Kernel
echo
echo ---------------------------------------------
echo Testing Kernel
@@
-348,11
+361,11
@@
echo
echo Configure
if test "${gui_ok}" = "yes"; then
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 Kernel_ok gui_ok"
+ 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
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 Kernel_ok gui_ok"
+ 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"
else
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 Kernel_ok"
+ 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"
fi
for var in $variables
fi
for var in $variables
@@
-437,6
+450,7
@@
AC_OUTPUT([ \
src/GEOMBase/Makefile \
src/GEOMClient/Makefile \
src/GEOMFiltersSelection/Makefile \
src/GEOMBase/Makefile \
src/GEOMClient/Makefile \
src/GEOMFiltersSelection/Makefile \
+ src/Material/Makefile \
src/GEOMGUI/Makefile \
src/GEOMImpl/Makefile \
src/GEOMToolsGUI/Makefile \
src/GEOMGUI/Makefile \
src/GEOMImpl/Makefile \
src/GEOMToolsGUI/Makefile \
@@
-463,11
+477,13
@@
AC_OUTPUT([ \
src/STEPImport/Makefile \
src/STLExport/Makefile \
src/ShHealOper/Makefile \
src/STEPImport/Makefile \
src/STLExport/Makefile \
src/ShHealOper/Makefile \
+ src/ShapeRecognition/Makefile \
src/TransformationGUI/Makefile \
src/VTKExport/Makefile \
resources/Makefile \
resources/GEOMCatalog.xml \
resources/SalomeApp.xml \
src/TransformationGUI/Makefile \
src/VTKExport/Makefile \
resources/Makefile \
resources/GEOMCatalog.xml \
resources/SalomeApp.xml \
+ resources/Plugin \
idl/Makefile \
Makefile \
])
idl/Makefile \
Makefile \
])