mirror-github-bspeice/libcvautomation
1
0
Fork 0
mirror of https://github.com/bspeice/libcvautomation synced 2026-05-30 19:50:58 -04:00
Code Issues Releases Wiki Activity

Fix the build process to support OpenCV 2 (Ubuntu)

Browse Source
This commit is contained in:
Bradlee Speice
2012-06-22 20:06:28 -04:00
parent 403a00435d
commit a01bf54b5d
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -27,7 +27,18 @@ AC_PATH_X
#AC_CHECK_HEADER(opencv/highgui.h)
#AC_CHECK_HEADER(X11/Xlib.h)
#AC_CHECK_HEADER(X11/Xutil.h)
PKG_CHECK_MODULES([OpenCV], [opencv >= 1.0.0])
#Configure OpenCV - version 2+ breaks a lot of things
PKG_CHECK_MODULES([OpenCV], [opencv >= 2.0.0], [use_opencv2=true], [use_opencv1=true])
if test "$use_opencv2" != ""; then
AM_CONDITIONAL(USEOPENCV2, true)
AC_DEFINE(USEOPENCV2)
fi
if test "$use_opencv1" != ""; then
echo "could not find OpenCV version 2.0.0 or higher, checking for 1.0.0 or higher..."
PKG_CHECK_MODULES([OpenCV], [opencv >= 1.0.0])
fi
PKG_CHECK_MODULES([X11], [x11 >= 1.0.3])
AC_ARG_WITH(examples, [ --with-examples build example programs '['default=yes']'])