From: gdd <gdd>
Date: Tue, 8 Nov 2011 14:31:36 +0000 (+0000)
Subject: rnc: fix error in checking of opencv at configure step
X-Git-Tag: V6_5_0a1~125
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=02971b5182e536183c3e3ff587fc9e6645e3bc66;p=modules%2Fgeom.git

rnc: fix error in checking of opencv at configure step
---

diff --git a/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am
index a1fbbcb93..e543b2875 100644
--- a/src/EntityGUI/Makefile.am
+++ b/src/EntityGUI/Makefile.am
@@ -33,6 +33,8 @@ if WITH_OPENCV
   PictureImportDlg_moc = EntityGUI_PictureImportDlg_moc.cxx
   Opencv_libs = $(OPENCV_LIBS)
   Opencv_includes = $(OPENCV_INCLUDES)
+  ShapeRec_dir = $(srcdir)/../ShapeRecognition
+  ShapeRec_la = ../ShapeRecognition/libGEOMShapeRec.la  
 endif
 
 # Libraries targets
@@ -106,17 +108,18 @@ libEntityGUI_la_CPPFLAGS =			\
 	-I$(srcdir)/../GEOMImpl			\
 	-I$(srcdir)/../GEOMFiltersSelection	\
 	-I$(srcdir)/../SKETCHER			\
-	-I$(srcdir)/../ShapeRecognition		\
+	-I$(ShapeRec_dir)			\
 	-I$(srcdir)/../GEOM			\
 	-I$(top_builddir)/src/DlgRef		\
 	-I$(top_builddir)/idl
 
+
 libEntityGUI_la_LDFLAGS  =					\
 	../GEOMFiltersSelection/libGEOMFiltersSelection.la	\
 	../GEOMBase/libGEOMBase.la				\
 	../SKETCHER/libGEOMSketcher.la				\
 	../GEOMGUI/libGEOM.la 					\
-	../ShapeRecognition/libGEOMShapeRec.la			\
+	$(ShapeRec_la)						\
 	$(QT_MT_LIBS)						\
 	$(CAS_TKTopAlgo) -lTKernel				\
 	$(Opencv_libs)