]> sigrok.org Git - libsigrokdecode.git/commitdiff
Detect Python 3.4 if not installed as "python3".
authorBert Vermeulen <redacted>
Thu, 24 Apr 2014 12:12:49 +0000 (14:12 +0200)
committerBert Vermeulen <redacted>
Thu, 24 Apr 2014 12:12:49 +0000 (14:12 +0200)
configure.ac

index b7777adf45ce8fda0acb851b70c5476638e35863..420c8f322d36c47dc10df1ecb144ab0cd459cd8f 100644 (file)
@@ -99,7 +99,11 @@ PKG_CHECK_MODULES([python3], [python3 >= 3.2],
        [pyver=`$PKG_CONFIG --modversion python3`;
        CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python3_CFLAGS";
        LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python3_LIBS"],
-[PKG_CHECK_MODULES([python33], [python-3.3 >= 3.2],
+[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"],
+[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"],
@@ -107,7 +111,7 @@ PKG_CHECK_MODULES([python3], [python3 >= 3.2],
        [pyver=`$PKG_CONFIG --modversion python-3.2`;
        CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python32_CFLAGS";
        LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python32_LIBS"],
-)])])
+)])])])
 AC_SUBST(CPPFLAGS_PYTHON)
 AC_SUBST(LDFLAGS_PYTHON)