Add conditional includes for config.h, for use with waf

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2423 0c269be4-1314-0410-8aa9-9f06e86f4224

92 files changed, 369 insertions, 0 deletions

diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp
index 31b7ef4d..f24900d9 100644
--- a/common/JackAPI.cpp
+++ b/common/JackAPI.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackClient.h"
 #include "JackError.h"
 #include "JackGraphManager.h"
diff --git a/common/JackActivationCount.cpp b/common/JackActivationCount.cpp
index 1b266405..839b25f1 100644
--- a/common/JackActivationCount.cpp
+++ b/common/JackActivationCount.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackAtomic.h"
 #include "JackActivationCount.h"
 #include "JackConstants.h"
diff --git a/common/JackAudioDriver.cpp b/common/JackAudioDriver.cpp
index 80fa5900..3aeb6e19 100644
--- a/common/JackAudioDriver.cpp
+++ b/common/JackAudioDriver.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/common/JackAudioPort.cpp b/common/JackAudioPort.cpp
index a054ef41..8ed0bc42 100644
--- a/common/JackAudioPort.cpp
+++ b/common/JackAudioPort.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackPortType.h"
 #include <string.h>
 
diff --git a/common/JackClient.cpp b/common/JackClient.cpp
index ea71c5c6..358521d8 100644
--- a/common/JackClient.cpp
+++ b/common/JackClient.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackClient.h"
 #include "JackGraphManager.h"
 #include "JackClientControl.h"
diff --git a/common/JackConnectionManager.cpp b/common/JackConnectionManager.cpp
index e8933371..8d41d470 100644
--- a/common/JackConnectionManager.cpp
+++ b/common/JackConnectionManager.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <iostream>
 #include <assert.h>
 #include "JackConnectionManager.h"
diff --git a/common/JackControl.cpp b/common/JackControl.cpp
index 2ac5557f..ba4b026a 100644
--- a/common/JackControl.cpp
+++ b/common/JackControl.cpp
@@ -19,6 +19,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifndef WIN32
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/common/JackDebugClient.cpp b/common/JackDebugClient.cpp
index 617a83f4..894201ef 100644
--- a/common/JackDebugClient.cpp
+++ b/common/JackDebugClient.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackDebugClient.h"
 #include "JackEngineControl.h"
 #include "JackError.h"
diff --git a/common/JackDriver.cpp b/common/JackDriver.cpp
index 746eeb75..f7205e88 100644
--- a/common/JackDriver.cpp
+++ b/common/JackDriver.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/common/JackDriverLoader.cpp b/common/JackDriverLoader.cpp
index 4ec6dae5..b89d2157 100644
--- a/common/JackDriverLoader.cpp
+++ b/common/JackDriverLoader.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/common/JackDummyDriver.cpp b/common/JackDummyDriver.cpp
index 7a8c5d17..ee902718 100644
--- a/common/JackDummyDriver.cpp
+++ b/common/JackDummyDriver.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackDummyDriver.h"
 #include "JackEngineControl.h"
 #include "JackGraphManager.h"
diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp
index d6070923..86c997f0 100644
--- a/common/JackEngine.cpp
+++ b/common/JackEngine.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <iostream>
 #include <fstream>
 #include <assert.h>
diff --git a/common/JackEngineControl.cpp b/common/JackEngineControl.cpp
index 405a80d2..85b4c32d 100644
--- a/common/JackEngineControl.cpp
+++ b/common/JackEngineControl.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackEngineControl.h"
 #include "JackGraphManager.h"
 #include "JackClientControl.h"
diff --git a/common/JackError.cpp b/common/JackError.cpp
index 7c973506..c465ebe7 100644
--- a/common/JackError.cpp
+++ b/common/JackError.cpp
@@ -19,6 +19,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdarg.h>
 #include <stdio.h>
 #include "JackError.h"
diff --git a/common/JackExternalClient.cpp b/common/JackExternalClient.cpp
index 490bb02c..5a230b1b 100644
--- a/common/JackExternalClient.cpp
+++ b/common/JackExternalClient.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackExternalClient.h"
 #include "JackClientControl.h"
 #include "JackGlobals.h"
