X-Git-Url: http://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=c4960f41d52a57fbd1bb685636ae60222c38b34c;hp=53e8bc1abb660f57e1d7bb1dce9d253023a9fe18;hb=8c90d7bdf21f091bb8bf6a45fbb8602e406b10e4;hpb=fdfc532ecd49fc3353627ef4a093366e73d6b91a diff --git a/configure.ac b/configure.ac index 53e8bc1..c4960f4 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,8 @@ SR_PKG_VERSION_SET([SRD_PACKAGE_VERSION], [AC_PACKAGE_VERSION]) # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info SR_LIB_VERSION_SET([SRD_LIB_VERSION], [2:0:0]) +AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"]) + ############################ ## Package dependencies ## ############################ @@ -128,7 +130,7 @@ AC_SUBST([SRD_PKGLIBS]) # Retrieve the compile and link flags for all modules combined. # Also, bail out at this point if any module dependency is not met. -PKG_CHECK_MODULES([LIBSIGROKDECODE], [glib-2.0 >= 2.24.0 $SRD_PKGLIBS]) +PKG_CHECK_MODULES([LIBSIGROKDECODE], [glib-2.0 >= 2.28.0 $SRD_PKGLIBS]) PKG_CHECK_MODULES([TESTS], [$SRD_PKGLIBS_TESTS glib-2.0 $SRD_PKGLIBS]) srd_glib_version=`$PKG_CONFIG --modversion glib-2.0 2>&AS_MESSAGE_LOG_FD` @@ -154,7 +156,7 @@ Compile configuration: - C compiler warnings............. $SRD_WFLAGS Detected libraries (required): - - glib-2.0 >= 2.24.0.............. $srd_glib_version + - glib-2.0 >= 2.28.0.............. $srd_glib_version $srd_pkglibs_summary Detected libraries (optional): $srd_pkglibs_opt_summary