Commit 604fd218 authored by sletz's avatar sletz
Browse files

Use JACK_DRIVER_DIR variable in internal clients loader.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3212 0c269be4-1314-0410-8aa9-9f06e86f4224
parent a43ebeb1
......@@ -23,6 +23,10 @@ Michael Voigt
Jackdmp changes log
---------------------------
2008-11-17 Stephane Letz <letz@grame.fr>
* Use JACK_DRIVER_DIR variable in internal clients loader.
2008-11-16 Stephane Letz <letz@grame.fr>
* Client and library global context cleanup in case of incorrect shutdown handling (that is applications not correctly closing client after server has shutdown).
......
......@@ -19,14 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "JackSystemDeps.h"
#ifndef WIN32
#ifndef ADDON_DIR
#include "config.h"
#endif
#endif
#include "JackGraphManager.h"
#include "JackConstants.h"
#include "JackInternalClient.h"
#include "JackLockedEngine.h"
#include "JackServer.h"
......@@ -79,7 +73,10 @@ static void PrintLoadError(const char* so_name)
static void BuildClientPath(char* path_to_so, int path_len, const char* so_name)
{
snprintf(path_to_so, path_len, ADDON_DIR "/%s.so", so_name);
const char* driver_dir;
if ((driver_dir = getenv("JACK_DRIVER_DIR")) == 0)
driver_dir = ADDON_DIR;
snprintf(path_to_so, path_len, "%s/%s.so", driver_dir, so_name);
}
#endif
......
......@@ -20,7 +20,6 @@
#include <string.h>
#include <getopt.h>
#include <jack/jack.h>
//#include <config.h>
char * my_name;
......
......@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef JACK_LOCATION
#include "config.h"
#endif
#include "JackConstants.h"
#include "JackChannel.h"
#include "JackLibGlobals.h"
#include "JackServerLaunch.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment