diff options
author | Holger Weiss <holger@zedat.fu-berlin.de> | 2013-08-19 21:27:12 (GMT) |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2013-08-19 21:27:12 (GMT) |
commit | 26fbe7f1e68bb0c96da32491efcf3696fe6c299b (patch) | |
tree | c4d95289187a64e9c7517bf73d8208026c3d2fb3 /build-aux | |
parent | 5f79e3e9f62ca5487d9881973149136ba1d19d3e (diff) | |
download | monitoring-plugins-26fbe7f1e68bb0c96da32491efcf3696fe6c299b.tar.gz |
Sync with the latest Gnulib code (6f2d632)
Diffstat (limited to 'build-aux')
-rwxr-xr-x | build-aux/config.rpath | 106 | ||||
-rw-r--r-- | build-aux/snippet/_Noreturn.h | 10 | ||||
-rw-r--r-- | build-aux/snippet/arg-nonnull.h (renamed from build-aux/arg-nonnull.h) | 4 | ||||
-rw-r--r-- | build-aux/snippet/c++defs.h (renamed from build-aux/c++defs.h) | 4 | ||||
-rw-r--r-- | build-aux/snippet/warn-on-use.h (renamed from build-aux/warn-on-use.h) | 6 |
5 files changed, 79 insertions, 51 deletions
diff --git a/build-aux/config.rpath b/build-aux/config.rpath index 17298f2..c38b914 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath | |||
@@ -2,7 +2,7 @@ | |||
2 | # Output a system dependent set of variables, describing how to set the | 2 | # Output a system dependent set of variables, describing how to set the |
3 | # run time search path of shared libraries in an executable. | 3 | # run time search path of shared libraries in an executable. |
4 | # | 4 | # |
5 | # Copyright 1996-2010 Free Software Foundation, Inc. | 5 | # Copyright 1996-2013 Free Software Foundation, Inc. |
6 | # Taken from GNU libtool, 2001 | 6 | # Taken from GNU libtool, 2001 |
7 | # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | 7 | # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
8 | # | 8 | # |
@@ -25,7 +25,7 @@ | |||
25 | # known workaround is to choose shorter directory names for the build | 25 | # known workaround is to choose shorter directory names for the build |
26 | # directory and/or the installation directory. | 26 | # directory and/or the installation directory. |
27 | 27 | ||
28 | # All known linkers require a `.a' archive for static linking (except MSVC, | 28 | # All known linkers require a '.a' archive for static linking (except MSVC, |
29 | # which needs '.lib'). | 29 | # which needs '.lib'). |
30 | libext=a | 30 | libext=a |
31 | shrext=.so | 31 | shrext=.so |
@@ -57,13 +57,6 @@ else | |||
57 | aix*) | 57 | aix*) |
58 | wl='-Wl,' | 58 | wl='-Wl,' |
59 | ;; | 59 | ;; |
60 | darwin*) | ||
61 | case $cc_basename in | ||
62 | xlc*) | ||
63 | wl='-Wl,' | ||
64 | ;; | ||
65 | esac | ||
66 | ;; | ||
67 | mingw* | cygwin* | pw32* | os2* | cegcc*) | 60 | mingw* | cygwin* | pw32* | os2* | cegcc*) |
68 | ;; | 61 | ;; |
69 | hpux9* | hpux10* | hpux11*) | 62 | hpux9* | hpux10* | hpux11*) |
@@ -72,9 +65,7 @@ else | |||
72 | irix5* | irix6* | nonstopux*) | 65 | irix5* | irix6* | nonstopux*) |
73 | wl='-Wl,' | 66 | wl='-Wl,' |
74 | ;; | 67 | ;; |
75 | newsos6) | 68 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
76 | ;; | ||
77 | linux* | k*bsd*-gnu) | ||
78 | case $cc_basename in | 69 | case $cc_basename in |
79 | ecc*) | 70 | ecc*) |
80 | wl='-Wl,' | 71 | wl='-Wl,' |
@@ -85,17 +76,26 @@ else | |||
85 | lf95*) | 76 | lf95*) |
86 | wl='-Wl,' | 77 | wl='-Wl,' |
87 | ;; | 78 | ;; |
88 | pgcc | pgf77 | pgf90) | 79 | nagfor*) |
80 | wl='-Wl,-Wl,,' | ||
81 | ;; | ||
82 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
89 | wl='-Wl,' | 83 | wl='-Wl,' |
90 | ;; | 84 | ;; |
91 | ccc*) | 85 | ccc*) |
92 | wl='-Wl,' | 86 | wl='-Wl,' |
93 | ;; | 87 | ;; |
88 | xl* | bgxl* | bgf* | mpixl*) | ||
89 | wl='-Wl,' | ||
90 | ;; | ||
94 | como) | 91 | como) |
95 | wl='-lopt=' | 92 | wl='-lopt=' |
96 | ;; | 93 | ;; |
97 | *) | 94 | *) |
98 | case `$CC -V 2>&1 | sed 5q` in | 95 | case `$CC -V 2>&1 | sed 5q` in |
96 | *Sun\ F* | *Sun*Fortran*) | ||
97 | wl= | ||
98 | ;; | ||
99 | *Sun\ C*) | 99 | *Sun\ C*) |
100 | wl='-Wl,' | 100 | wl='-Wl,' |
101 | ;; | 101 | ;; |
@@ -103,13 +103,24 @@ else | |||
103 | ;; | 103 | ;; |
104 | esac | 104 | esac |
105 | ;; | 105 | ;; |
106 | newsos6) | ||
107 | ;; | ||
108 | *nto* | *qnx*) | ||
109 | ;; | ||
106 | osf3* | osf4* | osf5*) | 110 | osf3* | osf4* | osf5*) |
107 | wl='-Wl,' | 111 | wl='-Wl,' |
108 | ;; | 112 | ;; |
109 | rdos*) | 113 | rdos*) |
110 | ;; | 114 | ;; |
111 | solaris*) | 115 | solaris*) |
112 | wl='-Wl,' | 116 | case $cc_basename in |
117 | f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
118 | wl='-Qoption ld ' | ||
119 | ;; | ||
120 | *) | ||
121 | wl='-Wl,' | ||
122 | ;; | ||
123 | esac | ||
113 | ;; | 124 | ;; |
114 | sunos4*) | 125 | sunos4*) |
115 | wl='-Qoption ld ' | 126 | wl='-Qoption ld ' |
@@ -171,15 +182,14 @@ if test "$with_gnu_ld" = yes; then | |||
171 | fi | 182 | fi |
172 | ;; | 183 | ;; |
173 | amigaos*) | 184 | amigaos*) |
174 | hardcode_libdir_flag_spec='-L$libdir' | 185 | case "$host_cpu" in |
175 | hardcode_minus_L=yes | 186 | powerpc) |
176 | # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports | 187 | ;; |
177 | # that the semantics of dynamic libraries on AmigaOS, at least up | 188 | m68k) |
178 | # to version 4, is to share data among multiple programs linked | 189 | hardcode_libdir_flag_spec='-L$libdir' |
179 | # with the same dynamic library. Since this doesn't match the | 190 | hardcode_minus_L=yes |
180 | # behavior of shared libraries on other platforms, we cannot use | 191 | ;; |
181 | # them. | 192 | esac |
182 | ld_shlibs=no | ||
183 | ;; | 193 | ;; |
184 | beos*) | 194 | beos*) |
185 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 195 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
@@ -198,11 +208,13 @@ if test "$with_gnu_ld" = yes; then | |||
198 | ld_shlibs=no | 208 | ld_shlibs=no |
199 | fi | 209 | fi |
200 | ;; | 210 | ;; |
211 | haiku*) | ||
212 | ;; | ||
201 | interix[3-9]*) | 213 | interix[3-9]*) |
202 | hardcode_direct=no | 214 | hardcode_direct=no |
203 | hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | 215 | hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
204 | ;; | 216 | ;; |
205 | gnu* | linux* | k*bsd*-gnu) | 217 | gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
206 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 218 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
207 | : | 219 | : |
208 | else | 220 | else |
@@ -325,10 +337,14 @@ else | |||
325 | fi | 337 | fi |
326 | ;; | 338 | ;; |
327 | amigaos*) | 339 | amigaos*) |
328 | hardcode_libdir_flag_spec='-L$libdir' | 340 | case "$host_cpu" in |
329 | hardcode_minus_L=yes | 341 | powerpc) |
330 | # see comment about different semantics on the GNU ld section | 342 | ;; |
331 | ld_shlibs=no | 343 | m68k) |
344 | hardcode_libdir_flag_spec='-L$libdir' | ||
345 | hardcode_minus_L=yes | ||
346 | ;; | ||
347 | esac | ||
332 | ;; | 348 | ;; |
333 | bsdi[45]*) | 349 | bsdi[45]*) |
334 | ;; | 350 | ;; |
@@ -342,24 +358,15 @@ else | |||
342 | ;; | 358 | ;; |
343 | darwin* | rhapsody*) | 359 | darwin* | rhapsody*) |
344 | hardcode_direct=no | 360 | hardcode_direct=no |
345 | if test "$GCC" = yes ; then | 361 | if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then |
346 | : | 362 | : |
347 | else | 363 | else |
348 | case $cc_basename in | 364 | ld_shlibs=no |
349 | xlc*) | ||
350 | ;; | ||
351 | *) | ||
352 | ld_shlibs=no | ||
353 | ;; | ||
354 | esac | ||
355 | fi | 365 | fi |
356 | ;; | 366 | ;; |
357 | dgux*) | 367 | dgux*) |
358 | hardcode_libdir_flag_spec='-L$libdir' | 368 | hardcode_libdir_flag_spec='-L$libdir' |
359 | ;; | 369 | ;; |
360 | freebsd1*) | ||
361 | ld_shlibs=no | ||
362 | ;; | ||
363 | freebsd2.2*) | 370 | freebsd2.2*) |
364 | hardcode_libdir_flag_spec='-R$libdir' | 371 | hardcode_libdir_flag_spec='-R$libdir' |
365 | hardcode_direct=yes | 372 | hardcode_direct=yes |
@@ -420,6 +427,8 @@ else | |||
420 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 427 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
421 | hardcode_libdir_separator=: | 428 | hardcode_libdir_separator=: |
422 | ;; | 429 | ;; |
430 | *nto* | *qnx*) | ||
431 | ;; | ||
423 | openbsd*) | 432 | openbsd*) |
424 | if test -f /usr/libexec/ld.so; then | 433 | if test -f /usr/libexec/ld.so; then |
425 | hardcode_direct=yes | 434 | hardcode_direct=yes |
@@ -515,7 +524,12 @@ case "$host_os" in | |||
515 | library_names_spec='$libname$shrext' | 524 | library_names_spec='$libname$shrext' |
516 | ;; | 525 | ;; |
517 | amigaos*) | 526 | amigaos*) |
518 | library_names_spec='$libname.a' | 527 | case "$host_cpu" in |
528 | powerpc*) | ||
529 | library_names_spec='$libname$shrext' ;; | ||
530 | m68k) | ||
531 | library_names_spec='$libname.a' ;; | ||
532 | esac | ||
519 | ;; | 533 | ;; |
520 | beos*) | 534 | beos*) |
521 | library_names_spec='$libname$shrext' | 535 | library_names_spec='$libname$shrext' |
@@ -534,8 +548,6 @@ case "$host_os" in | |||
534 | dgux*) | 548 | dgux*) |
535 | library_names_spec='$libname$shrext' | 549 | library_names_spec='$libname$shrext' |
536 | ;; | 550 | ;; |
537 | freebsd1*) | ||
538 | ;; | ||
539 | freebsd* | dragonfly*) | 551 | freebsd* | dragonfly*) |
540 | case "$host_os" in | 552 | case "$host_os" in |
541 | freebsd[123]*) | 553 | freebsd[123]*) |
@@ -547,6 +559,9 @@ case "$host_os" in | |||
547 | gnu*) | 559 | gnu*) |
548 | library_names_spec='$libname$shrext' | 560 | library_names_spec='$libname$shrext' |
549 | ;; | 561 | ;; |
562 | haiku*) | ||
563 | library_names_spec='$libname$shrext' | ||
564 | ;; | ||
550 | hpux9* | hpux10* | hpux11*) | 565 | hpux9* | hpux10* | hpux11*) |
551 | case $host_cpu in | 566 | case $host_cpu in |
552 | ia64*) | 567 | ia64*) |
@@ -582,7 +597,7 @@ case "$host_os" in | |||
582 | ;; | 597 | ;; |
583 | linux*oldld* | linux*aout* | linux*coff*) | 598 | linux*oldld* | linux*aout* | linux*coff*) |
584 | ;; | 599 | ;; |
585 | linux* | k*bsd*-gnu) | 600 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
586 | library_names_spec='$libname$shrext' | 601 | library_names_spec='$libname$shrext' |
587 | ;; | 602 | ;; |
588 | knetbsd*-gnu) | 603 | knetbsd*-gnu) |
@@ -594,7 +609,7 @@ case "$host_os" in | |||
594 | newsos6) | 609 | newsos6) |
595 | library_names_spec='$libname$shrext' | 610 | library_names_spec='$libname$shrext' |
596 | ;; | 611 | ;; |
597 | nto-qnx*) | 612 | *nto* | *qnx*) |
598 | library_names_spec='$libname$shrext' | 613 | library_names_spec='$libname$shrext' |
599 | ;; | 614 | ;; |
600 | openbsd*) | 615 | openbsd*) |
@@ -625,6 +640,9 @@ case "$host_os" in | |||
625 | sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) | 640 | sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
626 | library_names_spec='$libname$shrext' | 641 | library_names_spec='$libname$shrext' |
627 | ;; | 642 | ;; |
643 | tpf*) | ||
644 | library_names_spec='$libname$shrext' | ||
645 | ;; | ||
628 | uts4*) | 646 | uts4*) |
629 | library_names_spec='$libname$shrext' | 647 | library_names_spec='$libname$shrext' |
630 | ;; | 648 | ;; |
diff --git a/build-aux/snippet/_Noreturn.h b/build-aux/snippet/_Noreturn.h new file mode 100644 index 0000000..c44ad89 --- /dev/null +++ b/build-aux/snippet/_Noreturn.h | |||
@@ -0,0 +1,10 @@ | |||
1 | #if !defined _Noreturn && __STDC_VERSION__ < 201112 | ||
2 | # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ | ||
3 | || 0x5110 <= __SUNPRO_C) | ||
4 | # define _Noreturn __attribute__ ((__noreturn__)) | ||
5 | # elif 1200 <= _MSC_VER | ||
6 | # define _Noreturn __declspec (noreturn) | ||
7 | # else | ||
8 | # define _Noreturn | ||
9 | # endif | ||
10 | #endif | ||
diff --git a/build-aux/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h index 7e3e2db..8ea2a47 100644 --- a/build-aux/arg-nonnull.h +++ b/build-aux/snippet/arg-nonnull.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* A C macro for declaring that specific arguments must not be NULL. | 1 | /* A C macro for declaring that specific arguments must not be NULL. |
2 | Copyright (C) 2009, 2010 Free Software Foundation, Inc. | 2 | Copyright (C) 2009-2013 Free Software Foundation, Inc. |
3 | 3 | ||
4 | This program is free software: you can redistribute it and/or modify it | 4 | This program is free software: you can redistribute it and/or modify it |
5 | under the terms of the GNU General Public License as published | 5 | under the terms of the GNU General Public License as published |
@@ -9,7 +9,7 @@ | |||
9 | This program is distributed in the hope that it will be useful, | 9 | This program is distributed in the hope that it will be useful, |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | Lesser General Public License for more details. | 12 | General Public License for more details. |
13 | 13 | ||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
15 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
diff --git a/build-aux/c++defs.h b/build-aux/snippet/c++defs.h index 0c2fad7..b35b933 100644 --- a/build-aux/c++defs.h +++ b/build-aux/snippet/c++defs.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* C++ compatible function declaration macros. | 1 | /* C++ compatible function declaration macros. |
2 | Copyright (C) 2010 Free Software Foundation, Inc. | 2 | Copyright (C) 2010-2013 Free Software Foundation, Inc. |
3 | 3 | ||
4 | This program is free software: you can redistribute it and/or modify it | 4 | This program is free software: you can redistribute it and/or modify it |
5 | under the terms of the GNU General Public License as published | 5 | under the terms of the GNU General Public License as published |
@@ -9,7 +9,7 @@ | |||
9 | This program is distributed in the hope that it will be useful, | 9 | This program is distributed in the hope that it will be useful, |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | Lesser General Public License for more details. | 12 | General Public License for more details. |
13 | 13 | ||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
15 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
diff --git a/build-aux/warn-on-use.h b/build-aux/snippet/warn-on-use.h index 171e599..1736a1b 100644 --- a/build-aux/warn-on-use.h +++ b/build-aux/snippet/warn-on-use.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* A C macro for emitting warnings if a function is used. | 1 | /* A C macro for emitting warnings if a function is used. |
2 | Copyright (C) 2010 Free Software Foundation, Inc. | 2 | Copyright (C) 2010-2013 Free Software Foundation, Inc. |
3 | 3 | ||
4 | This program is free software: you can redistribute it and/or modify it | 4 | This program is free software: you can redistribute it and/or modify it |
5 | under the terms of the GNU General Public License as published | 5 | under the terms of the GNU General Public License as published |
@@ -9,7 +9,7 @@ | |||
9 | This program is distributed in the hope that it will be useful, | 9 | This program is distributed in the hope that it will be useful, |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | Lesser General Public License for more details. | 12 | General Public License for more details. |
13 | 13 | ||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
15 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
@@ -55,7 +55,7 @@ | |||
55 | rather than issue the nice warning, but the end result of informing | 55 | rather than issue the nice warning, but the end result of informing |
56 | the developer about their portability problem is still achieved): | 56 | the developer about their portability problem is still achieved): |
57 | #if HAVE_RAW_DECL_ENVIRON | 57 | #if HAVE_RAW_DECL_ENVIRON |
58 | static inline char ***rpl_environ (void) { return &environ; } | 58 | static char ***rpl_environ (void) { return &environ; } |
59 | _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); | 59 | _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); |
60 | # undef environ | 60 | # undef environ |
61 | # define environ (*rpl_environ ()) | 61 | # define environ (*rpl_environ ()) |