[vlc-devel] [PATCH] additional changes in configure, ac according to 71fafba47612fa01e51b3933060a277bef900346

[Detlef Schroeder]

A non-text attachment was scrubbed...
Name: 0001-additional-changes-in-configure-ac-according-to-71fa.patch
Type: application/octet-stream
Size: 1893 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20100112/72740506/attachment.obj>
-------------- next part --------------

i hope it's the right format now
additional  changes in configure,ac according to 71fafba47612fa01e51b3933060a277bef900346
in 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

From b63cca01d32cc02b2fd2db17816315f45d27d5db Mon Sep 17 00:00:00 2001
From: des <detlef.schroeder at feinsinn.com>
Date: Tue, 12 Jan 2010 21:42:30 +0100
Subject: [PATCH] additional  changes in configure,ac according to 71fafba47612fa01e51b3933060a277bef900346
---
 configure.ac |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 12fd310..851d588 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_CONFIG_LIBOBJ_DIR(compat)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(tar-ustar)
+AM_INIT_AUTOMAKE(tar-ustar color-tests)
 AM_CONFIG_HEADER(config.h)
 
 # Disable with "./configure --disable-silent-rules" or "make V=1"
@@ -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])
-- 
1.6.6