X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=d59e0bea35ee64618169ce4feac351559ab5cfa2;hp=16aab585e7c591f9b06af816de62e36856048c09;hb=afae4fa61ffd8dee62667e60f931e371061c7d7d;hpb=1ac02afa92e461a4586e9edc1f7bdda67650d477 diff --git a/configure.ac b/configure.ac index 16aab58..d59e0be 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_PREREQ([2.63]) # libsigrokdecode package version number (NOT the same as shared lib version!). -AC_INIT([libsigrokdecode], [0.5.0], +AC_INIT([libsigrokdecode], [0.6.0], [sigrok-devel@lists.sourceforge.net], [libsigrokdecode], [http://www.sigrok.org]) AC_CONFIG_MACRO_DIR([m4]) @@ -67,6 +67,10 @@ SR_LIB_VERSION_SET([SRD_LIB_VERSION], [4:0:0]) AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"]) +# Initialize pkg-config. +# We require at least 0.22, as "Requires.private" behaviour changed there. +PKG_PROG_PKG_CONFIG + ############################ ## Package dependencies ## ############################ @@ -85,15 +89,18 @@ SRD_PKGLIBS_TESTS= SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) # Python 3 is always needed. +# Starting with Python 3.8 we need to check for "python-3.8-embed" +# first, since usually only that variant will add "-lpython3.8". +# https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build SR_PKG_CHECK([python3], [SRD_PKGLIBS], - [python3 >= 3.2], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2]) + [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) AS_IF([test "x$sr_have_python3" = xno], [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) # We also need to find the name of the python3 executable (for 'make install'). # Some OSes call this python3, some call it python3.2, etc. etc. AC_ARG_VAR([PYTHON3], [Python 3 interpreter]) -AC_CHECK_PROGS([PYTHON3], [python3.6 python3.5 python3.4 python3.3 python3.2 python3]) +AC_CHECK_PROGS([PYTHON3], [python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3]) AS_IF([test "x$PYTHON3" = x], [AC_MSG_ERROR([Cannot find Python 3 interpreter.])]) @@ -115,7 +122,7 @@ SR_CHECK_COMPILE_FLAGS([SRD_EXTRA_CFLAGS], [C99], [-std=c99 -c99 -AC99 -qlanglvl SR_CHECK_COMPILE_FLAGS([SRD_EXTRA_CFLAGS], [visibility], [-fvisibility=hidden]) # Select suitable compiler warning flags. -SR_ARG_ENABLE_WARNINGS([SRD_WFLAGS], [-Wall], [-Wall -Wextra -Wmissing-prototypes]) +SR_ARG_ENABLE_WARNINGS([SRD_WFLAGS], [-Wall], [-Wall -Wextra -Wmissing-prototypes -Wshadow -Wformat=2 -Wno-format-nonliteral -Wfloat-equal]) # Link against libm, this is required (among other things) by Python. SRD_EXTRA_LIBS= @@ -123,6 +130,8 @@ SR_SEARCH_LIBS([SRD_EXTRA_LIBS], [pow], [m]) AC_SYS_LARGEFILE +AC_C_BIGENDIAN + ############################## ## Finalize configuration ## ############################## @@ -131,7 +140,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.28.0 $SRD_PKGLIBS]) +PKG_CHECK_MODULES([LIBSIGROKDECODE], [glib-2.0 >= 2.34 $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` @@ -162,7 +171,7 @@ Compile configuration: - Linker flags.................... $LDFLAGS Detected libraries (required): - - glib-2.0 >= 2.28.0.............. $srd_glib_version + - glib-2.0 >= 2.34................ $srd_glib_version $srd_pkglibs_summary Detected libraries (optional): $srd_pkglibs_opt_summary