mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-02-17 15:10:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

* libltdl/m4/argz.m4 (gl_FUNC_ARGZ): Sync with gnulib: If we

Browse Source 
define `error_t', also define `__error_t_defined', so argp.h
will not typedef the former.
This commit is contained in:
Ralf Wildenhues 2006-03-25 11:05:02 +00:00
parent 9e38ec274b
commit dccb94d892
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-03-25 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* 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 <Ralf.Wildenhues@gmx.de>
* libltdl/m4/ltdl.m4 (LT_SYS_DLOPEN_DEPLIBS) [ freebsd ]

8
libltdl/m4/argz.m4
View File

@ -1,13 +1,13 @@
# 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.
# 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 <argz.h>
#endif])