From 3f3abb76ef6c12331a17a3f84d60e737df95614b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Fillod=2C=20F8CFE?= Date: Wed, 2 Jan 2002 23:41:05 +0000 Subject: [PATCH] disabled static linked-in backends until better solution git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@834 7ae35d74-ebe9-4afe-98af-79ac388436b8 --- src/register.c | 12 ++++++++++-- src/rot_reg.c | 10 ++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/register.c b/src/register.c index 299033dfd..666120e6f 100644 --- a/src/register.c +++ b/src/register.c @@ -2,7 +2,7 @@ * Hamlib Interface - provides registering for dynamically loadable backends. * Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton * - * $Id: register.c,v 1.14 2001-12-28 20:28:02 fillods Exp $ + * $Id: register.c,v 1.15 2002-01-02 23:41:05 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -280,8 +280,12 @@ int rig_load_backend(const char *be_name) /* * lt_dlinit may be called several times + * + * FIXME: make static build seamless */ +#if 0 LTDL_SET_PRELOADED_SYMBOLS(); +#endif status = lt_dlinit(); if (status) { @@ -303,8 +307,12 @@ int rig_load_backend(const char *be_name) * external module not found? try dlopenself for backends * compiled in static */ - if (!be_handle) + if (!be_handle) { + rig_debug(RIG_DEBUG_VERBOSE, "rig: lt_dlopen(\"%s\") failed (%s), + trying static symbols...\n", + libname, lt_dlerror()); be_handle = lt_dlopen (NULL); + } if (!be_handle) { rig_debug(RIG_DEBUG_ERR, "rig: lt_dlopen(\"%s\") failed (%s)\n", diff --git a/src/rot_reg.c b/src/rot_reg.c index 2c73be0ce..410a16f16 100644 --- a/src/rot_reg.c +++ b/src/rot_reg.c @@ -2,7 +2,7 @@ * Hamlib Interface - provides registering for dynamically loadable backends. * Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton * - * $Id: rot_reg.c,v 1.2 2001-12-28 20:38:19 fillods Exp $ + * $Id: rot_reg.c,v 1.3 2002-01-02 23:41:05 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -281,7 +281,9 @@ int rot_load_backend(const char *be_name) /* * lt_dlinit may be called several times */ +#if 0 LTDL_SET_PRELOADED_SYMBOLS(); +#endif status = lt_dlinit(); if (status) { @@ -303,8 +305,12 @@ int rot_load_backend(const char *be_name) * external module not found? try dlopenself for backends * compiled in static */ - if (!be_handle) + if (!be_handle) { + rig_debug(RIG_DEBUG_VERBOSE, "rig: lt_dlopen(\"%s\") failed (%s), + trying static symbols...\n", + libname, lt_dlerror()); be_handle = lt_dlopen (NULL); + } if (!be_handle) { rot_debug(RIG_DEBUG_ERR, "rot: lt_dlopen(\"%s\") failed (%s)\n",