diff --git a/common/JackFifo.cpp b/common/JackFifo.cpp
index e545a845..c82f613d 100644
--- a/common/JackFifo.cpp
+++ b/common/JackFifo.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackFifo.h"
 #include "JackError.h"
 #include "JackConstants.h"
diff --git a/common/JackFrameTimer.cpp b/common/JackFrameTimer.cpp
index 1089a0e1..1276c741 100644
--- a/common/JackFrameTimer.cpp
+++ b/common/JackFrameTimer.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackFrameTimer.h"
 #include "JackError.h"
 #include <math.h>
diff --git a/common/JackFreewheelDriver.cpp b/common/JackFreewheelDriver.cpp
index 97dd1a26..1f64f1fe 100644
--- a/common/JackFreewheelDriver.cpp
+++ b/common/JackFreewheelDriver.cpp
@@ -18,6 +18,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/common/JackGlobals.cpp b/common/JackGlobals.cpp
index 0d1fbac2..ae0124db 100644
--- a/common/JackGlobals.cpp
+++ b/common/JackGlobals.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackGlobals.h"
 #include "JackError.h"
 
diff --git a/common/JackGraphManager.cpp b/common/JackGraphManager.cpp
index f0516357..589d571e 100644
--- a/common/JackGraphManager.cpp
+++ b/common/JackGraphManager.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackGraphManager.h"
 #include "JackConstants.h"
 #include "JackError.h"
diff --git a/common/JackInternalClient.cpp b/common/JackInternalClient.cpp
index 105c89f2..bd6f8a83 100644
--- a/common/JackInternalClient.cpp
+++ b/common/JackInternalClient.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp
index 0f5855d8..8597c368 100644
--- a/common/JackLibAPI.cpp
+++ b/common/JackLibAPI.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackDebugClient.h"
 #include "JackLibClient.h"
 #include "JackChannel.h"
diff --git a/common/JackLibClient.cpp b/common/JackLibClient.cpp
index a0523d6a..19a787a2 100644
--- a/common/JackLibClient.cpp
+++ b/common/JackLibClient.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackLibClient.h"
 #include "JackTime.h"
 #include "JackLibGlobals.h"
diff --git a/common/JackLoopbackDriver.cpp b/common/JackLoopbackDriver.cpp
index 3a570479..e8a721df 100644
--- a/common/JackLoopbackDriver.cpp
+++ b/common/JackLoopbackDriver.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/common/JackMessageBuffer.cpp b/common/JackMessageBuffer.cpp
index 51b81a21..34ca644f 100644
--- a/common/JackMessageBuffer.cpp
+++ b/common/JackMessageBuffer.cpp
@@ -27,6 +27,10 @@
  *
  */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackMessageBuffer.h"
 #include "JackGlobals.h"
 #include "JackError.h"
diff --git a/common/JackMidiAPI.cpp b/common/JackMidiAPI.cpp
index a1aa86a5..c546a523 100644
--- a/common/JackMidiAPI.cpp
+++ b/common/JackMidiAPI.cpp
@@ -17,6 +17,11 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
+
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackError.h"
 #include "JackMidiPort.h"
 #include "JackExports.h"
diff --git a/common/JackMidiPort.cpp b/common/JackMidiPort.cpp
index 031a4c9c..6df025e1 100644
--- a/common/JackMidiPort.cpp
+++ b/common/JackMidiPort.cpp
@@ -17,6 +17,11 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
+
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackError.h"
 #include "JackPortType.h"
 #include "JackMidiPort.h"
diff --git a/common/JackPort.cpp b/common/JackPort.cpp
index b9b73351..a845342e 100644
--- a/common/JackPort.cpp
+++ b/common/JackPort.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackPort.h"
 #include "JackError.h"
 #include "JackPortType.h"
diff --git a/common/JackPortType.cpp b/common/JackPortType.cpp
index e2f2f22f..d368a85c 100644
--- a/common/JackPortType.cpp
+++ b/common/JackPortType.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackPortType.h"
 #include <string.h>
 #include <assert.h>
diff --git a/common/JackPosixSemaphore.cpp b/common/JackPosixSemaphore.cpp
index 92b3a69a..ae999c05 100644
--- a/common/JackPosixSemaphore.cpp
+++ b/common/JackPosixSemaphore.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackPosixSemaphore.h"
 #include "JackConstants.h"
 #include "JackError.h"
