Fix incorrect doxygen comment for srd_decoder_list().

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e5232ccec25fb1ec80249e427dbda65240fd7a0f..10213a74835f63c88669a712d00e21bdd00f5fe9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ 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], [2])
+m4_define([srd_package_version_minor], [3])
 m4_define([srd_package_version_micro], [0])
 m4_define([srd_package_version], [srd_package_version_major.srd_package_version_minor.srd_package_version_micro])
 
@@ -91,6 +91,8 @@ AM_PATH_GLIB_2_0([2.24.0],
 # Python 3 is always needed.
 # Note: We need to try a few different variants, since some systems have a
 # python3.pc file, others have a python-3.3.pc file, and so on.
+# We also export the name of the package so that it can be correctly
+# added to libsigrokdecode.pc.
 # See also: http://sigrok.org/wiki/Libsigrokdecode/Python
 CPPFLAGS_PYTHON=""
 LDFLAGS_PYTHON=""
@@ -98,27 +100,32 @@ pyver="none"
 PKG_CHECK_MODULES([python3], [python3 >= 3.2],
        [pyver=`$PKG_CONFIG --modversion python3`;
        CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python3_CFLAGS";
-       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python3_LIBS"],
+       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python3_LIBS";
+       MODNAME_PYTHON="python3"],
 [PKG_CHECK_MODULES([python34], [python-3.4 >= 3.4],
        [pyver=`$PKG_CONFIG --modversion python-3.4`;
        CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python34_CFLAGS";
-       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python34_LIBS"],
+       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python34_LIBS";
+       MODNAME_PYTHON="python-3.4"],
 [PKG_CHECK_MODULES([python33], [python-3.3 >= 3.3],
        [pyver=`$PKG_CONFIG --modversion python-3.3`;
        CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python33_CFLAGS";
-       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python33_LIBS"],
+       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python33_LIBS";
+       MODNAME_PYTHON="python-3.3"],
 [PKG_CHECK_MODULES([python32], [python-3.2 >= 3.2],
        [pyver=`$PKG_CONFIG --modversion python-3.2`;
        CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python32_CFLAGS";
-       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python32_LIBS"],
+       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python32_LIBS";
+       MODNAME_PYTHON="python-3.2"],
 )])])])
 AC_SUBST(CPPFLAGS_PYTHON)
 AC_SUBST(LDFLAGS_PYTHON)
+AC_SUBST(MODNAME_PYTHON)
 
 # 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_CHECK_PROGS([PYTHON3], [python3.4 python3.3 python3.2 python3])
-if test "x$PYTHON3" == "x"; then
+if test "x$PYTHON3" = "x"; then
        AC_MSG_ERROR([cannot find python3 executable.])
 fi
 
@@ -127,8 +134,7 @@ AC_SEARCH_LIBS([pow], [m])
 
 # The Check unit testing framework is optional. Disable if not found.
 PKG_CHECK_MODULES([check], [check >= 0.9.4],
-       [have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS";
-       LIBS="$LIBS $check_LIBS"], [have_check="no"])
+       [have_check="yes"], [have_check="no"])
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
 # libsigrok is optional (only used for the protocol decoder test framework).