Fix setting the variable HAVE_LIBUSB for makefiles

configure.ac

@@ -357,7 +357,6 @@ AC_ARG_WITH([libusb],
     )
 
 AC_MSG_RESULT([$cf_with_libusb])
-AM_CONDITIONAL([HAVE_LIBUSB], [test x"${cf_with_libusb}" = "xyes"])
 
 LIBUSB=""
 AC_ARG_VAR([LIBUSB_CFLAGS], [C compiler flags for libusb, overriding configure defaults])
@@ -377,6 +376,9 @@ AS_IF([test x"${cf_with_libusb}" = "xyes"], [
 		   [Define if libusb-1.0 is available])
 	LIBUSB="libusb-1.0"])])
 
+AM_CONDITIONAL([HAVE_LIBUSB], [test x"${cf_with_libusb}" = "xyes"])
+AC_SUBST([HAVE_LIBUSB])
+
 # Only used in hamlib.pc.in
 AC_SUBST([LIBUSB])
 

tests/Makefile.am

@@ -4,8 +4,6 @@
 # AUTOMAKE_OPTIONS = dejagnu
 # DEJATOOL = testfreq testbcd testloc rigctl
 
-# For some reason this "if" is not working -- rigtestlibusb is still being included
-# Fix for now is to change rigtestlibusb.c instead
 if HAVE_LIBUSB
     TESTLIBUSB = rigtestlibusb
 else