X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=962c1b7e1ce3bcaa3684fb9f4804da6f3f464986;hp=2d480eed399696fb5e79d88420d1c9236ad34fbe;hb=21e7a67e9a9d70aca44577d7556c1008e872d14c;hpb=6af04d5a36a47b11dcf10bb629105600aa5a66eb

diff --git a/configure.ac b/configure.ac
index 2d480ee..962c1b7 100644
--- 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,27 +88,28 @@ 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.
+# 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=""
 PKG_CHECK_MODULES([python3], [python3 >= 3.0],
-	[have_python3="yes"; CPPFLAGS_PYTHON="$python3_CFLAGS";
-	LDFLAGS_PYTHON="$python3_LIBS"], [have_python3="no"])
-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"
-	;;
-*)
-	if test x"$have_python3" = xno; then
-		AC_MSG_ERROR([python3 not found])
-	fi
-	;;
-esac
+	[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)
 
@@ -121,7 +122,8 @@ PKG_CHECK_MODULES([check], [check >= 0.9.4],
 	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"])
@@ -132,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')