[vlc-devel] commit: fix automagic dependency on vcdinfo (Daniel Mierswa )

[git version control]

vlc | branch: 0.9-bugfix | Daniel Mierswa <impulze at impulze.org> | Mon Sep 15 01:11:02 2008 +0200| [dbce350712821cff4a89a541f110b489acdaa14b] | committer: Christophe Mutricy 

fix automagic dependency on vcdinfo

when --enable-libcdio was passed to configure, vcdinfo was searched and
linked against if found (only do that when vcdinfo wasn't disabled)

Signed-off-by: Christophe Mutricy <xtophe at videolan.org>
(cherry picked from commit f067ff205cc8565caa46a723fd3316aa08ec6213)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dbce350712821cff4a89a541f110b489acdaa14b
---

 configure.ac |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index f9be5c5..8f4332a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2499,6 +2499,8 @@ dnl Need to test libcdio and libvcdinfo for a number of things. Do it now.
 AC_ARG_ENABLE(libcdio,
   [  --enable-libcdio        CD input and control library support (default enabled)])
 
+AC_ARG_ENABLE(vcdinfo,
+  [  --enable-libvcdinfo     VCD information library support (default enabled)])
 
 have_libcdio=no
 have_libvcdinfo=no
@@ -2510,11 +2512,14 @@ then
      [Define if you have libcdio 0.78.2 or greater installed]),
      [AC_MSG_WARN(CD Reading and information library not found)])
 
-  PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.22,
-     [have_libvcdinfo=yes
-     AC_DEFINE(HAVE_VCDINFO, 1, 
-     [Define if you have libvcdinfo 0.7.22 or greater installed])],
-     [AC_MSG_WARN(VCD information library not found)])
+  if test "${enable_vcdinfo}" != "no"
+  then
+    PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.22,
+       [have_libvcdinfo=yes
+       AC_DEFINE(HAVE_VCDINFO, 1, 
+       [Define if you have libvcdinfo 0.7.22 or greater installed])],
+       [AC_MSG_WARN(VCD information library not found)])
+  fi
 fi
 
 dnl