diff --git a/common/JackPosixThread.cpp b/common/JackPosixThread.cpp
index a6c4d0fd..940444d3 100644
--- a/common/JackPosixThread.cpp
+++ b/common/JackPosixThread.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackPosixThread.h"
 #include "JackError.h"
 #include "JackTime.h"
diff --git a/common/JackProcessSync.cpp b/common/JackProcessSync.cpp
index a638172d..923f6997 100644
--- a/common/JackProcessSync.cpp
+++ b/common/JackProcessSync.cpp
@@ -17,6 +17,10 @@ This program is free software; you can redistribute it and/or modify
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackProcessSync.h"
 #include "JackError.h"
 
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index 9613f930..91554098 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/common/JackServerAPI.cpp b/common/JackServerAPI.cpp
index 8853f19d..246fe96d 100644
--- a/common/JackServerAPI.cpp
+++ b/common/JackServerAPI.cpp
@@ -18,6 +18,10 @@ This program is free software; you can redistribute it and/or modify
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/common/JackServerGlobals.cpp b/common/JackServerGlobals.cpp
index 8224310a..40bb345f 100644
--- a/common/JackServerGlobals.cpp
+++ b/common/JackServerGlobals.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/common/JackServerLaunch.cpp b/common/JackServerLaunch.cpp
index 13bdf89c..49b9888c 100644
--- a/common/JackServerLaunch.cpp
+++ b/common/JackServerLaunch.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifndef JACK_LOCATION
 #include "config.h"
 #endif
diff --git a/common/JackShmMem.cpp b/common/JackShmMem.cpp
index 084112d4..24d36e1b 100644
--- a/common/JackShmMem.cpp
+++ b/common/JackShmMem.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackError.h"
 #include "JackShmMem.h"
 #include <stdio.h>
diff --git a/common/JackSocket.cpp b/common/JackSocket.cpp
index f389c1c3..c60dc895 100644
--- a/common/JackSocket.cpp
+++ b/common/JackSocket.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackSocket.h"
 #include "JackError.h"
 #include <string.h>
diff --git a/common/JackSocketClientChannel.cpp b/common/JackSocketClientChannel.cpp
index c6c06204..8baae132 100644
--- a/common/JackSocketClientChannel.cpp
+++ b/common/JackSocketClientChannel.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackSocketClientChannel.h"
 #include "JackRequest.h"
 #include "JackClient.h"
diff --git a/common/JackSocketNotifyChannel.cpp b/common/JackSocketNotifyChannel.cpp
index b0c44867..196c849f 100644
--- a/common/JackSocketNotifyChannel.cpp
+++ b/common/JackSocketNotifyChannel.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackRequest.h"
 #include "JackSocketNotifyChannel.h"
 #include "JackError.h"
diff --git a/common/JackSocketServerChannel.cpp b/common/JackSocketServerChannel.cpp
index 09b04686..c08b0886 100644
--- a/common/JackSocketServerChannel.cpp
+++ b/common/JackSocketServerChannel.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackSocketServerChannel.h"
 #include "JackRequest.h"
 #include "JackServer.h"
diff --git a/common/JackSocketServerNotifyChannel.cpp b/common/JackSocketServerNotifyChannel.cpp
index b147fe06..c5758967 100644
--- a/common/JackSocketServerNotifyChannel.cpp
+++ b/common/JackSocketServerNotifyChannel.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackSocketServerNotifyChannel.h"
 #include "JackError.h"
 #include "JackRequest.h"
diff --git a/common/JackThreadedDriver.cpp b/common/JackThreadedDriver.cpp
index 42489899..37d058cb 100644
--- a/common/JackThreadedDriver.cpp
+++ b/common/JackThreadedDriver.cpp
@@ -18,6 +18,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/common/JackTime.c b/common/JackTime.c
index 3464d83f..942fa8d2 100644
--- a/common/JackTime.c
+++ b/common/JackTime.c
@@ -18,6 +18,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackTime.h"
 #include "JackError.h"
 
