Merge branch 'master' into ptt-control-on-cat-port

configure.ac

@@ -619,13 +619,17 @@ AS_CASE(["$host_os"],
         ],
 dnl As g313-posix.c has a hard dependency on linux/types.h
 dnl via linradio/wrg313api.h, disable compilation on other POSIX.
-        [ *linux-gnu ], [
+dnl (Certain systems have extra characters following "-gnu" such as
+dnl the Raspberry Pi which is "linux-gnueabihf"; presume that "linux-gnu"
+dnl is a sufficient test.)
+        [ *linux-gnu* ], [
              AM_CONDITIONAL(G313_LINUX_GNU, true)
              AM_CONDITIONAL(G313_WINDOWS, false)
         ],
         [
              AM_CONDITIONAL(G313_LINUX_GNU, false)
              AM_CONDITIONAL(G313_WINDOWS, false)
+             AC_DEFINE([OTHER_POSIX], [1], [Compilation on POSIX other than Linux])
         ])
 
 dnl If libdl is present, check for its header file.

kenwood/kenwood.c

@@ -2746,7 +2746,7 @@ DECLARE_INITRIG_BACKEND(kenwood)
 	rig_register(&tmd710_caps);
 
 	rig_register(&ts590_caps);
-	rig_register(&ts590_caps);
+	rig_register(&ts590sg_caps);
 	rig_register(&ts480_caps);
 	rig_register(&thf6a_caps);
 

winradio/winradio.c

@@ -252,11 +252,9 @@ DECLARE_INITRIG_BACKEND(winradio)
 #endif
 #endif
 
-	/* Not available on MS Windows */
+	/* Available on Linux and MS Windows */
-#ifndef _WIN32
+#ifndef OTHER_POSIX
-#ifndef __CYGWIN__
 	rig_register(&g313_caps);
-#endif
 #endif
 
 	return RIG_OK;