summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-04-12 19:35:53 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-04-12 19:35:53 +0000
commitc7c3d91d9857bad4c7f4d915fd30fec39351f2ff (patch)
tree231b772079935c327f56fe82dd6b64b92b5c914d
parente11bd56e02b5eb1296988b2abed3942f700997e3 (diff)
downloadgst-plugins-bad-c7c3d91d9857bad4c7f4d915fd30fec39351f2ff.tar.gz
gst-plugins-bad-c7c3d91d9857bad4c7f4d915fd30fec39351f2ff.tar.bz2
gst-plugins-bad-c7c3d91d9857bad4c7f4d915fd30fec39351f2ff.zip
Fix dvdnav detection
Original commit message from CVS: Fix dvdnav detection
-rw-r--r--configure.ac14
1 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index b328a278..adac51e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AM_MAINTAINER_MODE
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 6, 0, 0, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror")
+AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 6, 0, 90, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror")
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
dnl fix errors properly then remove this again
GST_ERROR=
@@ -528,10 +528,14 @@ GST_CHECK_FEATURE(DVDNAV, [dvdnav library], dvdnavsrc, [
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 0 ] || \
- [ $DVDNAV_MINOR -lt 1 ] || \
- [ $DVDNAV_MICRO -lt 4 ]; then
- AC_MSG_WARN([libdvdnav >= 0.1.4 is required, you have $DVDNAV_VERSION])
+ if [[ "$DVDNAV_MAJOR" -eq "0" ]] && \
+ [[ "$DVDNAV_MINOR" -lt "1" ]]; then
+ AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION])
+ HAVE_DVDNAV="no"
+ elif [[ "$DVDNAV_MAJOR" -eq "0" ]] && \
+ [[ "$DVDNAV_MINOR" -eq "1" ]] && \
+ [[ "$DVDNAV_MICRO" -lt "7" ]]; then
+ AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION])
HAVE_DVDNAV="no"
fi
fi