You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

30 lines
1.3 KiB

  1. Index: hamlib-1.2.15.3/configure.ac
  2. ===================================================================
  3. --- hamlib-1.2.15.3.orig/configure.ac 2012-11-01 22:27:27.000000000 +0100
  4. +++ hamlib-1.2.15.3/configure.ac 2014-06-15 09:34:25.557966205 +0200
  5. @@ -234,12 +234,12 @@
  6. "You need a C99 compliant C compiler that supports struct/array intializers."
  7. "Have you considered GCC lately?.")]);
  8. -dnl libxml2 required rigmem xml support
  9. -PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
  10. - [AC_DEFINE(HAVE_XML2,[1],[Define if libxml2 is available])],
  11. - [AC_MSG_WARN([libxml-2.0 pkg-config not found, XML support will be disabled])])
  12. +#dnl libxml2 required rigmem xml support
  13. +#PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
  14. +# [AC_DEFINE(HAVE_XML2,[1],[Define if libxml2 is available])],
  15. +# [AC_MSG_WARN([libxml-2.0 pkg-config not found, XML support will be disabled])])
  16. AC_SUBST(LIBXML2_LIBS)
  17. AC_SUBST(LIBXML2_CFLAGS)
  18. dnl Check if libgd-dev is installed, so we can enable rigmatrix
  19. @@ -406,7 +406,7 @@
  20. AM_CONDITIONAL(HAVE_USRP, test x"${cf_with_usrp}" = "xyes")
  21. -PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1, ,
  22. +PKG_CHECK_MODULES(LIBUSB, libusb >= 1.0, ,
  23. [AC_MSG_WARN([libusb pkg-config not found, USB backends will be disabled])])
  24. CFLAGS="${CFLAGS} ${LIBUSB_CFLAGS}"
  25. CXXFLAGS="${CXXFLAGS} ${LIBUSB_CFLAGS}"