Final pass over input plugin configuration checks

-- Move some generic checks out of m4/input.m4 and back into configure.ac
-- Remove ioctl_request.m4 and inline it in configure.ac
-- Fix compilation of internal libcdio and libvcd stuff -- now works for Darwin
-- Add a switch for enabling/disabling dvb support.  Disabled by default for
   all platforms except for Linux.  Only allowed to be used on Linux.
-- Disable vcd support on all platforms except for FreeBSD, Linux, and Solaris,
   because src/input/input_vcd.c is only supported on those platforms even
   though libcdio and libvcd will compile on other platforms
-- Clean up some summary.m4 stuff

4 files changed, 15 insertions, 13 deletions

diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index a5c98c85f..b1cd89bb5 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -10,7 +10,10 @@ AM_LDFLAGS = $(xineplug_ldflags)
 # All of xine input plugins should be named like the scheme "xineplug_inp_"
 #
 
-SUBDIRS = dvb libreal librtsp
+SUBDIRS = libreal librtsp
+if ENABLE_DVB
+SUBDIRS += dvb
+endif
 if ENABLE_VCD
 SUBDIRS += vcd
 endif
@@ -23,6 +26,10 @@ xineinclude_HEADERS = input_plugin.h
 noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.h
 
 
+if ENABLE_DVB
+in_dvb = xineplug_inp_dvb.la
+endif
+
 if ENABLE_VCD
 in_vcd = xineplug_inp_vcdo.la
 endif
@@ -51,7 +58,6 @@ endif
 # not ported to native Windows
 if !WIN32
 in_rtp = xineplug_inp_rtp.la
-in_dvb = xineplug_inp_dvb.la 
 endif
 
 
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 0ff664605..1f03720cb 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
 SUBDIRS =
@@ -13,9 +13,5 @@ noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
 xineplug_LTLIBRARIES = xineplug_inp_vcd.la
 
 xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
-
-if WITH_EXTERNAL_VCDLIBS
-xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS)
-else
 xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm
-endif
+xineplug_inp_vcd_la_CFLAGS  = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am
index 6414d8230..a79525c8f 100644
--- a/src/input/vcd/libcdio/Makefile.am
+++ b/src/input/vcd/libcdio/Makefile.am
@@ -1,11 +1,11 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS  = $(DEFAULT_OCFLAGS)
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
 SUBDIRS = cdio MSWindows image
 
-INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib
+INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib
 
 noinst_HEADERS = \
 	cdio_assert.h \
diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am
index 65ffc6255..c922685e3 100644
--- a/src/input/vcd/libvcd/Makefile.am
+++ b/src/input/vcd/libvcd/Makefile.am
@@ -1,8 +1,8 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(DEFAULT_OCFLAGS)
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib
 
 SUBDIRS = libvcd
 
@@ -47,7 +47,6 @@ libvcd_la_SOURCES = \
 	stream.c \
 	stream_stdio.c \
 	util.c 
-libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS)
 libvcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS)
 
 libvcdinfo_la_SOURCES = \
@@ -55,3 +54,4 @@ libvcdinfo_la_SOURCES = \
 	inf.c \
 	info_private.c \
 	vcd_read.c
+libvcdinfo_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS)