X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=39766c6bda5015c6d7c0b9f9a415605f6b8c1a30;hb=d378f1009999f8b9a1037a9f417ea5518d9a6d37;hp=d2340beaab7d08eec3406a641dd927dd829b047b;hpb=161dc24d845acfc00108dd33eac7c42430d21e17;p=libsigrok.git diff --git a/configure.ac b/configure.ac index d2340bea..39766c6b 100644 --- a/configure.ac +++ b/configure.ac @@ -260,8 +260,8 @@ AM_CONDITIONAL(NEED_RPC, test "x$have_rpc" != "x0") # libglib-2.0 is always needed. Abort if it's not found. # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement). -# We require at least 2.34.0 due to e.g. g_slist_deep_copy(). -AM_PATH_GLIB_2_0([2.34.0], +# We require at least 2.32.0 due to e.g. g_variant_new_fixed_array(). +AM_PATH_GLIB_2_0([2.32.0], [LIB_CFLAGS="$LIB_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) # libzip is always needed. Abort if it's not found. @@ -302,7 +302,7 @@ fi AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno) # The VISA SCPI backend is only compiled in if librevisa was found. -PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812], +PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130412], [have_librevisa="yes"; LIB_CFLAGS="$LIB_CFLAGS $librevisa_CFLAGS"; LIBS="$LIBS $librevisa_LIBS"; SR_PKGLIBS="$SR_PKGLIBS librevisa"], @@ -396,7 +396,7 @@ PKG_CHECK_MODULES([glibmm], [glibmm-2.4 >= 2.32.0], [BINDINGS_CXX="no"; cxx_msg="glibmm required"]) # C++ bindings want stoi and stod. -if test "x$BINDINGS_CXX" == "xyes"; then +if test "x$BINDINGS_CXX" = "xyes"; then AC_LANG_PUSH([C++]) AC_MSG_CHECKING([for stoi and stod]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], @@ -554,13 +554,13 @@ echo "Detected libraries:" echo # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0 >= 2.34.0" "libzip >= 0.10" "libserialport >= 0.2.0" \ - "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \ +for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.2.0" \ + "librevisa >= 0.0.20130412" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \ "libftdi1 >= 1.0" "libgpib" "glibmm-2.4 >= 2.32.0" \ "pygobject-3.0 >= 3.0.0" "check >= 0.9.4" do optional="OPTIONAL" - if test "x$lib" = "xglib-2.0 >= 2.34.0"; then optional="REQUIRED"; fi + if test "x$lib" = "xglib-2.0 >= 2.32.0"; then optional="REQUIRED"; fi if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib`