diff -urN alsaplayer-svn-r1232.orig/configure.ac alsaplayer-svn-r1232/configure.ac

--- alsaplayer-svn-r1232.orig/configure.ac	2007-06-25 00:52:07 +0300

+++ alsaplayer-svn-r1232/configure.ac	2007-06-25 01:26:19 +0300

@@ -23,6 +23,9 @@

 have_opengl=no

 have_audiofile=no

 have_oggvorbis=no

+have_mad=yes

+have_wav=yes

+have_null=yes

 have_flac=no

 have_oggflac=no

 have_alsa_05x=no

@@ -34,7 +37,11 @@

 have_nas=no

 have_mikmod=no

 have_jack=no

+have_text=yes

 have_xosd=no

+have_daemon=yes

+have_file=yes

+have_http=yes

 dynload=no

 use_3dnow_asm=no

 use_libmad=no

@@ -127,11 +134,9 @@

 dnl OpenGL

 dnl ======

-AC_ARG_ENABLE(opengl,

-[  --enable-opengl         Enable OpenGL plugins (default=yes)],,

-	enable_opengl=yes)

+AC_ARG_ENABLE(opengl,[  --disable-opengl        Disable OpenGL plugins (default=yes)])

-if test "x$enable_opengl" = xyes; then

+if test "x$enable_opengl" != "xno"; then

 	LIBS_save=$LIBS

 	OPENGL_LIBS=error

 	AC_CHECK_LIB(GL, glBegin, OPENGL_LIBS="-lGL -lpthread")

@@ -268,10 +273,46 @@

      MAD_LDADD=-lmad; use_libmad=yes; AC_DEFINE(HAVE_LIBMAD, 1, [Define if you have MAD library (-lmad)]), use_libmad=no; MAD_LDADD=, -lmad)

+AC_ARG_ENABLE(mad,

+[  --enable-mad            Enable MAD plugin (default=yes)],

+[if test "$enableval" = "no"

+then

+	if test "$have_mad" = "yes"

+	then

+		have_mad=no

+	fi

+fi])

+

+

+AC_ARG_ENABLE(wav,

+[  --enable-wav            Enable WAV plugin (default=yes)],

+[if test "$enableval" = "no"

+then

+	if test "$have_wav" = "yes"

+	then

+		have_wav=no

+	fi

+fi])

+

+

+AC_ARG_ENABLE(null,

+[  --enable-null           Enable NULL plugin (default=yes)],

+[if test "$enableval" = "no"

+then

+	if test "$have_null" = "yes"

+	then

+		have_null=no

+	fi

+fi])

+

+

 dnl ==============

 dnl id3tab library

 dnl ==============

+AC_ARG_ENABLE(opengl,[  --disable-id3tag        Disable libid3tag support (default=yes)])

+

+if test "x$enable_id3tag" != "xno"; then

 oldcflags=$CFLAGS

 CFLAGS="$CFLAGS -lz"

@@ -279,6 +320,9 @@

      FLC_LDADD="$FLC_LDADD -lid3tag -lz"; use_libid3tag=yes; AC_DEFINE(HAVE_LIBID3TAG, 1, [Define if you have libid3tag library (-lid3tag)]), use_libid3tag=no)

 CFLAGS=$oldcflags

+else

+AC_MSG_RESULT([*** Disabling libid3tag support per user request ***])

+fi

 AC_SUBST(FLC_LDADD)

 AC_SUBST(OGGFLC_LDADD)

@@ -305,6 +349,17 @@

 dnl ==========

 AC_CHECK_LIB(xosd, xosd_create,

      XOSD_LDADD=-lxosd; have_xosd=yes; AC_DEFINE(HAVE_LIBXOSD, 1, [Define if you have XOSD library (-lxosd)]), have_xosd=no; XOSD_LDADD=, -lxosd)

+

+AC_ARG_ENABLE(xosd,

+[  --enable-xosd               Enable XOSD interface (default=yes)],

+[if test "$enableval" = "no"

+then

+	if test "$have_xosd" = "yes"

+	then

+		have_xosd=no

+	fi

+fi])

+     

 AM_CONDITIONAL(HAVE_XOSD, test "x$have_xosd" = xyes)

 dnl ==========

@@ -324,6 +379,17 @@

 PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.4, have_sndfile=yes, have_sndfile=no)

 AC_SUBST(SNDFILE_LIBS)

 AC_SUBST(SNDFILE_CFLAGS)

+

