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

Fix conditional build of winradio backend 

With the new registration code set the HAVE_WINRADIO preprocessor
conditional if the winradio backend is to be built and test this
conditional in src/register.c whether to build winradio support.
Hamlib-3.0
Nate Bargmann 2013-09-22 20:45:49 -05:00
rodzic 3999121d03
commit 1f0590dfbe
2 zmienionych plików z 6 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
configure.ac
Wyświetl plik

@ -566,7 +566,7 @@ AC_ARG_ENABLE([winradio],
[AS_HELP_STRING([--disable-winradio], [AS_HELP_STRING([--disable-winradio],
[do not build winradio backend @<:@default=yes@:>@])], [do not build winradio backend @<:@default=yes@:>@])],
[cf_with_winradio="no"], [cf_with_winradio="no"],
[cf_with_winradio="yes"]) [cf_with_winradio="yes" AC_DEFINE([HAVE_WINRADIO],[1],[Define if winradio backend is built])])
AC_MSG_RESULT([$cf_with_winradio]) AC_MSG_RESULT([$cf_with_winradio])
AS_IF([test x"${cf_with_winradio}" = "xyes"], AS_IF([test x"${cf_with_winradio}" = "xyes"],

6
src/register.c
Wyświetl plik

@ -76,7 +76,6 @@ DEFINE_INITRIG_BACKEND(lowe);
DEFINE_INITRIG_BACKEND(racal); DEFINE_INITRIG_BACKEND(racal);
DEFINE_INITRIG_BACKEND(wj); DEFINE_INITRIG_BACKEND(wj);
DEFINE_INITRIG_BACKEND(skanti); DEFINE_INITRIG_BACKEND(skanti);
DEFINE_INITRIG_BACKEND(winradio);
DEFINE_INITRIG_BACKEND(tentec); DEFINE_INITRIG_BACKEND(tentec);
DEFINE_INITRIG_BACKEND(alinco); DEFINE_INITRIG_BACKEND(alinco);
DEFINE_INITRIG_BACKEND(kachina); DEFINE_INITRIG_BACKEND(kachina);
@ -89,6 +88,9 @@ DEFINE_INITRIG_BACKEND(rs);
DEFINE_INITRIG_BACKEND(prm80); DEFINE_INITRIG_BACKEND(prm80);
DEFINE_INITRIG_BACKEND(adat); DEFINE_INITRIG_BACKEND(adat);
#ifdef HAVE_WINRADIO
DEFINE_INITRIG_BACKEND(winradio);
#endif
/*! \def rig_backend_list /*! \def rig_backend_list
@ -118,7 +120,9 @@ static struct {
{ RIG_RACAL, RIG_BACKEND_RACAL, RIG_FUNCNAMA(racal) }, { RIG_RACAL, RIG_BACKEND_RACAL, RIG_FUNCNAMA(racal) },
{ RIG_WJ, RIG_BACKEND_WJ, RIG_FUNCNAMA(wj) }, { RIG_WJ, RIG_BACKEND_WJ, RIG_FUNCNAMA(wj) },
{ RIG_SKANTI, RIG_BACKEND_SKANTI, RIG_FUNCNAMA(skanti) }, { RIG_SKANTI, RIG_BACKEND_SKANTI, RIG_FUNCNAMA(skanti) },
#ifdef HAVE_WINRADIO
{ RIG_WINRADIO, RIG_BACKEND_WINRADIO, RIG_FUNCNAMA(winradio) }, { RIG_WINRADIO, RIG_BACKEND_WINRADIO, RIG_FUNCNAMA(winradio) },
#endif /* HAVE_WINRADIO */
{ RIG_TENTEC, RIG_BACKEND_TENTEC, RIG_FUNCNAMA(tentec) }, { RIG_TENTEC, RIG_BACKEND_TENTEC, RIG_FUNCNAMA(tentec) },
{ RIG_ALINCO, RIG_BACKEND_ALINCO, RIG_FUNCNAMA(alinco) }, { RIG_ALINCO, RIG_BACKEND_ALINCO, RIG_FUNCNAMA(alinco) },
{ RIG_KACHINA, RIG_BACKEND_KACHINA, RIG_FUNCNAMA(kachina) }, { RIG_KACHINA, RIG_BACKEND_KACHINA, RIG_FUNCNAMA(kachina) },