X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=6ced182e50f0bca12d164c8e2ea6f45279f880c8;hp=56dce1047496148521bfd29216b880d6562d26b0;hb=2b7c61d605a79206779d2ebb4336b9765f54881c;hpb=4bd77045bbad0aa6bdb8172d396a8cea7225c07e diff --git a/configure.ac b/configure.ac index 56dce10..6ced182 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([autostuff]) AC_CONFIG_AUX_DIR([autostuff]) # We require at least automake 1.11 (needed for 'silent rules'). -AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options]) +AM_INIT_AUTOMAKE([1.11 -Wall -Werror std-options check-news]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -47,7 +47,6 @@ AH_BOTTOM([#endif /* SRD_CONFIG_H */]) CFLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden" # Checks for programs. -AC_PROG_CXX AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL @@ -65,7 +64,7 @@ PKG_PROG_PKG_CONFIG([0.22]) # 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=0 +SRD_LIB_VERSION_REVISION=1 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" @@ -80,7 +79,7 @@ AC_SUBST(SRD_LIB_LDFLAGS) # libglib-2.0 is always needed. # Note: glib-2.0 is part of the libsigrokdecode API # (hard pkg-config requirement). -AM_PATH_GLIB_2_0([2.28.0], +AM_PATH_GLIB_2_0([2.24.0], [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) # Python support. We require at least Python >= 3.0. @@ -102,7 +101,8 @@ case "$build" in # On Darwin, Macports has python3.x-config, fink has python3-config. # Mac OS X (Snow Leopard) ships with 'python-config' per default, but # that's Python 2.x, so not useful for us. - # Everything else is untested, we just hope 'PYTHON3_CONFIG' works. + # Everything else is untested, we just hope some $PYTHON3_CONFIG + # (i.e., any of the tools we check for above) is available. if test -n "$PYTHON3_CONFIG"; then CPPFLAGS_PYTHON="$($PYTHON3_CONFIG --includes)" LDFLAGS_PYTHON="$($PYTHON3_CONFIG --ldflags)"