From: Uwe Hermann <redacted>
Date: Sat, 13 Oct 2012 13:49:09 +0000 (+0200)
Subject: Small update for the pkg-config files and Windows.
X-Git-Tag: libsigrokdecode-0.1.1~26
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=55e5c4e10d5d3f18d7f42ea6415782461ff55123;p=libsigrokdecode.git

Small update for the pkg-config files and Windows.

On Windows, cmake-using projects seem to have problems with the
"-I/c/Python32/include" syntax we have in the libsigrokdecode .pc file.

However, "-Ic:/Python32/include" works fine. So we just add both to
support everything.
---

diff --git a/configure.ac b/configure.ac
index 1cd0a07..935e832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,9 +90,10 @@ 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.
+	# Note: We add both the /c/ and c:/ syntax (needed for cmake).
 	AC_MSG_WARN([using hardcoded Python3 configuration on MinGW])
-	CPPFLAGS_PYTHON="-I/c/Python32/include"
-	LDFLAGS_PYTHON="-L/c/Python32/libs -lpython32"
+	CPPFLAGS_PYTHON="-I/c/Python32/include -Ic:/Python32/include"
+	LDFLAGS_PYTHON="-L/c/Python32/libs -Lc:/Python32/libs -lpython32"
 	;;
 *)
 	# We know that Linux has 'python3-config'.