diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-19 05:07:26 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-19 05:07:26 -0400 |
| commit | e734650e1161e7cc30141f3d665ea15c015d3e87 (patch) | |
| tree | fc890e15e72f835888fbf06194f076d6513be3e7 | |
| parent | b5b003ebba912f0047ed41696a6efcad6d4eedb9 (diff) | |
| download | xine-lib-e734650e1161e7cc30141f3d665ea15c015d3e87.tar.gz xine-lib-e734650e1161e7cc30141f3d665ea15c015d3e87.tar.bz2 | |
Input plugins: Enable vcd, but disable vcdo by default
except on FreeBSD, Linux, and Solaris. There's no explicit option to enable or
disable vcdo, and it's built if the platform supports it and vcd is enabled.
| -rw-r--r-- | m4/input.m4 | 13 | ||||
| -rw-r--r-- | m4/summary.m4 | 14 | ||||
| -rw-r--r-- | src/input/Makefile.am | 2 |
3 files changed, 21 insertions, 8 deletions
diff --git a/m4/input.m4 b/m4/input.m4 index 2d77f9521..76ad12ad9 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -13,7 +13,8 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ default_enable_gnomevfs=enable default_enable_samba=enable default_enable_v4l=disable - default_enable_vcd=disable + default_enable_vcd=enable + default_enable_vcdo=disable default_with_internal_vcdlibs=without @@ -27,15 +28,15 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ default_enable_samba=disable ;; freebsd*) - default_enable_vcd=enable + default_enable_vcdo=enable ;; linux*) default_enable_dvb=enable default_enable_v4l=enable - default_enable_vcd=enable + default_enable_vcdo=enable ;; solaris*) - default_enable_vcd=enable + default_enable_vcdo=enable ;; esac @@ -262,6 +263,9 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ fi fi + enable_vcdo=no + test $default_enable_vcdo = enable && test x"$enable_vcd" != x"no" && enable_vcdo=yes + AC_DEFINE([LIBCDIO_CONFIG_H], 1, [Get of rid system libcdio build configuration]) AC_DEFINE([EXTERNAL_LIBCDIO_CONFIG_H], 1, [Get of rid system libcdio build configuration]) AC_SUBST(LIBCDIO_CFLAGS) @@ -272,4 +276,5 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ AC_SUBST(LIBVCDINFO_LIBS) AM_CONDITIONAL([WITH_EXTERNAL_VCDLIBS], [test x"$with_internal_vcdlibs" = x"no"]) AM_CONDITIONAL([ENABLE_VCD], [test x"$enable_vcd" != x"no"]) + AM_CONDITIONAL([ENABLE_VCDO], [test x"$enable_vcdo" != x"no"]) ]) diff --git a/m4/summary.m4 b/m4/summary.m4 index f1d1b8457..792c5d319 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -13,10 +13,18 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ echo " - http - mms" echo " - pnm - rtsp" if test x"$enable_vcd" != x"no"; then - if test x"$with_internal_vcdlibs" = x"no"; then - echo " - vcdo - vcd (external libs)" + if test x"$enable_vcdo" != x"no"; then + if test x"$with_internal_vcdlibs" = x"no"; then + echo " - vcdo - vcd (external libs)" + else + echo " - vcdo - vcd (internal libs)" + fi else - echo " - vcdo - vcd (internal libs)" + if test x"$with_internal_vcdlibs" = x"no"; then + echo " - vcd (external libs)" + else + echo " - vcd (internal libs)" + fi fi fi if test x"$with_external_dvdnav" != x"no"; then diff --git a/src/input/Makefile.am b/src/input/Makefile.am index b1cd89bb5..f9f9a9fb8 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -30,7 +30,7 @@ if ENABLE_DVB in_dvb = xineplug_inp_dvb.la endif -if ENABLE_VCD +if ENABLE_VCDO in_vcd = xineplug_inp_vcdo.la endif |