mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

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
Hamlib-1.1.3
Stéphane Fillod, F8CFE 2002-01-02 23:41:05 +00:00
rodzic fad12c9552
commit 3f3abb76ef
2 zmienionych plików z 18 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
src/register.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Interface - provides registering for dynamically loadable backends. * Hamlib Interface - provides registering for dynamically loadable backends.
* Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton * 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 * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * 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 * lt_dlinit may be called several times
*
* FIXME: make static build seamless
*/ */
#if 0
LTDL_SET_PRELOADED_SYMBOLS(); LTDL_SET_PRELOADED_SYMBOLS();
#endif
status = lt_dlinit(); status = lt_dlinit();
if (status) { if (status) {
@ -303,8 +307,12 @@ int rig_load_backend(const char *be_name)
* external module not found? try dlopenself for backends * external module not found? try dlopenself for backends
* compiled in static * 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); be_handle = lt_dlopen (NULL);
}
if (!be_handle) { if (!be_handle) {
rig_debug(RIG_DEBUG_ERR, "rig: lt_dlopen(\"%s\") failed (%s)\n", rig_debug(RIG_DEBUG_ERR, "rig: lt_dlopen(\"%s\") failed (%s)\n",

10
src/rot_reg.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Interface - provides registering for dynamically loadable backends. * Hamlib Interface - provides registering for dynamically loadable backends.
* Copyright (c) 2000,2001 by Stephane Fillod and Frank Singleton * 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 * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * 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 * lt_dlinit may be called several times
*/ */
#if 0
LTDL_SET_PRELOADED_SYMBOLS(); LTDL_SET_PRELOADED_SYMBOLS();
#endif
status = lt_dlinit(); status = lt_dlinit();
if (status) { if (status) {
@ -303,8 +305,12 @@ int rot_load_backend(const char *be_name)
* external module not found? try dlopenself for backends * external module not found? try dlopenself for backends
* compiled in static * 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); be_handle = lt_dlopen (NULL);
}
if (!be_handle) { if (!be_handle) {
rot_debug(RIG_DEBUG_ERR, "rot: lt_dlopen(\"%s\") failed (%s)\n", rot_debug(RIG_DEBUG_ERR, "rot: lt_dlopen(\"%s\") failed (%s)\n",