diff --git a/common/JackTools.cpp b/common/JackTools.cpp
index 7f9468ba..747f3127 100644
--- a/common/JackTools.cpp
+++ b/common/JackTools.cpp
@@ -17,6 +17,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackTools.h"
 #include "JackError.h"
 #include <stdlib.h>
diff --git a/common/JackTransportEngine.cpp b/common/JackTransportEngine.cpp
index 42b8442a..0b43f2fb 100644
--- a/common/JackTransportEngine.cpp
+++ b/common/JackTransportEngine.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackTransportEngine.h"
 #include "JackClientControl.h"
 #include "JackError.h"
diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp
index 9f448704..1732ac0e 100644
--- a/common/Jackdmp.cpp
+++ b/common/Jackdmp.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <iostream>
 #include <assert.h>
 #include <signal.h>
diff --git a/common/ringbuffer.c b/common/ringbuffer.c
index c3b40871..67680b9c 100644
--- a/common/ringbuffer.c
+++ b/common/ringbuffer.c
@@ -20,6 +20,10 @@
   This is safe for the case of one read thread and one write thread.
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #ifdef USE_MLOCK
diff --git a/common/shm.c b/common/shm.c
index 0d80e1db..6742acfa 100644
--- a/common/shm.c
+++ b/common/shm.c
@@ -30,6 +30,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
+
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
  
 #ifdef WIN32
 #include <process.h>
diff --git a/common/timestamps.c b/common/timestamps.c
index 7a48e8a9..7e9a46d6 100644
--- a/common/timestamps.c
+++ b/common/timestamps.c
@@ -17,6 +17,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include "timestamps.h"
diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp
index d8393397..ced09a85 100644
--- a/linux/alsa/JackAlsaDriver.cpp
+++ b/linux/alsa/JackAlsaDriver.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <iostream>
 #include <unistd.h>
 
diff --git a/linux/alsa/generic_hw.c b/linux/alsa/generic_hw.c
index 30e7f340..d05c1ec9 100644
--- a/linux/alsa/generic_hw.c
+++ b/linux/alsa/generic_hw.c
@@ -18,6 +18,10 @@
     $Id: generic_hw.c,v 1.2 2005/08/29 10:36:28 letz Exp $
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "hardware.h"
 #include "alsa_driver.h"
 
diff --git a/linux/alsa/hammerfall.c b/linux/alsa/hammerfall.c
index 74f7941e..d2bb972b 100644
--- a/linux/alsa/hammerfall.c
+++ b/linux/alsa/hammerfall.c
@@ -18,6 +18,10 @@
     $Id: hammerfall.c,v 1.3 2005/09/29 14:51:59 letz Exp $
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "hardware.h"
 #include "alsa_driver.h"
 #include "hammerfall.h"
diff --git a/linux/alsa/hdsp.c b/linux/alsa/hdsp.c
index 64dcb407..7665b81f 100644
--- a/linux/alsa/hdsp.c
+++ b/linux/alsa/hdsp.c
@@ -19,6 +19,10 @@
     $Id: hdsp.c,v 1.3 2005/09/29 14:51:59 letz Exp $
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "hardware.h"
 #include "alsa_driver.h"
 #include "hdsp.h"
diff --git a/linux/alsa/ice1712.c b/linux/alsa/ice1712.c
index 07e25ca2..177a03e9 100644
--- a/linux/alsa/ice1712.c
+++ b/linux/alsa/ice1712.c
@@ -21,6 +21,10 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 //#include <jack/hardware.h>
 
 #include "hardware.h"
diff --git a/linux/alsa/memops.c b/linux/alsa/memops.c
index 799c8e9b..262bdb8c 100644
--- a/linux/alsa/memops.c
+++ b/linux/alsa/memops.c
@@ -18,6 +18,10 @@
     $Id: memops.c,v 1.2 2005/08/29 10:36:28 letz Exp $
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #define _ISOC9X_SOURCE  1
 #define _ISOC99_SOURCE  1
 
diff --git a/linux/alsa/usx2y.c b/linux/alsa/usx2y.c
index 92236925..7b1a2201 100644
--- a/linux/alsa/usx2y.c
+++ b/linux/alsa/usx2y.c
@@ -18,6 +18,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "hardware.h"
 #include "alsa_driver.h"
 #include "usx2y.h"
