X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=3f661ec99a605634b1c13087f45cf83c577adc88;hp=180875178afb6054e3fe8b73fde4912b1ecae5c7;hb=3b776f38b9fe2903fd7a4af9d9ca9edd159cea0b;hpb=95e2b2f92b144e1b0edf29819a8585dbbc00f169

diff --git a/configure.ac b/configure.ac
index 1808751..3f661ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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