srd: sigrokdecode.h: Add version macros.

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index eb27cefe87c18d08c9510bbdcd5cb25655cbf640..8fbfd451188525c2e4811ce4a1f0ce8fd9ae0b24 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,11 +17,12 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AC_PREREQ([2.61])
+# We require at least autoconf 2.63 (AC_INIT format changed there).
+AC_PREREQ([2.63])
 
 # libsigrokdecode package version number (NOT the same as shared lib version!).
 m4_define([libsigrokdecode_major_version], [0])
-m4_define([libsigrokdecode_minor_version], [2])
+m4_define([libsigrokdecode_minor_version], [1])
 m4_define([libsigrokdecode_micro_version], [0])
 m4_define([libsigrokdecode_version],
          [libsigrokdecode_major_version.libsigrokdecode_minor_version.libsigrokdecode_micro_version])
@@ -33,7 +34,8 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign std-options])
+# We require at least automake 1.11 (needed for 'silent rules').
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AH_TOP([#ifndef LIBSIGROKDECODE_CONFIG_H
@@ -65,6 +67,10 @@ LIBSIGROKDECODE_LT_REVISION=0
 LIBSIGROKDECODE_LT_AGE=0
 LIBSIGROKDECODE_LT_VERSION="$LIBSIGROKDECODE_LT_CURRENT:$LIBSIGROKDECODE_LT_REVISION:$LIBSIGROKDECODE_LT_AGE"
 LIBSIGROKDECODE_LT_LDFLAGS="-version-info $LIBSIGROKDECODE_LT_VERSION"
+AC_SUBST(LIBSIGROKDECODE_LT_CURRENT)
+AC_SUBST(LIBSIGROKDECODE_LT_REVISION)
+AC_SUBST(LIBSIGROKDECODE_LT_AGE)
+AC_SUBST(LIBSIGROKDECODE_LT_VERSION)
 AC_SUBST(LIBSIGROKDECODE_LT_LDFLAGS)
 
 # Checks for libraries.
@@ -76,15 +82,15 @@ AM_PATH_GLIB_2_0([2.22.0],
         [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # Python support. We require at least Python >= 3.0.
-AC_ARG_VAR([PYTHON_CONFIG], [path to python3-config utility])
-AC_CHECK_PROGS([PYTHON_CONFIG], [python3-config python3.2-config python3.1-config python3.0-config])
+AC_ARG_VAR([PYTHON3_CONFIG], [path to python3-config utility])
+AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.2-config python3.1-config python3.0-config])
 CPPFLAGS_PYTHON=""
 LDFLAGS_PYTHON=""
 case "$build" in
 *mingw*)
        # We currently hardcode the paths to the Python 3.2 default install
        # location as there's no 'python-config' script on Windows, it seems.
-       AC_MSG_WARN([using hardcoded python configuration])
+       AC_MSG_WARN([using hardcoded Python3 configuration on MinGW])
        CPPFLAGS_PYTHON="-I/c/Python32/include"
        LDFLAGS_PYTHON="-L/c/Python32/libs -lpython32"
        ;;
@@ -93,10 +99,10 @@ 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 'PYTHON_CONFIG' works.
-       if test -n "$PYTHON_CONFIG"; then
-               CPPFLAGS_PYTHON="$($PYTHON_CONFIG --includes)"
-               LDFLAGS_PYTHON="$($PYTHON_CONFIG --ldflags)"
+       # Everything else is untested, we just hope 'PYTHON3_CONFIG' works.
+       if test -n "$PYTHON3_CONFIG"; then
+               CPPFLAGS_PYTHON="$($PYTHON3_CONFIG --includes)"
+               LDFLAGS_PYTHON="$($PYTHON3_CONFIG --ldflags)"
        else
                AC_MSG_ERROR([python3-config not found])
        fi
@@ -138,18 +144,24 @@ AC_SUBST(LIBSIGROKDECODE_MINOR_VERSION)
 AC_SUBST(LIBSIGROKDECODE_MICRO_VERSION)
 AC_SUBST(LIBSIGROKDECODE_VERSION)
 
-AC_DEFINE(LIBSIGROKDECODE_MAJOR_VERSION, [libsigrokdecode_major_version],
-         [Define to the libsigrokdecode major package version])
-AC_DEFINE(LIBSIGROKDECODE_MINOR_VERSION, [libsigrokdecode_minor_version],
-         [Define to the libsigrokdecode minor package version])
-AC_DEFINE(LIBSIGROKDECODE_MICRO_VERSION, [libsigrokdecode_micro_version],
-         [Define to the libsigrokdecode micro package version])
-AC_DEFINE(LIBSIGROKDECODE_VERSION, [libsigrokdecode_version],
-         [Define to the libsigrokdecode package version])
-
 AC_CONFIG_FILES([Makefile
+                sigrokdecode.h
                 libsigrokdecode.pc
                 decoders/Makefile
+                decoders/dcf77/Makefile
+                decoders/edid/Makefile
+                decoders/i2c/Makefile
+                decoders/i2cdemux/Makefile
+                decoders/i2cfilter/Makefile
+                decoders/mlx90614/Makefile
+                decoders/mx25lxx05d/Makefile
+                decoders/nunchuk/Makefile
+                decoders/pan1321/Makefile
+                decoders/rtc8564/Makefile
+                decoders/spi/Makefile
+                decoders/transitioncounter/Makefile
+                decoders/uart/Makefile
+                decoders/usb/Makefile
                ])
 
 AC_OUTPUT