[vlc-devel] commit: configure: fix vcdinfo/libvcdinfo inconsistencies ( Detlef Schroeder )

[git version control]

vlc | branch: master | Detlef Schroeder <detlef.schroeder at feinsinn.com> | Tue Jan 12 21:42:30 2010 +0100| [76f6410c0c6b37f5d582646eafacd8e4ffb24c16] | committer: Rémi Denis-Courmont 

configure: fix vcdinfo/libvcdinfo inconsistencies

Additional changes in configure.ac according to
[71fafba47612fa01e51b3933060a277bef900346].
--enable-vcdinfo was changed to --enable-libvcdinfo and some VCDINFO
were renamed to LIBVCDINFO but the checking was incomplete so pkg-config
could not correctly configure libvcdinfo

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

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

diff --git a/configure.ac b/configure.ac
index 12fd310..c04857c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2488,7 +2488,7 @@ then
      [Define if you have libcdio 0.78.2 or greater installed]),
      [AC_MSG_WARN(CD Reading and information library not found)])
 
-  if test "${enable_vcdinfo}" != "no"
+  if test "${enable_libvcdinfo}" != "no"
   then
     PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
        [have_libvcdinfo=yes],
@@ -2506,8 +2506,8 @@ if test "${enable_vcdx}" = "yes"
 then
   if test "${have_libvcdinfo}" = "yes"
   then
-    VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS])
-    VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
+    VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
+    VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])
   else
     AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found or disabled])
     HAVE_VCDX=no
@@ -2523,8 +2523,8 @@ then
   then
     AC_DEFINE(HAVE_VCDX, 1,
     [Define for the VCD plugin using libcdio/libvcdinfo])
-    VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS])
-    VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
+    VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
+    VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])
     VLC_ADD_PLUGIN([vcdx])
   else
     AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found])