[Hamlib-commits] Hamlib -- Ham radio control libraries branch, master, updated. 419dc8540ff5f4c73a5705b6211a9e4d7cc0cf16

[Nate B. <n0...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  419dc8540ff5f4c73a5705b6211a9e4d7cc0cf16 (commit)
       via  87688bc2549ed8d9e1ac966d6b7e368faae47fc3 (commit)
      from  9cd11ebe27f5335ff9e1c4a62861fd7efe0e318c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 419dc8540ff5f4c73a5705b6211a9e4d7cc0cf16
Author: Bill Somerville <bi...@cl...>
Date:   Mon Sep 30 22:22:45 2013 +0100

    Fix Yaesu newcat backend set_tx_vfo issue.
    
    The newcat Yaesu backend was using a toggle command to set the TX VFO
    where an explicit set command is avaiable.
    
    This fix corrects the function for the FT-2000(D) and the FT-DX5000.
    
    There is still an issue with the FT-450D which as far as I can see has
    no definitive way of setting which VFO will be used for TX.
    
    Signed-off-by: Nate Bargmann <n0...@n0...>

diff --git a/yaesu/newcat.c b/yaesu/newcat.c
index f31d854..6b34807 100644
--- a/yaesu/newcat.c
+++ b/yaesu/newcat.c
@@ -3758,8 +3758,13 @@ int newcat_set_tx_vfo(RIG * rig, vfo_t tx_vfo) {
             return -RIG_EINVAL;
     }
 
-    if (newcat_is_rig(rig, RIG_MODEL_FT950))
-        p1 = p1 + 2;            /* FT950 non-Toggle */
+    /* TODO: G4WJS - FT-450 only has toggle command so not sure how to
+       definitively set the TX VFO (VS; doesn't seem to help
+       either) */
+    if (newcat_is_rig(rig, RIG_MODEL_FT950) ||
+            newcat_is_rig(rig, RIG_MODEL_FT2000) ||
+            newcat_is_rig(rig, RIG_MODEL_FTDX5000))
+        p1 = p1 + 2;            /* use non-Toggle commands */
 
     snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c%c", "FT", p1, cat_term);
 

commit 87688bc2549ed8d9e1ac966d6b7e368faae47fc3
Author: Nate Bargmann <n0...@n0...>
Date:   Tue Oct 1 03:00:59 2013 -0500

    hamlib.pc.in:  Use AC_SUBST variables
    
    Use AC_SUBST variables for generating hamlib.pc based on local
    configuration of Hamlib.
    
    Rework libusb pkg-config section and set LIBUSB as an AC_SUBST variable.

diff --git a/configure.ac b/configure.ac
index 5945217..672164f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -355,6 +355,26 @@ AS_IF([test x"${cf_with_xml_support}" = "xyes"], [
 AC_SUBST([LIBXML2_LIBS])
 AC_SUBST([LIBXML2_CFLAGS])
 
+dnl Defines LIBUSB_CFLAGS and LIBUSB_LIBS as precious variables
+dnl so they appear in all Makefiles.
+# macros/pkg.m4
+PKG_CHECK_MODULES([LIBUSB], [libusb >= 0.1],
+                  [AC_CHECK_HEADERS([usb.h])
+                  AC_DEFINE([HAVE_LIBUSB],
+                             [1],
+                             [Define if libusb is available])
+                  cf_with_libusb="yes"
+                  LIBUSB="libusb"],
+                  [cf_with_libusb="no"
+                  LIBUSB=""])
+
+AS_IF([test x"${cf_with_libusb}" = xno],
+      [AC_MSG_WARN([libusb pkg-config not found, USB backends will be disabled])
+      ])
+
+# Only used in hamlib.pc.in
+AC_SUBST([LIBUSB])
+
 
 dnl Check if readline support in rigctl/rotctl is wanted
 AC_MSG_CHECKING([whether to use readline in rigctl/rotctl])
@@ -595,23 +615,6 @@ AM_CONDITIONAL([ENABLE_CXX], [test x"${cf_with_cxx}" = "xyes"])
 AM_CONDITIONAL([HAVE_USRP], [test x"${cf_with_usrp}" = "xyes"])
 
 
-dnl Defines LIBUSB_CFLAGS and LIBUSB_LIBS as precious variables
-dnl so they appear in all Makefiles.
-# macros/pkg.m4
-PKG_CHECK_MODULES([LIBUSB], [libusb >= 0.1], [],
-                  [AC_MSG_WARN([libusb pkg-config not found, USB backends will be disabled])])
-
-AC_CHECK_HEADERS([usb.h])
-AC_MSG_CHECKING([whether to build USB backends])
-
-AS_IF([test x"${LIBUSB_LIBS}" = x],
-      [cf_with_libusb="no"],
-      [cf_with_libusb="yes"],
-      [AC_DEFINE([HAVE_LIBUSB],[1],[Define if libusb is available])
-      ])
-AC_MSG_RESULT([$cf_with_libusb])
-
-
 ## -------------------------------- ##
 ## Prepare rig backend dependencies ##
 ## -------------------------------- ##
diff --git a/hamlib.pc.in b/hamlib.pc.in
index fdb5418..94f599b 100644
--- a/hamlib.pc.in
+++ b/hamlib.pc.in
@@ -7,8 +7,7 @@ Name: @PACKAGE_NAME@
 Description: Library to control radio and rotator equipment.
 URL: @PACKAGE_URL@
 Version: @PACKAGE_VERSION@
-Requires.private: libusb >= 0.1
-Conflicts: libusb >= 1.0
-Cflags: -I${includedir}
+Requires.private: @LIBUSB@
+Cflags: -I${includedir} @PTHREAD_CFLAGS@
 Libs: -L${libdir} -lhamlib
-Libs.private: -lm -ldl -lpthread
+Libs.private: @MATH_LIBS@ @DL_LIB@ @PTHREAD_LIBS@

-----------------------------------------------------------------------

Summary of changes:
 configure.ac   |   37 ++++++++++++++++++++-----------------
 hamlib.pc.in   |    7 +++----
 yaesu/newcat.c |    9 +++++++--
 3 files changed, 30 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries