projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* argz.m4 (gl_FUNC_ARGZ): If we define `error_t', also define
[gnulib.git]
/
m4
/
argz.m4
diff --git
a/m4/argz.m4
b/m4/argz.m4
index
51fe7cd
..
40e836b
100644
(file)
--- a/
m4/argz.m4
+++ b/
m4/argz.m4
@@
-1,13
+1,13
@@
# Portability macros for glibc argz. -*- Autoconf -*-
# Written by Gary V. Vaughan <gary@gnu.org>
# Portability macros for glibc argz. -*- Autoconf -*-
# Written by Gary V. Vaughan <gary@gnu.org>
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005
, 2006
Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial
2
+# serial
4 argz.m4
AC_DEFUN([gl_FUNC_ARGZ],
[gl_PREREQ_ARGZ
AC_DEFUN([gl_FUNC_ARGZ],
[gl_PREREQ_ARGZ
@@
-17,7
+17,9
@@
AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
AC_CHECK_TYPES([error_t],
[],
[AC_DEFINE([error_t], [int],
AC_CHECK_TYPES([error_t],
[],
[AC_DEFINE([error_t], [int],
- [Define to a type to use for `error_t' if it is not otherwise available.])],
+ [Define to a type to use for `error_t' if it is not otherwise available.])
+ AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h
+ does not typedef error_t.])],
[#if defined(HAVE_ARGZ_H)
# include <argz.h>
#endif])
[#if defined(HAVE_ARGZ_H)
# include <argz.h>
#endif])