Update of /cvsroot/robotflow/RobotFlow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8729
Modified Files:
configure.in
Log Message:
checking for proper version of opencv
Index: configure.in
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** configure.in 28 Jul 2005 15:01:15 -0000 1.52
--- configure.in 3 Aug 2005 18:41:37 -0000 1.53
***************
*** 44,47 ****
--- 44,48 ----
AC_PROG_LN_S
AC_PROG_MAKE_SET
+ PKG_PROG_PKG_CONFIG
AC_CANONICAL_HOST
AC_DISABLE_STATIC
***************
*** 205,219 ****
fi
-
dnl detection of OpenCV image library
! OPENCV_INCLUDES=`pkg-config --cflags opencv --silence-errors`
! OPENCV_LIBS=`pkg-config --libs opencv --silence-errors`
! OPENCV_FOUND=""
! if test -n "$OPENCV_INCLUDES"; then
AC_MSG_RESULT([Using OpenCV lib : $OPENCV_LIBS])
AM_CONDITIONAL(WITH_OPENCV,true)
- OPENCV_FOUND="yes"
else
! AC_MSG_RESULT([OpenCV not found, disabled])
AM_CONDITIONAL(WITH_OPENCV,false)
fi
--- 206,217 ----
fi
dnl detection of OpenCV image library
! PKG_CHECK_MODULES(OPENCV, opencv >= 0.9.6,[OPENCV_FOUND="yes"],[OPENCV_FOUND="no"])
!
! if test "$OPENCV_FOUND" = "yes"; then
AC_MSG_RESULT([Using OpenCV lib : $OPENCV_LIBS])
AM_CONDITIONAL(WITH_OPENCV,true)
else
! AC_MSG_RESULT([OpenCV >= 0.9.6 not found, disabled])
AM_CONDITIONAL(WITH_OPENCV,false)
fi
***************
*** 223,227 ****
AC_SUBST(MARIE_LIBS)
AC_SUBST(MARIE_INCLUDES)
! AC_SUBST(OPENCV_INCLUDES)
AC_SUBST(OPENCV_LIBS)
--- 221,225 ----
AC_SUBST(MARIE_LIBS)
AC_SUBST(MARIE_INCLUDES)
! AC_SUBST(OPENCV_CFLAGS)
AC_SUBST(OPENCV_LIBS)
|
