From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 23 Jan 2010 13:39:53 +0000 (+0200)
Subject: Still build the vcdx plugin
X-Git-Tag: 1.1.0-ff~1030
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b187fe3d02dc0c0ae00cbe9245bfba04d8fae8a9;p=vlc

Still build the vcdx plugin

Pointed-out-by: Alexis Ballier
---

diff --git a/configure.ac b/configure.ac
index c9be584ba4..0ee70dc146 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2360,6 +2360,7 @@ then
 		[VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
 		 VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])],
 	  [AC_MSG_ERROR([vcdx plugin requires libvcdinfo library >= 0.7.22])])
+        VLC_ADD_PLUGIN([vcdx])
 fi
 
 dnl
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index ac1e92b7d5..e29b0c84c1 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -843,14 +843,8 @@ static const char *const ppsz_clock_descriptions[] =
 #endif
 
 #define VCD_DEV_TEXT N_("VCD device")
-#ifdef HAVE_VCDX
-#define VCD_DEV_LONGTEXT N_( \
-    "This is the default VCD device to use. " \
-    "If you don't specify anything, we'll scan for a suitable CD-ROM device." )
-#else
 #define VCD_DEV_LONGTEXT N_( \
     "This is the default VCD device to use." )
-#endif
 
 #define CDAUDIO_DEV_TEXT N_("Audio CD device")
 #define CDAUDIO_DEV_LONGTEXT N_( \