Merge pull request #35 from wellton/patch-1

Support OpenCV 4.1.2 - Update config.m4
Esse commit está contido em:
Robert Eisele
2020-01-29 14:16:30 +01:00
commit de GitHub
+16 -3
Ver Arquivo
@@ -11,15 +11,28 @@ if test "$PHP_FACEDETECT" != "no"; then
if $PKG_CONFIG opencv --atleast-version=3.0.0 ; then
AC_MSG_RESULT($CV_VERSION)
else
AC_MSG_ERROR(opencv version is too old)
AC_MSG_ERROR(opencv version is too old.)
fi
PHP_EVAL_LIBLINE($CV_LIBRARY, FACEDETECT_SHARED_LIBADD)
PHP_ADD_INCLUDE($CV_INCLUDE)
else
AC_MSG_ERROR(Please reinstall opencv)
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists opencv4; then
CV_INCLUDE=`$PKG_CONFIG opencv4 --variable=includedir_new`
CV_LIBRARY=`$PKG_CONFIG opencv4 --libs`
CV_VERSION=`$PKG_CONFIG opencv4 --modversion`
if $PKG_CONFIG opencv4 --atleast-version=3.0.0 ; then
AC_MSG_RESULT($CV_VERSION)
else
AC_MSG_ERROR(opencv version is too old)
fi
PHP_EVAL_LIBLINE($CV_LIBRARY, FACEDETECT_SHARED_LIBADD)
PHP_ADD_INCLUDE($CV_INCLUDE)
else
AC_MSG_ERROR(Please reinstall opencv)
fi
fi
PHP_SUBST(FACEDETECT_SHARED_LIBADD)
AC_DEFINE(HAVE_FACEDETECT, 1, [ ])
PHP_NEW_EXTENSION(facedetect, facedetect.cc, $ext_shared)
fi
fi