]> git.sesse.net Git - vlc/commitdiff
Still build the vcdx plugin
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 23 Jan 2010 13:39:53 +0000 (15:39 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 23 Jan 2010 13:39:53 +0000 (15:39 +0200)
Pointed-out-by: Alexis Ballier
configure.ac
src/libvlc-module.c

index c9be584ba493ea247f7a894ada60e279833ed156..0ee70dc146b41a23c1433c0d40306d05436cf067 100644 (file)
@@ -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
index ac1e92b7d57b33a9d6d6a488f525605c9a8c9954..e29b0c84c10e2a4a568af00562811dec33e75c57 100644 (file)
@@ -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_( \