about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in2
-rw-r--r--stdio-common/bug13.c30
3 files changed, 35 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b13a183ff..5884fca6d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-10-04  Andreas Jaeger  <aj@suse.de>
+
+	* configure.in: Allow makeinfo 4.*.
+
 1999-10-04  Ulrich Drepper  <drepper@cygnus.com>
 
 	* stdio-common/vfprintf.c: Correct last patch and use outchar
diff --git a/configure.in b/configure.in
index 28290d8f3f..3cc31806de 100644
--- a/configure.in
+++ b/configure.in
@@ -500,7 +500,7 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
   [0.[1-9][0-9].* | [1-9].*], MSGFMT=: aux_missing=t)
 AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [GNU texinfo.* \([0-9][0-9.]*\)],
-  [3.1[1-9] | 3.[2-9][0-9] | 1.6[89] | 1.7[0-9]], MAKEINFO=: aux_missing=t)
+  [3.1[1-9] | 3.[2-9][0-9] | 4.* | 1.6[89] | 1.7[0-9]], MAKEINFO=: aux_missing=t)
 
 if test -n "$critic_missing"; then
 AC_MSG_ERROR([
diff --git a/stdio-common/bug13.c b/stdio-common/bug13.c
new file mode 100644
index 0000000000..17b7ff9825
--- /dev/null
+++ b/stdio-common/bug13.c
@@ -0,0 +1,30 @@
+#include <stdio.h>
+
+
+
+int
+main (void)
+{
+  int res = 0;
+  char buf[100];
+
+#define TEST(nr, result, format, args...) \
+  if (sprintf (buf, format, ## args) != result)				      \
+    {									      \
+      printf ("test %d failed\n", nr);					      \
+      res = 1;								      \
+    }
+
+  TEST (1, 2, "%d", -1);
+  TEST (2, 2, "% 2d", 1);
+  TEST (3, 3, "%#x", 1);
+  TEST (4, 2, "%+d", 1);
+  TEST (5, 2, "% d", 1);
+  TEST (6, 2, "%-d", -1);
+  TEST (7, 2, "%- 2d", 1);
+  TEST (8, 3, "%-#x", 1);
+  TEST (9, 2, "%-+d", 1);
+  TEST (10, 2, "%- d", 1);
+
+  return res;
+}