configure.ac/Makefile.am: Alphabetical order.

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0d7f71050a0a08205bb2f17ac1e5c1f2a48ec6aa..ceeb7477c2d8ab38cbae18e81f63fc814ea01f65 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,7 @@ AC_CONFIG_AUX_DIR([autostuff])
 # We require at least automake 1.11 (needed for 'silent rules').
 AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 AH_TOP([#ifndef SRD_CONFIG_H
 #define SRD_CONFIG_H    /* To stop multiple inclusions. */])
@@ -77,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.
@@ -89,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'.
@@ -147,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
@@ -155,16 +158,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/uart_dump/Makefile
+                decoders/usb_protocol/Makefile
+                decoders/usb_signalling/Makefile
                ])
 
 AC_OUTPUT