Fix link issues for jackd.

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

common/JackDriverLoader.h

@@ -59,9 +59,18 @@ jack_driver_desc_t * jack_find_driver_descriptor(JSList * drivers, const char *
 JSList * jack_drivers_load(JSList * drivers);
 JSList * jack_internals_load(JSList * internals);
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 SERVER_EXPORT int jackctl_parse_driver_params (jackctl_driver * driver_ptr, int argc, char* argv[]);
 SERVER_EXPORT void jack_free_driver_params(JSList * param_ptr);
 SERVER_EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 

linux/wscript

@@ -34,7 +34,7 @@ def build(bld):
     if bld.env['BUILD_JACKD'] == True:
         jackd = bld.new_task_gen('cxx', 'program')
         jackd.includes = ['../linux', '../posix', '../common/jack', '../common', '../dbus']
-        jackd.defines = 'HAVE_CONFIG_H'
+        jackd.defines = ['HAVE_CONFIG_H','SERVER_SIDE']
         jackd.source = ['../common/Jackdmp.cpp']
 	if bld.env['IS_LINUX'] and bld.env['BUILD_JACKDBUS']: 
             jackd.source += ['../dbus/reserve.c', '../dbus/audio_reserve.c']