X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=a5335a5479be44ec45091a855f7a710b7168a034;hp=ec1a14f9962836d5c4d25b926c6365b834a018b4;hb=702fa251997d8e6ac4f71837e1e89d3d537df42a;hpb=2dc6d41c64a8235308e61b4f9b509c7fecb2b502

diff --git a/configure.ac b/configure.ac
index ec1a14f..a5335a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,21 +78,22 @@ AC_SUBST(SRD_LIB_LDFLAGS)
 # libglib-2.0 is always needed.
 # Note: glib-2.0 is part of the libsigrokdecode API
 # (hard pkg-config requirement).
-AM_PATH_GLIB_2_0([2.22.0],
+AM_PATH_GLIB_2_0([2.28.0],
         [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # Python support. We require at least Python >= 3.0.
 AC_ARG_VAR([PYTHON3_CONFIG], [path to python3-config utility])
-AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.2-config python3.1-config python3.0-config])
+AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.3-config python3.2-config python3.1-config python3.0-config])
 CPPFLAGS_PYTHON=""
 LDFLAGS_PYTHON=""
 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'.
@@ -148,6 +149,8 @@ AC_CONFIG_FILES([Makefile
 		 sigrokdecode.h
 		 libsigrokdecode.pc
 		 decoders/Makefile
+		 decoders/avr_isp/Makefile
+		 decoders/can/Makefile
 		 decoders/dcf77/Makefile
 		 decoders/edid/Makefile
 		 decoders/i2c/Makefile
@@ -156,20 +159,25 @@ AC_CONFIG_FILES([Makefile
 		 decoders/i2s/Makefile
 		 decoders/jtag/Makefile
 		 decoders/jtag_stm32/Makefile
+		 decoders/lm75/Makefile
 		 decoders/lpc/Makefile
+		 decoders/maxim_ds28ea00/Makefile
 		 decoders/mlx90614/Makefile
 		 decoders/mx25lxx05d/Makefile
 		 decoders/mxc6225xu/Makefile
 		 decoders/nunchuk/Makefile
+		 decoders/onewire_link/Makefile
+		 decoders/onewire_network/Makefile
 		 decoders/pan1321/Makefile
 		 decoders/rtc8564/Makefile
+		 decoders/sdcard_spi/Makefile
 		 decoders/spi/Makefile
+		 decoders/tlc5620/Makefile
 		 decoders/transitioncounter/Makefile
 		 decoders/uart/Makefile
 		 decoders/uart_dump/Makefile
-		 decoders/usb/Makefile
-		 decoders/usb_signalling/Makefile
 		 decoders/usb_protocol/Makefile
+		 decoders/usb_signalling/Makefile
 		])
 
 AC_OUTPUT