diff options
| author | Руслан Ижбулатов <lrn1986@gmail.com> | 2015-04-12 00:56:48 +0000 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-04-17 17:25:18 +0200 |
| commit | 64080e632d7e86b218f2595bcc7b3a9199c1bc4a (patch) | |
| tree | 95c105626a73e7b26a102957b23519504f7f5208 /configure.ac | |
| parent | a02a948a5dbdda949f2aa818981eb2fc96e03b76 (diff) | |
| download | gstreamer-plugins-bad-64080e632d7e86b218f2595bcc7b3a9199c1bc4a.tar.gz | |
opencv: Change configure test to check for OpenCV2 headers
* Checks for opencv2 headers only, not for legacy opencv1 headers
* Checks for every opencv2 header that the implementation needs,
not just highgui_c.h
https://bugzilla.gnome.org/show_bug.cgi?id=725163
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2ba3033ca..bfde9c63b 100644 --- a/configure.ac +++ b/configure.ac @@ -2447,15 +2447,26 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [ AC_LANG([C++]) OLD_CPPFLAGS=$CPPFLAGS CPPFLAGS=$OPENCV_CFLAGS - AC_CHECK_HEADERS([highgui.h opencv2/highgui/highgui_c.h]) + something_not_found=no + AC_CHECK_HEADERS([opencv2/contrib/contrib.hpp \ + opencv2/core/core_c.h \ + opencv2/core/types_c.h \ + opencv2/core/version.hpp \ + opencv2/highgui/highgui_c.h \ + opencv2/imgproc/imgproc.hpp \ + opencv2/imgproc/imgproc_c.h \ + opencv2/legacy/compat.hpp \ + opencv2/legacy/legacy.hpp \ + opencv2/objdetect/objdetect.hpp \ + opencv2/video/background_segm.hpp], [], [something_not_found=yes]) CPPFLAGS=$OLD_CPPFLAGS AC_LANG([C]) - if test $ac_cv_header_highgui_h = "yes" -o $ac_cv_header_opencv2_highgui_highgui_c_h = "yes" ; then - HAVE_OPENCV="yes" - else - AC_MSG_RESULT([neither highgui.h nor opencv2/highgui/highgui_c.h could not be found]) + if test $something_not_found = "yes"; then + AC_MSG_RESULT([not all opencv2 headers were found]) HAVE_OPENCV="no" + else + HAVE_OPENCV="yes" fi ], [ HAVE_OPENCV="no" |