diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-05-15 15:37:59 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-05-15 15:42:59 +0200 |
| commit | e0cb4fba529bfbf1dd7142435453568c931c4970 (patch) | |
| tree | 98e06134dd28be194ae8072bcb8ff4e5f00354e9 | |
| parent | 1e399b9838d38dd6cd92da4ab83cbc89dc3d007c (diff) | |
resindvd: Check for dvdnav and dvdread libraries
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 2b2d0a84b..c521f7fc9 100644 --- a/configure.ac +++ b/configure.ac @@ -723,11 +723,11 @@ return 0; fi ]) -dnl *** dvdnav for resindvd *** -translit(dnm, m, l) AM_CONDITIONAL(USE_DVDNAV, true) -AG_GST_CHECK_FEATURE(DVDNAV, [dvdnav library], resindvd, [ - PKG_CHECK_MODULES(DVDNAV, dvdnav >= 4.1.2, HAVE_DVDNAV="yes", [ - HAVE_DVDNAV="no" +dnl *** resindvd *** +translit(dnm, m, l) AM_CONDITIONAL(USE_RESINDVD, true) +AG_GST_CHECK_FEATURE(RESINDVD, [resindvd plugin], resindvd, [ + PKG_CHECK_MODULES(DVDNAV, dvdnav >= 4.1.2 dvdread >= 4.1.2, HAVE_RESINDVD="yes", [ + HAVE_RESINDVD="no" AC_MSG_RESULT(no) ]) ]) @@ -1496,7 +1496,7 @@ AM_CONDITIONAL(USE_DIRECTFB, false) AM_CONDITIONAL(USE_DIRAC, false) AM_CONDITIONAL(USE_DTS, false) AM_CONDITIONAL(USE_DIVX, false) -AM_CONDITIONAL(USE_DVDNAV, false) +AM_CONDITIONAL(USE_RESINDVD, false) AM_CONDITIONAL(USE_METADATA, false) AM_CONDITIONAL(USE_FAAC, false) AM_CONDITIONAL(USE_FAAD, false) diff --git a/ext/Makefile.am b/ext/Makefile.am index d38cdd4e0..781369171 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -100,10 +100,10 @@ else DTS_DIR= endif -if USE_DVDNAV - DVDNAV_DIR = resindvd +if USE_RESINDVD + RESINDVD_DIR = resindvd else - DVDNAV_DIR = + RESINDVD_DIR = endif if USE_FAAC @@ -384,7 +384,7 @@ SUBDIRS=\ $(DIRECTFB_DIR) \ $(DIVX_DIR) \ $(DTS_DIR) \ - $(DVDNAV_DIR) \ + $(RESINDVD_DIR) \ $(FAAC_DIR) \ $(FAAD_DIR) \ $(FLITE_DIR) \ |