Fix for sync AM rig modes

These are new in hamlib 1.2.6. We could require >= 1.2.6
in configure.ac, but then we would make packaging difficult
on Debian stable (etch) for no good reason.

configure.ac

@@ -299,7 +299,7 @@ if test "x$ac_cv_want_hamlib" = "xno"; then
 else
     PKG_CHECK_EXISTS(hamlib >= 1.2.4, ac_cv_hamlib=yes, ac_cv_hamlib=no)
     if test "x$ac_cv_want_hamlib" = "xcheck"; then
-        PKG_CHECK_MODULES(HAMLIB, hamlib >= 1.2.0, [:], [:])
+        PKG_CHECK_MODULES(HAMLIB, hamlib >= 1.2.4, [:], [:])
         if test "x$ac_cv_hamlib" = "xyes"; then
             AC_DEFINE(USE_HAMLIB, 1, [Define to 1 if we are using hamlib])
         else
@@ -311,7 +311,7 @@ else
         else
             AC_DEFINE(USE_HAMLIB, 1, [Define to 1 if we are using hamlib])
         fi
-        PKG_CHECK_MODULES(HAMLIB, hamlib >= 1.2.0) # for the error message
+        PKG_CHECK_MODULES(HAMLIB, hamlib >= 1.2.4) # for the error message
     fi
 fi
 AC_SUBST([HAMLIB_CFLAGS])

src/rigcontrol/rigsupport.cxx

@@ -57,10 +57,14 @@ struct rmode_name_t {
 	{ RIG_MODE_PKTFM, "PKTFM" },
 	{ RIG_MODE_ECSSUSB, "ECSSUSB" },
 	{ RIG_MODE_ECSSLSB, "ECSSLSB" },
-	{ RIG_MODE_FAX, "FAX" },
+	{ RIG_MODE_FAX, "FAX" }
+// the above are covered by our requirement that hamlib be >= 1.2.4
+#if (defined(RIG_MODE_SAM) && defined(RIG_MODE_SAL) && defined(RIG_MODE_SAH))
+	, // C99 trailing commas in enumerations not yet in the C++ standard
 	{ RIG_MODE_SAM, "SAM" },
 	{ RIG_MODE_SAL, "SAL" },
 	{ RIG_MODE_SAH, "SAH" }
+#endif
 };
 
 map<string, rmode_t> mode_nums;