From f8fceccb7fecde32923dbe46693e99ee09b89525 Mon Sep 17 00:00:00 2001 From: Antoine Villeret Date: Sun, 13 Jul 2014 13:58:17 +0000 Subject: fix build on MacOSX improve help patch (contours) svn path=/trunk/externals/pix_opencv/; revision=17329 --- configure.ac | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 513109f..706f484 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,9 @@ AC_SUBST(PD_CPPFLAGS) AC_SUBST(PD_LDFLAGS) AC_SUBST(GEM_CPPFLAGS) AC_SUBST(GEM_LDFLAGS) +AC_SUBST(OPENCV_CFLAGS) +AC_SUBST(OPENCV_LDFLAGS) +AC_SUBST(OPENCV_LIBS) AC_SUBST(FACETRACKER_CPPFLAGS) AC_SUBST(FACETRACKER_LDFLAGS) AC_SUBST(EXTENSION) @@ -149,17 +152,19 @@ else fi AC_MSG_RESULT([$EXTENSION]) -AC_CHECK_LIB([opencv_core], [error],,[AC_MSG_ERROR([[please install libopencv_core and try again]])]) -AC_CHECK_LIB([opencv_imgproc], [cvCvtColor],,[AC_MSG_ERROR([[please install libopencv_imgproc and try again]])]) -AC_CHECK_LIB([opencv_legacy], [_Z38cvCreateModuleBlobTrackAnalysisHistPVSv],,[AC_MSG_ERROR([[please install libopencv_legacy and try again]])]) + +PKG_CHECK_EXISTS([opencv >= 2.4],[AC_DEFINE([HAVE_BGSUB],[1], [Define if opencv version >= 2.4])]); +PKG_CHECK_EXISTS([opencv >= 2.4.5],[AC_DEFINE([HAVE_CLAHE],[1], [Define if opencv version >= 2.4.5])]); + +AC_CHECK_LIB([opencv_core], [error],,[PKG_CHECK_MODULES([OPENCV],[opencv > 2.0],,[AC_MSG_RESULT(["warning ! can't find OpenCV !"])])]) +AC_CHECK_LIB([opencv_imgproc], [cvCvtColor],,) +AC_CHECK_LIB([opencv_legacy], [_Z38cvCreateModuleBlobTrackAnalysisHistPVSv],,) AC_CHECK_LIB([opencv_objdetect], [cvHaarDetectObjects],,) AC_CHECK_LIB([opencv_ml], [_ZN10CvKNearestC1EPK5CvMatS2_S2_bi],,) AC_CHECK_LIB([opencv_ocl], [_init],,) -AC_CHECK_LIB([opencv_calib3d], [cvFindChessboardCorners],,[AC_MSG_ERROR([[please install libopencv_calib3d and try again]])]) -AC_CHECK_LIB([opencv_video], [_ZTSN2cv20BackgroundSubtractorE],,[AC_MSG_ERROR([[please install libopencv_video and try again]])]) +AC_CHECK_LIB([opencv_calib3d], [cvFindChessboardCorners],,) +AC_CHECK_LIB([opencv_video], [_ZTSN2cv20BackgroundSubtractorE],,) AC_CHECK_LIB([opencv_nonfree],[_ZN2cv18initModule_nonfreeEv],,) -PKG_CHECK_EXISTS([opencv >= 2.4],[AC_DEFINE([HAVE_BGSUB],[1], [Define if opencv version >= 2.4])]); -PKG_CHECK_EXISTS([opencv >= 2.4.5],[AC_DEFINE([HAVE_CLAHE],[1], [Define if opencv version >= 2.4.5])]); AC_OUTPUT(Makefile src/Makefile) -- cgit v1.2.1