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.

31 lines
866 B

  1. --- a/configure.ac
  2. +++ b/configure.ac
  3. @@ -3825,18 +3825,20 @@ AC_ARG_WITH(libsigrok, [AS_HELP_STRING([--with-libsigrok@<:@=PREFIX@:>@], [Path
  4. with_libsigrok_ldflags="-L$withval/lib"
  5. fi
  6. fi
  7. -],[])
  8. +],[with_libsigrok="yes"])
  9. # libsigrok has a glib dependency
  10. if test "x$with_libsigrok" = "xyes"
  11. then
  12. - if test -z "m4_ifdef([AM_PATH_GLIB_2_0], [yes], [])"
  13. - then
  14. - with_libsigrok="no (glib not available)"
  15. - else
  16. - AM_PATH_GLIB_2_0([2.28.0],
  17. - [with_libsigrok_cflags="$with_libsigrok_cflags $GLIB_CFLAGS"; with_libsigrok_ldflags="$with_libsigrok_ldflags $GLIB_LIBS"])
  18. - fi
  19. +m4_ifdef([AM_PATH_GLIB_2_0],
  20. + [
  21. + AM_PATH_GLIB_2_0([2.28.0],
  22. + [with_libsigrok_cflags="$with_libsigrok_cflags $GLIB_CFLAGS"; with_libsigrok_ldflags="$with_libsigrok_ldflags $GLIB_LIBS"])
  23. + ],
  24. + [
  25. + with_libsigrok="no (glib not available)"
  26. + ]
  27. +)
  28. fi
  29. # libsigrok headers