diff --git a/linux/dbus/controller.c b/linux/dbus/controller.c
index 1aa1d922..d2c9dc73 100644
--- a/linux/dbus/controller.c
+++ b/linux/dbus/controller.c
@@ -18,6 +18,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <string.h>
 #include <dbus/dbus.h>
diff --git a/linux/dbus/controller_iface_configure.c b/linux/dbus/controller_iface_configure.c
index 7180f718..99a46c05 100644
--- a/linux/dbus/controller_iface_configure.c
+++ b/linux/dbus/controller_iface_configure.c
@@ -18,6 +18,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <string.h>
 #include <assert.h>
diff --git a/linux/dbus/controller_iface_control.c b/linux/dbus/controller_iface_control.c
index 4cac9473..e5e08f79 100644
--- a/linux/dbus/controller_iface_control.c
+++ b/linux/dbus/controller_iface_control.c
@@ -18,6 +18,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/linux/dbus/controller_iface_introspectable.c b/linux/dbus/controller_iface_introspectable.c
index 1392a656..8b1a644c 100644
--- a/linux/dbus/controller_iface_introspectable.c
+++ b/linux/dbus/controller_iface_introspectable.c
@@ -18,6 +18,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/linux/dbus/controller_iface_patchbay.c b/linux/dbus/controller_iface_patchbay.c
index 7fe7a130..3b1fde74 100644
--- a/linux/dbus/controller_iface_patchbay.c
+++ b/linux/dbus/controller_iface_patchbay.c
@@ -18,6 +18,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #define _GNU_SOURCE            /* PTHREAD_MUTEX_RECURSIVE */
 
 #include <stdint.h>
diff --git a/linux/dbus/controller_iface_transport.c b/linux/dbus/controller_iface_transport.c
index f5680a1c..546a9602 100644
--- a/linux/dbus/controller_iface_transport.c
+++ b/linux/dbus/controller_iface_transport.c
@@ -18,6 +18,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/linux/dbus/jackdbus.c b/linux/dbus/jackdbus.c
index b856b820..d3d44bef 100644
--- a/linux/dbus/jackdbus.c
+++ b/linux/dbus/jackdbus.c
@@ -19,6 +19,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/linux/dbus/sigsegv.c b/linux/dbus/sigsegv.c
index eeb1ddde..d66ea000 100644
--- a/linux/dbus/sigsegv.c
+++ b/linux/dbus/sigsegv.c
@@ -11,6 +11,10 @@
  * Copyright (C) 2005 - 2008 Jaco Kroon
  */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 //#define NO_CPP_DEMANGLE
 #define SIGSEGV_NO_AUTO_INIT
 
diff --git a/linux/dbus/xml.c b/linux/dbus/xml.c
index c40952ce..c5ad2eb9 100644
--- a/linux/dbus/xml.c
+++ b/linux/dbus/xml.c
@@ -17,6 +17,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/linux/dbus/xml_expat.c b/linux/dbus/xml_expat.c
index 5e58a491..05c684a7 100644
--- a/linux/dbus/xml_expat.c
+++ b/linux/dbus/xml_expat.c
@@ -17,6 +17,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
diff --git a/linux/dbus/xml_libxml.c b/linux/dbus/xml_libxml.c
index 021239d8..df4b49ef 100644
--- a/linux/dbus/xml_libxml.c
+++ b/linux/dbus/xml_libxml.c
@@ -17,6 +17,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdbool.h>
 #include <string.h>
 #include <dbus/dbus.h>
diff --git a/linux/dbus/xml_nop.c b/linux/dbus/xml_nop.c
index 0a20ef90..e234076b 100644
--- a/linux/dbus/xml_nop.c
+++ b/linux/dbus/xml_nop.c
@@ -17,6 +17,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdbool.h>
 #include <dbus/dbus.h>
 
diff --git a/linux/dbus/xml_write_raw.c b/linux/dbus/xml_write_raw.c
index 98546eea..864dbed4 100644
--- a/linux/dbus/xml_write_raw.c
+++ b/linux/dbus/xml_write_raw.c
@@ -17,6 +17,10 @@
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
index b0874a05..940360aa 100644
--- a/linux/firewire/JackFFADODriver.cpp
+++ b/linux/firewire/JackFFADODriver.cpp
@@ -19,6 +19,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <iostream>
 #include <unistd.h>
 
