Build: Reduce autogen.sh to trivial stub

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9527379c98d9b0f44689d2406f51f45cd9798eeb..fd48ddcf30b00de4d9e64323728149bfe333ed3d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,10 @@ AC_PREREQ([2.63])
 
 # libsigrokdecode package version number (NOT the same as shared lib version!).
 m4_define([srd_package_version_major], [0])
-m4_define([srd_package_version_minor], [3])
+m4_define([srd_package_version_minor], [4])
 m4_define([srd_package_version_micro], [0])
-m4_define([srd_package_version], [srd_package_version_major.srd_package_version_minor.srd_package_version_micro])
+m4_define([srd_package_version_suffix], [-git])
+m4_define([srd_package_version], [srd_package_version_major.srd_package_version_minor.srd_package_version_micro[]srd_package_version_suffix])
 
 AC_INIT([libsigrokdecode], [srd_package_version],
        [sigrok-devel@lists.sourceforge.net], [libsigrokdecode],
@@ -44,7 +45,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 -Wmissing-prototypes -fvisibility=hidden"
+AM_CFLAGS="$AM_CFLAGS -Wall -Wextra -Wmissing-prototypes -fvisibility=hidden"
 
 # Checks for programs.
 AC_PROG_CC
@@ -77,16 +78,13 @@ 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.
 # Note: glib-2.0 is part of the libsigrokdecode API
 # (hard pkg-config requirement).
 AM_PATH_GLIB_2_0([2.24.0],
-        [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
+        [AM_CFLAGS="$AM_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # Python 3 is always needed.
 # Note: We need to try a few different variants, since some systems have a
@@ -125,7 +123,7 @@ AC_SUBST(MODNAME_PYTHON)
 # We also need to find the name of the python3 executable (for 'make install').
 # Some OSes call this python3, some call it python3.2, etc. etc.
 AC_CHECK_PROGS([PYTHON3], [python3.4 python3.3 python3.2 python3])
-if test "x$PYTHON3" == "x"; then
+if test "x$PYTHON3" = "x"; then
        AC_MSG_ERROR([cannot find python3 executable.])
 fi
 
@@ -134,21 +132,11 @@ 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"])
+       [have_check="yes"], [have_check="no"])
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
-# libsigrok is optional (only used for the protocol decoder test framework).
-# Disable if not found.
-PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.3.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_HEADER([sys/resource.h], [], [build_runtc="no"])
 
 AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders")
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
@@ -164,7 +152,7 @@ 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_SUBST(AM_CFLAGS)
 
 AC_CONFIG_FILES([Makefile version.h libsigrokdecode.pc])
 
@@ -189,7 +177,7 @@ else
 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.3.0"; do
+for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4"; do
        optional="OPTIONAL"
        if test "x$lib" = "xglib-2.0 >= 2.24.0"; then optional="REQUIRED"; fi
        if `$PKG_CONFIG --exists $lib`; then
@@ -205,6 +193,5 @@ echo
 echo "Enabled features:"
 echo
 echo "  - (OPTIONAL) Library unit test framework support: $have_check"
-echo "  - (OPTIONAL) Protocol decoder test framework support: $build_runtc"
 echo