From: Bert Vermeulen Date: Fri, 22 Jun 2012 23:17:36 +0000 (+0200) Subject: sr/srd/cli: require glib version >= 2.28 X-Git-Tag: dsupstream~904 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e21e846330070e102b24e08605b76b362020f500;p=libsigrok.git sr/srd/cli: require glib version >= 2.28 Needed for g_get_monotonic_time(). Thanks to Tomaž Šolc. --- diff --git a/README b/README index 33e367a4..e25f2272 100644 --- a/README +++ b/README @@ -21,7 +21,7 @@ Requirements - automake >= 1.11 - libtool - pkg-config >= 0.22 - - libglib >= 2.22.0 + - libglib >= 2.28.0 - libusb >= 1.0.5 (for most logic analyzer hardware) - libzip >= 0.8 - libftdi >= 0.16 (for some logic analyzer hardware) diff --git a/configure.ac b/configure.ac index 485fd90d..b0558ef3 100644 --- a/configure.ac +++ b/configure.ac @@ -181,7 +181,7 @@ SR_PKGLIBS="" # libglib-2.0 is always needed. # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement). -AM_PATH_GLIB_2_0([2.22.0], +AM_PATH_GLIB_2_0([2.28.0], [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) # libgthread-2.0 is always needed (e.g. for the demo hardware driver).