diff --git a/linux/freebob/JackFreebobDriver.cpp b/linux/freebob/JackFreebobDriver.cpp
index c198c9ea..44241b2f 100644
--- a/linux/freebob/JackFreebobDriver.cpp
+++ b/linux/freebob/JackFreebobDriver.cpp
@@ -19,6 +19,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include <iostream>
 #include <unistd.h>
 
diff --git a/macosx/JackCoreAudioDriver.cpp b/macosx/JackCoreAudioDriver.cpp
index 84976d97..57e63636 100644
--- a/macosx/JackCoreAudioDriver.cpp
+++ b/macosx/JackCoreAudioDriver.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackCoreAudioDriver.h"
 #include "JackEngineControl.h"
 #include "JackMachThread.h"
diff --git a/macosx/JackMacEngineRPC.cpp b/macosx/JackMacEngineRPC.cpp
index f95c7691..52fb5f2c 100644
--- a/macosx/JackMacEngineRPC.cpp
+++ b/macosx/JackMacEngineRPC.cpp
@@ -17,6 +17,10 @@ This program is free software; you can redistribute it and/or modify
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackServer.h"
 #include "JackEngine.h"
 #include "JackRPCEngine.h"
diff --git a/macosx/JackMacLibClientRPC.cpp b/macosx/JackMacLibClientRPC.cpp
index 8e3c7cc7..4c78c287 100644
--- a/macosx/JackMacLibClientRPC.cpp
+++ b/macosx/JackMacLibClientRPC.cpp
@@ -17,6 +17,10 @@ This program is free software; you can redistribute it and/or modify
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackLibClient.h"
 #include "JackMachClientChannel.h"
 #include "JackRPCEngine.h"
diff --git a/macosx/JackMachClientChannel.cpp b/macosx/JackMachClientChannel.cpp
index 7149c115..87a41a98 100644
--- a/macosx/JackMachClientChannel.cpp
+++ b/macosx/JackMachClientChannel.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackMachClientChannel.h"
 #include "JackRPCEngine.h"
 #include "JackRPCClientServer.c"
diff --git a/macosx/JackMachNotifyChannel.cpp b/macosx/JackMachNotifyChannel.cpp
index e4c3bdfe..070abd1a 100644
--- a/macosx/JackMachNotifyChannel.cpp
+++ b/macosx/JackMachNotifyChannel.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackMachNotifyChannel.h"
 #include "JackRPCClient.h"
 #include "JackError.h"
diff --git a/macosx/JackMachPort.cpp b/macosx/JackMachPort.cpp
index d0d236b7..2aeffae0 100644
--- a/macosx/JackMachPort.cpp
+++ b/macosx/JackMachPort.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackMachPort.h"
 #include "JackError.h"
 
diff --git a/macosx/JackMachSemaphore.cpp b/macosx/JackMachSemaphore.cpp
index 3e902752..8b2581ce 100644
--- a/macosx/JackMachSemaphore.cpp
+++ b/macosx/JackMachSemaphore.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackMachSemaphore.h"
 #include "JackError.h"
 #include <stdio.h>
diff --git a/macosx/JackMachServerChannel.cpp b/macosx/JackMachServerChannel.cpp
index 2e01efec..2fc2493f 100644
--- a/macosx/JackMachServerChannel.cpp
+++ b/macosx/JackMachServerChannel.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackMachServerChannel.h"
 #include "JackRPCEngineServer.c"
 #include "JackError.h"
diff --git a/macosx/JackMachServerNotifyChannel.cpp b/macosx/JackMachServerNotifyChannel.cpp
index 10d4cb18..a9344692 100644
--- a/macosx/JackMachServerNotifyChannel.cpp
+++ b/macosx/JackMachServerNotifyChannel.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackMachServerNotifyChannel.h"
 #include "JackRPCEngineUser.c"
 #include "JackConstants.h"
diff --git a/macosx/JackMachThread.cpp b/macosx/JackMachThread.cpp
index b1022f0f..0ad9065d 100644
--- a/macosx/JackMachThread.cpp
+++ b/macosx/JackMachThread.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackMachThread.h"
 #include "JackError.h"
 
