X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=420c8f322d36c47dc10df1ecb144ab0cd459cd8f;hp=f7bf20d4c653b06b13387d8c1568b787b9724da3;hb=e94fdd576d250652891f3ca5be61e2eb80b152cc;hpb=91c78794d872dcac55f93ecbae1e28cec1ca6bf6

diff --git a/configure.ac b/configure.ac
index f7bf20d..420c8f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
 # We require at least automake 1.11 (needed for 'silent rules').
-AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news color-tests])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
@@ -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
@@ -77,7 +77,7 @@ AC_SUBST(SRD_LIB_VERSION_AGE)
 AC_SUBST(SRD_LIB_VERSION)
 AC_SUBST(SRD_LIB_LDFLAGS)
 
-# assume we can build tests/runtc unless proven otherwise
+# Assume we can build tests/runtc unless proven otherwise.
 build_runtc="yes"
 
 # Checks for libraries.
@@ -94,32 +94,24 @@ AM_PATH_GLIB_2_0([2.24.0],
 # See also: http://sigrok.org/wiki/Libsigrokdecode/Python
 CPPFLAGS_PYTHON=""
 LDFLAGS_PYTHON=""
-PKG_CHECK_MODULES([python3], [python3 >= 3.0],
-	[CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python3_CFLAGS";
+pyver="none"
+PKG_CHECK_MODULES([python3], [python3 >= 3.2],
+	[pyver=`$PKG_CONFIG --modversion python3`;
+	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";
+[PKG_CHECK_MODULES([python34], [python-3.4 >= 3.4],
+	[pyver=`$PKG_CONFIG --modversion python-3.4`;
+	CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python34_CFLAGS";
+	LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python34_LIBS"],
+[PKG_CHECK_MODULES([python33], [python-3.3 >= 3.3],
+	[pyver=`$PKG_CONFIG --modversion python-3.3`;
+	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";
+[PKG_CHECK_MODULES([python32], [python-3.2 >= 3.2],
+	[pyver=`$PKG_CONFIG --modversion python-3.2`;
+	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"],
-)])])])])
-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"
-	;;
-esac
+)])])])
 AC_SUBST(CPPFLAGS_PYTHON)
 AC_SUBST(LDFLAGS_PYTHON)
 
@@ -144,21 +136,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')
@@ -175,12 +152,7 @@ AC_SUBST(SRD_PACKAGE_VERSION)
 
 AM_CONDITIONAL(BUILD_RUNTC, test x"$build_runtc" = "xyes")
 
-AC_CONFIG_FILES([Makefile
-		 version.h
-		 libsigrokdecode.pc
-		 contrib/Makefile
-		 tests/Makefile
-		])
+AC_CONFIG_FILES([Makefile version.h libsigrokdecode.pc])
 
 AC_OUTPUT
 
@@ -192,26 +164,33 @@ echo "  - Library version (current:revision:age): $SRD_LIB_VERSION"
 echo "  - Prefix: $prefix"
 echo "  - Building on: $build"
 echo "  - Building for: $host"
-echo "  - Building protocol decoder test framework: $build_runtc"
 echo
 echo "Detected libraries:"
 echo
 
+if test "x$pyver" = "xnone"; then
+	echo "  - (REQUIRED) python >= 3.2: no"
+else
+	echo "  - (REQUIRED) python >= 3.2: yes ($pyver)"
+fi
+
 # Note: This only works for libs with pkg-config integration.
 for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4" "libsigrok >= 0.2.0"; do
-        if `$PKG_CONFIG --exists $lib`; then
-                ver=`$PKG_CONFIG --modversion $lib`
-                answer="yes ($ver)"
-        else
-                answer="no"
-        fi
-        echo "  - $lib: $answer"
+	optional="OPTIONAL"
+	if test "x$lib" = "xglib-2.0 >= 2.24.0"; then optional="REQUIRED"; fi
+	if `$PKG_CONFIG --exists $lib`; then
+		ver=`$PKG_CONFIG --modversion $lib`
+		answer="yes ($ver)"
+	else
+		answer="no"
+	fi
+	echo "  - ($optional) $lib: $answer"
 done
 
 echo
-echo "Detected Python:"
+echo "Enabled features:"
 echo
-echo "  - Python CPPFLAGS: $CPPFLAGS_PYTHON"
-echo "  - Python LDFLAGS: $LDFLAGS_PYTHON"
+echo "  - (OPTIONAL) Library unit test framework support: $have_check"
+echo "  - (OPTIONAL) Protocol decoder test framework support: $build_runtc"
 echo