diff options
| author | Bert Vermeulen <bert@biot.com> | 2014-04-24 14:12:49 +0200 |
|---|---|---|
| committer | Bert Vermeulen <bert@biot.com> | 2014-04-24 14:12:49 +0200 |
| commit | dea61db0817432886e830b4916c375a88256ba07 (patch) | |
| tree | f25b2b243183ede902cb0f2be31f95f1a12a6254 /configure.ac | |
| parent | f714f8f836b7cd20f9a5a41dc21bcc8584c87c3b (diff) | |
| download | libsigrokdecode-dea61db0817432886e830b4916c375a88256ba07.tar.gz libsigrokdecode-dea61db0817432886e830b4916c375a88256ba07.zip | |
Detect Python 3.4 if not installed as "python3".
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b7777ad..420c8f3 100644 --- a/configure.ac +++ b/configure.ac @@ -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) |