diff --git a/windows/JackPortAudioDriver.cpp b/windows/JackPortAudioDriver.cpp
index a819aa31..a6d22cf9 100644
--- a/windows/JackPortAudioDriver.cpp
+++ b/windows/JackPortAudioDriver.cpp
@@ -17,6 +17,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/windows/JackWinEvent.cpp b/windows/JackWinEvent.cpp
index cd26d355..e4c8e981 100644
--- a/windows/JackWinEvent.cpp
+++ b/windows/JackWinEvent.cpp
@@ -17,6 +17,10 @@ This program is free software; you can redistribute it and/or modify
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackWinEvent.h"
 #include "JackError.h"
 
diff --git a/windows/JackWinNamedPipe.cpp b/windows/JackWinNamedPipe.cpp
index 0d53a08d..e625ad4f 100644
--- a/windows/JackWinNamedPipe.cpp
+++ b/windows/JackWinNamedPipe.cpp
@@ -17,6 +17,10 @@ This program is free software; you can redistribute it and/or modify
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackWinNamedPipe.h"
 #include "JackError.h"
 #include <assert.h>
diff --git a/windows/JackWinNamedPipeClientChannel.cpp b/windows/JackWinNamedPipeClientChannel.cpp
index 4402ac7b..035e8d3f 100644
--- a/windows/JackWinNamedPipeClientChannel.cpp
+++ b/windows/JackWinNamedPipeClientChannel.cpp
@@ -17,6 +17,10 @@ Copyright (C) 2004-2006 Grame
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackWinNamedPipeClientChannel.h"
 #include "JackRequest.h"
 #include "JackClient.h"
diff --git a/windows/JackWinNamedPipeNotifyChannel.cpp b/windows/JackWinNamedPipeNotifyChannel.cpp
index 991f260c..4d04cea5 100644
--- a/windows/JackWinNamedPipeNotifyChannel.cpp
+++ b/windows/JackWinNamedPipeNotifyChannel.cpp
@@ -17,6 +17,10 @@ Copyright (C) 2004-2006 Grame
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackRequest.h"
 #include "JackWinNamedPipeNotifyChannel.h"
 #include "JackError.h"
diff --git a/windows/JackWinNamedPipeServerChannel.cpp b/windows/JackWinNamedPipeServerChannel.cpp
index af605f73..e9ab5395 100644
--- a/windows/JackWinNamedPipeServerChannel.cpp
+++ b/windows/JackWinNamedPipeServerChannel.cpp
@@ -17,6 +17,10 @@ Copyright (C) 2004-2006 Grame
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif
diff --git a/windows/JackWinNamedPipeServerNotifyChannel.cpp b/windows/JackWinNamedPipeServerNotifyChannel.cpp
index 7f2f14cf..1a70ff12 100644
--- a/windows/JackWinNamedPipeServerNotifyChannel.cpp
+++ b/windows/JackWinNamedPipeServerNotifyChannel.cpp
@@ -17,6 +17,10 @@ This program is free software; you can redistribute it and/or modify
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackWinNamedPipeServerNotifyChannel.h"
 #include "JackError.h"
 #include "JackRequest.h"
diff --git a/windows/JackWinProcessSync.cpp b/windows/JackWinProcessSync.cpp
index d0b1f9fb..17427994 100644
--- a/windows/JackWinProcessSync.cpp
+++ b/windows/JackWinProcessSync.cpp
@@ -17,6 +17,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include "JackWinProcessSync.h"

 #include "JackError.h"

diff --git a/windows/JackWinSemaphore.cpp b/windows/JackWinSemaphore.cpp
index 843ad868..84944402 100644
--- a/windows/JackWinSemaphore.cpp
+++ b/windows/JackWinSemaphore.cpp
@@ -17,6 +17,10 @@ This program is free software; you can redistribute it and/or modify
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackWinSemaphore.h"
 #include "JackError.h"
 
diff --git a/windows/JackWinThread.cpp b/windows/JackWinThread.cpp
index 95757c07..be8a8956 100644
--- a/windows/JackWinThread.cpp
+++ b/windows/JackWinThread.cpp
@@ -18,6 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "JackWinThread.h"
 #include "JackError.h"
 #include "JackTime.h"