X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=a5335a5479be44ec45091a855f7a710b7168a034;hp=768e19bfd95eb9a34581187c5436eb415e7240c1;hb=702fa251997d8e6ac4f71837e1e89d3d537df42a;hpb=99f5f3b5ac31347795582872a5d92f3d9430c21d diff --git a/configure.ac b/configure.ac index 768e19b..a5335a5 100644 --- a/configure.ac +++ b/configure.ac @@ -83,16 +83,17 @@ AM_PATH_GLIB_2_0([2.28.0], # 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 @@ -158,20 +161,23 @@ AC_CONFIG_FILES([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_signalling/Makefile decoders/usb_protocol/Makefile - decoders/onewire_link/Makefile - decoders/onewire_network/Makefile + decoders/usb_signalling/Makefile ]) AC_OUTPUT