X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=7707dc4994200f42de7442f6887ff5231b16ed54;hp=6dfaee26c4b72514dc66d2e2583ff2f4ed8ca3c5;hb=92d1aba34bbe661b388e874fda0a41f477d3e30d;hpb=365eeed279c3a2089dde413cdbb2a19a7726edb3 diff --git a/configure.ac b/configure.ac index 6dfaee2..7707dc4 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,7 @@ 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. @@ -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'. @@ -148,6 +149,7 @@ AC_CONFIG_FILES([Makefile sigrokdecode.h libsigrokdecode.pc decoders/Makefile + decoders/avr_isp/Makefile decoders/dcf77/Makefile decoders/edid/Makefile decoders/i2c/Makefile @@ -156,6 +158,7 @@ AC_CONFIG_FILES([Makefile decoders/i2s/Makefile decoders/jtag/Makefile decoders/jtag_stm32/Makefile + decoders/lm75/Makefile decoders/lpc/Makefile decoders/mlx90614/Makefile decoders/mx25lxx05d/Makefile @@ -163,10 +166,17 @@ AC_CONFIG_FILES([Makefile decoders/nunchuk/Makefile decoders/pan1321/Makefile decoders/rtc8564/Makefile + decoders/sdcard_spi/Makefile decoders/spi/Makefile + decoders/tlc5620/Makefile decoders/transitioncounter/Makefile decoders/uart/Makefile - decoders/usb/Makefile + decoders/uart_dump/Makefile + decoders/usb_signalling/Makefile + decoders/usb_protocol/Makefile + decoders/onewire_link/Makefile + decoders/onewire_network/Makefile + decoders/maxim_ds28ea00/Makefile ]) AC_OUTPUT