clean up build process / configure script - allow libsndfile

README

@@ -5,26 +5,29 @@ Last changed Saturday December 11 2002.
 SpiralSynthModular is open source software, distributed under the General
 Public License (GPL). See the file COPYING.
 
-Dependancies:
-FLTK (www.fltk.org) If you build FLTK from source use 
-"./configure --enable-shared"
-LADSPA plugins
+
+** Dependancies **
+
+FLTK (www.fltk.org)
+If you build FLTK from source use "./configure --enable-shared"
+
+LADSPA plugins  (www.ladspa.org)
 
 Sound output can be provided by either OSS or JACK (and therefore alsa).
 
 See www.pawfal.org or sourceforge.net/projects/spiralmodular for more details.
-    
+
 ** Installing **
-	
+
 To build the SpiralSynthModular application, and all the plugins:
 
-./configure 
+./configure
 make
 make install
 spiralsynthmodular
 
 Check out the designs in the Examples directory.
-For more examples be sure to check out the noize farm 
+For more examples be sure to check out the noize farm
 (http://groups.yahoo.com/group/noize_farm) an open source repository of
 ssm patches.
 
@@ -38,6 +41,23 @@ options list:
 --Realtime : spawn audio thread with FIFO scheduling (run as root)
 --PluginPath <PATH> : look for plugins in the specified directory
 
+*** LRDF support for LADSPA plugins ***
+
+http://plugin.org.uk/releases/lrdf/
+http://www.redland.opensource.ac.uk/raptor/
+
+If you have the lrdf library installed on your system,
+the LADSPAPlugin will automatically use it.
+
+To disable detection of this this, use the configure option:
+./configure --disable-liblrdf
+
+Having a tempfs file system mounted on /dev/shm allows a single LADSPA
+plugin database to be shared between instances.
+
+To disable detection of this, use the configure option:
+./configure --disable-posiz-shm
+
 *** Jack support ***
 
 http://jackit.sourceforge.net
@@ -49,12 +69,12 @@ To load the plugin, add it to .SpiralSynthModular's plugin list.
 
 *** Setting up your .SpiralSynthModular file ***
 
-This file contains all the setup variables for the program. Thes values can be 
+This file contains all the setup variables for the program. Thes values can be
 edited with the options window whilst running SSM.
-The following variables in the are the ones to play with to get a good playback 
-on your machine. This is usually tradeoff between quality and responsiveness 
-(latency). You can build designs and songs at low quality (22050 samplerate etc) 
-and then record them at higher settings. The wav file will sound fine, even if 
+The following variables in the are the ones to play with to get a good playback
+on your machine. This is usually tradeoff between quality and responsiveness
+(latency). You can build designs and songs at low quality (22050 samplerate etc)
+and then record them at higher settings. The wav file will sound fine, even if
 the realtime output doesn't.
 
 BufferSize        = 512         - Size of sample buffer to be calculated each cycle.
@@ -65,9 +85,9 @@ Samplerate        = 44100       - Sets the samplerate
 
 
 Disclaimer:
-No representations are made about the suitability of this software 
-for any purpose. This software is provided "as is" without express 
-or implied warranty. 
+No representations are made about the suitability of this software
+for any purpose. This software is provided "as is" without express
+or implied warranty.
 (Damage to ears, speakers or buildings are not my fault :))
 
 Dave Griffiths - dave@pawfal.org

SpiralSound/Midi.C

@@ -44,14 +44,14 @@ static int NKEYS = 30;
 MidiDevice *MidiDevice::m_Singleton;
 string MidiDevice::m_AppName;
 
-#ifdef OSS_MIDI
-string MidiDevice::m_DeviceName;
-#endif
-
 #if __APPLE__
 #define read	AppleRead
 #endif
 
