Build: Move _POSIX_C_SOURCE definition to config.h

Do not redefine it though when already set, so that it can be
overridden by the user, or indirectly by the compiler settings.

diff --git a/Makefile.am b/Makefile.am
index d685d775e24b6697b5a7f0034feed520bf6af988..953080dcd017cb8656ac2475d4fdb1bebf3a9acf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@
 ACLOCAL_AMFLAGS = -I m4
 GNUMAKEFLAGS = --no-print-directory
 
-AM_CPPFLAGS = -D_POSIX_C_SOURCE=200112L
 AM_CFLAGS = $(SC_EXTRA_CFLAGS) $(SC_WFLAGS) $(SIGROK_CLI_CFLAGS)
 
 bin_PROGRAMS = sigrok-cli

diff --git a/configure.ac b/configure.ac
index 1f925fa1f08402940aa45b1eebfb5be259e923be..7e13190560324b12123f18926051ff83d7870bb0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,16 +31,18 @@ AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.11 -Wall -Werror no-define std-options check-news])
 AM_SILENT_RULES([yes])
 
-AH_TOP([#ifndef SIGROK_CLI_CONFIG_H
-#define SIGROK_CLI_CONFIG_H    /* To stop multiple inclusions. */])
-AH_BOTTOM([#endif /* SIGROK_CLI_CONFIG_H */])
-
 AC_CANONICAL_HOST
 
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 
+# 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], [sc_cc_version])