mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix compilation when OS does not have libusb installed 

https://github.com/Hamlib/Hamlib/issues/803
pull/809/head
Mike Black W9MDB 2021-09-21 23:32:12 -05:00
rodzic 9671a26858
commit 0806896e3b
2 zmienionych plików z 13 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
configure.ac
Wyświetl plik

@ -321,10 +321,11 @@ LIBUSB=""
AC_ARG_VAR([LIBUSB_CFLAGS], [C compiler flags for libusb, overriding configure defaults]) AC_ARG_VAR([LIBUSB_CFLAGS], [C compiler flags for libusb, overriding configure defaults])
AC_ARG_VAR([LIBUSB_LIBS], [linker flags for libusb, overriding configure check (useful for specifying static libusb-1.0.a (see INSTALL))]) AC_ARG_VAR([LIBUSB_LIBS], [linker flags for libusb, overriding configure check (useful for specifying static libusb-1.0.a (see INSTALL))])
AS_IF([test x"${cf_with_libusb}" = "xyes"], AS_IF([test x"${cf_with_libusb}" = "xyes"], [
[AS_IF([test -z $LIBUSB_LIBS], AS_IF([test -z $LIBUSB_LIBS],
[AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBUSB_LIBS="-lusb-1.0"], [AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBUSB_LIBS="-lusb-1.0"],
[AC_MSG_WARN([libusb_init was not found in libusb-1.0--USB backends will be disabled])]) [AC_MSG_WARN([libusb_init was not found in libusb-1.0--USB backends will be disabled])])
[cf_with_libusb="no"]
], [cf_with_libusb="yes"]) ], [cf_with_libusb="yes"])
AS_IF([test x"${cf_with_libusb}" = "xyes"], AS_IF([test x"${cf_with_libusb}" = "xyes"],

12
tests/rigtestlibusb.c
Wyświetl plik

@ -24,12 +24,13 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#if __has_include("libusb.h") #if defined(HAVE_LIBUSB_H)
#include "libusb.h" #include "libusb.h"
#else #elif defined(HAVE_LIBUSB_1_0_LIBUSB_H)
#include <libusb-1.0/libusb.h> #include <libusb-1.0/libusb.h>
#endif #endif
#if HAVE_LIBUSB
int verbose = 0; int verbose = 0;
static void print_endpoint_comp(const struct static void print_endpoint_comp(const struct
@ -410,3 +411,10 @@ int main(int argc, char *argv[])
libusb_exit(NULL); libusb_exit(NULL);
return r; return r;
} }
#else
int main()
{
puts("libusb not installed");
return 0;
}
#endif