fixed to pass make distcheck before 0.4-beta1

30 files changed, 308 insertions, 71 deletions

diff --git a/Makefile.am b/Makefile.am
index 2bc9a544..2b00eebf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ deadbeef_SOURCES =\
 	vfs.c vfs.h vfs_stdio.c\
 	timeline.c timeline.h\
 	md5/md5.c md5/md5.h\
-	metacache.c
+	metacache.c metacache.h
 
 sdkdir = $(pkgincludedir)
 sdk_HEADERS = deadbeef.h
diff --git a/configure.ac b/configure.ac
index 1f096180..4f31d116 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,25 +120,18 @@ fi
 
 dnl curl lib
 AC_CHECK_LIB([curl], [main], [HAVE_CURL=yes])
-dnl AM_CONDITIONAL(HAVE_CURL, test "x$HAVE_CURL" = "xyes")
 if test "x$HAVE_CURL" = "xyes"; then
     CURL_LIBS="-lcurl"
     AC_SUBST(CURL_LIBS)
 fi
 
-dnl lastfm plugin
-if test "x$HAVE_CURL" = "xyes" && test "x$enable_lastfm" != "xno" ; then
-    PLUGINS_DIRS="$PLUGINS_DIRS plugins/lastfm"
-fi
-
 dnl mpgmad plugin
 if test "x$enable_mpgmad" != "xno" ; then
     AC_CHECK_LIB([mad], [main], [HAVE_LIBMAD=yes])
-dnl    AM_CONDITIONAL(HAVE_LIBMAD, test "x$HAVE_LIBMAD"="xyes")
     if test "x$HAVE_LIBMAD"="xyes" ; then
+        HAVE_MPGMAD=yes
         MAD_LIBS="-lmad"
         AC_SUBST(MAD_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/mpgmad"
     fi
 fi
 
@@ -150,45 +143,36 @@ if test "x$enable_vorbis" != "xno" ; then
         HAVE_VORBISPLUGIN=yes
         VORBIS_LIBS="-lvorbis -lvorbisfile"
         AC_SUBST(VORBIS_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/vorbis"
     fi
-    dnl AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBIS" = "xyes")
-    dnl AM_CONDITIONAL(HAVE_VORBISFILE, test "x$HAVE_VORBISFILE" = "xyes")
 fi
 
 dnl flac plugin
 if test "x$enable_flac" != "xno" ; then
     AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes])
