X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=2d480eed399696fb5e79d88420d1c9236ad34fbe;hb=8eafa2613d2541e934a04874cd35cbc944c3168b;hp=ca387107f8e4e0668ea7ce7f12a59d72e6d89348;hpb=3f5bd4ed85954564b0b6d9819328dbef04d1d3d5;p=libsigrokdecode.git

diff --git a/configure.ac b/configure.ac
index ca38710..2d480ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,9 @@ 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
+build_runtc="yes"
+
 # Checks for libraries.
 
 # libglib-2.0 is always needed.
@@ -86,10 +89,11 @@ 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])
 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
@@ -100,32 +104,33 @@ case "$build" in
 	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])
+	if test x"$have_python3" = xno; then
+		AC_MSG_ERROR([python3 not found])
 	fi
 	;;
 esac
 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
+PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2.0],
+	[LIBSIGROK_CFLAGS="$libsigrok_CFLAGS"; LIBSIGROK_LIBS="$libsigrok_LIBS"],
+	[build_runtc="no"])
+AC_SUBST([LIBSIGROK_CFLAGS])
+AC_SUBST([LIBSIGROK_LIBS])
+
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
-# AC_CHECK_HEADERS([])
+AC_CHECK_HEADER([sys/resource.h], [], [build_runtc="no"])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -156,6 +161,8 @@ AC_SUBST(SRD_PACKAGE_VERSION_MINOR)
 AC_SUBST(SRD_PACKAGE_VERSION_MICRO)
 AC_SUBST(SRD_PACKAGE_VERSION)
 
+AM_CONDITIONAL(BUILD_RUNTC, test x"$build_runtc" = "xyes")
+
 AC_CONFIG_FILES([Makefile
 		 version.h
 		 libsigrokdecode.pc
@@ -173,12 +180,13 @@ 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
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4"; do
+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)"