X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=3ed527fb87ba1509a10f5d07ea50542368922a43;hp=40a3450a78a403e301efc70111762fa80e122014;hb=3abc83b996547a69bad906ec748f30874aae4796;hpb=47198f313a3c3e6431f5896fae3fb556f38746ed diff --git a/configure.ac b/configure.ac index 40a3450..3ed527f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ ## -## This file is part of the sigrok project. +## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2010 Bert Vermeulen ## @@ -22,8 +22,8 @@ AC_PREREQ([2.63]) # libsigrokdecode package version number (NOT the same as shared lib version!). m4_define([srd_package_version_major], [0]) -m4_define([srd_package_version_minor], [1]) -m4_define([srd_package_version_micro], [1]) +m4_define([srd_package_version_minor], [2]) +m4_define([srd_package_version_micro], [0]) m4_define([srd_package_version], [srd_package_version_major.srd_package_version_minor.srd_package_version_micro]) AC_INIT([libsigrokdecode], [srd_package_version], @@ -63,8 +63,8 @@ PKG_PROG_PKG_CONFIG([0.22]) # Carefully read the libtool docs before updating these numbers! # The algorithm for determining which number to change (and how) is nontrivial! # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info -SRD_LIB_VERSION_CURRENT=0 -SRD_LIB_VERSION_REVISION=1 +SRD_LIB_VERSION_CURRENT=1 +SRD_LIB_VERSION_REVISION=0 SRD_LIB_VERSION_AGE=0 SRD_LIB_VERSION="$SRD_LIB_VERSION_CURRENT:$SRD_LIB_VERSION_REVISION:$SRD_LIB_VERSION_AGE" SRD_LIB_LDFLAGS="-version-info $SRD_LIB_VERSION" @@ -84,7 +84,7 @@ AM_PATH_GLIB_2_0([2.24.0], # Python support. We require at least Python >= 3.0. AC_ARG_VAR([PYTHON3_CONFIG], [path to python3-config utility]) -AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.3-config python3.2-config python3.1-config python3.0-config]) +AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.3-config python-config-3.3 python3.2-config python-config-3.2 python3.1-config python-config-3.1 python3.0-config python-config-3.0]) CPPFLAGS_PYTHON="" LDFLAGS_PYTHON="" case "$build" in @@ -148,7 +148,7 @@ AC_SUBST(SRD_PACKAGE_VERSION_MICRO) AC_SUBST(SRD_PACKAGE_VERSION) AC_CONFIG_FILES([Makefile - sigrokdecode.h + libsigrokdecode.h libsigrokdecode.pc contrib/Makefile decoders/Makefile @@ -192,12 +192,14 @@ echo echo " - Package version (major.minor.micro): $SRD_PACKAGE_VERSION" echo " - Library version (current:revision:age): $SRD_LIB_VERSION" echo " - Prefix: $prefix" +echo " - Building on: $build" +echo " - Building for: $host" echo echo "Detected libraries:" echo # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0"; do +for lib in "glib-2.0 >= 2.24.0"; do if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib` answer="yes ($ver)"