init: Simplify srd_decoder_searchpath_add()

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c1704cbb690ca3600a3e1b233c7d9fbdb2807d3b..53e8bc1abb660f57e1d7bb1dce9d253023a9fe18 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
 
@@ -69,7 +76,7 @@ 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])
@@ -95,7 +102,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
@@ -111,6 +118,8 @@ SR_ARG_ENABLE_WARNINGS([SRD_WFLAGS], [-Wall], [-Wall -Wextra -Wmissing-prototype
 SRD_EXTRA_LIBS=
 SR_SEARCH_LIBS([SRD_EXTRA_LIBS], [pow], [m])
 
+AC_SYS_LARGEFILE
+
 ##############################
 ##  Finalize configuration  ##
 ##############################
@@ -120,7 +129,7 @@ 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([TESTS], [$SRD_PKGLIBS_TESTS glib-2.0 $SRD_PKGLIBS])
 
 srd_glib_version=`$PKG_CONFIG --modversion glib-2.0 2>&AS_MESSAGE_LOG_FD`
 
@@ -136,6 +145,11 @@ libsigrokdecode configuration summary:
  - Prefix.......................... $prefix
  - Building on..................... $build
  - Building for.................... $host
+
+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