From 3debb5052f7ab7162cc518f33596791e6ee84fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Fillod=2C=20F8CFE?= Date: Sun, 12 Aug 2001 23:00:43 +0000 Subject: [PATCH] added kachina backend, winradio no more optional git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@631 7ae35d74-ebe9-4afe-98af-79ac388436b8 --- configure.ac | 28 ++++------------------------ tests/Makefile.am | 6 ++++-- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/configure.ac b/configure.ac index 39324c41b..3ee480120 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_CONFIG_SRCDIR([include/hamlib/rig.h]) AM_INIT_AUTOMAKE(hamlib, 1.1.2) AM_CONFIG_HEADER(include/config.h) AC_PREREQ(2.50)dnl dnl Minimum Autoconf version required. -AC_REVISION($Revision: 1.1 $) +AC_REVISION($Revision: 1.2 $) dnl directory for docs (html) hamlibdocdir=$datadir/doc/hamlib @@ -127,30 +127,8 @@ else fi AC_SUBST(RIGMATRIX) -dnl Check if linradio-toolkit includes are there, so we can enable WiNRADiO - -AC_CHECK_HEADERS(linradio/radio_ioctl.h linradio/wrapi.h) -if test "${ac_cv_header_linradio_radio_ioctl_h}" = "no" -o \ - "${ac_cv_header_linradio_wrapi_h}" = "no"; then - echo "disabling WiNRADiO receiver support" - WINRADIOLNK= - WINRADIODEPS= - LIBWINRADIO= - LTLIBWINRADIO= -else - echo "enabling WiNRADiO receiver support" - LIBWINRADIO=libhamlib-winradio.a - LTLIBWINRADIO=libhamlib-winradio.la - WINRADIOLNK="-dlopen \$(top_builddir)/winradio/${LTLIBWINRADIO}" - WINRADIODEPS="\$(top_builddir)/winradio/${LTLIBWINRADIO}" -fi -AM_CONDITIONAL(WINRADIO, test x$LTLIBWINRADIO != x) -AC_SUBST(WINRADIOLNK) -AC_SUBST(WINRADIODEPS) -AC_SUBST(LIBWINRADIO) -AC_SUBST(LTLIBWINRADIO) - dnl Check if tcl includes are there, so we can enable HamlibTCL +dnl FIXME! AC_CHECK_HEADERS(tcl8.2/tcl.h) if test "${ac_cv_header_tcl8_2_tcl_h}" = "no" ; then @@ -201,10 +179,12 @@ icom/Makefile aor/Makefile kenwood/Makefile winradio/Makefile +winradio/linradio/Makefile pcr/Makefile alinco/Makefile uniden/Makefile tentec/Makefile +kachina/Makefile src/Makefile c++/Makefile tcl/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index 2030ef1ed..46a53bf42 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,8 +11,8 @@ LDADD = ../src/libhamlib.la ../lib/libmisc.a DEPENDENCIES = ../src/libhamlib.la ## The quotes around -dlopen below fool automake into accepting it -BACKENDLNK = -dlopen self -dlopen ../icom/libhamlib-icom.la -dlopen ../yaesu/libhamlib-yaesu.la -dlopen ../kenwood/libhamlib-kenwood.la -dlopen ../aor/libhamlib-aor.la -dlopen ../dummy/libhamlib-dummy.la -dlopen ../pcr/libhamlib-pcr.la -dlopen ../alinco/libhamlib-alinco.la -dlopen ../uniden/libhamlib-uniden.la -dlopen ../tentec/libhamlib-tentec.la @WINRADIOLNK@ -BACKENDEPS = ../icom/libhamlib-icom.la ../yaesu/libhamlib-yaesu.la ../kenwood/libhamlib-kenwood.la ../aor/libhamlib-aor.la ../dummy/libhamlib-dummy.la ../pcr/libhamlib-pcr.la ../alinco/libhamlib-alinco.la ../uniden/libhamlib-uniden.la ../tentec/libhamlib-tentec.la @WINRADIODEPS@ +BACKENDLNK = -dlopen self -dlopen ../icom/libhamlib-icom.la -dlopen ../yaesu/libhamlib-yaesu.la -dlopen ../kenwood/libhamlib-kenwood.la -dlopen ../aor/libhamlib-aor.la -dlopen ../dummy/libhamlib-dummy.la -dlopen ../pcr/libhamlib-pcr.la -dlopen ../alinco/libhamlib-alinco.la -dlopen ../uniden/libhamlib-uniden.la -dlopen ../tentec/libhamlib-tentec.la -dlopen ../winradio/libhamlib-winradio.la -dlopen ../kachina/libhamlib-kachina.la +BACKENDEPS = ../icom/libhamlib-icom.la ../yaesu/libhamlib-yaesu.la ../kenwood/libhamlib-kenwood.la ../aor/libhamlib-aor.la ../dummy/libhamlib-dummy.la ../pcr/libhamlib-pcr.la ../alinco/libhamlib-alinco.la ../uniden/libhamlib-uniden.la ../tentec/libhamlib-tentec.la ../winradio/libhamlib-winradio.la ../kachina/libhamlib-kachina.la ## Linker options listrigs_LDFLAGS = $(BACKENDLNK) @@ -21,6 +21,8 @@ dumpmem_LDFLAGS = $(BACKENDLNK) testcaps_LDFLAGS = $(BACKENDLNK) testrig_LDFLAGS = $(BACKENDLNK) testtrn_LDFLAGS = $(BACKENDLNK) +testbcd_LDFLAGS = $(BACKENDLNK) +testfreq_LDFLAGS = $(BACKENDLNK) rigctl_LDFLAGS = $(BACKENDLNK) # rigmatrix needs also libgd rigmatrix_LDFLAGS = -lgd $(BACKENDLNK)