X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=772b984ed6b8cdcda9c496e5443b4fb10c3780e3;hp=c1704cbb690ca3600a3e1b233c7d9fbdb2807d3b;hb=a27981c145cd9a3709673339dc455f3a0d5c3745;hpb=7eb90f2304e10d13281d47d944168fe40a77e6d6

diff --git a/configure.ac b/configure.ac
index c1704cb..772b984 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 AC_PREREQ([2.63])
 
 # libsigrokdecode package version number (NOT the same as shared lib version!).
-AC_INIT([libsigrokdecode], [0.4.0],
+AC_INIT([libsigrokdecode], [0.6.0],
 	[sigrok-devel@lists.sourceforge.net], [libsigrokdecode],
 	[http://www.sigrok.org])
 AC_CONFIG_MACRO_DIR([m4])
@@ -33,9 +33,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall -Werror no-define subdir-objects check-news color-t
 AM_SILENT_RULES([yes])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
-AH_TOP([#ifndef SRD_CONFIG_H
-#define SRD_CONFIG_H    /* To stop multiple inclusions. */])
-AH_BOTTOM([#endif /* SRD_CONFIG_H */])
+AC_CANONICAL_HOST
 
 # Checks for programs.
 AC_PROG_CC
@@ -45,6 +43,15 @@ AC_PROG_LN_S
 # Required for per-target flags or subdir-objects with C sources.
 AM_PROG_CC_C_O
 
+# Set the standard the C library headers should conform to.
+AH_VERBATIM([_POSIX_C_SOURCE], [/* The targeted POSIX standard. */
+#ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+#endif])
+
+# Get compiler versions.
+SR_PROG_VERSION([$CC], [srd_cc_version])
+
 # Initialize libtool.
 LT_INIT
 
@@ -55,7 +62,14 @@ SR_PKG_VERSION_SET([SRD_PACKAGE_VERSION], [AC_PACKAGE_VERSION])
 # Carefully read the libtool docs before updating these numbers!
 # The algorithm for determining which number to change (and how) is nontrivial!
 # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-SR_LIB_VERSION_SET([SRD_LIB_VERSION], [2:0:0])
+# Format: current:revision:age.
+SR_LIB_VERSION_SET([SRD_LIB_VERSION], [4:0:0])
+
+AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"])
+
+# Initialize pkg-config.
+# We require at least 0.22, as "Requires.private" behaviour changed there.
+PKG_PROG_PKG_CONFIG
 
 ############################
 ##  Package dependencies  ##
@@ -69,21 +83,21 @@ PKG_PROG_PKG_CONFIG([0.22])
 # These are used to derive the compiler flags and for the "Requires.private"
 # field in the generated libsigrokdecode.pc file.
 SRD_PKGLIBS=
-SRD_PKGLIBS_CHECK=
+SRD_PKGLIBS_TESTS=
 
 # Keep track of all checked modules so we can list them at the end.
 SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary])
 
 # Python 3 is always needed.
 SR_PKG_CHECK([python3], [SRD_PKGLIBS],
-	[python3 >= 3.2], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2])
+	[python3 >= 3.2], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2])
 AS_IF([test "x$sr_have_python3" = xno],
 	[AC_MSG_ERROR([Cannot find Python 3 development headers.])])
 
 # 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_ARG_VAR([PYTHON3], [Python 3 interpreter])
-AC_CHECK_PROGS([PYTHON3], [python3.4 python3.3 python3.2 python3])
+AC_CHECK_PROGS([PYTHON3], [python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3])
 AS_IF([test "x$PYTHON3" = x],
 	[AC_MSG_ERROR([Cannot find Python 3 interpreter.])])
 
@@ -95,7 +109,7 @@ AS_IF([test "x$PYTHON3" = x],
 SR_PKG_CHECK_SUMMARY([srd_pkglibs_opt_summary])
 
 # The Check unit testing framework is optional. Disable if not found.
-SR_PKG_CHECK([check], [SRD_PKGLIBS_CHECK], [check >= 0.9.4])
+SR_PKG_CHECK([check], [SRD_PKGLIBS_TESTS], [check >= 0.9.4])
 AM_CONDITIONAL([HAVE_CHECK], [test "x$sr_have_check" = xyes])
 
 # Enable the C99 standard if possible, and enforce the use
@@ -105,12 +119,16 @@ SR_CHECK_COMPILE_FLAGS([SRD_EXTRA_CFLAGS], [C99], [-std=c99 -c99 -AC99 -qlanglvl
 SR_CHECK_COMPILE_FLAGS([SRD_EXTRA_CFLAGS], [visibility], [-fvisibility=hidden])
 
 # Select suitable compiler warning flags.
-SR_ARG_ENABLE_WARNINGS([SRD_WFLAGS], [-Wall], [-Wall -Wextra -Wmissing-prototypes])
+SR_ARG_ENABLE_WARNINGS([SRD_WFLAGS], [-Wall], [-Wall -Wextra -Wmissing-prototypes -Wshadow -Wformat=2 -Wno-format-nonliteral -Wfloat-equal])
 
 # Link against libm, this is required (among other things) by Python.
 SRD_EXTRA_LIBS=
 SR_SEARCH_LIBS([SRD_EXTRA_LIBS], [pow], [m])
 
+AC_SYS_LARGEFILE
+
+AC_C_BIGENDIAN
+
 ##############################
 ##  Finalize configuration  ##
 ##############################
@@ -119,11 +137,14 @@ AC_SUBST([SRD_PKGLIBS])
 
 # Retrieve the compile and link flags for all modules combined.
 # Also, bail out at this point if any module dependency is not met.
-PKG_CHECK_MODULES([LIBSIGROKDECODE], [glib-2.0 >= 2.24.0 $SRD_PKGLIBS])
-PKG_CHECK_MODULES([CHECK], [$SRD_PKGLIBS_CHECK glib-2.0 $SRD_PKGLIBS])
+PKG_CHECK_MODULES([LIBSIGROKDECODE], [glib-2.0 >= 2.34 $SRD_PKGLIBS])
+PKG_CHECK_MODULES([TESTS], [$SRD_PKGLIBS_TESTS glib-2.0 $SRD_PKGLIBS])
 
 srd_glib_version=`$PKG_CONFIG --modversion glib-2.0 2>&AS_MESSAGE_LOG_FD`
 
+AC_DEFINE_UNQUOTED([CONF_HOST], ["$host"],
+        [The canonical host libsigrokdecode will run on.])
+
 AC_CONFIG_FILES([Makefile libsigrokdecode.pc])
 
 AC_OUTPUT
@@ -136,11 +157,18 @@ libsigrokdecode configuration summary:
  - Prefix.......................... $prefix
  - Building on..................... $build
  - Building for.................... $host
+ - Building shared / static........ $enable_shared / $enable_static
+
+Compile configuration:
+ - C compiler...................... $CC
+ - C compiler version.............. $srd_cc_version
+ - C compiler flags................ $CFLAGS
  - Additional C compiler flags..... $SRD_EXTRA_CFLAGS
  - C compiler warnings............. $SRD_WFLAGS
+ - Linker flags.................... $LDFLAGS
 
 Detected libraries (required):
- - glib-2.0 >= 2.24.0.............. $srd_glib_version
+ - glib-2.0 >= 2.34................ $srd_glib_version
 $srd_pkglibs_summary
 Detected libraries (optional):
 $srd_pkglibs_opt_summary