+AC_ARG_ENABLE(sndfile,

+[  --enable-sndfile            Enable sndfile plugin (default=yes)],

+[if test "$enableval" = "no"

+then

+	if test "$have_sndfile" = "yes"

+	then

+		have_sndfile=no

+	fi

+fi])

+

 AM_CONDITIONAL(HAVE_SNDFILE, test "x$have_sndfile" = xyes)

 dnl ===============

@@ -354,6 +420,16 @@

 AC_CHECK_HEADERS(FLAC/stream_decoder.h)

 AC_CHECK_HEADERS(OggFLAC/stream_decoder.h)

+AC_ARG_ENABLE(cdda,

+[  --enable-cdda           Enable CDDA plugin (default=yes)],

+[if test "$enableval" = "no"

+then

+	if test "x$ac_cv_header_linux_cdrom_h" = "xyes"

+	then

+		ac_cv_header_linux_cdrom_h=no

+	fi

+fi])

+

 dnl ==========

 dnl ALSA stuff

 dnl ==========

@@ -417,27 +493,6 @@

 	have_oss=no

 fi

-dnl =========

-dnl SGI stuff

-dnl =========

-

-AC_CHECK_LIB(audio, alOpenPort,

-[have_sgi=yes

-SGI_LIBS=-laudio],

-have_sgi=no)

-

-AC_SUBST(SGI_LIBS)

-

-dnl =========

-dnl NAS stuff

-dnl =========

-

-oldcflags=$CFLAGS

-CFLAGS="$CFLAGS -I$x_includes -L$x_libraries -lXt"

-AC_CHECK_LIB(audio,AuStartFlow, [have_nas=yes NAS_LIB="-L$x_libraries -laudio -lXt"], have_nas=no)

-CFLAGS=$oldcflags

-AC_SUBST(NAS_LIB)

-

 dnl ======================

 dnl JACK conditional stuff