-dnl    AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLAC" = "xyes")
     if test "x$HAVE_FLAC" = "xyes" ; then
         HAVE_FLACPLUGIN=yes
         FLAC_LIBS="-lFLAC"
         AC_SUBST(FLAC_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/flac"
     fi
 fi
 
 dnl wavpack plugin
 if test "x$enable_wavpack" != "xno" ; then
     AC_CHECK_LIB([wavpack], [main], [HAVE_WAVPACK=yes])
-dnl    AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACK" = "xyes")
     if test "x$HAVE_WAVPACK" = "xyes" ; then
         HAVE_WAVPACKPLUGIN=yes
         WAVPACK_LIBS="-lwavpack"
         AC_SUBST(WAVPACK_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/wavpack"
     fi
 fi
 
 dnl libsndfile plugin
 if test "x$enable_sndfile" != "xno" ; then
     AC_CHECK_LIB([sndfile], [main], [HAVE_SNDFILE=yes])
-dnl    AM_CONDITIONAL(HAVE_SNDFILE, test "x$HAVE_SNDFILE" = "xyes")
     if test "x$HAVE_SNDFILE" = "xyes" ; then
         HAVE_SNDFILEPLUGIN=yes
         SNDFILE_LIBS="-lsndfile"
         AC_SUBST(SNDFILE_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/sndfile"
     fi
 fi
 
@@ -198,7 +182,6 @@ if test "x$enable_vfs_curl" != "xno" ; then
         HAVE_VFS_CURL=yes
         VFS_CURL_LIBS="-lcurl"
         AC_SUBST(VFS_CURL_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/vfs_curl"
     fi
 fi
 
@@ -218,47 +201,39 @@ dnl cdda plugin
 if test "x$enable_cdda" != "xno" ; then
     AC_CHECK_LIB([cdio], [main], [HAVE_CDIO=yes])
     AC_CHECK_LIB([cddb], [main], [HAVE_CDDB=yes])
-dnl    AM_CONDITIONAL(HAVE_CDIO, test "x$HAVE_CDIO" = "xyes")
-dnl    AM_CONDITIONAL(HAVE_CDDB, test "x$HAVE_CDDB" = "xyes")
     if test "x$HAVE_CDIO" = "xyes" && test "x$HAVE_CDDB" = "xyes" ; then
         HAVE_CDDAPLUGIN=yes
         CDDA_LIBS="-lcdio -lcddb"
         AC_SUBST(CDDA_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/cdda"
     fi
 fi
 
 dnl gtkui plugin
 if test "x$enable_gtkui" != "xno" ; then
     if test "x$HAVE_GTK" = "xyes" ; then
+        HAVE_GTKUI=yes
         AC_SUBST(GTKUI_DEPS_CFLAGS)
         AC_SUBST(GTKUI_DEPS_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/gtkui"
     fi
 fi
-dnl AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
 
 if test "x$enable_alsa" != "xno" ; then
     if test "x$HAVE_ALSA" = "xyes" ; then
+        HAVE_ALSAPLUGIN=yes
         AC_SUBST(ALSA_DEPS_CFLAGS)
         AC_SUBST(ALSA_DEPS_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/alsa"
     fi
 fi
-dnl AM_CONDITIONAL(HAVE_ALSA, test "x$HAVE_ALSA" = "xyes")
 
 if test "x$enable_ffmpeg" != "xno" ; then
-dnl    AM_CONDITIONAL(HAVE_FFMPEG, test "x$HAVE_FFMPEG" = "xyes")
     if test "x$HAVE_FFMPEG" = "xyes" ; then
         HAVE_FFMPEGPLUGIN=yes
         AC_CHECK_HEADER([ffmpeg/avformat.h], FFMPEG_DEPS_CFLAGS="$FFMPEG_DEPS_CFLAGS -D FFMPEG_OLD")
         AC_SUBST(FFMPEG_DEPS_CFLAGS)
         AC_SUBST(FFMPEG_DEPS_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/ffmpeg"
     fi
 fi
 
-dnl AM_CONDITIONAL(HAVE_NOTIFY, test "x$HAVE_NOTIFY" = "xyes")
 if test "x$HAVE_NOTIFY" = "xyes"; then
     AC_DEFINE(HAVE_NOTIFY,1,[Use libnotify])
     AC_SUBST(NOTIFY_DEPS_CFLAGS)
@@ -268,9 +243,9 @@ fi
 if test "x$enable_hotkeys" != "xno" ; then
     AC_CHECK_HEADER([X11/Xlib.h], HAVE_XLIB_H=yes)
     if test "x$HAVE_XLIB_H" = "xyes" ; then
+        HAVE_HOTKEYS=yes
         HOTKEYS_LIBS="-lX11"
         AC_SUBST(HOTKEYS_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/hotkeys"
     fi
 fi
 
@@ -308,68 +283,90 @@ if test "x$enable_oss" != "xno"; then
 
 
     if test "x$have_oss" = "xyes"; then
+        HAVE_OSS=yes
         AC_SUBST(OSS_CFLAGS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/oss"
     fi
 fi
 
 if test "x$enable_pulseaudio" != "xno"; then
-dnl    AM_CONDITIONAL(HAVE_PULSE, test "x$HAVE_PULSE" = "xyes")
     if test "x$HAVE_PULSE" = "xyes"; then
         HAVE_PULSEPLUGIN=yes
         AC_SUBST(PULSE_DEPS_CFLAGS)
         AC_SUBST(PULSE_DEPS_LIBS)
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/pulse"
     fi
 fi
 
+dnl lastfm plugin
+if test "x$HAVE_CURL" = "xyes" && test "x$enable_lastfm" != "xno" ; then
+    HAVE_LASTFM=yes
+fi
+
 if test "x$enable_artwork" != "xno" ; then
     if test "x$HAVE_CURL" = "xyes" && test "x$HAVE_VFS_CURL" = "xyes" ; then
         HAVE_ARTWORK=yes
-        PLUGINS_DIRS="$PLUGINS_DIRS plugins/artwork"
     fi
 fi
 
 if test "x$enable_adplug" != "xno" ; then
     HAVE_ADPLUG=yes
-    PLUGINS_DIRS="$PLUGINS_DIRS plugins/adplug"
 fi
 
 if test "x$enable_ffap" != "xno" ; then
     HAVE_FFAP=yes
-    PLUGINS_DIRS="$PLUGINS_DIRS plugins/ffap"
 fi
 
 if test "x$enable_sid" != "xno" ; then
     HAVE_SID=yes
-    PLUGINS_DIRS="$PLUGINS_DIRS plugins/sid"
 fi
 
 if test "x$enable_nullout" != "xno" ; then
     HAVE_NULLOUT=yes
-    PLUGINS_DIRS="$PLUGINS_DIRS plugins/nullout"
 fi
 
 if test "x$enable_supereq" != "xno" ; then
     HAVE_SUPEREQ=yes
-    PLUGINS_DIRS="$PLUGINS_DIRS plugins/supereq"
 fi
 
 if test "x$enable_vtx" != "xno" ; then
     HAVE_VTX=yes
-    PLUGINS_DIRS="$PLUGINS_DIRS plugins/vtx"
 fi
 
 if test "x$enable_gme" != "xno" ; then
     HAVE_GME=yes
-    PLUGINS_DIRS="$PLUGINS_DIRS plugins/gme"
 fi
 
 if test "x$enable_dumb" != "xno" ; then
     HAVE_DUMB=yes
-    PLUGINS_DIRS="$PLUGINS_DIRS plugins/dumb"
 fi
 
+PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/dumb plugins/pulse"
+
+AM_CONDITIONAL(HAVE_LIBMAD, test "x$HAVE_LIBMAD"="xyes")
+AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACKPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_SNDFILE, test "x$HAVE_SNDFILEPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_CDDA, test "x$HAVE_CDDAPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_GTKUI, test "x$HAVE_GTKUI" = "xyes")
+AM_CONDITIONAL(HAVE_ALSA, test "x$HAVE_ALSAPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_FFMPEG, test "x$HAVE_FFMPEGPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_NOTIFY, test "x$HAVE_NOTIFY" = "xyes")
+AM_CONDITIONAL(HAVE_PULSE, test "x$HAVE_PULSEPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_ARTWORK, test "x$HAVE_ARTWORK" = "xyes")
+AM_CONDITIONAL(HAVE_ADPLUG, test "x$HAVE_ADPLUG" = "xyes")
+AM_CONDITIONAL(HAVE_FFAP, test "x$HAVE_FFAP" = "xyes")
+AM_CONDITIONAL(HAVE_SID, test "x$HAVE_SID" = "xyes")
+AM_CONDITIONAL(HAVE_NULLOUT, test "x$HAVE_NULLOUT" = "xyes")
+AM_CONDITIONAL(HAVE_VTX, test "x$HAVE_VXT" = "xyes")
+AM_CONDITIONAL(HAVE_GME, test "x$HAVE_GME" = "xyes")
+AM_CONDITIONAL(HAVE_DUMB, test "x$HAVE_DUMB" = "xyes")
+AM_CONDITIONAL(HAVE_LASTFM, test "x$HAVE_LASTFM" = "xyes")
+AM_CONDITIONAL(HAVE_VFS_CURL, test "x$HAVE_VFS_CURL" = "xyes")
+AM_CONDITIONAL(HAVE_HOTKEYS, test "x$HAVE_HOTKEYS" = "xyes")
+AM_CONDITIONAL(HAVE_MPGMAD, test "x$HAVE_MPGMAD" = "xyes")
+AM_CONDITIONAL(HAVE_OSS, test "x$HAVE_OSS" = "xyes")
+AM_CONDITIONAL(HAVE_SUPEREQ, test "x$HAVE_SUPEREQ" = "xyes")
+
 AC_SUBST(PLUGINS_DIRS)
 
 echo
@@ -402,7 +399,7 @@ PRINT_PLUGIN_INFO([nullout],[NULL output],[test "x$HAVE_NULLOUT" = "xyes"])
 PRINT_PLUGIN_INFO([alsa],[ALSA output],[test "x$HAVE_ALSA" = "xyes"])
 PRINT_PLUGIN_INFO([sid],[SID player based on libsidplay2],[test "x$HAVE_SID" = "xyes"])
 PRINT_PLUGIN_INFO([ffap],[Monkey's audio (APE) decoder],[test "x$HAVE_FFAP" = "xyes"])
-PRINT_PLUGIN_INFO([lastfm],[last.fm scrobbler],[test "x$HAVE_CURL" = "xyes"])
+PRINT_PLUGIN_INFO([lastfm],[last.fm scrobbler],[test "x$HAVE_LASTFM" = "xyes"])
 PRINT_PLUGIN_INFO([mpgmad],[mpeg player based on libmad],[test "x$HAVE_LIBMAD" = "xyes"])
 PRINT_PLUGIN_INFO([vorbis],[ogg vorbis player],[test "x$HAVE_VORBISPLUGIN" = "xyes"])
 PRINT_PLUGIN_INFO([flac],[flac player],[test "x$HAVE_FLACPLUGIN" = "xyes"])
@@ -414,10 +411,10 @@ PRINT_PLUGIN_INFO([vfs_curl],[http/ftp streaming support],[test "x$HAVE_VFS_CURL
 dnl PRINT_PLUGIN_INFO([faad2],[aac/mp4 player],[test $HAVE_FAAD && test $HAVE_MP4FF])
 PRINT_PLUGIN_INFO([cdda],[cd audio player],[test "x$HAVE_CDDAPLUGIN" = "xyes"])
 PRINT_PLUGIN_INFO([gtkui],[GTK user interface],[test "x$HAVE_GTK" = "xyes"])
-PRINT_PLUGIN_INFO([hotkeys],[Global hotkeys support],[test "x$HAVE_XLIB_H" = "xyes"])
+PRINT_PLUGIN_INFO([hotkeys],[Global hotkeys support],[test "x$HAVE_HOTKEYS" = "xyes"])
 PRINT_PLUGIN_INFO([libnotify],[Current track notification],[test "x$HAVE_NOTIFY" = "xyes"])
 PRINT_PLUGIN_INFO([ffmpeg],[ffmpeg codecs],[test "x$HAVE_FFMPEGPLUGIN" = "xyes"])
-PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$have_oss" = "xyes"])
+PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$HAVE_OSS" = "xyes"])
 PRINT_PLUGIN_INFO([pulse],[PulseAudio output plugin],[test "x$HAVE_PULSEPLUGIN" = "xyes"])
 PRINT_PLUGIN_INFO([artwork],[Cover art plugin],[test "x$HAVE_ARTWORK" = "xyes"])
 PRINT_PLUGIN_INFO([supereq],[Equalizer based on Super EQ library by Naoki Shibata],[test "x$HAVE_SUPEREQ" = "xyes"])
@@ -426,14 +423,11 @@ echo "plugin build directories: $PLUGINS_DIRS"
 
 echo
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 pixmaps/Makefile
 icons/Makefile
 plugins/gme/Makefile
-plugins/gme/Game_Music_Emu-0.5.2/Makefile
-plugins/gme/Game_Music_Emu-0.5.2/gme/Makefile
-plugins/sid/sidplay-libs/Makefile
 plugins/dumb/Makefile
 plugins/alsa/Makefile
 plugins/hotkeys/Makefile
@@ -459,3 +453,4 @@ plugins/supereq/Makefile
 deadbeef.desktop
 ])
 
+AC_OUTPUT
diff --git a/plugins/adplug/Makefile.am b/plugins/adplug/Makefile.am
index e35d4107..0d4e2a5d 100644
--- a/plugins/adplug/Makefile.am
+++ b/plugins/adplug/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_ADPLUG
 adplugpath=@top_srcdir@/plugins/adplug
 
 adlibdir = $(libdir)/$(PACKAGE)
@@ -133,5 +134,4 @@ adplug_la_SOURCES = adplug-db.cpp\
 				   adplug/xsm.h
 
 adplug_la_LDFLAGS = -module
-
-
+endif
diff --git a/plugins/alsa/Makefile.am b/plugins/alsa/Makefile.am
index 179f8793..265c9b50 100644
--- a/plugins/alsa/Makefile.am
+++ b/plugins/alsa/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_ALSA
 alsadir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = alsa.la
 alsa_la_SOURCES = alsa.c
@@ -5,3 +6,4 @@ alsa_la_LDFLAGS = -module
 alsa_la_LIBADD = $(LDADD) $(ALSA_DEPS_LIBS)
 
 AM_CFLAGS = $(CFLAGS) -std=c99 $(ALSA_DEPS_CFLAGS)
+endif
diff --git a/plugins/artwork/Makefile.am b/plugins/artwork/Makefile.am
index de137844..403a30e2 100644
--- a/plugins/artwork/Makefile.am
+++ b/plugins/artwork/Makefile.am
@@ -1,8 +1,10 @@
+if HAVE_ARTWORK
 artworkdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = artwork.la
-artwork_la_SOURCES = artwork.h albumartorg.c artwork.c lastfm.c
+artwork_la_SOURCES = artwork.c artwork.h albumartorg.c albumartorg.h lastfm.c lastfm.h
 
 artwork_la_LDFLAGS = -module
 
 artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS_LIBS) $(CURL_LIBS)
 AM_CFLAGS = -std=c99 $(ARTWORK_DEPS_CFLAGS)
+endif
diff --git a/plugins/cdda/Makefile.am b/plugins/cdda/Makefile.am
index 48e4a8d1..875cf9ae 100644
--- a/plugins/cdda/Makefile.am
+++ b/plugins/cdda/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_CDDA
 cddadir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = cdda.la
 cdda_la_SOURCES = cdda.c
@@ -5,3 +6,4 @@ cdda_la_LDFLAGS = -module
 
 cdda_la_LIBADD = $(LDADD) $(CDDA_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/dumb/Makefile.am b/plugins/dumb/Makefile.am
index 5beff7a9..776fb3e7 100644
--- a/plugins/dumb/Makefile.am
+++ b/plugins/dumb/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_DUMB
 dumbpath=@top_srcdir@/plugins/dumb/dumb-kode54
 
 EXTRA_DIST = $(dumbpath)/readme.txt $(dumbpath)/ChangeLog $(dumbpath)/licence.txt $(dumbpath)/release.txt $(dumbpath)/todo.txt
@@ -103,4 +104,4 @@ dumb-kode54/src/helpers/resample.inc\
 dumb-kode54/src/helpers/resamp2.inc\
 dumb-kode54/src/helpers/resamp3.inc\
 cdumb.c
-
+endif
diff --git a/plugins/dumb/cdumb.c b/plugins/dumb/cdumb.c
index d60c7397..92e27437 100644
--- a/plugins/dumb/cdumb.c
+++ b/plugins/dumb/cdumb.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include "dumb.h"
 #include "internal/it.h"
-#include "deadbeef.h"
+#include "../../deadbeef.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
diff --git a/plugins/ffap/Makefile.am b/plugins/ffap/Makefile.am
index cc43e294..a3671fbe 100644
--- a/plugins/ffap/Makefile.am
+++ b/plugins/ffap/Makefile.am
@@ -1,6 +1,8 @@
+if HAVE_FFAP
 ffapdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = ffap.la
 ffap_la_SOURCES = ffap.c
 ffap_la_LDFLAGS = -module
 
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/ffmpeg/Makefile.am b/plugins/ffmpeg/Makefile.am
index c3ff18b2..0793990f 100644
--- a/plugins/ffmpeg/Makefile.am
+++ b/plugins/ffmpeg/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_FFMPEG
 ffmpegdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = ffmpeg.la
 ffmpeg_la_SOURCES = ffmpeg.c
@@ -5,3 +6,4 @@ ffmpeg_la_LDFLAGS = -module
 
 ffmpeg_la_LIBADD = $(LDADD) $(FFMPEG_DEPS_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99 ${FFMPEG_DEPS_CFLAGS}
+endif
diff --git a/plugins/flac/Makefile.am b/plugins/flac/Makefile.am
index 3072883e..1e8b09bc 100644
--- a/plugins/flac/Makefile.am
+++ b/plugins/flac/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_FLAC
 flacdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = flac.la
 flac_la_SOURCES = flac.c
@@ -5,3 +6,4 @@ flac_la_LDFLAGS = -module
 
 flac_la_LIBADD = $(LDADD) $(FLAC_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/gme/Makefile.am b/plugins/gme/Makefile.am
index 475e35c0..392c0789 100644
--- a/plugins/gme/Makefile.am
+++ b/plugins/gme/Makefile.am
@@ -1,12 +1,115 @@
+if HAVE_GME
 gmepath=@top_srcdir@/plugins/gme/Game_Music_Emu-0.5.2
-SUBDIRS = Game_Music_Emu-0.5.2 Game_Music_Emu-0.5.2/gme
+
+EXTRA_DIST = $(gmepath)/changes.txt $(gmepath)/design.txt $(gmepath)/gme.txt $(gmepath)/license.txt $(gmepath)/readme.txt 
 
 gmedir = $(libdir)/$(PACKAGE)
 
 pkglib_LTLIBRARIES = gme.la
 
-gme_la_SOURCES = cgme.c
+gme_la_SOURCES = cgme.c\
+Game_Music_Emu-0.5.2/gme/Ay_Apu.cpp\
+Game_Music_Emu-0.5.2/gme/Gb_Apu.cpp\
+Game_Music_Emu-0.5.2/gme/Hes_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Nes_Fme7_Apu.cpp\
+Game_Music_Emu-0.5.2/gme/Sms_Apu.cpp\
+Game_Music_Emu-0.5.2/gme/Ay_Cpu.cpp\
+Game_Music_Emu-0.5.2/gme/Gb_Cpu.cpp\
+Game_Music_Emu-0.5.2/gme/Kss_Cpu.cpp\
+Game_Music_Emu-0.5.2/gme/Nes_Namco_Apu.cpp\
+Game_Music_Emu-0.5.2/gme/Snes_Spc.cpp\
+Game_Music_Emu-0.5.2/gme/Ay_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Gb_Oscs.cpp\
+Game_Music_Emu-0.5.2/gme/Kss_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Nes_Oscs.cpp\
+Game_Music_Emu-0.5.2/gme/Spc_Cpu.cpp\
+Game_Music_Emu-0.5.2/gme/Blip_Buffer.cpp\
+Game_Music_Emu-0.5.2/gme/Gbs_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Kss_Scc_Apu.cpp\
+Game_Music_Emu-0.5.2/gme/Nes_Vrc6_Apu.cpp\
+Game_Music_Emu-0.5.2/gme/Spc_Dsp.cpp\
+Game_Music_Emu-0.5.2/gme/Classic_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/gme.cpp\
+Game_Music_Emu-0.5.2/gme/M3u_Playlist.cpp\
+Game_Music_Emu-0.5.2/gme/Nsfe_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Spc_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Data_Reader.cpp\
+Game_Music_Emu-0.5.2/gme/Gme_File.cpp\
+Game_Music_Emu-0.5.2/gme/Multi_Buffer.cpp\
+Game_Music_Emu-0.5.2/gme/Nsf_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Vgm_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Dual_Resampler.cpp\
+Game_Music_Emu-0.5.2/gme/Gym_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Music_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Sap_Apu.cpp\
+Game_Music_Emu-0.5.2/gme/Vgm_Emu_Impl.cpp\
+Game_Music_Emu-0.5.2/gme/Effects_Buffer.cpp\
+Game_Music_Emu-0.5.2/gme/Hes_Apu.cpp\
+Game_Music_Emu-0.5.2/gme/Nes_Apu.cpp\
+Game_Music_Emu-0.5.2/gme/Sap_Cpu.cpp\
+Game_Music_Emu-0.5.2/gme/Ym2413_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Fir_Resampler.cpp\
+Game_Music_Emu-0.5.2/gme/Hes_Cpu.cpp\
+Game_Music_Emu-0.5.2/gme/Nes_Cpu.cpp\
+Game_Music_Emu-0.5.2/gme/Sap_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Ym2612_Emu.cpp\
+Game_Music_Emu-0.5.2/gme/Ay_Apu.h\
+Game_Music_Emu-0.5.2/gme/Ay_Cpu.h\
+Game_Music_Emu-0.5.2/gme/Ay_Emu.h\
+Game_Music_Emu-0.5.2/gme/blargg_common.h\
+Game_Music_Emu-0.5.2/gme/blargg_config.h\
+Game_Music_Emu-0.5.2/gme/blargg_endian.h\
+Game_Music_Emu-0.5.2/gme/blargg_source.h\
+Game_Music_Emu-0.5.2/gme/Blip_Buffer.h\
+Game_Music_Emu-0.5.2/gme/Classic_Emu.h\
+Game_Music_Emu-0.5.2/gme/Data_Reader.h\
+Game_Music_Emu-0.5.2/gme/Dual_Resampler.h\
+Game_Music_Emu-0.5.2/gme/Effects_Buffer.h\
+Game_Music_Emu-0.5.2/gme/Fir_Resampler.h\
+Game_Music_Emu-0.5.2/gme/Gb_Apu.h\
+Game_Music_Emu-0.5.2/gme/Gb_Cpu.h\
+Game_Music_Emu-0.5.2/gme/gb_cpu_io.h\
+Game_Music_Emu-0.5.2/gme/Gb_Oscs.h\
+Game_Music_Emu-0.5.2/gme/Gbs_Emu.h\
+Game_Music_Emu-0.5.2/gme/Gme_File.h\
+Game_Music_Emu-0.5.2/gme/gme.h\
+Game_Music_Emu-0.5.2/gme/Gym_Emu.h\
+Game_Music_Emu-0.5.2/gme/Hes_Apu.h\
+Game_Music_Emu-0.5.2/gme/Hes_Cpu.h\
+Game_Music_Emu-0.5.2/gme/hes_cpu_io.h\
+Game_Music_Emu-0.5.2/gme/Hes_Emu.h\
+Game_Music_Emu-0.5.2/gme/Kss_Cpu.h\
+Game_Music_Emu-0.5.2/gme/Kss_Emu.h\
+Game_Music_Emu-0.5.2/gme/Kss_Scc_Apu.h\
+Game_Music_Emu-0.5.2/gme/M3u_Playlist.h\
+Game_Music_Emu-0.5.2/gme/Multi_Buffer.h\
+Game_Music_Emu-0.5.2/gme/Music_Emu.h\
+Game_Music_Emu-0.5.2/gme/Nes_Apu.h\
+Game_Music_Emu-0.5.2/gme/Nes_Cpu.h\
+Game_Music_Emu-0.5.2/gme/nes_cpu_io.h\
+Game_Music_Emu-0.5.2/gme/Nes_Fme7_Apu.h\
+Game_Music_Emu-0.5.2/gme/Nes_Namco_Apu.h\
+Game_Music_Emu-0.5.2/gme/Nes_Oscs.h\
+Game_Music_Emu-0.5.2/gme/Nes_Vrc6_Apu.h\
+Game_Music_Emu-0.5.2/gme/Nsfe_Emu.h\
+Game_Music_Emu-0.5.2/gme/Nsf_Emu.h\
+Game_Music_Emu-0.5.2/gme/Sap_Apu.h\
+Game_Music_Emu-0.5.2/gme/Sap_Cpu.h\
+Game_Music_Emu-0.5.2/gme/sap_cpu_io.h\
+Game_Music_Emu-0.5.2/gme/Sap_Emu.h\
+Game_Music_Emu-0.5.2/gme/Sms_Apu.h\
+Game_Music_Emu-0.5.2/gme/Sms_Oscs.h\
+Game_Music_Emu-0.5.2/gme/Snes_Spc.h\
+Game_Music_Emu-0.5.2/gme/Spc_Cpu.h\
+Game_Music_Emu-0.5.2/gme/Spc_Dsp.h\
+Game_Music_Emu-0.5.2/gme/Spc_Emu.h\
+Game_Music_Emu-0.5.2/gme/Vgm_Emu.h\
+Game_Music_Emu-0.5.2/gme/Vgm_Emu_Impl.h\
+Game_Music_Emu-0.5.2/gme/Ym2413_Emu.h\
+Game_Music_Emu-0.5.2/gme/Ym2612_Emu.h
+
 gme_la_LDFLAGS = -module
 
-gme_la_LIBADD = $(LDADD) $(gmepath)/gme/libgme.a -lstdc++
-AM_CFLAGS = $(CFLAGS) -I$(gmepath) -std=c99 -fPIC
+gme_la_LIBADD = $(LDADD) -lstdc++
+AM_CFLAGS = $(CFLAGS) -I$(gmepath) -std=c99
+endif
diff --git a/plugins/gme/cgme.c b/plugins/gme/cgme.c
index 2bed740c..77253df0 100644
--- a/plugins/gme/cgme.c
+++ b/plugins/gme/cgme.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "gme/gme.h"
-#include "deadbeef.h"
+#include "../../deadbeef.h"
 
 static DB_decoder_t plugin;
 static DB_functions_t *deadbeef;
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am
index 8c8c5fef..775dfca4 100644
--- a/plugins/gtkui/Makefile.am
+++ b/plugins/gtkui/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_GTKUI
 gtkuidir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = gtkui.la
 
@@ -17,7 +18,7 @@ gtkui_la_SOURCES = $(gtkui_VALABUILTSOURCES)\
 				   gtkui.c gtkui.h\
 				   callbacks.c interface.c support.c callbacks.h interface.h support.h\
 				   ddblistview.c ddblistview.h\
-				   mainplaylist.c\
+				   mainplaylist.c mainplaylist.h\
 				   drawing.h gdkdrawing.c\
 				   progress.c progress.h\
 				   search.c search.h\
@@ -44,3 +45,4 @@ CLEANFILES =								\
 	$(BUILT_SOURCES)						\
 	$(gtkui_VALABUILTSOURCES)
 endif
+endif
diff --git a/plugins/hotkeys/Makefile.am b/plugins/hotkeys/Makefile.am
index 5f2e9d38..79a9d642 100644
--- a/plugins/hotkeys/Makefile.am
+++ b/plugins/hotkeys/Makefile.am
@@ -1,9 +1,11 @@
+if HAVE_HOTKEYS
 hotkeysdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = hotkeys.la
-hotkeys_la_SOURCES = hotkeys.c
+hotkeys_la_SOURCES = hotkeys.c hotkeys.h
 hotkeys_la_LDFLAGS = -module
 
 EXTRA_hotkeys_la_SOURCES = keysyms.inc
 
 hotkeys_la_LIBADD = $(LDADD) $(HOTKEYS_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/lastfm/Makefile.am b/plugins/lastfm/Makefile.am
index 0c49f8d9..87499d7e 100644
--- a/plugins/lastfm/Makefile.am
+++ b/plugins/lastfm/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_LASTFM
 lastfmdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = lastfm.la
 lastfm_la_SOURCES = lastfm.c
@@ -5,3 +6,4 @@ lastfm_la_LDFLAGS = -module
 
 lastfm_la_LIBADD = $(LDADD) $(CURL_LIBS)
 AM_CFLAGS = -std=c99
+endif
diff --git a/plugins/mpgmad/Makefile.am b/plugins/mpgmad/Makefile.am
index d3019db1..aae7fa37 100644
--- a/plugins/mpgmad/Makefile.am
+++ b/plugins/mpgmad/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_MPGMAD
 mpgmaddir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = mpgmad.la
 mpgmad_la_SOURCES = mpgmad.c
@@ -5,3 +6,4 @@ mpgmad_la_LDFLAGS = -module
 
 mpgmad_la_LIBADD = $(LDADD) $(MAD_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/nullout/Makefile.am b/plugins/nullout/Makefile.am
index da914823..73e63136 100644
--- a/plugins/nullout/Makefile.am
+++ b/plugins/nullout/Makefile.am
@@ -1,5 +1,7 @@
+if HAVE_NULLOUT
 nulloutdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = nullout.la
 nullout_la_SOURCES = nullout.c
 nullout_la_LDFLAGS = -module
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/oss/Makefile.am b/plugins/oss/Makefile.am
index e2195996..cd7e1675 100644
--- a/plugins/oss/Makefile.am
+++ b/plugins/oss/Makefile.am
@@ -1,6 +1,7 @@
+if HAVE_OSS
 ossdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = oss.la
 AM_CFLAGS = $(CFLAGS) $(OSS_CFLAGS) -std=c99
 oss_la_SOURCES = oss.c
 oss_la_LDFLAGS = -module
-
+endif
diff --git a/plugins/pulse/Makefile.am b/plugins/pulse/Makefile.am
index c04bdb81..d0e29c66 100644
--- a/plugins/pulse/Makefile.am
+++ b/plugins/pulse/Makefile.am
@@ -1,7 +1,8 @@
+if HAVE_PULSE
 pulsedir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = pulse.la
 AM_CFLAGS = $(CFLAGS) $(PULSE_DEPS_CFLAGS) -std=c99
 pulse_la_SOURCES = pulse.c
 pulse_la_LDFLAGS = -module
 pulse_la_LIBADD = $(LDADD) $(PULSE_DEPS_LIBS)
-
+endif
diff --git a/plugins/sid/Makefile.am b/plugins/sid/Makefile.am
index b7d35943..5034c222 100644
--- a/plugins/sid/Makefile.am
+++ b/plugins/sid/Makefile.am
@@ -1,12 +1,111 @@
+if HAVE_SID
 sidpath=@top_srcdir@/plugins/sid/sidplay-libs
-SUBDIRS = sidplay-libs
+EXTRA_DIST = \
+	$(sidpath)/libsidutils/README $(sidpath)/libsidplay/README $(sidpath)/resid/README\
+	$(sidpath)/libsidutils/COPYING $(sidpath)/libsidplay/COPYING $(sidpath)/resid/COPYING\
+	$(sidpath)/libsidutils/AUTHORS $(sidpath)/libsidplay/AUTHORS $(sidpath)/resid/AUTHORS
 
 pkglib_LTLIBRARIES = sid.la
-sid_la_SOURCES = plugin.c csid.cpp csid.h
+sid_la_SOURCES = plugin.c csid.cpp csid.h\
+sidplay-libs/libsidplay/src/mixer.cpp\
+sidplay-libs/libsidplay/src/player.cpp\
+sidplay-libs/libsidplay/src/mos656x/mos656x.cpp\
+sidplay-libs/libsidplay/src/mos6510/mos6510.cpp\
+sidplay-libs/libsidplay/src/sid6526/sid6526.cpp\
+sidplay-libs/libsidplay/src/sidtune/MUS.cpp\
+sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp\
+sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp\
+sidplay-libs/libsidplay/src/sidtune/SidTune.cpp\
+sidplay-libs/libsidplay/src/sidtune/PSID.cpp\
+sidplay-libs/libsidplay/src/sidtune/PP20.cpp\
+sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp\
+sidplay-libs/libsidplay/src/event.cpp\
+sidplay-libs/libsidplay/src/psiddrv.cpp\
+sidplay-libs/libsidplay/src/config.cpp\
+sidplay-libs/libsidplay/src/sidplay2.cpp\
+sidplay-libs/libsidplay/src/xsid/xsid.cpp\
+sidplay-libs/libsidplay/src/mos6526/mos6526.cpp\
+sidplay-libs/builders/resid-builder/src/resid.cpp\
+sidplay-libs/builders/resid-builder/src/resid-builder.cpp\
+sidplay-libs/resid/wave8580_PS_.cc\
+sidplay-libs/resid/filter.cc\
+sidplay-libs/resid/pot.cc\
+sidplay-libs/resid/wave.cc\
+sidplay-libs/resid/version.cc\
+sidplay-libs/resid/wave6581__ST.cc\
+sidplay-libs/resid/extfilt.cc\
+sidplay-libs/resid/wave8580_PST.cc\
+sidplay-libs/resid/wave6581_PST.cc\
+sidplay-libs/resid/wave6581_P_T.cc\
+sidplay-libs/resid/wave6581_PS_.cc\
+sidplay-libs/resid/envelope.cc\
+sidplay-libs/resid/voice.cc\
+sidplay-libs/resid/sid.cc\
+sidplay-libs/resid/wave8580__ST.cc\
+sidplay-libs/resid/wave8580_P_T.cc\
+sidplay-libs/libsidplay/src/reloc65.c\
+sidplay-libs/unix/config.h\
+sidplay-libs/libsidplay/win/VC/sidconfig.h\
+sidplay-libs/libsidplay/win/VC/sidint.h\
+sidplay-libs/libsidplay/win/VC/config.h\
+sidplay-libs/libsidplay/unix/sidconfig.h\
+sidplay-libs/libsidplay/unix/sidint.h\
+sidplay-libs/libsidplay/src/xsid/xsid.h\
+sidplay-libs/libsidplay/src/mos6526/mos6526.h\
+sidplay-libs/libsidplay/src/sid6526/sid6526.h\
+sidplay-libs/libsidplay/src/mos656x/mos656x.h\
+sidplay-libs/libsidplay/src/c64/c64xsid.h\
+sidplay-libs/libsidplay/src/c64/c64cia.h\
+sidplay-libs/libsidplay/src/c64/c64vic.h\
+sidplay-libs/libsidplay/src/nullsid.h\
+sidplay-libs/libsidplay/src/sidtune/PP20_Defs.h\
+sidplay-libs/libsidplay/src/sidtune/SidTuneTools.h\
+sidplay-libs/libsidplay/src/sidtune/SidTuneCfg.h\
+sidplay-libs/libsidplay/src/sidtune/PP20.h\
+sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.h\
+sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.h\
+sidplay-libs/libsidplay/src/mos6510/mos6510.h\
+sidplay-libs/libsidplay/src/mos6510/conf6510.h\
+sidplay-libs/libsidplay/src/mos6510/opcodes.h\
+sidplay-libs/libsidplay/src/player.h\
+sidplay-libs/libsidplay/include/sidplay/SmartPtr.h\
+sidplay-libs/libsidplay/include/sidplay/sidusage.h\
+sidplay-libs/libsidplay/include/sidplay/sidtypes.h\
+sidplay-libs/libsidplay/include/sidplay/sidplay2.h\
+sidplay-libs/libsidplay/include/sidplay/sidconfig.h\
+sidplay-libs/libsidplay/include/sidplay/SidTune.h\
+sidplay-libs/libsidplay/include/sidplay/sid2types.h\
+sidplay-libs/libsidplay/include/sidplay/c64env.h\
+sidplay-libs/libsidplay/include/sidplay/sidbuilder.h\
+sidplay-libs/libsidplay/include/sidplay/sidint.h\
+sidplay-libs/libsidplay/include/sidplay/component.h\
+sidplay-libs/libsidplay/include/sidplay/event.h\
+sidplay-libs/libsidplay/include/sidplay/sidendian.h\
+sidplay-libs/libsidplay/include/sidplay/Buffer.h\
+sidplay-libs/libsidplay/include/sidenv.h\
+sidplay-libs/libsidplay/include/config.h\
+sidplay-libs/builders/resid-builder/win/VC/config.h\
+sidplay-libs/builders/resid-builder/src/resid-emu.h\
+sidplay-libs/builders/resid-builder/include/sidplay/builders/resid.h\
+sidplay-libs/builders/resid-builder/include/config.h\
+sidplay-libs/resid/voice.h\
+sidplay-libs/resid/siddefs.h\
+sidplay-libs/resid/wave.h\
+sidplay-libs/resid/sid.h\
+sidplay-libs/resid/filter.h\
+sidplay-libs/resid/envelope.h\
+sidplay-libs/resid/spline.h\
+sidplay-libs/resid/pot.h\
+sidplay-libs/resid/extfilt.h\
+sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.i\
+sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.i\
+sidplay-libs/libsidplay/src/kernal.bin\
+sidplay-libs/libsidplay/src/psiddrv.bin\
+sidplay-libs/libsidplay/src/poweron.bin
 	
-sid_la_LIBADD =  $(sidpath)/libsidplay2.a -lstdc++
+sid_la_LIBADD =  -lstdc++
 sid_la_LDFLAGS = -module
 
 AM_CFLAGS = $(CFLAGS) -std=c99 -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC
-AM_CPPFLAGS = $(CXXFLAGS) -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC
-
+AM_CPPFLAGS = $(CXXFLAGS) -DHAVE_UNIX -I$(sidpath) -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP
+endif
diff --git a/plugins/sid/csid.cpp b/plugins/sid/csid.cpp
index 09c1d3ec..701ac3d4 100644
--- a/plugins/sid/csid.cpp
+++ b/plugins/sid/csid.cpp
@@ -28,7 +28,7 @@
 //#include "md5.h"
 // #include "sidplay/sidendian.h"
 
-#include "deadbeef.h"
+#include "../../deadbeef.h"
 #include "csid.h"
 
 extern DB_decoder_t sid_plugin;
diff --git a/plugins/sid/sidplay-libs/Makefile.am b/plugins/sid/sidplay-libs/Makefile.am
index 7f4ea0b7..9adeb2e9 100644
--- a/plugins/sid/sidplay-libs/Makefile.am
+++ b/plugins/sid/sidplay-libs/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = \
 	$(sidpath)/libsidutils/COPYING $(sidpath)/libsidplay/COPYING $(sidpath)/resid/COPYING\
 	$(sidpath)/libsidutils/AUTHORS $(sidpath)/libsidplay/AUTHORS $(sidpath)/resid/AUTHORS
 
-AM_CPPFLAGS = $(INSANE_CXXFLAGS) -DHAVE_UNIX -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -fPIC
+AM_CPPFLAGS = $(INSANE_CXXFLAGS) -DHAVE_UNIX -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -fPIC
 
 libsidplay2_a_SOURCES = \
 libsidplay/src/mixer.cpp\
diff --git a/plugins/sid/sidplay-libs/unix/config.h b/plugins/sid/sidplay-libs/unix/config.h
index ee1de9e8..e7dafb5c 100644
--- a/plugins/sid/sidplay-libs/unix/config.h
+++ b/plugins/sid/sidplay-libs/unix/config.h
@@ -1,6 +1,8 @@
 /* unix/config.h.  Generated by configure.  */
 /* unix/config.h.in.  Generated from configure.ac by autoheader.  */
 
+#if 0
+
 /* Define if the C++ compiler supports BOOL */
 #define HAVE_BOOL 
 
@@ -106,3 +108,4 @@
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 /* #undef WORDS_BIGENDIAN */
+#endif
diff --git a/plugins/sndfile/Makefile.am b/plugins/sndfile/Makefile.am
index a92828f5..d5c7c9af 100644
--- a/plugins/sndfile/Makefile.am
+++ b/plugins/sndfile/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_SNDFILE
 sndfiledir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = sndfile.la
 sndfile_la_SOURCES = sndfile.c
@@ -5,3 +6,4 @@ sndfile_la_LDFLAGS = -module
 
 sndfile_la_LIBADD = $(LDADD) $(SNDFILE_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/supereq/Makefile.am b/plugins/supereq/Makefile.am
index f86c3e06..0fffd6d6 100644
--- a/plugins/supereq/Makefile.am
+++ b/plugins/supereq/Makefile.am
@@ -1,8 +1,10 @@
+if HAVE_SUPEREQ
 supereqdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = supereq.la
-supereq_la_SOURCES = supereq.c Equ.cpp Fftsg_fl.cpp paramlist.hpp
+supereq_la_SOURCES = supereq.c supereq.h Equ.cpp Fftsg_fl.cpp paramlist.hpp
 
 supereq_la_LDFLAGS = -module
 
 supereq_la_LIBADD = $(LDADD)
 AM_CFLAGS = -std=c99
+endif
diff --git a/plugins/vfs_curl/Makefile.am b/plugins/vfs_curl/Makefile.am
index 189596a5..95794831 100644
--- a/plugins/vfs_curl/Makefile.am
+++ b/plugins/vfs_curl/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_VFS_CURL
 vfs_curldir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = vfs_curl.la
 vfs_curl_la_SOURCES = vfs_curl.c
@@ -5,3 +6,4 @@ vfs_curl_la_LDFLAGS = -module
 
 vfs_curl_la_LIBADD = $(LDADD) $(CURL_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/vorbis/Makefile.am b/plugins/vorbis/Makefile.am
index b4da3fd5..6580db14 100644
--- a/plugins/vorbis/Makefile.am
+++ b/plugins/vorbis/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_VORBIS
 vorbisdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = vorbis.la
 vorbis_la_SOURCES = vorbis.c vcedit.c vcedit.h vceditaux.h i18n.h
@@ -5,3 +6,4 @@ vorbis_la_LDFLAGS = -module
 
 vorbis_la_LIBADD = $(LDADD) $(VORBIS_LIBS) -lc
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/vtx/Makefile.am b/plugins/vtx/Makefile.am
index abfa8c98..02d8de5c 100644
--- a/plugins/vtx/Makefile.am
+++ b/plugins/vtx/Makefile.am
@@ -1,6 +1,8 @@
+if HAVE_VTX
 vtxdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = vtx.la
 vtx_la_SOURCES = vtx.c ay8912.c ayemu_8912.h ayemu.h ayemu_vtxfile.h lh5dec.c vtxfile.c
 vtx_la_LDFLAGS = -module
 
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/wavpack/Makefile.am b/plugins/wavpack/Makefile.am
index 9a86351f..10f44cf1 100644
--- a/plugins/wavpack/Makefile.am
+++ b/plugins/wavpack/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_WAVPACK
 wavpackdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = wavpack.la
 wavpack_la_SOURCES = wavpack.c
@@ -5,3 +6,4 @@ wavpack_la_LDFLAGS = -module
 
 wavpack_la_LIBADD = $(LDADD) $(WAVPACK_LIBS)
 AM_CFLAGS = $(CFLAGS) -std=c99
+endif