From 1f0590dfbe5eb5df5e63b552da11247415efed0f Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Sun, 22 Sep 2013 20:45:49 -0500 Subject: [PATCH] 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. --- configure.ac | 2 +- src/register.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 585411087..594521761 100644 --- a/configure.ac +++ b/configure.ac @@ -566,7 +566,7 @@ AC_ARG_ENABLE([winradio], [AS_HELP_STRING([--disable-winradio], [do not build winradio backend @<:@default=yes@:>@])], [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]) AS_IF([test x"${cf_with_winradio}" = "xyes"], diff --git a/src/register.c b/src/register.c index 70e6b343d..9d576622d 100644 --- a/src/register.c +++ b/src/register.c @@ -76,7 +76,6 @@ DEFINE_INITRIG_BACKEND(lowe); DEFINE_INITRIG_BACKEND(racal); DEFINE_INITRIG_BACKEND(wj); DEFINE_INITRIG_BACKEND(skanti); -DEFINE_INITRIG_BACKEND(winradio); DEFINE_INITRIG_BACKEND(tentec); DEFINE_INITRIG_BACKEND(alinco); DEFINE_INITRIG_BACKEND(kachina); @@ -89,6 +88,9 @@ DEFINE_INITRIG_BACKEND(rs); DEFINE_INITRIG_BACKEND(prm80); DEFINE_INITRIG_BACKEND(adat); +#ifdef HAVE_WINRADIO +DEFINE_INITRIG_BACKEND(winradio); +#endif /*! \def rig_backend_list @@ -118,7 +120,9 @@ static struct { { RIG_RACAL, RIG_BACKEND_RACAL, RIG_FUNCNAMA(racal) }, { RIG_WJ, RIG_BACKEND_WJ, RIG_FUNCNAMA(wj) }, { RIG_SKANTI, RIG_BACKEND_SKANTI, RIG_FUNCNAMA(skanti) }, +#ifdef HAVE_WINRADIO { RIG_WINRADIO, RIG_BACKEND_WINRADIO, RIG_FUNCNAMA(winradio) }, +#endif /* HAVE_WINRADIO */ { RIG_TENTEC, RIG_BACKEND_TENTEC, RIG_FUNCNAMA(tentec) }, { RIG_ALINCO, RIG_BACKEND_ALINCO, RIG_FUNCNAMA(alinco) }, { RIG_KACHINA, RIG_BACKEND_KACHINA, RIG_FUNCNAMA(kachina) },