X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=444b631f806eb3d745c2926d0b35776dd525fc62;hp=ae68871ad860f9c512c9ee07eeca35f62ec182e2;hb=7560e16c17b9616e2ab6ae39a65c550b061889fd;hpb=51990c45a1cdcf023f3bbe75a5003c87f8ac902b diff --git a/configure.ac b/configure.ac index ae68871..444b631 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,9 @@ AH_TOP([#ifndef SRD_CONFIG_H #define SRD_CONFIG_H /* To stop multiple inclusions. */]) AH_BOTTOM([#endif /* SRD_CONFIG_H */]) -CFLAGS="-g -Wall -Wextra" +# Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden +# and enforce use of SRD_API to explicitly mark all public API functions. +CFLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden" # Checks for programs. AC_PROG_CXX @@ -78,28 +80,30 @@ 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.24.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'. # On Darwin, Macports has python3.x-config, fink has python3-config. # Mac OS X (Snow Leopard) ships with 'python-config' per default, but # that's Python 2.x, so not useful for us. - # Everything else is untested, we just hope 'PYTHON3_CONFIG' works. + # Everything else is untested, we just hope some $PYTHON3_CONFIG + # (i.e., any of the tools we check for above) is available. if test -n "$PYTHON3_CONFIG"; then CPPFLAGS_PYTHON="$($PYTHON3_CONFIG --includes)" LDFLAGS_PYTHON="$($PYTHON3_CONFIG --ldflags)" @@ -148,6 +152,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,17 +162,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/usb/Makefile - decoders/onewire/Makefile + decoders/uart_dump/Makefile + decoders/usb_protocol/Makefile + decoders/usb_signalling/Makefile ]) AC_OUTPUT