diff --git a/configure.ac b/configure.ac index e8eb2a9a57..72cd92c53b 100644 --- a/configure.ac +++ b/configure.ac @@ -726,30 +726,10 @@ return 0; dnl *** dvdnav for resindvd *** translit(dnm, m, l) AM_CONDITIONAL(USE_DVDNAV, true) AG_GST_CHECK_FEATURE(DVDNAV, [dvdnav library], resindvd, [ - translit(dnm, m, l) AC_SUBST(DVDNAV_LIBS) - translit(dnm, m, l) AC_SUBST(DVDNAV_CFLAGS) - AG_GST_CHECK_CONFIGPROG(DVDNAV, dvdnav-config) - if test x"$HAVE_DVDNAV" = x"yes"; then - dnl check version - DVDNAV_VERSION=`dvdnav-config --version|head -n 1|sed 's/^.*) //'|sed 's/ (.*)//'` - DVDNAV_MAJOR=`echo $DVDNAV_VERSION | cut -d. -f1 | sed s/[a-zA-Z\-].*//g` - DVDNAV_MINOR=`echo $DVDNAV_VERSION | cut -d. -f2 | sed s/[a-zA-Z\-].*//g` - DVDNAV_MICRO=`echo $DVDNAV_VERSION | cut -d. -f3 | sed s/[a-zA-Z\-].*//g` - if [[ "$DVDNAV_MAJOR" -lt "4" ]]; then - AC_MSG_WARN([libdvdnav >= 4.1.2 is required, you have $DVDNAV_VERSION]) - HAVE_DVDNAV="no" - elif [[ "$DVDNAV_MAJOR" -eq "4" ]] && \ - [[ "$DVDNAV_MINOR" -lt "1" ]]; then - AC_MSG_WARN([libdvdnav >= 4.1.2 is required, you have $DVDNAV_VERSION]) - HAVE_DVDNAV="no" - elif [[ "$DVDNAV_MAJOR" -eq "4" ]] && \ - [[ "$DVDNAV_MINOR" -eq "1" ]] && \ - [[ "$DVDNAV_MICRO" -lt "2" ]]; then - AC_MSG_WARN([libdvdnav >= 4.1.2 is required, you have $DVDNAV_VERSION]) - HAVE_DVDNAV="no" - fi - fi - AS_SCRUB_INCLUDE(DVDNAV_CFLAGS) + PKG_CHECK_MODULES(DVDNAV, dvdnav >= 4.1.2, HAVE_DVDNAV="yes", [ + HAVE_DVDNAV="no" + AC_MSG_RESULT(no) + ]) ]) dnl *** METADATA ***