summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2019-09-22 20:34:09 +0300
committerArnold D. Robbins <arnold@skeeve.com>2019-09-22 20:34:09 +0300
commit779f64fd18d9d8ea09ac60f8fbbc9bb330a0bf33 (patch)
treec4f0924506a5dbbadfb8a01a90be5f62932596ae
parent5e1b2168b2778bf4a03f14455026500db1ce3eac (diff)
parent92a7d2382ca92b2f5fcffb757018223c6ff423f5 (diff)
downloadgawk-feature/better-index.tar.gz
Merge branch 'master' into feature/better-indexfeature/better-index
-rw-r--r--ChangeLog7
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac2
-rw-r--r--m4/ChangeLog5
-rw-r--r--m4/readline.m42
5 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index da29bc23..a76a555f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-09-20 Florian Weimer <fweimer@redhat.com>
+
+ * configure.ac (PRINTF_HAS_F_FORMAT): Include <string.h> for
+ strcmp.
+ (PRINTF_HAS_A_FORMAT): Likewise.
+ * configure: Regenerate.
+
2019-09-17 Arnold D. Robbins <arnold@skeeve.com>
* awkgram.y, commands.y: Upgrade to Bison 3.4.2.
diff --git a/configure b/configure
index ee0bbbfc..8d5d2d21 100755
--- a/configure
+++ b/configure
@@ -10169,6 +10169,7 @@ else
#include <stdio.h>
+#include <string.h>
int main()
{
@@ -10211,6 +10212,7 @@ else
#include <stdio.h>
+#include <string.h>
int main()
{
@@ -10455,6 +10457,8 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
#include <readline/readline.h>
#include <readline/history.h>
diff --git a/configure.ac b/configure.ac
index 7c01f48d..f353cea3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -361,6 +361,7 @@ AC_MSG_CHECKING([for printf %F format])
AC_RUN_IFELSE([
AC_LANG_SOURCE([
#include <stdio.h>
+#include <string.h>
int main()
{
@@ -389,6 +390,7 @@ AC_MSG_CHECKING([for printf %a format])
AC_RUN_IFELSE([
AC_LANG_SOURCE([
#include <stdio.h>
+#include <string.h>
int main()
{
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 6df93c56..a4e8450c 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-10 Florian Weimer <fweimer@redhat.com>
+
+ * readline.m4 (GAWK_CHECK_READLINE): Include <fcntl.h>, <unistd.h>
+ for close, open, dup.
+
2019-06-18 Arnold D. Robbins <arnold@skeeve.com>
* 5.0.1: Release tar ball made.
diff --git a/m4/readline.m4 b/m4/readline.m4
index 5c0bb1ea..12f389bf 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -39,6 +39,8 @@ AC_DEFUN([GAWK_CHECK_READLINE],
AC_TRY_RUN(
dnl source program:
AC_LANG_SOURCE([[#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
#include <readline/readline.h>
#include <readline/history.h>