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

added HAMLIB_MODULE_DIR so there's no more need for LD_LIBRARY_PATH setting for backend module path 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@968 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.3
Stéphane Fillod, F8CFE 2002-02-26 21:23:45 +00:00
rodzic caefb39aaa
commit e8abb46b6c
3 zmienionych plików z 13 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/Makefile.am
Wyświetl plik

@ -5,7 +5,7 @@ RIGSRC = rig.c serial.c misc.c register.c event.c cal.c conf.c tones.c \
lib_LTLIBRARIES = libhamlib.la lib_LTLIBRARIES = libhamlib.la
libhamlib_la_SOURCES = $(RIGSRC) libhamlib_la_SOURCES = $(RIGSRC)
libhamlib_la_LDFLAGS = -no-undefined -release @VERSION@ -version-info 0:0:0 libhamlib_la_LDFLAGS = -no-undefined -release @VERSION@ -version-info 0:0:0
libhamlib_la_CFLAGS = -DIN_HAMLIB $(AM_CFLAGS) libhamlib_la_CFLAGS = -DIN_HAMLIB $(AM_CFLAGS) -DHAMLIB_MODULE_DIR=\"$(libdir)\"
libhamlib_la_LIBADD = @LIBLTDL@ ../lib/libmisc.la @MATH_LIBS@ libhamlib_la_LIBADD = @LIBLTDL@ ../lib/libmisc.la @MATH_LIBS@
noinst_HEADERS = event.h misc.h serial.h iofunc.h cal.h tones.h \ noinst_HEADERS = event.h misc.h serial.h iofunc.h cal.h tones.h \

10
src/register.c
Wyświetl plik

@ -1,8 +1,8 @@
/* /*
* 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,2002 by Stephane Fillod
* *
* $Id: register.c,v 1.15 2002-01-02 23:41:05 fillods Exp $ * $Id: register.c,v 1.16 2002-02-26 21:23:45 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
@ -294,6 +294,8 @@ int rig_load_backend(const char *be_name)
return -RIG_EINTERNAL; return -RIG_EINTERNAL;
} }
lt_dladdsearchdir(HAMLIB_MODULE_DIR);
rig_debug(RIG_DEBUG_VERBOSE, "rig: loading backend %s\n",be_name); rig_debug(RIG_DEBUG_VERBOSE, "rig: loading backend %s\n",be_name);
/* /*
@ -308,8 +310,8 @@ int rig_load_backend(const char *be_name)
* compiled in static * compiled in static
*/ */
if (!be_handle) { if (!be_handle) {
rig_debug(RIG_DEBUG_VERBOSE, "rig: lt_dlopen(\"%s\") failed (%s), rig_debug(RIG_DEBUG_VERBOSE, "rig: lt_dlopen(\"%s\") failed (%s), "
trying static symbols...\n", "trying static symbols...\n",
libname, lt_dlerror()); libname, lt_dlerror());
be_handle = lt_dlopen (NULL); be_handle = lt_dlopen (NULL);
} }

10
src/rot_reg.c
Wyświetl plik

@ -1,8 +1,8 @@
/* /*
* 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,2002 by Stephane Fillod
* *
* $Id: rot_reg.c,v 1.3 2002-01-02 23:41:05 fillods Exp $ * $Id: rot_reg.c,v 1.4 2002-02-26 21:23:45 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
@ -292,6 +292,8 @@ int rot_load_backend(const char *be_name)
return -RIG_EINTERNAL; return -RIG_EINTERNAL;
} }
lt_dladdsearchdir(HAMLIB_MODULE_DIR);
rot_debug(RIG_DEBUG_VERBOSE, "rot: loading backend %s\n",be_name); rot_debug(RIG_DEBUG_VERBOSE, "rot: loading backend %s\n",be_name);
/* /*
@ -306,8 +308,8 @@ int rot_load_backend(const char *be_name)
* compiled in static * compiled in static
*/ */
if (!be_handle) { if (!be_handle) {
rig_debug(RIG_DEBUG_VERBOSE, "rig: lt_dlopen(\"%s\") failed (%s), rig_debug(RIG_DEBUG_VERBOSE, "rig: lt_dlopen(\"%s\") failed (%s), "
trying static symbols...\n", "trying static symbols...\n",
libname, lt_dlerror()); libname, lt_dlerror());
be_handle = lt_dlopen (NULL); be_handle = lt_dlopen (NULL);
} }