sdcard_spi: Fix handling of some warning annotations.

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 88855e010a0b10144a5a695733150f8f23564677..962c1b7e1ce3bcaa3684fb9f4804da6f3f464986 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AH_BOTTOM([#endif /* SRD_CONFIG_H */])
 
 # 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"
+CFLAGS="$CFLAGS -Wall -Wextra -Wmissing-prototypes -fvisibility=hidden"
 
 # Checks for programs.
 AC_PROG_CC
@@ -88,45 +88,42 @@ build_runtc="yes"
 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.3-config python-config-3.3 python3.2-config python-config-3.2 python3.1-config python-config-3.1 python3.0-config python-config-3.0])
+# Python 3 is always needed.
+# Note: We need to try a few different variants, since some systems have a
+# python3.pc file, others have a python-3.3.pc file, and so on.
+# See also: http://sigrok.org/wiki/Libsigrokdecode/Python
 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 -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 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)"
-       else
-               AC_MSG_ERROR([python3-config not found])
-       fi
-       ;;
-esac
+PKG_CHECK_MODULES([python3], [python3 >= 3.0],
+       [CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python3_CFLAGS";
+       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python3_LIBS"],
+[PKG_CHECK_MODULES([python33], [python-3.3 >= 3.0],
+       [CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python33_CFLAGS";
+       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python33_LIBS"],
+[PKG_CHECK_MODULES([python32], [python-3.2 >= 3.0],
+       [CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python32_CFLAGS";
+       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python32_LIBS"],
+[PKG_CHECK_MODULES([python31], [python-3.1 >= 3.0],
+       [CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python31_CFLAGS";
+       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python31_LIBS"],
+[PKG_CHECK_MODULES([python30], [python-3.0 >= 3.0],
+       [CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python30_CFLAGS";
+       LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python30_LIBS"],
+)])])])])
 AC_SUBST(CPPFLAGS_PYTHON)
 AC_SUBST(LDFLAGS_PYTHON)
 
+# Link against libm, this is required (among other things) by Python.
+AC_SEARCH_LIBS([pow], [m])
+
 # The Check unit testing framework is optional. Disable if not found.
 PKG_CHECK_MODULES([check], [check >= 0.9.4],
        [have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS";
        LIBS="$LIBS $check_LIBS"], [have_check="no"])
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
-# Protocol decoder test framework
+# libsigrok is optional (only used for the protocol decoder test framework).
+# Disable if not found.
 PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2.0],
        [LIBSIGROK_CFLAGS="$libsigrok_CFLAGS"; LIBSIGROK_LIBS="$libsigrok_LIBS"],
        [build_runtc="no"])
@@ -137,21 +134,6 @@ AC_SUBST([LIBSIGROK_LIBS])
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
 AC_CHECK_HEADER([sys/resource.h], [], [build_runtc="no"])
 
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_CHECK_FUNCS([memset strtoull])
-
 AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders")
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
 AC_SUBST(AM_LIBTOOLFLAGS, '--silent')