+#ifdef USE_OSS_MIDI
+string MidiDevice::m_DeviceName;
+#endif
+
 void MidiDevice::Init(const string &name, Type t)
 {
 	if (!m_Singleton)
@@ -69,10 +69,10 @@ m_ClockCount (0)
 #if __APPLE__
      AppleOpen();
 #endif
-#ifdef ALSA_MIDI
+#ifdef USE_ALSA_MIDI
      seq_handle=AlsaOpen(t);
 #endif
-#ifdef OSS_MIDI
+#ifdef USE_OSS_MIDI
      if (!OssOpen()) return;
 #endif
      m_Mutex = new pthread_mutex_t;
@@ -88,10 +88,10 @@ MidiDevice::~MidiDevice() {
 #if __APPLE__
      AppleClose();
 #endif
-#ifdef ALSA_MIDI
+#ifdef USE_ALSA_MIDI
      AlsaClose();
 #endif
-#ifdef OSS_MIDI
+#ifdef USE_OSS_MIDI
      OssClose();
 #endif
 }
@@ -121,7 +121,7 @@ MidiEvent MidiDevice::GetEvent(int Device)
 }
 
 void MidiDevice::SendEvent (int Device, const MidiEvent &Event) {
-#ifdef ALSA_MIDI
+#ifdef USE_ALSA_MIDI
 	snd_seq_event_t ev;
 	snd_seq_ev_clear      (&ev);
   	snd_seq_ev_set_direct (&ev);
@@ -175,7 +175,7 @@ void MidiDevice::SendEvent (int Device, const MidiEvent &Event) {
 
 //////////////////////////////////////////// Oss Code Only ////////////////////////////////////////
 
-#ifdef OSS_MIDI
+#ifdef USE_OSS_MIDI
 
 bool MidiDevice::OssOpen() {
      //if (!SpiralInfo::WANTMIDI) return;
@@ -362,7 +362,7 @@ void MidiDevice::OssAddEvent(unsigned char* midi)
 
 //////////////////////////////////////////// Alsa Code Only ////////////////////////////////////////
 
-#ifdef ALSA_MIDI
+#ifdef USE_ALSA_MIDI
 
 // code taken and modified from jack_miniFMsynth
 

SpiralSound/Midi.h

@@ -16,6 +16,9 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#ifndef MIDI
+#define MIDI
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -24,18 +27,11 @@
 #include <limits.h>
 #include <queue>
 #include <string>
-
-#ifndef MIDI
-#define MIDI
+#include "../config.h"
 
 using namespace std;
 
-// comment out one of these to choose your MIDI driver (for non-Apple systems)
-// I'll stick this in the ./configue when it'd all working
-#define ALSA_MIDI
-//#define OSS_MIDI
-
-#ifdef ALSA_MIDI
+#ifdef USE_ALSA_MIDI
 #include <alsa/asoundlib.h>
 #endif
 
@@ -70,7 +66,7 @@ public:
 
 	static void Init(const string &name, Type t);
 	static void SetDeviceName(string s) {
-               #ifdef OSS_MIDI
+               #ifdef USE_OSS_MIDI
                m_DeviceName=s;
                #endif
         }
@@ -99,20 +95,21 @@ private:
 	pthread_mutex_t* m_Mutex;
 
 	static string m_AppName;
-#ifdef ALSA_MIDI
+#ifdef USE_ALSA_MIDI
 	static void *MidiReaderCallback (void *o) { ((MidiDevice*)o)->AlsaCollectEvents(); return NULL; }
 	void AlsaCollectEvents();
         void AlsaClose ();
 	snd_seq_t *seq_handle;
 	snd_seq_t *AlsaOpen(Type t);
 #endif
-#ifdef OSS_MIDI
+#ifdef USE_OSS_MIDI
         static void *MidiReaderCallback (void *o) { ((MidiDevice*)o)->OssCollectEvents(); return NULL; }
 	void OssCollectEvents();
 	void OssAddEvent(unsigned char* midi);
 	void OssReadByte(unsigned char *c);
 	void OssClose();
-	static string m_DeviceName;
+        bool OssOpen();
+        static string m_DeviceName;
 	int m_MidiFd, m_MidiWrFd;
 #endif
 #if __APPLE__

SpiralSound/Plugins/AmpPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/BeatMatchPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/ComplexEnvelopePlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@ @FLTK_CXXFLAGS@
 INCPATH	=
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   @FLTK_LIBS@  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/ControllerPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/CounterPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/DelayPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/DiskWriterPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11 -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/DistributorPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/EchoPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/EnvelopePlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/FilterPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/FlipflopPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
+CFLAGS	=	@CFLAGS@
 CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/FormantFilterPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/JackPlugin/JackPluginGUI.C

@@ -14,13 +14,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/ 
+*/
 
 #include "JackPlugin.h"
 #include "JackPluginGUI.h"
 #include <FL/fl_draw.h>
 #include <FL/fl_file_chooser.H>
 #include <FL/Fl_Hold_Browser.H>
+#include <algorithm>
 
 using namespace std;
 
@@ -32,9 +33,9 @@ int OptionsList(const std::vector<string> &List)
 	Fl_Button *Ok            = new Fl_Button(10,275,40,20,"Ok");
 	Ok->labelsize(10);
 	Fl_Button *Cancel        = new Fl_Button(50,275,40,20,"Cancel");
-	Cancel->labelsize(10);	
+	Cancel->labelsize(10);
 	Fl_Hold_Browser* Browser = new Fl_Hold_Browser(5,5,290,265,"");
-	
+
 	for (std::vector<string>::const_iterator i = List.begin();
 		 i!=List.end(); i++)
 	{
@@ -125,7 +126,7 @@ SpiralPluginGUI(w,h,o,ch)
 	m_Scroll->type(Fl_Scroll::VERTICAL_ALWAYS);
         m_Scroll->position(0, 0);
         add(m_Scroll);
-        
+
         m_OutputPack = new Fl_Pack(15, 90, 85, h - 102);
 	m_Scroll->add(m_OutputPack);
 	
@@ -178,7 +179,7 @@ void JackPluginGUI::Update()
 
 		for (unsigned int n=0; n<m_JackClient->m_InputPortsChanged.size(); n++) {
 			m_JackClient->m_InputPortsChanged[n]->Connected = jack_port_connected(m_JackClient->m_InputPortsChanged[n]->Port);
-			
+
 			if (m_JackClient->m_InputPortsChanged[n]->Connected) {
 				if (m_JackClient->m_InputPortsChanged[n]->ConnectedTo!="") {
 					m_InputButton[n]->label(m_JackClient->m_InputPortsChanged[n]->ConnectedTo.c_str());
@@ -197,7 +198,7 @@ void JackPluginGUI::Update()
 			{
 				m_InputButton[m_JackClient->m_InputPortsChanged[n]->PortNo]->value(0);
 				m_InputButton[m_JackClient->m_InputPortsChanged[n]->PortNo]->label("None");
-			}	
+			}
 
 		}
 
@@ -286,7 +287,7 @@ void JackPluginGUI::AddOutput() {
         m_OutputLabel.push_back(new Fl_Box(0,n*30,90,10,m_OutputName[n]));
         m_OutputLabel[n]->labelsize(8);
         m_OutputPack->add(m_OutputLabel[n]);
-        
+
         m_OutputButton.push_back(new Fl_Button(0,n*30+10,90,20,"None"));
         m_OutputButton[n]->type(1);
         m_OutputButton[n]->labelsize(8);
@@ -322,7 +323,7 @@ inline void  JackPluginGUI::cb_Remove_i(Fl_Button* o)
 { 
         int n = (int) m_InputName.size();
 
-        if (n > MIN_PORTS) 
+        if (n > MIN_PORTS)
         {
 	        RemoveOutput() ;		
 	        RemoveInput() ;	
@@ -394,7 +395,7 @@ inline void  JackPluginGUI::cb_Attach_i(Fl_Button* o)
 }
 
 inline void  JackPluginGUI::cb_Detach_i(Fl_Button* o)
-{ 
+{
 	for (int n=0; n<(int)m_OutputName.size(); n++)
 	{		
 		m_OutputButton[n]->value(false);
@@ -402,16 +403,16 @@ inline void  JackPluginGUI::cb_Detach_i(Fl_Button* o)
 	}
 	
 	for (int n=0; n<(int)m_InputName.size(); n++)
-	{		
+	{
 		m_InputButton[n]->value(false);
 		m_InputButton[n]->label("None");
 	}
-	
+
 	m_JackPlugin->Detach();
 }
 
 inline void JackPluginGUI::cb_OutputConnect_i(Fl_Button* o)
-{ 
+{
 	int index=0;
 	std::vector<Fl_Button *>::iterator it = std::find( m_OutputButton.begin(), m_OutputButton.end(), o );
 
@@ -420,14 +421,14 @@ inline void JackPluginGUI::cb_OutputConnect_i(Fl_Button* o)
 
 	if ((o->value()) && m_GUICH->GetBool("Connected"))
 	{
-		m_GUICH->SetCommand(JackPlugin::UPDATE_NAMES);	
+		m_GUICH->SetCommand(JackPlugin::UPDATE_NAMES);
 		m_GUICH->Wait();
-		
+
 		// bit of a hack for multithreaded safety
 		int ninputs=m_GUICH->GetInt("NumOutputPortNames");
 		char inputs[MAX_PORTS][256];
 		m_GUICH->GetData("InputPortNames",inputs);
-			
+
 		vector<string> Inputs;
 		for (int n=0; n<ninputs; n++) Inputs.push_back(inputs[n]);
 		int choice=OptionsList(Inputs);

SpiralSound/Plugins/JackPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib -L/usr/local/lib/ @FLTK_LIBS@ -lGL -lXext -lX11  -ldl -lrt -ljack -lpthread
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@ -lrt -ljack -lpthread
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/JoystickPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/KeyboardPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl -pthread
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/LADSPAPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I../../../ -I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   @FLTK_LIBS@ -L/usr/X11R6/lib -lGL -lXext -lX11 -ldl @SHMLIBS@ @LRDFLIBS@
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@ @SHMLIBS@ @LRDFLIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/LFOPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/LogicPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/MasherPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/MatrixPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/MeterPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/MidiPlugin/Makefile.in

@@ -7,13 +7,13 @@
 CC	=	gcc
 CXX	=	g++
 CFLAGS	=	@CFLAGS@
-CXXFLAGS=	@CXXFLAGS@ 
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl -pthread -lasound
+LFLAGS	=
+LIBS	=	@FLTK_LIBS@ @AMIDILIBS@
 MOC     = moc
-UIC	=	
+UIC	=
 
 TAR	=	tar -cf
 GZIP	=	gzip -9f

SpiralSound/Plugins/MixSwitchPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/MixerPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/MoogFilterPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/MousePlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/NoisePlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/NoteSnapPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/OperatorPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/OscillatorPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/OutputPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@  @FLTK_CXXFLAGS@
 INCPATH	=
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   @FLTK_LIBS@
+LIBS	=   @FLTK_LIBS@ @SFLIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/RingModPlugin/Makefile.in

@@ -6,14 +6,14 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
-UIC	=	
+UIC	=
 
 TAR	=	tar -cf
 GZIP	=	gzip -9f

SpiralSound/Plugins/SVFilterPlugin/Makefile.in

@@ -10,8 +10,8 @@ CFLAGS	=	@CFLAGS@
 CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/SampleHoldPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/SamplerPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/ScopePlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/SeqPlugin/Makefile.in

@@ -10,8 +10,8 @@ CFLAGS	=	@CFLAGS@
 CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/SequencerPlugin/Makefile.in

@@ -10,8 +10,8 @@ CFLAGS	=	@CFLAGS@
 CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/SmoothPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=   @FLTK_LIBS@ @SFLIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/SplitterPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/StereoMixerPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=   @FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/StreamPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=	@FLTK_LIBS@ @SFLIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/SwitchPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=	@FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/TransposePlugin/Makefile.in

@@ -7,7 +7,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=	@FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/TrigPlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=	@FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/WaveShaperPlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=	@FLTK_LIBS@
 MOC     = moc
 UIC	=
 

SpiralSound/Plugins/WaveTablePlugin/Makefile.in

@@ -6,12 +6,12 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	@CFLAGS@ 
-CXXFLAGS=	@CXXFLAGS@ 
+CFLAGS	=	@CFLAGS@
+CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
-LFLAGS	=	
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LFLAGS	=
+LIBS	=	@FLTK_LIBS@
 MOC     = moc
 UIC	=	
 

SpiralSound/Plugins/XFadePlugin/Makefile.in

@@ -11,7 +11,7 @@ CXXFLAGS=	@CXXFLAGS@
 INCPATH	=	-I/usr/X11R6/include
 LINK	=	g++ -shared
 LFLAGS	=
-LIBS	=   -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11  -ldl
+LIBS	=	@FLTK_LIBS@
 MOC     = moc
 UIC	=
 

configure.in

@@ -18,14 +18,13 @@ AC_C_INLINE
 
 dnl Check plugin directory
 AC_ARG_WITH(plugindir,
-  [ --with-plugindir=dir        give the plugin directory],
+  [  --with-plugindir=dir    give the plugin directory],
   plugindir="$withval",
   plugindir="/usr/lib/SpiralPlugins")
 AC_SUBST(PLUGINDIR, $plugindir)
 
 dnl Check whether to enable debugging
-
-AC_ARG_ENABLE(debug,  [  --enable-debug             enable debugging ],
+AC_ARG_ENABLE(debug,  [  --enable-debug          enable debugging ],
         ac_arg_debug="Y", ac_arg_debug="N")
 
 if test $ac_arg_debug = "Y" ; then
@@ -34,75 +33,128 @@ if test $ac_arg_debug = "Y" ; then
 else
 	CFLAGS="-pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused "
 	CXXFLAGS="-pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused "
-	fi
+fi
+
+dnl build plugin list - plugins that do not require an optional component
+dnl (e.g. Jack)
+
+PLUGINLIST="AmpPlugin AnotherFilterPlugin BeatMatchPlugin ControllerPlugin \
+CounterPlugin DelayPlugin DiskWriterPlugin DistributorPlugin EchoPlugin \
+EnvFollowerPlugin EnvelopePlugin FilterPlugin FlipflopPlugin FormantFilterPlugin \
+KeyboardPlugin LADSPAPlugin LFOPlugin LogicPlugin MasherPlugin MatrixPlugin \
+MeterPlugin MidiPlugin MixSwitchPlugin MixerPlugin MoogFilterPlugin NoisePlugin \
+NoteSnapPlugin OperatorPlugin OscillatorPlugin OutputPlugin PoshSamplerPlugin \
+RingModPlugin SVFilterPlugin SampleHoldPlugin ScopePlugin SeqSelectorPlugin \
+SmoothPlugin SpiralLoopPlugin SplitSwitchPlugin SplitterPlugin StereoMixerPlugin \
+StreamPlugin SwitchPlugin TransposePlugin TrigPlugin WaveShaperPlugin \
+WaveTablePlugin XFadePlugin"
+
+dnl Check whether jack is present or has been disabled
+jack_message=""
+AC_ARG_ENABLE(
+    jack,
+    [  --disable-jack          Do not build JackPlugin],
+    [build_jack="n" ; jack_message="manually disabled"],
+    [build_jack="y"]
+)
+if test "$build_jack" = "y"; then
+   AC_CHECK_HEADER(jack/jack.h, [build_jack="y"], [build_jack="n" ; jack_message="No jack/jack.h found"])
+fi
+if test "$build_jack" = "y"; then
+   AC_CHECK_LIB(jack, jack_client_new, [build_jack="y"], [build_jack="n" ; jack_message="No libjack found"])
+fi
+if test $build_jack = "y" ; then
+   PLUGINLIST="$PLUGINLIST JackPlugin"
+fi
+
+dnl build plugin list
 echo "$PLUGINLIST" > SpiralSound/PluginList.txt
 
-AC_ARG_ENABLE(jack,  [  --enable-jack              build JackPlugin ],
-        ac_arg_jack="Y", ac_arg_jack="N")
-	
-if test $ac_arg_jack = "Y" ; then
-	PLUGINLIST="AmpPlugin ControllerPlugin DelayPlugin EchoPlugin EnvFollowerPlugin \
-	EnvelopePlugin FilterPlugin MatrixPlugin MidiPlugin MixerPlugin MoogFilterPlugin \
-	NoteSnapPlugin OscillatorPlugin OutputPlugin RingModPlugin SVFilterPlugin \
-	SampleHoldPlugin ScopePlugin SmoothPlugin SplitterPlugin StereoMixerPlugin StreamPlugin\
-	WaveTablePlugin LADSPAPlugin XFadePlugin PoshSamplerPlugin SeqSelectorPlugin\
-	DistributorPlugin LFOPlugin KeyboardPlugin DiskWriterPlugin FormantFilterPlugin \
-	AnotherFilterPlugin OperatorPlugin CounterPlugin FlipflopPlugin SwitchPlugin \
-	BeatMatchPlugin NoisePlugin LogicPlugin SplitSwitchPlugin \
-	MixSwitchPlugin MeterPlugin WaveShaperPlugin TrigPlugin SpiralLoopPlugin  \
-	MasherPlugin TransposePlugin JackPlugin"
+dnl Check whether alsa-midi is present or has been disabled
+
+amidi_message=""
+AC_ARG_ENABLE(
+    alsa_midi,
+    [  --disable-alsa-midi     Disable alsa midi (use OSS)],
+    [use_alsa_midi="n"; amidi_message="manually disabled"],
+    [use_alsa_midi="y"]
+)
+if test "$use_alsa_midi" = "y"; then
+   AC_CHECK_HEADER(alsa/asoundlib.h, [use_alsa_midi="y"], [use_alsa_midi="n" ; amidi_message="No alsa/asoundlib.h found"])
+fi
+if test "$use_alsa_midi" = "y"; then
+   AC_CHECK_LIB(asound, snd_seq_open, [use_alsa_midi="y"], [use_alsa_midi="n" ; amidi_message="No libasound found"])
+fi
+if test "$use_alsa_midi" = "y"; then
+   AC_DEFINE(USE_ALSA_MIDI, , [Use ALSA MIDI not OSS])
+   AMIDILIBS="-lasound"
+   AC_SUBST(AMIDILIBS)
 else
-	PLUGINLIST="AmpPlugin ControllerPlugin DelayPlugin EchoPlugin EnvFollowerPlugin \
-	EnvelopePlugin FilterPlugin MatrixPlugin MidiPlugin MixerPlugin MoogFilterPlugin \
-	NoteSnapPlugin OscillatorPlugin OutputPlugin RingModPlugin SVFilterPlugin \
-	SampleHoldPlugin ScopePlugin SmoothPlugin SplitterPlugin StereoMixerPlugin StreamPlugin\
-	WaveTablePlugin LADSPAPlugin XFadePlugin PoshSamplerPlugin SeqSelectorPlugin\
-	DistributorPlugin LFOPlugin KeyboardPlugin DiskWriterPlugin FormantFilterPlugin \
-	AnotherFilterPlugin OperatorPlugin CounterPlugin FlipflopPlugin SwitchPlugin \
-	BeatMatchPlugin NoisePlugin LogicPlugin SplitSwitchPlugin \
-	MixSwitchPlugin MeterPlugin WaveShaperPlugin TrigPlugin SpiralLoopPlugin \
-	MasherPlugin TransposePlugin"
-
-	fi
-echo "$PLUGINLIST" > SpiralSound/PluginList.txt
+   AC_DEFINE(USE_OSS_MIDI, , [Use OSS MIDI not ALSA])
+fi
 
-dnl Check whether liblrdf has been enabled
+dnl Check whether liblrdf is present or has been disabled
+lrdf_message=""
 AC_ARG_ENABLE(
     lrdf,
-    [  --enable-lrdf           Enable liblrdf for LADSPA Plugin [no]],
-    [use_liblrdf="y"],
-    [use_liblrdf="n"]
+    [  --disable-lrdf          Disable liblrdf for LADSPA Plugin],
+    [use_liblrdf="n" ; lrdf_message="manually disabled"],
+    [use_liblrdf="y"]
 )
 if test "$use_liblrdf" = "y"; then
-    AC_CHECK_HEADER(lrdf.h, , AC_MSG_ERROR( ** No lrdf.h found for liblrdf))
-    AC_CHECK_LIB(lrdf, lrdf_init, AC_DEFINE(HAVE_LIBLRDF, , [Enable liblrdf support for LADSPA Plugin]), AC_MSG_ERROR( ** No liblrdf found))
-    LRDFLIBS="-llrdf"
-    AC_SUBST(LRDFLIBS)
+   AC_CHECK_HEADER(lrdf.h, [use_liblrdf="y"], [use_liblrdf="n" ; lrdf_message="No lrdf.h found"])
+fi
+if test "$use_liblrdf" = "y"; then
+   AC_CHECK_LIB(lrdf, lrdf_init, [use_liblrdf="y"], [use_liblrdf="n" ; lrdf_message="No liblrdf found"])
+fi
+if test "$use_liblrdf" = "y"; then
+   AC_DEFINE(HAVE_LIBLRDF, , [Enable liblrdf support for LADSPA Plugin])
+   LRDFLIBS="-llrdf"
+   AC_SUBST(LRDFLIBS)
 fi
 
-dnl Check if POSIX SHM enabled (for sharing LADSPA Plugin database)
-dnl Nicked in part from JACK configure.in
+dnl Check if POSIX SHM is present or has been disabled
+shm_message=""
 AC_ARG_ENABLE(
     posix-shm,
-    [  --enable-posix-shm      Enable POSIX SHM for LADSPA Plugin [no]
-                            This allows a single LADSPA plugin database
-                            to be shared between instances],
-    [use_posix_shm="y"],
-    [use_posix_shm="n"]
+    [  --disable-posix-shm     Disable POSIX SHM for LADSPA Plugin],
+    [use_posix_shm="n" ; shm_message="manually disabled"],
+    [use_posix_shm="y"]
 )
 if test "$use_posix_shm" = "y"; then
-    AC_MSG_CHECKING([POSIX SHM support ])
-    ls /dev/shm >/dev/null 2>&1
-    if test $? = 0; then
-        AC_DEFINE(USE_POSIX_SHM, ,[Enable POSIX SHM support for LADSPA Plugin])
-        AC_MSG_RESULT(found.)
-        SHMLIBS="-lrt"
-        AC_SUBST(SHMLIBS)
+   AC_MSG_CHECKING([POSIX SHM support ])
+   if test -d /dev/shm -a -w /dev/shm ; then
+       AC_DEFINE(USE_POSIX_SHM, ,[Enable POSIX SHM support for LADSPA Plugin])
+       AC_MSG_RESULT(found.)
+       SHMLIBS="-lrt"
+       AC_SUBST(SHMLIBS)
     else
-        AC_MSG_RESULT(not found.)
+       AC_MSG_RESULT(not found.)
+       use_posix_shm="n"
+       shm_message="/dev/shm not found";
     fi
 fi
 
+dnl Check whether libsndfile is present or has been disabled
+sndfile_message=""
+AC_ARG_ENABLE(
+    sndfile,
+    [  --disable-sndfile       Disable libsndfile for waveform loading],
+    [use_sndfile="n" ; sndfile_message="manually disabled"],
+    [use_sndfile="y"]
+)
+if test "$use_sndfile" = "y"; then
+   AC_CHECK_HEADER(sndfile.h, [use_sndfile="y"], [use_sndfile="n" ; sndfile_message="No sndfile.h found"])
+fi
+if test "$use_sndfile" = "y"; then
+   AC_CHECK_LIB(sndfile, sf_open, [use_sndfile="y"], [use_sndfile="n" ; sndfile_message="No libXXXX found"])
+fi
+if test "$use_sndfile" = "y"; then
+   AC_DEFINE(USE_LIBSNDFILE, , [Enable libsndfile for waveform loading])
+   SFLIBS="-lsndfile"
+   AC_SUBST(SFLIBS)
+fi
+
 dnl Checks for library functions.
 
 AC_CHECK_HEADERS(math.h)
@@ -148,8 +200,9 @@ AC_SUBST(FLTK_LIBS)
 AC_CHECK_HEADERS(dlfcn.h)
 AC_CHECK_LIB(dl, dlopen)
 
-AC_CHECK_HEADERS(png.h)
-AC_CHECK_LIB(png, png_get_copyright)
+dnl Do we need png?????
+dnl AC_CHECK_HEADERS(png.h)
+dnl AC_CHECK_LIB(png, png_get_copyright)
 
 dnl This is normally done with libtool but since we aren't using libtool
 dnl yet to it here.
@@ -163,11 +216,12 @@ AC_SUBST(CXXFLAGS)
 AC_SUBST(PLUGINLIST)
 
 dnl Modify the output files.
-
 AC_OUTPUT(
 SpiralSound/Plugins/AmpPlugin/Makefile
 SpiralSound/Plugins/AnotherFilterPlugin/Makefile
+SpiralSound/Plugins/BeatMatchPlugin/Makefile
 SpiralSound/Plugins/ControllerPlugin/Makefile
+SpiralSound/Plugins/CounterPlugin/Makefile
 SpiralSound/Plugins/DelayPlugin/Makefile
 SpiralSound/Plugins/DiskWriterPlugin/Makefile
 SpiralSound/Plugins/DistributorPlugin/Makefile
@@ -175,46 +229,76 @@ SpiralSound/Plugins/EchoPlugin/Makefile
 SpiralSound/Plugins/EnvFollowerPlugin/Makefile
 SpiralSound/Plugins/EnvelopePlugin/Makefile
 SpiralSound/Plugins/FilterPlugin/Makefile
+SpiralSound/Plugins/FlipflopPlugin/Makefile
 SpiralSound/Plugins/FormantFilterPlugin/Makefile
 SpiralSound/Plugins/JackPlugin/Makefile
 SpiralSound/Plugins/KeyboardPlugin/Makefile
 SpiralSound/Plugins/LADSPAPlugin/Makefile
 SpiralSound/Plugins/LFOPlugin/Makefile
+SpiralSound/Plugins/LogicPlugin/Makefile
+SpiralSound/Plugins/MasherPlugin/Makefile
 SpiralSound/Plugins/MatrixPlugin/Makefile
 SpiralSound/Plugins/MeterPlugin/Makefile
 SpiralSound/Plugins/MidiPlugin/Makefile
+SpiralSound/Plugins/MixSwitchPlugin/Makefile
 SpiralSound/Plugins/MixerPlugin/Makefile
 SpiralSound/Plugins/MoogFilterPlugin/Makefile
+SpiralSound/Plugins/NoisePlugin/Makefile
 SpiralSound/Plugins/NoteSnapPlugin/Makefile
+SpiralSound/Plugins/OperatorPlugin/Makefile
 SpiralSound/Plugins/OscillatorPlugin/Makefile
 SpiralSound/Plugins/OutputPlugin/Makefile
 SpiralSound/Plugins/PoshSamplerPlugin/Makefile
 SpiralSound/Plugins/RingModPlugin/Makefile
 SpiralSound/Plugins/SVFilterPlugin/Makefile
 SpiralSound/Plugins/SampleHoldPlugin/Makefile
-SpiralSound/Plugins/SeqSelectorPlugin/Makefile
 SpiralSound/Plugins/ScopePlugin/Makefile
+SpiralSound/Plugins/SeqSelectorPlugin/Makefile
 SpiralSound/Plugins/SmoothPlugin/Makefile
+SpiralSound/Plugins/SpiralLoopPlugin/Makefile
+SpiralSound/Plugins/SplitSwitchPlugin/Makefile
 SpiralSound/Plugins/SplitterPlugin/Makefile
 SpiralSound/Plugins/StereoMixerPlugin/Makefile
 SpiralSound/Plugins/StreamPlugin/Makefile
+SpiralSound/Plugins/SwitchPlugin/Makefile
+SpiralSound/Plugins/TransposePlugin/Makefile
+SpiralSound/Plugins/TrigPlugin/Makefile
 SpiralSound/Plugins/WaveShaperPlugin/Makefile
 SpiralSound/Plugins/WaveTablePlugin/Makefile
 SpiralSound/Plugins/XFadePlugin/Makefile
-SpiralSound/Plugins/OperatorPlugin/Makefile
-SpiralSound/Plugins/CounterPlugin/Makefile
-SpiralSound/Plugins/FlipflopPlugin/Makefile
-SpiralSound/Plugins/SwitchPlugin/Makefile
-SpiralSound/Plugins/BeatMatchPlugin/Makefile
-SpiralSound/Plugins/NoisePlugin/Makefile
-SpiralSound/Plugins/LogicPlugin/Makefile
-SpiralSound/Plugins/SplitSwitchPlugin/Makefile
-SpiralSound/Plugins/MixSwitchPlugin/Makefile
-SpiralSound/Plugins/TrigPlugin/Makefile
-SpiralSound/Plugins/SpiralLoopPlugin/Makefile
-SpiralSound/Plugins/MasherPlugin/Makefile
-SpiralSound/Plugins/TransposePlugin/Makefile
 SpiralSynthPluginLocation.h
 Makefile
 )
 
+echo -e "\nConfig options:"
+echo -n "libsndfile support for wave loading - "
+if test "$use_sndfile" = "y"; then
+   echo "Enabled"
+else
+   echo "Disabled - $sndfile_message"
+fi
+echo -n "        ALSA support for MidiPlugin - "
+if test "$use_alsa_midi" = "y"; then
+   echo "Enabled"
+else
+   echo "Disabled - $amidi_message - Using OSS instead"
+fi
+echo -n "      Jack support (via JackPlugin) - "
+if test "$build_jack" = "y"; then
+   echo "Enabled"
+else
+   echo "Disabled - $jack_message"
+fi
+echo -n "   liblrdf support for LADSPAPlugin - "
+if test "$use_liblrdf" = "y"; then
+   echo "Enabled"
+else
+   echo "Disabled - $lrdf_message"
+fi
+echo -n " POSIX SHM support for LADSPAPlugin - "
+if test "$use_posix_shm" = "y"; then
+   echo "Enabled"
+else
+   echo "Disabled - $shm_message"
+fi
+echo ""