@@ -458,7 +513,8 @@

 [  --enable-alsa		  Enable ALSA (default=yes)],

 [if test "$enableval" = "no"

 then

-have_alsa=no

+have_alsa_05x=no

+have_alsa_final=no

 fi])

 AC_ARG_ENABLE(esd,

@@ -471,7 +527,6 @@

 AC_ARG_ENABLE(sparc,

 [  --enable-sparc          Enable SPARC driver (default=yes)],

-

 [if test "$enableval" = "no"

 then

 have_sparc=no

@@ -500,13 +555,64 @@

 have_gtk2=no

 fi])

+AC_ARG_ENABLE(text,

+[  --enable-text           Enable TEXT interface (default=yes)],

+[if test "$enableval" = "no"

+then

+have_text=no

+fi])

+

+AC_ARG_ENABLE(daemon,

+[  --enable-daemon         Enable DAEMON interface (default=yes)],

+[if test "$enableval" = "no"

+then

+have_daemon=no

+fi])

+

 AC_ARG_ENABLE(nas,

-[  --enable-nas            Enable NAS driver (default=yes)],

+[  --enable-nas            Enable NAS driver (default=no)],

+[if test "$enableval" != "no"

+then

+have_nas=yes

+fi])

+

+AC_ARG_ENABLE(file,

+[  --enable-file           Enable file read (default=yes)],

 [if test "$enableval" = "no"

 then

-have_nas=no

+have_file=no

 fi])

+AC_ARG_ENABLE(http,

+[  --enable-http           Enable HTTP read (default=yes)],

+[if test "$enableval" = "no"

+then

+have_http=no

+fi])

+

+dnl =========

+dnl NAS stuff

+dnl =========

+

+if test "x$have_nas" != "xno"; then

+oldcflags=$CFLAGS

+CFLAGS="$CFLAGS -I$x_includes -L$x_libraries -lXt"

+AC_CHECK_LIB(audio,AuStartFlow, [have_nas=yes NAS_LIB="-L$x_libraries -laudio -lXt"], have_nas=no)

+CFLAGS=$oldcflags

+fi

+AC_SUBST(NAS_LIB)

+

+

+dnl =========

+dnl SGI stuff

+dnl =========

+

+if test "x$have_sgi" != "xno"; then

+AC_CHECK_LIB(audio, alOpenPort, [have_sgi=yes SGI_LIBS=-laudio], have_sgi=no)

+fi

+AC_SUBST(SGI_LIBS)

+

+

 if test "x$ac_cv_header_mad_h" = "xno"

 then

 	use_libmad=no

@@ -531,6 +637,9 @@

 AM_CONDITIONAL(USE_LIBMAD,test "x$use_libmad" = xyes)

 AM_CONDITIONAL(USE_LIBID3TAG, test "x$use_libid3tag" = xyes)

 AM_CONDITIONAL(HAVE_FLC, test "x$have_flac" = xyes)

+AM_CONDITIONAL(HAVE_MAD, test "x$have_mad" = xyes)

+AM_CONDITIONAL(HAVE_WAV, test "x$have_wav" = xyes)

+AM_CONDITIONAL(HAVE_NULL, test "x$have_null" = xyes)

 AM_CONDITIONAL(HAVE_OGGFLC, test "x$have_oggflac" = xyes)

 AM_CONDITIONAL(HAVE_JACK,	test "x$have_jack" = xyes)

 AM_CONDITIONAL(HAVE_ALSA_05X, test "x$have_alsa_05x" = xyes)

@@ -542,7 +651,11 @@

 AM_CONDITIONAL(HAVE_NAS, test "x$have_nas" = xyes)

 AM_CONDITIONAL(HAVE_LINUX_CDROM,test "x$ac_cv_header_linux_cdrom_h" = xyes)

 AM_CONDITIONAL(HAVE_GTK2, test "x$have_gtk2" = xyes)

+AM_CONDITIONAL(HAVE_TEXT, test "x$have_text" = xyes)

+AM_CONDITIONAL(HAVE_DAEMON, test "x$have_daemon" = xyes)

 AM_CONDITIONAL(HAVE_MIKMOD,test "x$have_mikmod" = xyes)

+AM_CONDITIONAL(HAVE_FILE, test "x$have_file" = xyes)

+AM_CONDITIONAL(HAVE_HTTP, test "x$have_http" = xyes)

 AM_CONDITIONAL(PREFER_MAD, test "x$prefer_mad" = "xyes")

 dnl ============

@@ -725,9 +838,14 @@

   Enable libid3tag support:           ${use_libid3tag}

   Build GTK2 interface:               ${have_gtk2}

   Build XOSD interface:               ${have_xosd}

+  Build TEXT interface:               ${have_text}

+  Build DAEMON interface:             ${have_daemon}

+  Build file read plugin:             ${have_file}

+  Build HTTP read plugin:             ${have_http}

   Build OpenGL based visual plugins:  ${have_opengl}

   Build alsa 0.5.x output plugin:     ${have_alsa_05x}

   Build alsa 0.9.x output plugin:     ${have_alsa_final}

+  Build sndfile output plugin:        ${have_sndfile}

   Build jack output plugin:           ${have_jack}

   Build oss output plugin:            ${have_oss}

   Build esound output plugin:         ${have_esd}

@@ -739,6 +857,9 @@

   Build mikmod input plugin:          ${have_mikmod}

   Build audiofile input plugin:       ${have_audiofile}

   Build FLAC input plugin:            ${have_flac}

+  Build MAD input plugin:             ${have_mad}

+  Build WAV input plugin:             ${have_wav}

+  Build NULL output plugin:           ${have_null}

   Build OggFLAC input plugin:         ${have_oggflac}

   Build sndfile input plugin:         ${have_sndfile}"

 echo

diff -urN alsaplayer-svn-r1232.orig/input/mad/Makefile.am alsaplayer-svn-r1232/input/mad/Makefile.am

--- alsaplayer-svn-r1232.orig/input/mad/Makefile.am	2007-06-23 22:25:59 +0300

+++ alsaplayer-svn-r1232/input/mad/Makefile.am	2007-06-25 01:00:31 +0300

@@ -1,3 +1,4 @@

+if HAVE_MAD

 EXTRA_DIST = D.dat huffman.h mad.h stream.h fixed.h \

 		imdct_s.dat qc_table.dat synth.h bit.h frame.h layer12.h \

@@ -27,6 +28,14 @@

 extra_libs =

 endif

+else

+

+mad_inltlibs =

+mad_inldflags =

+mad_insources =

+

+endif

+

 lib_LTLIBRARIES = $(mad_inltlibs)

 libdir = $(ADDON_DIR)/input

diff -urN alsaplayer-svn-r1232.orig/input/wav/Makefile.am alsaplayer-svn-r1232/input/wav/Makefile.am

--- alsaplayer-svn-r1232.orig/input/wav/Makefile.am	2007-06-14 00:37:37 +0300

+++ alsaplayer-svn-r1232/input/wav/Makefile.am	2007-06-25 01:00:31 +0300

@@ -1,7 +1,17 @@

+if HAVE_WAV

+

 wavltlibs = libwav.la

 wavldflags = -export-dynamic -avoid-version

 wavsources = wav_engine.c formats.h

+else

+

+wavltlibs =

+wavldflags =

+wavsources =

+

+endif

+

 lib_LTLIBRARIES = $(wavltlibs)

 AM_CFLAGS = @DFLAGS@ -D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer

diff -urN alsaplayer-svn-r1232.orig/interface/daemon/Makefile.am alsaplayer-svn-r1232/interface/daemon/Makefile.am

--- alsaplayer-svn-r1232.orig/interface/daemon/Makefile.am	2007-06-14 00:37:39 +0300

+++ alsaplayer-svn-r1232/interface/daemon/Makefile.am	2007-06-25 01:00:31 +0300

@@ -1,7 +1,17 @@

+if HAVE_DAEMON

+

 daemon_interfaceltlibs = libdaemon_interface.la

 daemon_interfaceldflags = -export-dynamic -avoid-version

 daemon_interfacesources = daemon.cpp

+else

+

+daemon_interfaceltlibs =

+daemon_interfaceldflags =

+daemon_interfacesources =

+

+endif

+

 lib_LTLIBRARIES = $(daemon_interfaceltlibs)

 COMMON_FLAGS = @ARCH_CFLAGS@

diff -urN alsaplayer-svn-r1232.orig/interface/text/Makefile.am alsaplayer-svn-r1232/interface/text/Makefile.am

--- alsaplayer-svn-r1232.orig/interface/text/Makefile.am	2007-06-14 00:37:52 +0300

+++ alsaplayer-svn-r1232/interface/text/Makefile.am	2007-06-25 01:00:31 +0300

@@ -1,7 +1,17 @@

+if HAVE_TEXT

+

 text_interfaceltlibs = libtext_interface.la

 text_interfaceldflags = -export-dynamic -avoid-version

 text_interfacesources = text.cpp

+else

+

+text_interfaceltlibs =

+text_interfaceldflags =

+text_interfacesources =

+

+endif

+

 lib_LTLIBRARIES = $(text_interfaceltlibs)

 COMMON_FLAGS = @ARCH_CFLAGS@

diff -urN alsaplayer-svn-r1232.orig/output/null/Makefile.am alsaplayer-svn-r1232/output/null/Makefile.am

--- alsaplayer-svn-r1232.orig/output/null/Makefile.am	2007-06-14 00:39:23 +0300

+++ alsaplayer-svn-r1232/output/null/Makefile.am	2007-06-25 01:00:31 +0300

@@ -1,7 +1,17 @@

+if HAVE_NULL

+

 null_outltlibs = libnull_out.la

 null_outldflags = -export-dynamic -avoid-version

 null_outsources = null.c

+else

+

+null_outltlibs =

+null_outldflags =

+null_outsources =

+

+endif

+

 lib_LTLIBRARIES = $(null_outltlibs)

 AM_CFLAGS = -D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer @ARCH_CFLAGS@

diff -urN alsaplayer-svn-r1232.orig/reader/file/Makefile.am alsaplayer-svn-r1232/reader/file/Makefile.am

--- alsaplayer-svn-r1232.orig/reader/file/Makefile.am	2007-06-14 00:39:26 +0300

+++ alsaplayer-svn-r1232/reader/file/Makefile.am	2007-06-25 01:00:31 +0300

@@ -1,7 +1,17 @@

+if HAVE_FILE

+

 fileltlibs = libfile.la

 fileldflags = -export-dynamic -avoid-version

 filesources = file.c

+else

+

+fileltlibs =

+fileldflags =

+filesources =

+

+endif

+

 lib_LTLIBRARIES = $(fileltlibs)

 AM_CFLAGS = @DFLAGS@ -Wall -D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer

diff -urN alsaplayer-svn-r1232.orig/reader/http/Makefile.am alsaplayer-svn-r1232/reader/http/Makefile.am

--- alsaplayer-svn-r1232.orig/reader/http/Makefile.am	2007-06-14 00:39:31 +0300

+++ alsaplayer-svn-r1232/reader/http/Makefile.am	2007-06-25 01:00:31 +0300

@@ -1,7 +1,17 @@

+if HAVE_HTTP

+

 httpltlibs = libhttp.la

 httpldflags = -export-dynamic -avoid-version

 httpsources = http.c

+else

+

+httpltlibs =

+httpldflags =

+httpsources =

+

+endif

+

 lib_LTLIBRARIES = $(httpltlibs)

 AM_CFLAGS = @DFLAGS@ -Wall -D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer