From: Ralf Wildenhues Date: Sat, 25 Mar 2006 11:05:02 +0000 (+0000) Subject: * libltdl/m4/argz.m4 (gl_FUNC_ARGZ): Sync with gnulib: If we X-Git-Tag: release-2-1b~306 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dccb94d8921538b29f4aab64b462998679e9cba9;p=thirdparty%2Flibtool.git * libltdl/m4/argz.m4 (gl_FUNC_ARGZ): Sync with gnulib: If we define `error_t', also define `__error_t_defined', so argp.h will not typedef the former. --- diff --git a/ChangeLog b/ChangeLog index b070b924e..c2a0ad980 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-25 Ralf Wildenhues + + * libltdl/m4/argz.m4 (gl_FUNC_ARGZ): Sync with gnulib: If we + define `error_t', also define `__error_t_defined', so argp.h + will not typedef the former. + 2006-03-23 Ralf Wildenhues * libltdl/m4/ltdl.m4 (LT_SYS_DLOPEN_DEPLIBS) [ freebsd ] diff --git a/libltdl/m4/argz.m4 b/libltdl/m4/argz.m4 index a98d2aea0..40e836b82 100644 --- a/libltdl/m4/argz.m4 +++ b/libltdl/m4/argz.m4 @@ -1,13 +1,13 @@ # Portability macros for glibc argz. -*- Autoconf -*- # Written by Gary V. Vaughan -# 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. -# serial 3 argz.m4 +# serial 4 argz.m4 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], - [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 #endif])