A better way to avoid link failure for the argmatch test.

diff --git a/ChangeLog b/ChangeLog
index ef5eb8f..a6a3f1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-11-11  Bruno Haible  <bruno@clisp.org>
 
+       * tests/test-argmatch.c (ARGMATCH_DIE): Undefine.
+       (usage): Remove function.
+
+2007-11-11  Bruno Haible  <bruno@clisp.org>
+
        * m4/roundf.m4 (gl_FUNC_ROUNDF): Use gl_FUNC_FLOORF_LIBS and
        gl_FUNC_CEILF_LIBS.
        * m4/round.m4 (gl_FUNC_ROUND): Use gl_FUNC_FLOOR_LIBS and

diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c
index 3d6f968..f6126f6 100644 (file)
--- a/tests/test-argmatch.c
+++ b/tests/test-argmatch.c
@@ -19,6 +19,10 @@
 
 #include <config.h>
 
+/* Some packages define ARGMATCH_DIE in their <config.h>.  Here we want to
+   assume the default definition of ARGMATCH_DIE.  */
+#undef ARGMATCH_DIE
+
 #include "argmatch.h"
 
 #include <stdio.h>
@@ -62,11 +66,6 @@ static const enum backup_type backup_vals[] =
   numbered_backups, numbered_backups, numbered_backups
 };
 
-void
-usage (void)
-{
-}
-
 int
 main (int argc, char *argv[])
 {