diff --git a/INSTALL b/INSTALL index e82fd21..8865734 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* - Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free -Software Foundation, Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -225,7 +225,7 @@ order to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX 'make' updates targets which have the same timestamps as their + HP-UX 'make' updates targets which have the same time stamps as their prerequisites, which makes it generally unusable when shipped generated files such as 'configure' are involved. Use GNU 'make' instead. diff --git a/Makefile.am b/Makefile.am index 5d9b075..fe9c564 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = gl tap lib plugins plugins-scripts plugins-root @PERLMODS_DIR@ +SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@ EXTRA_DIST = config.rpath \ ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ NEWS \ diff --git a/Makefile.in b/Makefile.in index 14fab66..4ec5c1c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,7 +163,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \ $(top_srcdir)/gl/m4/open-cloexec.m4 \ $(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \ - $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/printf.m4 \ + $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/pid_t.m4 \ + $(top_srcdir)/gl/m4/printf.m4 \ $(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ @@ -176,6 +177,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ + $(top_srcdir)/gl/m4/std-gnu11.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ @@ -193,6 +195,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/time_r.m4 $(top_srcdir)/gl/m4/timegm.m4 \ $(top_srcdir)/gl/m4/ungetc.m4 $(top_srcdir)/gl/m4/unistd_h.m4 \ $(top_srcdir)/gl/m4/unlocked-io.m4 \ + $(top_srcdir)/gl/m4/vararrays.m4 \ $(top_srcdir)/gl/m4/vasnprintf.m4 \ $(top_srcdir)/gl/m4/vasprintf.m4 \ $(top_srcdir)/gl/m4/visibility.m4 \ @@ -266,10 +269,12 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/test.pl.in $(top_srcdir)/build-aux/compile \ - $(top_srcdir)/build-aux/config.guess \ + $(srcdir)/test.pl.in $(top_srcdir)/build-aux/config.guess \ $(top_srcdir)/build-aux/config.rpath \ $(top_srcdir)/build-aux/config.sub \ $(top_srcdir)/build-aux/install-sh \ @@ -277,11 +282,10 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/build-aux/missing \ $(top_srcdir)/build-aux/mkinstalldirs \ $(top_srcdir)/pkg/solaris/pkginfo.in ABOUT-NLS AUTHORS COPYING \ - ChangeLog INSTALL NEWS README THANKS build-aux/compile \ - build-aux/config.guess build-aux/config.rpath \ - build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \ - build-aux/missing build-aux/mkinstalldirs config.rpath \ - mkinstalldirs + ChangeLog INSTALL NEWS README THANKS build-aux/config.guess \ + build-aux/config.rpath build-aux/config.sub \ + build-aux/install-sh build-aux/ltmain.sh build-aux/missing \ + build-aux/mkinstalldirs config.rpath mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -352,8 +356,6 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DBILIBS = @DBILIBS@ DEFS = -DLOCALEDIR=\"$(localedir)\" @@ -373,7 +375,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ EXTRAS = @EXTRAS@ EXTRAS_ROOT = @EXTRAS_ROOT@ @@ -1745,8 +1746,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = $(datadir)/locale -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -1766,7 +1765,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ with_trusted_path = @with_trusted_path@ -SUBDIRS = gl tap lib plugins plugins-scripts plugins-root @PERLMODS_DIR@ +SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@ EXTRA_DIST = config.rpath \ ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ NEWS \ NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \ @@ -1952,6 +1951,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/NEWS b/NEWS index 2b257aa..5ddadf4 100644 --- a/NEWS +++ b/NEWS @@ -1,64 +1,5 @@ This file documents the major additions and syntax changes between releases. -2.4.0 25th Jul 2024 - FIXES - * check_dbi: Compiler warning for uninitialized variable - * check_curl: Initialize pointer before usage - * check_ntp: Initialize intermediate results in any case - * Fixes for -Wsign-compare - * check_tcp: Fixes an error with using the wrong type for a variable - * check_mailq: exit on empty strings and exit early - * check_users: Change option for sanity checking arguments to avoid segfault - * check_users: Update help to properly show that thresholds are ranges - * check_users: fix segfault - * check_dbi: Fix compiler warning for uninitialized variable - * check_curl: Initialize pointer before usage - * check_ntp: Initialize intermediate results in any case - * Fix logic in is_uint64_t to fix type-limit warning - * check_ntp_peer: Fixes for Wmaybe-unitialized and some restructuring - * check_dns: Remove unused variable - * check_ntp_peer: Fixes for Wmaybe-unitialized and some restructuring - * check_dns: Remove unused variable - * check_disk: fix ignore-missing in combination with includes - * check_procs: ignore our own children - * Prevent -lcrypto from showing up in Makefile dependencies - * Change irritating NULL assignment - * check_http: Remove self assignment of a variable and add some comments - * check_snmp: Remove unused variable - * check_dhcp: Make implicit conversion explicit to dismiss warning - * check_http: Remove self assignment of a variable and add some comments - * check_dhcp: Make implicit conversion explicit to dismiss warning - * Ini Parser: Avoid freeing symbols from text section - * check_icmp: keep performance data order in case of none-reachable hosts - * check_swap: Change another fake boolean to a real one - * check_swap: Rename type since *_t is reserved for C standard types - * check_ssh: Fix a typo in "remote-protocol parameter - * check_ssh: Handle non-alpha software versions - * check_ssh: properly parse a delayed version control string - * check_disk: Fail on missing arguments for --warning and --critical and fix a test case - * check_disk: Use new test function for percentage expressions - * check_load: remove unused code - * check_curl/check_http: clarified format of POST data - - ENHANCEMENTS - * Use C99 booleans - * check_mailq: remove trailing whitespaces - * check_mailq: unify tabs/spaces - * check_oracle: Shellcheck fixes - * check_ups: output ups.realpower if supported - * check_disk: add -n short option for --ignore-missing - * check_procs: Improve help text, mentioning excluded processes - * check_procs: Generalise wording, remove mentioning of nrpe - * check_curl: add haproxy protocol option - * Improve negate plugin helptext - * check_disk: increase alert precision - * check_ircd: IPv6 support - * check_nwstat: adds percentage used space - * Add new test function for percentage expressions - * check_swap: Possibility to run check_swap without thresholds - * check_ups: additional alarm conditions - * check_http/check_curl: added a --regex-state option to change the state of a regex check - 2.3.5 18th Oct 2023 FIXES * Include maxfd.h in lib Makefile diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN index 9bcbb73..2453774 100755 --- a/NP-VERSION-GEN +++ b/NP-VERSION-GEN @@ -6,7 +6,7 @@ SRC_ROOT=`dirname $0` NPVF=NP-VERSION-FILE -DEF_VER=2.4.0 +DEF_VER=2.3.5 LF=' ' diff --git a/THANKS b/THANKS index c82bdd6..3376921 100644 --- a/THANKS +++ b/THANKS @@ -2,18 +2,18 @@ This software is brought to you by the Monitoring Plugins Development Team. Howe there have been many contributors to this project. Everyone below has helped in raising bug reports, creating patches or contributing new plugins. -Matthias Hähnel -dag rob?le -Diego Elio Pettenò -Elan Ruusamäe -Thoralf Rickert-Wendt -Aksel Sjögren -fabiodds -Nicolai Søborg Arkadiusz Miśkiewicz -Wolfgang Karall-Ahlborn +dag rob?le Matthias Döhler Marc Sánchez +Wolfgang Karall-Ahlborn +Thoralf Rickert-Wendt +Diego Elio Pettenò +Nicolai Søborg +Elan Ruusamäe +Matthias Hähnel +fabiodds +Aksel Sjögren Randy O'Meara Oskar Ahner Lance Albertson @@ -25,8 +25,8 @@ Felipe Gustavo de Almeida Michael Almond Michael Anthon Bernd Apfel -Paula Arnold Bernd Arnold +Paula Arnold Kondoros Attila Daniel Austin Karol Babioch @@ -89,9 +89,9 @@ Lee Clemens Ben Clewett Jean-Claude Computing Lionel Cons -Charlie Cook -Garry Cook Ollie Cook +Garry Cook +Charlie Cook Luca Corti Greg Cox Jason Crawford @@ -135,8 +135,8 @@ Paulo Fessel James Fidell Tobias Fiebig Roman Fiedler -Bernhard Fischer Johan Fischer +Bernhard Fischer Matthias Flacke Martin Foster Felix Frank @@ -149,12 +149,11 @@ Tim Gates Sven Geggus Jonas Genannt Robby Giffin -Florian Gleixner Flo Gleixner +Florian Gleixner Evgeni Golov Joseph Gooch Aravind Gottipati -Ralph Gottschalkson Kev Green Steve Greenland Roberto Greiner @@ -167,11 +166,10 @@ Sebastien Guay Linda Guo Jon Hallett Steve Hanselman -Jacob Hansen Ask Bjoern Hansen +Jacob Hansen Sebastian Harl Michael Haro -Sven Hartge Olli Hauer Gunnar Hellekson Stuart Henderson @@ -206,7 +204,6 @@ Konstantin Khomoutov Serhan Kiymaz Alexander A. Klimov Denis Knauf -Eric Knibbe Harald Koch Tilman Koschnick John Koyle @@ -250,8 +247,8 @@ Gerardo Malazdrewicz Ricardo Maraschini Michael Markstaller John Marquart -Ernst-Dieter Martin Jason Martin +Ernst-Dieter Martin Christopher Maser Mathieu Masseboeuf Alexander Matey @@ -296,7 +293,6 @@ Remi Paulmier Tom Payerle Nick Peelman Fabian Pehla -Alvar Penning Chris Pepper Matt Perry Matthew Peters @@ -322,7 +318,6 @@ Abid Rasheed Patrick Rauscher Jeremy Reed Spenser Reinhardt -Eunice Remoquillo Marc Remy Alessandro Ren Joe Rhett @@ -330,7 +325,6 @@ Cliff Rice Alain Richard Didi Rieder Steve Rigler -Emmanuel Riviere Josip Rodin Kenny Root Wolfgang Rosenauer @@ -341,13 +335,12 @@ Sascha Runschke Dietmar Ruzicka Ralph Rye Alen Salamun -Louis Sautier Sven Schaffranneck Christoph Schell Thomas Schimpke Benjamin Schmid -Sebastian Schmidt Christian Schmidt +Sebastian Schmidt Henning Schmiedehausen Christian Schneemann Cove Schneider @@ -423,8 +416,8 @@ Shawn Wills Rob Windsor Mario Witte Alexander Wittig -Brian De Wolf Tobias Wolf +Brian De Wolf Eric Wunderlin Patric Wust Jamie Zawinski diff --git a/aclocal.m4 b/aclocal.m4 index 9afcbeb..fcedd2d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.5 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,94 +14,14 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, -[m4_warning([this file was generated for autoconf 2.71. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# build-to-host.m4 serial 3 -dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Written by Bruno Haible. - -dnl When the build environment ($build_os) is different from the target runtime -dnl environment ($host_os), file names may need to be converted from the build -dnl environment syntax to the target runtime environment syntax. This is -dnl because the Makefiles are executed (mostly) by build environment tools and -dnl therefore expect file names in build environment syntax, whereas the runtime -dnl expects file names in target runtime environment syntax. -dnl -dnl For example, if $build_os = cygwin and $host_os = mingw32, filenames need -dnl be converted from Cygwin syntax to native Windows syntax: -dnl /cygdrive/c/foo/bar -> C:\foo\bar -dnl /usr/local/share -> C:\cygwin64\usr\local\share -dnl -dnl gl_BUILD_TO_HOST([somedir]) -dnl This macro takes as input an AC_SUBSTed variable 'somedir', which must -dnl already have its final value assigned, and produces two additional -dnl AC_SUBSTed variables 'somedir_c' and 'somedir_c_make', that designate the -dnl same file name value, just in different syntax: -dnl - somedir_c is the file name in target runtime environment syntax, -dnl as a C string (starting and ending with a double-quote, -dnl and with escaped backslashes and double-quotes in -dnl between). -dnl - somedir_c_make is the same thing, escaped for use in a Makefile. - -AC_DEFUN([gl_BUILD_TO_HOST], -[ - AC_REQUIRE([AC_CANONICAL_BUILD]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_BUILD_TO_HOST_INIT]) - - dnl Define somedir_c. - gl_final_[$1]="$[$1]" - dnl Translate it from build syntax to host syntax. - case "$build_os" in - cygwin*) - case "$host_os" in - mingw* | windows*) - gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;; - esac - ;; - esac - dnl Convert it to C string syntax. - [$1]_c=`printf '%s\n' "$gl_final_[$1]" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"` - [$1]_c='"'"$[$1]_c"'"' - AC_SUBST([$1_c]) - - dnl Define somedir_c_make. - [$1]_c_make=`printf '%s\n' "$[$1]_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"` - dnl Use the substituted somedir variable, when possible, so that the user - dnl may adjust somedir a posteriori when there are no special characters. - if test "$[$1]_c_make" = '\"'"${gl_final_[$1]}"'\"'; then - [$1]_c_make='\"$([$1])\"' - fi - AC_SUBST([$1_c_make]) -]) - -dnl Some initializations for gl_BUILD_TO_HOST. -AC_DEFUN([gl_BUILD_TO_HOST_INIT], -[ - gl_sed_double_backslashes='s/\\/\\\\/g' - gl_sed_escape_doublequotes='s/"/\\"/g' -changequote(,)dnl - gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" -changequote([,])dnl - gl_sed_escape_for_make_2='s,\$,\\$$,g' - dnl Find out how to remove carriage returns from output. Solaris /usr/ucb/tr - dnl does not understand '\r'. - case `echo r | tr -d '\r'` in - '') gl_tr_cr='\015' ;; - *) gl_tr_cr='\r' ;; - esac -]) - -# gettext.m4 serial 78 (gettext-0.22.4) -dnl Copyright (C) 1995-2014, 2016, 2018-2023 Free Software Foundation, Inc. +# gettext.m4 serial 71 (gettext-0.20.2) +dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -122,13 +42,11 @@ dnl Bruno Haible , 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL must be one of 'external', 'use-libtool', 'here'. -dnl INTLSYMBOL should be 'external' for packages other than GNU gettext. -dnl It should be 'use-libtool' for the packages 'gettext-runtime' and -dnl 'gettext-tools'. -dnl It should be 'here' for the package 'gettext-runtime/intl'. -dnl If INTLSYMBOL is 'here', then a libtool library -dnl $(top_builddir)/libintl.la will be created (shared and/or static, +dnl INTLSYMBOL must be one of 'external', 'use-libtool'. +dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and +dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'. +dnl If INTLSYMBOL is 'use-libtool', then a libtool library +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, dnl depending on --{enable,disable}-{shared,static} and on the presence of dnl AM-DISABLE-SHARED). dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext @@ -159,21 +77,24 @@ dnl AC_DEFUN([AM_GNU_GETTEXT], [ dnl Argument checking. - m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , [m4_if([$1], [here], , + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) - m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old], +])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported. ])]) - m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], , + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define([gt_building_libintl_in_same_build_tree], - m4_if([$1], [use-libtool], [yes], [m4_if([$1], [here], [yes], [no])])) + define([gt_included_intl], + ifelse([$1], [external], [no], [yes])) gt_NEEDS_INIT AM_GNU_GETTEXT_NEED([$2]) AC_REQUIRE([AM_PO_SUBDIRS])dnl + ifelse(gt_included_intl, yes, [ + AC_REQUIRE([AM_INTL_SUBDIR])dnl + ]) dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) @@ -183,13 +104,13 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl Ideally we would do this search only after the dnl if test "$USE_NLS" = "yes"; then dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT + dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT dnl the configure script would need to contain the same shell code dnl again, outside any 'if'. There are two solutions: dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it. - m4_if(gt_building_libintl_in_same_build_tree, yes, , [ + ifelse(gt_included_intl, yes, , [ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) @@ -199,7 +120,8 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl Set USE_NLS. AC_REQUIRE([AM_NLS]) - m4_if(gt_building_libintl_in_same_build_tree, yes, [ + ifelse(gt_included_intl, yes, [ + BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no ]) LIBINTL= @@ -218,7 +140,7 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - m4_if(gt_building_libintl_in_same_build_tree, yes, [ + ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], @@ -274,7 +196,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl Sometimes libintl requires libiconv, so first search for libiconv. - m4_if(gt_building_libintl_in_same_build_tree, yes, , [ + ifelse(gt_included_intl, yes, , [ AM_ICONV_LINK ]) dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL @@ -312,16 +234,9 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION ]])], [eval "$gt_func_gnugettext_libintl=yes"], [eval "$gt_func_gnugettext_libintl=no"]) - dnl Now see whether libintl exists and depends on libiconv or other - dnl OS dependent libraries, specifically on macOS and AIX. - gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS" - AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in - aix*) gt_LIBINTL_EXTRA="-lpthread" ;; - esac - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \ - && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then - LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA" + dnl Now see whether libintl exists and depends on libiconv. + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[ @@ -343,8 +258,8 @@ $gt_revision_test_code bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION ]])], - [LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA" - LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA" + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" eval "$gt_func_gnugettext_libintl=yes" ]) fi @@ -359,8 +274,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools \ - && test "$PACKAGE" != libintl; }; then + && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes else dnl Reset the values set by searching for libintl. @@ -369,7 +283,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION INCINTL= fi - m4_if(gt_building_libintl_in_same_build_tree, yes, [ + ifelse(gt_included_intl, yes, [ if test "$gt_use_preinstalled_gnugettext" != "yes"; then dnl GNU gettext is not found in the C library. dnl Fall back on included GNU gettext library. @@ -379,9 +293,10 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. + BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes - LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" - LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi @@ -448,39 +363,25 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION POSUB=po fi - m4_if(gt_building_libintl_in_same_build_tree, yes, [ + ifelse(gt_included_intl, yes, [ + dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes' + dnl because some of the testsuite requires it. + BUILD_INCLUDED_LIBINTL=yes + dnl Make all variables we use known to autoconf. + AC_SUBST([BUILD_INCLUDED_LIBINTL]) AC_SUBST([USE_INCLUDED_LIBINTL]) AC_SUBST([CATOBJEXT]) ]) - m4_if(gt_building_libintl_in_same_build_tree, yes, [], [ - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST([INTLLIBS]) - ]) + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) AC_SUBST([POSUB]) - - dnl Define localedir_c and localedir_c_make. - dnl Find the final value of localedir. - gt_save_prefix="${prefix}" - gt_save_datarootdir="${datarootdir}" - gt_save_localedir="${localedir}" - dnl Unfortunately, prefix gets only finally determined at the end of - dnl configure. - if test "X$prefix" = "XNONE"; then - prefix="$ac_default_prefix" - fi - eval datarootdir="$datarootdir" - eval localedir="$localedir" - gl_BUILD_TO_HOST([localedir]) - localedir="${gt_save_localedir}" - datarootdir="${gt_save_datarootdir}" - prefix="${gt_save_prefix}" ]) @@ -506,8 +407,8 @@ AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version]) AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], []) -# host-cpu-c-abi.m4 serial 17 -dnl Copyright (C) 2002-2024 Free Software Foundation, Inc. +# host-cpu-c-abi.m4 serial 13 +dnl Copyright (C) 2002-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -719,7 +620,7 @@ changequote([,])dnl # be generating 64-bit code. AC_COMPILE_IFELSE( [AC_LANG_SOURCE( - [[#if defined __powerpc64__ || defined __LP64__ + [[#if defined __powerpc64__ || defined _ARCH_PPC64 int ok; #else error fail @@ -890,9 +791,6 @@ EOF #ifndef __ia64__ #undef __ia64__ #endif -#ifndef __loongarch64__ -#undef __loongarch64__ -#endif #ifndef __m68k__ #undef __m68k__ #endif @@ -969,73 +867,224 @@ EOF dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI dnl (application binary interface) is a 32-bit one, to 'no' if it is a 64-bit -dnl one. +dnl one, or to 'unknown' if unknown. dnl This is a simplified variant of gl_HOST_CPU_C_ABI. AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit], - [case "$host_cpu" in + [if test -n "$gl_cv_host_cpu_c_abi"; then + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; + x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; + esac + else + case "$host_cpu" in - # CPUs that only support a 32-bit ABI. - arc \ - | bfin \ - | cris* \ - | csky \ - | epiphany \ - | ft32 \ - | h8300 \ - | m68k \ - | microblaze | microblazeel \ - | nds32 | nds32le | nds32be \ - | nios2 | nios2eb | nios2el \ - | or1k* \ - | or32 \ - | sh | sh[1234] | sh[1234]e[lb] \ - | tic6x \ - | xtensa* ) - gl_cv_host_cpu_c_abi_32bit=yes - ;; + # CPUs that only support a 32-bit ABI. + arc \ + | bfin \ + | cris* \ + | csky \ + | epiphany \ + | ft32 \ + | h8300 \ + | m68k \ + | microblaze | microblazeel \ + | nds32 | nds32le | nds32be \ + | nios2 | nios2eb | nios2el \ + | or1k* \ + | or32 \ + | sh | sh[1234] | sh[1234]e[lb] \ + | tic6x \ + | xtensa* ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; - # CPUs that only support a 64-bit ABI. + # CPUs that only support a 64-bit ABI. changequote(,)dnl - alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ - | mmix ) + alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ + | mmix ) changequote([,])dnl - gl_cv_host_cpu_c_abi_32bit=no - ;; + gl_cv_host_cpu_c_abi_32bit=no + ;; - *) - if test -n "$gl_cv_host_cpu_c_abi"; then - dnl gl_HOST_CPU_C_ABI has already been run. Use its result. - case "$gl_cv_host_cpu_c_abi" in - i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) - gl_cv_host_cpu_c_abi_32bit=yes ;; - x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) - gl_cv_host_cpu_c_abi_32bit=no ;; - *) - gl_cv_host_cpu_c_abi_32bit=unknown ;; - esac - else - gl_cv_host_cpu_c_abi_32bit=unknown - fi - if test $gl_cv_host_cpu_c_abi_32bit = unknown; then +changequote(,)dnl + i[34567]86 ) +changequote([,])dnl + gl_cv_host_cpu_c_abi_32bit=yes + ;; + + x86_64 ) + # On x86_64 systems, the C compiler may be generating code in one of + # these ABIs: + # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64. + # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64 + # with native Windows (mingw, MSVC). + # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386. AC_COMPILE_IFELSE( [AC_LANG_SOURCE( - [[int test_pointer_size[sizeof (void *) - 5]; + [[#if (defined __x86_64__ || defined __amd64__ \ + || defined _M_X64 || defined _M_AMD64) \ + && !(defined __ILP32__ || defined _ILP32) + int ok; + #else + error fail + #endif ]])], [gl_cv_host_cpu_c_abi_32bit=no], [gl_cv_host_cpu_c_abi_32bit=yes]) - fi - ;; - esac + ;; + + arm* | aarch64 ) + # Assume arm with EABI. + # On arm64 systems, the C compiler may be generating code in one of + # these ABIs: + # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64. + # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32) + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + hppa1.0 | hppa1.1 | hppa2.0* | hppa64 ) + # On hppa, the C compiler may be generating 32-bit code or 64-bit + # code. In the latter case, it defines _LP64 and __LP64__. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef __LP64__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + ia64* ) + # On ia64 on HP-UX, the C compiler may be generating 64-bit code or + # 32-bit code. In the latter case, it defines _ILP32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef _ILP32 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=yes], + [gl_cv_host_cpu_c_abi_32bit=no]) + ;; + + mips* ) + # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this + # at 32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64) + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + powerpc* ) + # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD. + # No need to distinguish them here; the caller may distinguish + # them based on the OS. + # On powerpc64 systems, the C compiler may still be generating + # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may + # be generating 64-bit code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __powerpc64__ || defined _ARCH_PPC64 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + rs6000 ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; + + riscv32 | riscv64 ) + # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. + # Size of 'long' and 'void *': + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + s390* ) + # On s390x, the C compiler may be generating 64-bit (= s390x) code + # or 31-bit (= s390) code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ || defined __s390x__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + sparc | sparc64 ) + # UltraSPARCs running Linux have `uname -m` = "sparc64", but the + # C compiler still generates 32-bit code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __sparcv9 || defined __arch64__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi_32bit=no], + [gl_cv_host_cpu_c_abi_32bit=yes]) + ;; + + *) + gl_cv_host_cpu_c_abi_32bit=unknown + ;; + esac + fi ]) HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit" ]) -# iconv.m4 serial 27 -dnl Copyright (C) 2000-2002, 2007-2014, 2016-2024 Free Software Foundation, +# iconv.m4 serial 21 +dnl Copyright (C) 2000-2002, 2007-2014, 2016-2020 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -1043,12 +1092,6 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -AC_PREREQ([2.64]) - -dnl Note: AM_ICONV is documented in the GNU gettext manual -dnl . -dnl Don't make changes that are incompatible with that documentation! - AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], [ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. @@ -1074,7 +1117,7 @@ AC_DEFUN([AM_ICONV_LINK], dnl because if the user has installed libiconv and not disabled its use dnl via --without-libiconv-prefix, he wants to use it. The first dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. - gl_saved_CPPFLAGS="$CPPFLAGS" + am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ @@ -1091,7 +1134,7 @@ AC_DEFUN([AM_ICONV_LINK], iconv_close(cd);]])], [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then - gl_saved_LIBS="$LIBS" + am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -1104,14 +1147,14 @@ AC_DEFUN([AM_ICONV_LINK], iconv_close(cd);]])], [am_cv_lib_iconv=yes] [am_cv_func_iconv=yes]) - LIBS="$gl_saved_LIBS" + LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, dnl Solaris 10. - gl_saved_LIBS="$LIBS" + am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi @@ -1128,9 +1171,8 @@ AC_DEFUN([AM_ICONV_LINK], #endif ]], [[int result = 0; - /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from - successful returns. This is even documented in - */ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) @@ -1241,7 +1283,7 @@ AC_DEFUN([AM_ICONV_LINK], esac]) test "$am_cv_func_iconv_works" = no || break done - LIBS="$gl_saved_LIBS" + LIBS="$am_save_LIBS" ]) case "$am_cv_func_iconv_works" in *no) am_func_iconv=no am_cv_lib_iconv=no ;; @@ -1260,7 +1302,7 @@ AC_DEFUN([AM_ICONV_LINK], else dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV dnl either. - CPPFLAGS="$gl_saved_CPPFLAGS" + CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= LTLIBICONV= fi @@ -1268,68 +1310,70 @@ AC_DEFUN([AM_ICONV_LINK], AC_SUBST([LTLIBICONV]) ]) -dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like +dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to +dnl avoid warnings like dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". -AC_DEFUN_ONCE([AM_ICONV], +dnl This is tricky because of the way 'aclocal' is implemented: +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. +dnl Otherwise aclocal's initial scan pass would miss the macro definition. +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. +dnl Otherwise aclocal would emit many "Use of uninitialized value $1" +dnl warnings. +m4_define([gl_iconv_AC_DEFUN], + m4_version_prereq([2.64], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [m4_ifdef([gl_00GNULIB], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [[AC_DEFUN( + [$1], [$2])]])])) +gl_iconv_AC_DEFUN([AM_ICONV], [ AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then - AC_CACHE_CHECK([whether iconv is compatible with its POSIX signature], - [gl_cv_iconv_nonconst], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL([am_cv_proto_iconv], [ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ #include #include extern #ifdef __cplusplus "C" #endif +#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); - ]], - [[]])], - [gl_cv_iconv_nonconst=yes], - [gl_cv_iconv_nonconst=no]) - ]) +#else +size_t iconv(); +#endif + ]], + [[]])], + [am_cv_proto_iconv_arg1=""], + [am_cv_proto_iconv_arg1="const"]) + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + AC_MSG_RESULT([ + $am_cv_proto_iconv]) else dnl When compiling GNU libiconv on a system that does not have iconv yet, dnl pick the POSIX compliant declaration without 'const'. - gl_cv_iconv_nonconst=yes + am_cv_proto_iconv_arg1="" fi - if test $gl_cv_iconv_nonconst = yes; then - iconv_arg1="" - else - iconv_arg1="const" - fi - AC_DEFINE_UNQUOTED([ICONV_CONST], [$iconv_arg1], + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) dnl Also substitute ICONV_CONST in the gnulib generated . m4_ifdef([gl_ICONV_H_DEFAULTS], [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) - if test $gl_cv_iconv_nonconst != yes; then + if test -n "$am_cv_proto_iconv_arg1"; then ICONV_CONST="const" fi ]) - - dnl A summary result, for those packages which want to print a summary at the - dnl end of the configuration. - if test "$am_func_iconv" = yes; then - if test -n "$LIBICONV"; then - am_cv_func_iconv_summary='yes, in libiconv' - else - am_cv_func_iconv_summary='yes, in libc' - fi - else - if test "$am_cv_func_iconv" = yes; then - am_cv_func_iconv_summary='not working, consider installing GNU libiconv' - else - am_cv_func_iconv_summary='no, consider installing GNU libiconv' - fi - fi ]) -# intlmacosx.m4 serial 10 (gettext-0.23) -dnl Copyright (C) 2004-2014, 2016, 2019-2024 Free Software Foundation, Inc. +# intlmacosx.m4 serial 8 (gettext-0.20.2) +dnl Copyright (C) 2004-2014, 2016, 2019-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1350,7 +1394,7 @@ AC_DEFUN([gt_INTL_MACOSX], dnl Check for API introduced in Mac OS X 10.4. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], [gt_cv_func_CFPreferencesCopyAppValue], - [gt_saved_LIBS="$LIBS" + [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -1358,7 +1402,7 @@ AC_DEFUN([gt_INTL_MACOSX], [[CFPreferencesCopyAppValue(NULL, NULL)]])], [gt_cv_func_CFPreferencesCopyAppValue=yes], [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_saved_LIBS"]) + LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) @@ -1373,7 +1417,7 @@ AC_DEFUN([gt_INTL_MACOSX], dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the dnl first among the preferred languages and CC is the territory. AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages], - [gt_saved_LIBS="$LIBS" + [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -1381,7 +1425,7 @@ AC_DEFUN([gt_INTL_MACOSX], [[CFLocaleCopyPreferredLanguages();]])], [gt_cv_func_CFLocaleCopyPreferredLanguages=yes], [gt_cv_func_CFLocaleCopyPreferredLanguages=no]) - LIBS="$gt_saved_LIBS"]) + LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1], [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.]) @@ -1389,17 +1433,13 @@ AC_DEFUN([gt_INTL_MACOSX], INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then - dnl Starting with macOS version 14, CoreFoundation relies on CoreServices, - dnl and we have to link it in explicitly, otherwise an exception - dnl NSInvalidArgumentException "unrecognized selector sent to instance" - dnl occurs. - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" fi AC_SUBST([INTL_MACOSX_LIBS]) ]) -# lib-ld.m4 serial 13 -dnl Copyright (C) 1996-2003, 2009-2024 Free Software Foundation, Inc. +# lib-ld.m4 serial 9 +dnl Copyright (C) 1996-2003, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1429,7 +1469,7 @@ AC_DEFUN([AC_LIB_PROG_LD], AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([[--with-gnu-ld]], + [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld [default=no]])], [test "$withval" = no || with_gnu_ld=yes], [with_gnu_ld=no])dnl @@ -1467,7 +1507,7 @@ else if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. case $host in - *-*-mingw* | windows*) + *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) @@ -1497,9 +1537,9 @@ else fi if test -n "$ac_prog"; then # Search for $ac_prog in $PATH. - acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$acl_saved_IFS" + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" @@ -1516,13 +1556,13 @@ else esac fi done - IFS="$acl_saved_IFS" + IFS="$acl_save_ifs" fi case $host in *-*-aix*) AC_COMPILE_IFELSE( [AC_LANG_SOURCE( - [[#if defined __powerpc64__ || defined __LP64__ + [[#if defined __powerpc64__ || defined _ARCH_PPC64 int ok; #else error fail @@ -1567,8 +1607,8 @@ fi AC_LIB_PROG_LD_GNU ]) -# lib-link.m4 serial 34 -dnl Copyright (C) 2001-2024 Free Software Foundation, Inc. +# lib-link.m4 serial 31 +dnl Copyright (C) 2001-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1638,11 +1678,11 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, dnl because if the user has installed lib[]Name and not disabled its use dnl via --without-lib[]Name-prefix, he wants to use it. - acl_saved_CPPFLAGS="$CPPFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - acl_saved_LIBS="$LIBS" + ac_save_LIBS="$LIBS" dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, dnl because these -l options might require -L options that are present in dnl LIBS. -l options benefit only from the -L options listed before it. @@ -1658,7 +1698,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [AC_LANG_PROGRAM([[$3]], [[$4]])], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) - LIBS="$acl_saved_LIBS" + LIBS="$ac_save_LIBS" ]) if test "$ac_cv_lib[]Name" = yes; then HAVE_LIB[]NAME=yes @@ -1669,7 +1709,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], HAVE_LIB[]NAME=no dnl If $LIB[]NAME didn't lead to a usable library, we don't need dnl $INC[]NAME either. - CPPFLAGS="$acl_saved_CPPFLAGS" + CPPFLAGS="$ac_save_CPPFLAGS" LIB[]NAME= LTLIB[]NAME= LIB[]NAME[]_PREFIX= @@ -1765,8 +1805,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" ]) AC_ARG_WITH(PACK[-prefix], -[[ --with-]]PACK[[-prefix[=DIR] search for ]]PACKLIBS[[ in DIR/include and DIR/lib - --without-]]PACK[[-prefix don't search for ]]PACKLIBS[[ in includedir and libdir]], +[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -1793,7 +1833,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], additional_libdir3= fi dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Use breadth-first search. + dnl $LDFLAGS. Using breadth-first-seach. LIB[]NAME= LTLIB[]NAME= INC[]NAME= @@ -2106,12 +2146,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl Read the .la file. It defines the variables dnl dlname, library_names, old_library, dependency_libs, current, dnl age, revision, installed, dlopen, dlpreopen, libdir. - saved_libdir="$libdir" + save_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$saved_libdir" + libdir="$save_libdir" dnl We use only dependency_libs. for dep in $dependency_libs; do case "$dep" in @@ -2200,20 +2240,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], ;; -l*) dnl Handle this in the next round. - dnl But on GNU systems, ignore -lc options, because - dnl - linking with libc is the default anyway, - dnl - linking with libc.a may produce an error - dnl "/usr/bin/ld: dynamic STT_GNU_IFUNC symbol `strcmp' with pointer equality in `/usr/lib/libc.a(strcmp.o)' can not be used when making an executable; recompile with -fPIE and relink with -pie" - dnl or may produce an executable that always crashes, see - dnl . - dep=`echo "X$dep" | sed -e 's/^X-l//'` - if test "X$dep" != Xc \ - || case $host_os in - linux* | gnu* | k*bsd*-gnu) false ;; - *) true ;; - esac; then - names_next_round="$names_next_round $dep" - fi + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; *.la) dnl Handle this in the next round. Throw away the .la's @@ -2251,18 +2278,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. - acl_saved_libdir="$libdir" + acl_save_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_saved_libdir" + libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" else dnl The -rpath options are cumulative. for found_dir in $rpathdirs; do - acl_saved_libdir="$libdir" + acl_save_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_saved_libdir" + libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" done fi @@ -2359,18 +2386,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], for dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" done - acl_saved_libdir="$libdir" + acl_save_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_saved_libdir" + libdir="$acl_save_libdir" $1="$flag" else dnl The -rpath options are cumulative. for dir in $rpathdirs; do - acl_saved_libdir="$libdir" + acl_save_libdir="$libdir" libdir="$dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_saved_libdir" + libdir="$acl_save_libdir" $1="${$1}${$1:+ }$flag" done fi @@ -2381,8 +2408,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], AC_SUBST([$1]) ]) -# lib-prefix.m4 serial 22 -dnl Copyright (C) 2001-2005, 2008-2024 Free Software Foundation, Inc. +# lib-prefix.m4 serial 17 +dnl Copyright (C) 2001-2005, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -2509,10 +2536,10 @@ AC_DEFUN([AC_LIB_PREPARE_PREFIX], else acl_final_exec_prefix="$exec_prefix" fi - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_saved_prefix" + prefix="$acl_save_prefix" ]) dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the @@ -2520,13 +2547,13 @@ dnl variables prefix and exec_prefix bound to the values they will have dnl at the end of the configure script. AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], [ - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" $1 - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" ]) dnl AC_LIB_PREPARE_MULTILIB creates @@ -2557,14 +2584,14 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB], AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf], [AC_EGREP_CPP([Extensible Linking Format], - [#if defined __ELF__ || (defined __linux__ && defined __EDG__) + [#ifdef __ELF__ Extensible Linking Format #endif ], [gl_cv_elf=yes], [gl_cv_elf=no]) - ]) - if test $gl_cv_elf = yes; then + ]) + if test $gl_cv_elf; then # Extract the ELF class of a file (5th byte) in decimal. # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header if od -A x < /dev/null >/dev/null 2>/dev/null; then @@ -2581,23 +2608,20 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB], echo } fi - # Use 'expr', not 'test', to compare the values of func_elfclass, because on - # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002, - # not 1 or 2. changequote(,)dnl case $HOST_CPU_C_ABI_32BIT in yes) # 32-bit ABI. acl_is_expected_elfclass () { - expr "`func_elfclass | sed -e 's/[ ]//g'`" = 1 > /dev/null + test "`func_elfclass | sed -e 's/[ ]//g'`" = 1 } ;; no) # 64-bit ABI. acl_is_expected_elfclass () { - expr "`func_elfclass | sed -e 's/[ ]//g'`" = 2 > /dev/null + test "`func_elfclass | sed -e 's/[ ]//g'`" = 2 } ;; *) @@ -2639,15 +2663,6 @@ changequote([,])dnl esac fi ;; - netbsd*) - dnl On NetBSD/sparc64, there is a 'sparc' subdirectory that contains - dnl 32-bit libraries. - if test $HOST_CPU_C_ABI_32BIT != no; then - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparc ;; - esac - fi - ;; *) dnl If $CC generates code for a 32-bit ABI, the libraries are dnl surely under $prefix/lib or $prefix/lib32, not $prefix/lib64. @@ -2672,7 +2687,7 @@ changequote([,])dnl fi fi if test -n "$searchpath"; then - acl_saved_IFS="${IFS= }"; IFS=":" + acl_save_IFS="${IFS= }"; IFS=":" for searchdir in $searchpath; do if test -d "$searchdir"; then case "$searchdir" in @@ -2689,7 +2704,7 @@ changequote([,])dnl esac fi done - IFS="$acl_saved_IFS" + IFS="$acl_save_IFS" if test $HOST_CPU_C_ABI_32BIT = yes; then # 32-bit ABI. acl_libdirstem3= @@ -2715,7 +2730,7 @@ changequote([,])dnl ]) # nls.m4 serial 6 (gettext-0.20.2) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2024 Free +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2020 Free dnl Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -2747,9 +2762,8 @@ AC_DEFUN([AM_NLS], AC_SUBST([USE_NLS]) ]) -# po.m4 serial 32 (gettext-0.21.1) -dnl Copyright (C) 1995-2014, 2016, 2018-2022, 2024 Free Software Foundation, -dnl Inc. +# po.m4 serial 31 (gettext-0.20.2) +dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -2929,9 +2943,7 @@ changequote([,])dnl # presentlang can be used as a fallback for messages # which are not translated in the desiredlang catalog). case "$desiredlang" in - "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*) - useit=yes - ;; + "$presentlang"*) useit=yes;; esac done if test $useit = yes; then @@ -3131,9 +3143,7 @@ changequote([,])dnl # presentlang can be used as a fallback for messages # which are not translated in the desiredlang catalog). case "$desiredlang" in - "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*) - useit=yes - ;; + "$presentlang"*) useit=yes;; esac done if test $useit = yes; then @@ -3203,8 +3213,8 @@ AC_DEFUN([AM_XGETTEXT_OPTION], XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" ]) -# progtest.m4 serial 10 (gettext-0.23) -dnl Copyright (C) 1996-2003, 2005, 2008-2024 Free Software Foundation, Inc. +# progtest.m4 serial 8 (gettext-0.20.2) +dnl Copyright (C) 1996-2003, 2005, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -3221,7 +3231,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper , 1996. -AC_PREREQ([2.53]) +AC_PREREQ([2.50]) # Search path for a program which passes the given test. @@ -3265,9 +3275,9 @@ AC_CACHE_VAL([ac_cv_path_$1], ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; *) - gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in m4_if([$5], , $PATH, [$5]); do - IFS="$gt_saved_IFS" + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in ifelse([$5], , $PATH, [$5]); do + IFS="$ac_save_IFS" test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then @@ -3279,15 +3289,15 @@ AC_CACHE_VAL([ac_cv_path_$1], fi done done - IFS="$gt_saved_IFS" + IFS="$ac_save_IFS" dnl If no 4th arg is given, leave the cache variable unset, dnl so AC_PATH_PROGS will keep looking. -m4_if([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ])dnl ;; esac])dnl $1="$ac_cv_path_$1" -if test m4_if([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then AC_MSG_RESULT([$][$1]) else AC_MSG_RESULT([no]) @@ -3295,7 +3305,7 @@ fi AC_SUBST([$1])dnl ]) -# Copyright (C) 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3310,7 +3320,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.5], [], +m4_if([$1], [1.16.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -3326,14 +3336,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.5])dnl +[AM_AUTOMAKE_VERSION([1.16.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3385,7 +3395,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_COND_IF -*- Autoconf -*- -# Copyright (C) 2008-2021 Free Software Foundation, Inc. +# Copyright (C) 2008-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3422,7 +3432,7 @@ fi[]dnl # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3453,7 +3463,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3644,7 +3654,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3712,7 +3722,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3740,10 +3750,6 @@ m4_defn([AC_PROG_CC]) # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl -m4_ifdef([_$0_ALREADY_INIT], - [m4_fatal([$0 expanded multiple times -]m4_defn([_$0_ALREADY_INIT]))], - [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -3780,7 +3786,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -3832,20 +3838,6 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -# Variables for tags utilities; see am/tags.am -if test -z "$CTAGS"; then - CTAGS=ctags -fi -AC_SUBST([CTAGS]) -if test -z "$ETAGS"; then - ETAGS=etags -fi -AC_SUBST([ETAGS]) -if test -z "$CSCOPE"; then - CSCOPE=cscope -fi -AC_SUBST([CSCOPE]) - AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -3927,7 +3919,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3948,7 +3940,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2021 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3970,7 +3962,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4005,7 +3997,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4048,7 +4040,7 @@ AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4082,7 +4074,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4111,7 +4103,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4158,7 +4150,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4177,7 +4169,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4258,7 +4250,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2021 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4318,7 +4310,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4346,7 +4338,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2021 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4365,7 +4357,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2021 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -4599,6 +4591,7 @@ m4_include([gl/m4/open-cloexec.m4]) m4_include([gl/m4/open-slash.m4]) m4_include([gl/m4/open.m4]) m4_include([gl/m4/pathmax.m4]) +m4_include([gl/m4/pid_t.m4]) m4_include([gl/m4/printf.m4]) m4_include([gl/m4/pthread_rwlock_rdlock.m4]) m4_include([gl/m4/realloc.m4]) @@ -4617,6 +4610,7 @@ m4_include([gl/m4/sockpfaf.m4]) m4_include([gl/m4/ssize_t.m4]) m4_include([gl/m4/stat-time.m4]) m4_include([gl/m4/stat.m4]) +m4_include([gl/m4/std-gnu11.m4]) m4_include([gl/m4/stdalign.m4]) m4_include([gl/m4/stddef_h.m4]) m4_include([gl/m4/stdint.m4]) @@ -4641,6 +4635,7 @@ m4_include([gl/m4/timegm.m4]) m4_include([gl/m4/ungetc.m4]) m4_include([gl/m4/unistd_h.m4]) m4_include([gl/m4/unlocked-io.m4]) +m4_include([gl/m4/vararrays.m4]) m4_include([gl/m4/vasnprintf.m4]) m4_include([gl/m4/vasprintf.m4]) m4_include([gl/m4/visibility.m4]) diff --git a/build-aux/compile b/build-aux/compile deleted file mode 100755 index df363c8..0000000 --- a/build-aux/compile +++ /dev/null @@ -1,348 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2018-03-07.03; # UTC - -# Copyright (C) 1999-2021 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN* | MSYS*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" -# time-stamp-end: "; # UTC" -# End: diff --git a/build-aux/config.guess b/build-aux/config.guess index 7f76b62..f50dcdb 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -# shellcheck disable=SC2006,SC2268 # see below for rationale - -timestamp='2022-01-09' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -29,19 +27,11 @@ timestamp='2022-01-09' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . -# The "shellcheck disable" line above the timestamp inhibits complaints -# about features and limitations of the classic Bourne shell that were -# superseded or lifted in POSIX. However, this script identifies a wide -# variety of pre-POSIX systems that do not have POSIX shells at all, and -# even some reasonably current systems (Solaris 10 as case-in-point) still -# have a pre-POSIX /bin/sh. - - me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -60,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -94,8 +84,7 @@ if test $# != 0; then exit 1 fi -# Just in case it came from the environment. -GUESS= +trap 'exit 1' 1 2 15 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -107,90 +96,73 @@ GUESS= # Portable tmp directory creation inspired by the Autoconf team. -tmp= -# shellcheck disable=SC2172 -trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 - -set_cc_for_build() { - # prevent multiple calls if $tmp is already set - test "$tmp" && return 0 - : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039,SC3028 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } - dummy=$tmp/dummy - case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in - ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c89 c99 ; do - if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD=$driver - break - fi - done - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; - esac -} +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > "$dummy.c" ; + for c in cc gcc c89 c99 ; do + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if test -f /.attbin/uname ; then +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case $UNAME_SYSTEM in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) - LIBC=unknown + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu - set_cc_for_build + eval "$set_cc_for_build" cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #elif defined(__GLIBC__) - LIBC=gnu #else - #include - /* First heuristic to detect musl libc. */ - #ifdef __DEFINED_va_list - LIBC=musl - #endif + LIBC=gnu #endif EOF - cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` - eval "$cc_set_libc" + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" - # Second heuristic to detect musl libc. - if [ "$LIBC" = unknown ] && - command -v ldd >/dev/null && - ldd --version 2>&1 | grep -q ^musl; then - LIBC=musl - fi - - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - if [ "$LIBC" = unknown ]; then - LIBC=gnu + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl fi ;; esac # Note: order is significant - the case branches are not exclusive. -case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -202,12 +174,12 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ - /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case $UNAME_MACHINE_ARCH in - aarch64eb) machine=aarch64_be-unknown ;; + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -216,18 +188,18 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + machine="${arch}${endian}"-unknown ;; - *) machine=$UNAME_MACHINE_ARCH-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case $UNAME_MACHINE_ARCH in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -243,7 +215,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in ;; esac # Determine ABI tags. - case $UNAME_MACHINE_ARCH in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -254,7 +226,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case $UNAME_VERSION in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; @@ -265,57 +237,45 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - GUESS=$machine-${os}${release}${abi-} - ;; + echo "$machine-${os}${release}${abi}" + exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE - ;; - *:SecBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; *:MidnightBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" + exit ;; *:ekkoBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" + exit ;; *:SolidBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE - ;; - *:OS108:*:*) - GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) - GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE - ;; + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" + exit ;; *:MirBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" + exit ;; *:Sortix:*:*) - GUESS=$UNAME_MACHINE-unknown-sortix - ;; - *:Twizzler:*:*) - GUESS=$UNAME_MACHINE-unknown-twizzler - ;; + echo "$UNAME_MACHINE"-unknown-sortix + exit ;; *:Redox:*:*) - GUESS=$UNAME_MACHINE-unknown-redox - ;; + echo "$UNAME_MACHINE"-unknown-redox + exit ;; mips:OSF1:*.*) - GUESS=mips-dec-osf1 - ;; + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -329,7 +289,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case $ALPHA_CPU_TYPE in + case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -366,121 +326,117 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - GUESS=$UNAME_MACHINE-dec-osf$OSF_REL - ;; + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Amiga*:UNIX_System_V:4.0:*) - GUESS=m68k-unknown-sysv4 - ;; + echo m68k-unknown-sysv4 + exit ;; *:[Aa]miga[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-amigaos - ;; + echo "$UNAME_MACHINE"-unknown-amigaos + exit ;; *:[Mm]orph[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-morphos - ;; + echo "$UNAME_MACHINE"-unknown-morphos + exit ;; *:OS/390:*:*) - GUESS=i370-ibm-openedition - ;; + echo i370-ibm-openedition + exit ;; *:z/VM:*:*) - GUESS=s390-ibm-zvmoe - ;; + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) - GUESS=powerpc-ibm-os400 - ;; + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - GUESS=arm-acorn-riscix$UNAME_RELEASE - ;; + echo arm-acorn-riscix"$UNAME_RELEASE" + exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - GUESS=arm-unknown-riscos - ;; + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - GUESS=hppa1.1-hitachi-hiuxmpp - ;; + echo hppa1.1-hitachi-hiuxmpp + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - case `(/bin/universe) 2>/dev/null` in - att) GUESS=pyramid-pyramid-sysv3 ;; - *) GUESS=pyramid-pyramid-bsd ;; - esac - ;; + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; NILE*:*:*:dcosx) - GUESS=pyramid-pyramid-svr4 - ;; + echo pyramid-pyramid-svr4 + exit ;; DRS?6000:unix:4.0:6*) - GUESS=sparc-icl-nx6 - ;; + echo sparc-icl-nx6 + exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) GUESS=sparc-icl-nx7 ;; - esac - ;; + sparc) echo sparc-icl-nx7; exit ;; + esac ;; s390x:SunOS:*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL - ;; + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + exit ;; sun4H:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-hal-solaris2$SUN_REL - ;; + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-sun-solaris2$SUN_REL - ;; + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - GUESS=i386-pc-auroraux$UNAME_RELEASE - ;; + echo i386-pc-auroraux"$UNAME_RELEASE" + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - set_cc_for_build + eval "$set_cc_for_build" SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if test "$CC_FOR_BUILD" != no_compiler_found; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=$SUN_ARCH-pc-solaris2$SUN_REL - ;; + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-sun-solaris3$SUN_REL - ;; + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:*:*) - case `/usr/bin/arch -k` in + case "`/usr/bin/arch -k`" in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` - GUESS=sparc-sun-sunos$SUN_REL - ;; + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" + exit ;; sun3*:SunOS:*:*) - GUESS=m68k-sun-sunos$UNAME_RELEASE - ;; + echo m68k-sun-sunos"$UNAME_RELEASE" + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case `/bin/arch` in + case "`/bin/arch`" in sun3) - GUESS=m68k-sun-sunos$UNAME_RELEASE + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - GUESS=sparc-sun-sunos$UNAME_RELEASE + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac - ;; + exit ;; aushp:SunOS:*:*) - GUESS=sparc-auspex-sunos$UNAME_RELEASE - ;; + echo sparc-auspex-sunos"$UNAME_RELEASE" + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -490,43 +446,43 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - GUESS=m68k-milan-mint$UNAME_RELEASE - ;; + echo m68k-milan-mint"$UNAME_RELEASE" + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - GUESS=m68k-hades-mint$UNAME_RELEASE - ;; + echo m68k-hades-mint"$UNAME_RELEASE" + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - GUESS=m68k-unknown-mint$UNAME_RELEASE - ;; + echo m68k-unknown-mint"$UNAME_RELEASE" + exit ;; m68k:machten:*:*) - GUESS=m68k-apple-machten$UNAME_RELEASE - ;; + echo m68k-apple-machten"$UNAME_RELEASE" + exit ;; powerpc:machten:*:*) - GUESS=powerpc-apple-machten$UNAME_RELEASE - ;; + echo powerpc-apple-machten"$UNAME_RELEASE" + exit ;; RISC*:Mach:*:*) - GUESS=mips-dec-mach_bsd4.3 - ;; + echo mips-dec-mach_bsd4.3 + exit ;; RISC*:ULTRIX:*:*) - GUESS=mips-dec-ultrix$UNAME_RELEASE - ;; + echo mips-dec-ultrix"$UNAME_RELEASE" + exit ;; VAX*:ULTRIX*:*:*) - GUESS=vax-dec-ultrix$UNAME_RELEASE - ;; + echo vax-dec-ultrix"$UNAME_RELEASE" + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - GUESS=clipper-intergraph-clix$UNAME_RELEASE - ;; + echo clipper-intergraph-clix"$UNAME_RELEASE" + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -552,79 +508,78 @@ EOF dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - GUESS=mips-mips-riscos$UNAME_RELEASE - ;; + echo mips-mips-riscos"$UNAME_RELEASE" + exit ;; Motorola:PowerMAX_OS:*:*) - GUESS=powerpc-motorola-powermax - ;; + echo powerpc-motorola-powermax + exit ;; Motorola:*:4.3:PL8-*) - GUESS=powerpc-harris-powermax - ;; + echo powerpc-harris-powermax + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - GUESS=powerpc-harris-powermax - ;; + echo powerpc-harris-powermax + exit ;; Night_Hawk:Power_UNIX:*:*) - GUESS=powerpc-harris-powerunix - ;; + echo powerpc-harris-powerunix + exit ;; m88k:CX/UX:7*:*) - GUESS=m88k-harris-cxux7 - ;; + echo m88k-harris-cxux7 + exit ;; m88k:*:4*:R4*) - GUESS=m88k-motorola-sysv4 - ;; + echo m88k-motorola-sysv4 + exit ;; m88k:*:3*:R3*) - GUESS=m88k-motorola-sysv3 - ;; + echo m88k-motorola-sysv3 + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ - test "$TARGET_BINARY_INTERFACE"x = x + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - GUESS=m88k-dg-dgux$UNAME_RELEASE + echo m88k-dg-dgux"$UNAME_RELEASE" else - GUESS=m88k-dg-dguxbcs$UNAME_RELEASE + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - GUESS=i586-dg-dgux$UNAME_RELEASE + echo i586-dg-dgux"$UNAME_RELEASE" fi - ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - GUESS=m88k-dolphin-sysv3 - ;; + echo m88k-dolphin-sysv3 + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - GUESS=m88k-motorola-sysv3 - ;; + echo m88k-motorola-sysv3 + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - GUESS=m88k-tektronix-sysv3 - ;; + echo m88k-tektronix-sysv3 + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - GUESS=m68k-tektronix-bsd - ;; + echo m68k-tektronix-bsd + exit ;; *:IRIX*:*:*) - IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` - GUESS=mips-sgi-irix$IRIX_REL - ;; + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id - ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - GUESS=i386-ibm-aix - ;; + echo i386-ibm-aix + exit ;; ia64:AIX:*:*) - if test -x /usr/bin/oslevel ; then + if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=$UNAME_VERSION.$UNAME_RELEASE + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV - ;; + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include @@ -638,16 +593,16 @@ EOF EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - GUESS=$SYSTEM_NAME + echo "$SYSTEM_NAME" else - GUESS=rs6000-ibm-aix3.2.5 + echo rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - GUESS=rs6000-ibm-aix3.2.4 + echo rs6000-ibm-aix3.2.4 else - GUESS=rs6000-ibm-aix3.2 + echo rs6000-ibm-aix3.2 fi - ;; + exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then @@ -655,57 +610,57 @@ EOF else IBM_ARCH=powerpc fi - if test -x /usr/bin/lslpp ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=$UNAME_VERSION.$UNAME_RELEASE + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - GUESS=$IBM_ARCH-ibm-aix$IBM_REV - ;; + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" + exit ;; *:AIX:*:*) - GUESS=rs6000-ibm-aix - ;; + echo rs6000-ibm-aix + exit ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - GUESS=romp-ibm-bsd4.4 - ;; + echo romp-ibm-bsd4.4 + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to - ;; # report: romp-ibm BSD 4.3 + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - GUESS=rs6000-bull-bosx - ;; + echo rs6000-bull-bosx + exit ;; DPX/2?00:B.O.S.:*:*) - GUESS=m68k-bull-sysv3 - ;; + echo m68k-bull-sysv3 + exit ;; 9000/[34]??:4.3bsd:1.*:*) - GUESS=m68k-hp-bsd - ;; + echo m68k-hp-bsd + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - GUESS=m68k-hp-bsd4.4 - ;; + echo m68k-hp-bsd4.4 + exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` - case $UNAME_MACHINE in + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if test -x /usr/bin/getconf; then + if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case $sc_cpu_version in + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case $sc_kernel_bits in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if test "$HP_ARCH" = ""; then - set_cc_for_build + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -743,9 +698,9 @@ EOF test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if test "$HP_ARCH" = hppa2.0w + if [ "$HP_ARCH" = hppa2.0w ] then - set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -764,14 +719,14 @@ EOF HP_ARCH=hppa64 fi fi - GUESS=$HP_ARCH-hp-hpux$HPUX_REV - ;; + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" + exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` - GUESS=ia64-hp-hpux$HPUX_REV - ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" + exit ;; 3050*:HI-UX:*:*) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include int @@ -799,36 +754,36 @@ EOF EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - GUESS=unknown-hitachi-hiuxwe2 - ;; + echo unknown-hitachi-hiuxwe2 + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - GUESS=hppa1.1-hp-bsd - ;; + echo hppa1.1-hp-bsd + exit ;; 9000/8??:4.3bsd:*:*) - GUESS=hppa1.0-hp-bsd - ;; + echo hppa1.0-hp-bsd + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - GUESS=hppa1.0-hp-mpeix - ;; + echo hppa1.0-hp-mpeix + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - GUESS=hppa1.1-hp-osf - ;; + echo hppa1.1-hp-osf + exit ;; hp8??:OSF1:*:*) - GUESS=hppa1.0-hp-osf - ;; + echo hppa1.0-hp-osf + exit ;; i*86:OSF1:*:*) - if test -x /usr/sbin/sysversion ; then - GUESS=$UNAME_MACHINE-unknown-osf1mk + if [ -x /usr/sbin/sysversion ] ; then + echo "$UNAME_MACHINE"-unknown-osf1mk else - GUESS=$UNAME_MACHINE-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi - ;; + exit ;; parisc*:Lites*:*:*) - GUESS=hppa1.1-hp-lites - ;; + echo hppa1.1-hp-lites + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - GUESS=c1-convex-bsd - ;; + echo c1-convex-bsd + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -836,18 +791,17 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - GUESS=c34-convex-bsd - ;; + echo c34-convex-bsd + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - GUESS=c38-convex-bsd - ;; + echo c38-convex-bsd + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - GUESS=c4-convex-bsd - ;; + echo c4-convex-bsd + exit ;; CRAY*Y-MP:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=ymp-cray-unicos$CRAY_REL - ;; + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -855,129 +809,103 @@ EOF -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=t90-cray-unicos$CRAY_REL - ;; + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*T3E:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=alphaev5-cray-unicosmk$CRAY_REL - ;; + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*SV1:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=sv1-cray-unicos$CRAY_REL - ;; + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; *:UNICOS/mp:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=craynv-cray-unicosmp$CRAY_REL - ;; + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} - ;; + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} - ;; + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" + exit ;; sparc*:BSD/OS:*:*) - GUESS=sparc-unknown-bsdi$UNAME_RELEASE - ;; + echo sparc-unknown-bsdi"$UNAME_RELEASE" + exit ;; *:BSD/OS:*:*) - GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE - ;; - arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` - set_cc_for_build - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi - else - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf - fi - ;; + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" + exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case $UNAME_PROCESSOR in + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL - ;; + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + exit ;; i*:CYGWIN*:*) - GUESS=$UNAME_MACHINE-pc-cygwin - ;; + echo "$UNAME_MACHINE"-pc-cygwin + exit ;; *:MINGW64*:*) - GUESS=$UNAME_MACHINE-pc-mingw64 - ;; + echo "$UNAME_MACHINE"-pc-mingw64 + exit ;; *:MINGW*:*) - GUESS=$UNAME_MACHINE-pc-mingw32 - ;; + echo "$UNAME_MACHINE"-pc-mingw32 + exit ;; *:MSYS*:*) - GUESS=$UNAME_MACHINE-pc-msys - ;; + echo "$UNAME_MACHINE"-pc-msys + exit ;; i*:PW*:*) - GUESS=$UNAME_MACHINE-pc-pw32 - ;; - *:SerenityOS:*:*) - GUESS=$UNAME_MACHINE-pc-serenity - ;; + echo "$UNAME_MACHINE"-pc-pw32 + exit ;; *:Interix*:*) - case $UNAME_MACHINE in + case "$UNAME_MACHINE" in x86) - GUESS=i586-pc-interix$UNAME_RELEASE - ;; + echo i586-pc-interix"$UNAME_RELEASE" + exit ;; authenticamd | genuineintel | EM64T) - GUESS=x86_64-unknown-interix$UNAME_RELEASE - ;; + echo x86_64-unknown-interix"$UNAME_RELEASE" + exit ;; IA64) - GUESS=ia64-unknown-interix$UNAME_RELEASE - ;; + echo ia64-unknown-interix"$UNAME_RELEASE" + exit ;; esac ;; i*:UWIN*:*) - GUESS=$UNAME_MACHINE-pc-uwin - ;; + echo "$UNAME_MACHINE"-pc-uwin + exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - GUESS=x86_64-pc-cygwin - ;; + echo x86_64-unknown-cygwin + exit ;; prep*:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=powerpcle-unknown-solaris2$SUN_REL - ;; + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; *:GNU:*:*) # the GNU system - GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` - GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL - ;; + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC - ;; - *:Minix:*:*) - GUESS=$UNAME_MACHINE-unknown-minix - ;; + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" + exit ;; + i*86:Minix:*:*) + echo "$UNAME_MACHINE"-pc-minix + exit ;; aarch64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -988,225 +916,187 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; arm*:Linux:*:*) - set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi - ;; + exit ;; avr32*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; cris:Linux:*:*) - GUESS=$UNAME_MACHINE-axis-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; crisv32:Linux:*:*) - GUESS=$UNAME_MACHINE-axis-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; e2k:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; frv:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; hexagon:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; i*86:Linux:*:*) - GUESS=$UNAME_MACHINE-pc-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + exit ;; ia64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; k1om:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m68*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; mips:Linux:*:* | mips64:Linux:*:*) - set_cc_for_build - IS_GLIBC=0 - test x"${LIBC}" = xgnu && IS_GLIBC=1 + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef mips - #undef mipsel - #undef mips64 - #undef mips64el - #if ${IS_GLIBC} && defined(_ABI64) - LIBCABI=gnuabi64 - #else - #if ${IS_GLIBC} && defined(_ABIN32) - LIBCABI=gnuabin32 - #else - LIBCABI=${LIBC} - #endif - #endif - - #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 - CPU=mipsisa64r6 - #else - #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 - CPU=mipsisa32r6 - #else - #if defined(__mips64) - CPU=mips64 - #else - CPU=mips - #endif - #endif - #endif - + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - MIPS_ENDIAN=el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - MIPS_ENDIAN= + CPU=${UNAME_MACHINE} #else - MIPS_ENDIAN= + CPU= #endif #endif EOF - cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` - eval "$cc_set_vars" - test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; openrisc*:Linux:*:*) - GUESS=or1k-unknown-linux-$LIBC - ;; + echo or1k-unknown-linux-"$LIBC" + exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; padre:Linux:*:*) - GUESS=sparc-unknown-linux-$LIBC - ;; + echo sparc-unknown-linux-"$LIBC" + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - GUESS=hppa64-unknown-linux-$LIBC - ;; + echo hppa64-unknown-linux-"$LIBC" + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; - PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; - *) GUESS=hppa-unknown-linux-$LIBC ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac - ;; + exit ;; ppc64:Linux:*:*) - GUESS=powerpc64-unknown-linux-$LIBC - ;; + echo powerpc64-unknown-linux-"$LIBC" + exit ;; ppc:Linux:*:*) - GUESS=powerpc-unknown-linux-$LIBC - ;; + echo powerpc-unknown-linux-"$LIBC" + exit ;; ppc64le:Linux:*:*) - GUESS=powerpc64le-unknown-linux-$LIBC - ;; + echo powerpc64le-unknown-linux-"$LIBC" + exit ;; ppcle:Linux:*:*) - GUESS=powerpcle-unknown-linux-$LIBC - ;; - riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo powerpcle-unknown-linux-"$LIBC" + exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; s390:Linux:*:* | s390x:Linux:*:*) - GUESS=$UNAME_MACHINE-ibm-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" + exit ;; sh64*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; sh*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; tile*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; vax:Linux:*:*) - GUESS=$UNAME_MACHINE-dec-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" + exit ;; x86_64:Linux:*:*) - set_cc_for_build - LIBCABI=$LIBC - if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI - ;; + exit ;; xtensa*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - GUESS=i386-sequent-sysv4 - ;; + echo i386-sequent-sysv4 + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION - ;; + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - GUESS=$UNAME_MACHINE-pc-os2-emx - ;; + echo "$UNAME_MACHINE"-pc-os2-emx + exit ;; i*86:XTS-300:*:STOP) - GUESS=$UNAME_MACHINE-unknown-stop - ;; + echo "$UNAME_MACHINE"-unknown-stop + exit ;; i*86:atheos:*:*) - GUESS=$UNAME_MACHINE-unknown-atheos - ;; + echo "$UNAME_MACHINE"-unknown-atheos + exit ;; i*86:syllable:*:*) - GUESS=$UNAME_MACHINE-pc-syllable - ;; + echo "$UNAME_MACHINE"-pc-syllable + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - GUESS=i386-unknown-lynxos$UNAME_RELEASE - ;; + echo i386-unknown-lynxos"$UNAME_RELEASE" + exit ;; i*86:*DOS:*:*) - GUESS=$UNAME_MACHINE-pc-msdosdjgpp - ;; + echo "$UNAME_MACHINE"-pc-msdosdjgpp + exit ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi - ;; + exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1214,12 +1104,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - ;; + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1229,11 +1119,11 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - GUESS=$UNAME_MACHINE-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi - ;; + exit ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1241,31 +1131,31 @@ EOF # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - GUESS=i586-pc-msdosdjgpp - ;; + echo i586-pc-msdosdjgpp + exit ;; Intel:Mach:3*:*) - GUESS=i386-pc-mach3 - ;; + echo i386-pc-mach3 + exit ;; paragon:*:*:*) - GUESS=i860-intel-osf1 - ;; + echo i860-intel-osf1 + exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi - ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" - GUESS=m68010-convergent-sysv - ;; + echo m68010-convergent-sysv + exit ;; mc68k:UNIX:SYSTEM5:3.51m) - GUESS=m68k-convergent-sysv - ;; + echo m68k-convergent-sysv + exit ;; M680?0:D-NIX:5.3:*) - GUESS=m68k-diab-dnix - ;; + echo m68k-diab-dnix + exit ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1290,404 +1180,249 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - GUESS=m68k-unknown-lynxos$UNAME_RELEASE - ;; + echo m68k-unknown-lynxos"$UNAME_RELEASE" + exit ;; mc68030:UNIX_System_V:4.*:*) - GUESS=m68k-atari-sysv4 - ;; + echo m68k-atari-sysv4 + exit ;; TSUNAMI:LynxOS:2.*:*) - GUESS=sparc-unknown-lynxos$UNAME_RELEASE - ;; + echo sparc-unknown-lynxos"$UNAME_RELEASE" + exit ;; rs6000:LynxOS:2.*:*) - GUESS=rs6000-unknown-lynxos$UNAME_RELEASE - ;; + echo rs6000-unknown-lynxos"$UNAME_RELEASE" + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - GUESS=powerpc-unknown-lynxos$UNAME_RELEASE - ;; + echo powerpc-unknown-lynxos"$UNAME_RELEASE" + exit ;; SM[BE]S:UNIX_SV:*:*) - GUESS=mips-dde-sysv$UNAME_RELEASE - ;; + echo mips-dde-sysv"$UNAME_RELEASE" + exit ;; RM*:ReliantUNIX-*:*:*) - GUESS=mips-sni-sysv4 - ;; + echo mips-sni-sysv4 + exit ;; RM*:SINIX-*:*:*) - GUESS=mips-sni-sysv4 - ;; + echo mips-sni-sysv4 + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - GUESS=$UNAME_MACHINE-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else - GUESS=ns32k-sni-sysv + echo ns32k-sni-sysv fi - ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says - GUESS=i586-unisys-sysv4 - ;; + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - GUESS=hppa1.1-stratus-sysv4 - ;; + echo hppa1.1-stratus-sysv4 + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - GUESS=i860-stratus-sysv4 - ;; + echo i860-stratus-sysv4 + exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - GUESS=$UNAME_MACHINE-stratus-vos - ;; + echo "$UNAME_MACHINE"-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. - GUESS=hppa1.1-stratus-vos - ;; + echo hppa1.1-stratus-vos + exit ;; mc68*:A/UX:*:*) - GUESS=m68k-apple-aux$UNAME_RELEASE - ;; + echo m68k-apple-aux"$UNAME_RELEASE" + exit ;; news*:NEWS-OS:6*:*) - GUESS=mips-sony-newsos6 - ;; + echo mips-sony-newsos6 + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if test -d /usr/nec; then - GUESS=mips-nec-sysv$UNAME_RELEASE + if [ -d /usr/nec ]; then + echo mips-nec-sysv"$UNAME_RELEASE" else - GUESS=mips-unknown-sysv$UNAME_RELEASE + echo mips-unknown-sysv"$UNAME_RELEASE" fi - ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - GUESS=powerpc-be-beos - ;; + echo powerpc-be-beos + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - GUESS=powerpc-apple-beos - ;; + echo powerpc-apple-beos + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - GUESS=i586-pc-beos - ;; + echo i586-pc-beos + exit ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - GUESS=i586-pc-haiku - ;; + echo i586-pc-haiku + exit ;; x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku - ;; + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) - GUESS=sx4-nec-superux$UNAME_RELEASE - ;; + echo sx4-nec-superux"$UNAME_RELEASE" + exit ;; SX-5:SUPER-UX:*:*) - GUESS=sx5-nec-superux$UNAME_RELEASE - ;; + echo sx5-nec-superux"$UNAME_RELEASE" + exit ;; SX-6:SUPER-UX:*:*) - GUESS=sx6-nec-superux$UNAME_RELEASE - ;; + echo sx6-nec-superux"$UNAME_RELEASE" + exit ;; SX-7:SUPER-UX:*:*) - GUESS=sx7-nec-superux$UNAME_RELEASE - ;; + echo sx7-nec-superux"$UNAME_RELEASE" + exit ;; SX-8:SUPER-UX:*:*) - GUESS=sx8-nec-superux$UNAME_RELEASE - ;; + echo sx8-nec-superux"$UNAME_RELEASE" + exit ;; SX-8R:SUPER-UX:*:*) - GUESS=sx8r-nec-superux$UNAME_RELEASE - ;; + echo sx8r-nec-superux"$UNAME_RELEASE" + exit ;; SX-ACE:SUPER-UX:*:*) - GUESS=sxace-nec-superux$UNAME_RELEASE - ;; + echo sxace-nec-superux"$UNAME_RELEASE" + exit ;; Power*:Rhapsody:*:*) - GUESS=powerpc-apple-rhapsody$UNAME_RELEASE - ;; + echo powerpc-apple-rhapsody"$UNAME_RELEASE" + exit ;; *:Rhapsody:*:*) - GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE - ;; - arm64:Darwin:*:*) - GUESS=aarch64-apple-darwin$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - if command -v xcode-select > /dev/null 2> /dev/null && \ - ! xcode-select --print-path > /dev/null 2> /dev/null ; then - # Avoid executing cc if there is no toolchain installed as - # cc will be a stub that puts up a graphical alert - # prompting the user to install developer tools. - CC_FOR_BUILD=no_compiler_found - else - set_cc_for_build + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval "$set_cc_for_build" + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc fi - if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then - # uname -m returns i386 or x86_64 - UNAME_PROCESSOR=$UNAME_MACHINE + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi - GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE - ;; + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE - ;; + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" + exit ;; *:QNX:*:4*) - GUESS=i386-pc-qnx - ;; + echo i386-pc-qnx + exit ;; NEO-*:NONSTOP_KERNEL:*:*) - GUESS=neo-tandem-nsk$UNAME_RELEASE - ;; + echo neo-tandem-nsk"$UNAME_RELEASE" + exit ;; NSE-*:NONSTOP_KERNEL:*:*) - GUESS=nse-tandem-nsk$UNAME_RELEASE - ;; + echo nse-tandem-nsk"$UNAME_RELEASE" + exit ;; NSR-*:NONSTOP_KERNEL:*:*) - GUESS=nsr-tandem-nsk$UNAME_RELEASE - ;; + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; NSV-*:NONSTOP_KERNEL:*:*) - GUESS=nsv-tandem-nsk$UNAME_RELEASE - ;; + echo nsv-tandem-nsk"$UNAME_RELEASE" + exit ;; NSX-*:NONSTOP_KERNEL:*:*) - GUESS=nsx-tandem-nsk$UNAME_RELEASE - ;; + echo nsx-tandem-nsk"$UNAME_RELEASE" + exit ;; *:NonStop-UX:*:*) - GUESS=mips-compaq-nonstopux - ;; + echo mips-compaq-nonstopux + exit ;; BS2000:POSIX*:*:*) - GUESS=bs2000-siemens-sysv - ;; + echo bs2000-siemens-sysv + exit ;; DS/*:UNIX_System_V:*:*) - GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "${cputype-}" = 386; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 - elif test "x${cputype-}" != x; then - UNAME_MACHINE=$cputype + else + UNAME_MACHINE="$cputype" fi - GUESS=$UNAME_MACHINE-unknown-plan9 - ;; + echo "$UNAME_MACHINE"-unknown-plan9 + exit ;; *:TOPS-10:*:*) - GUESS=pdp10-unknown-tops10 - ;; + echo pdp10-unknown-tops10 + exit ;; *:TENEX:*:*) - GUESS=pdp10-unknown-tenex - ;; + echo pdp10-unknown-tenex + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - GUESS=pdp10-dec-tops20 - ;; + echo pdp10-dec-tops20 + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - GUESS=pdp10-xkl-tops20 - ;; + echo pdp10-xkl-tops20 + exit ;; *:TOPS-20:*:*) - GUESS=pdp10-unknown-tops20 - ;; + echo pdp10-unknown-tops20 + exit ;; *:ITS:*:*) - GUESS=pdp10-unknown-its - ;; + echo pdp10-unknown-its + exit ;; SEI:*:*:SEIUX) - GUESS=mips-sei-seiux$UNAME_RELEASE - ;; + echo mips-sei-seiux"$UNAME_RELEASE" + exit ;; *:DragonFly:*:*) - DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL - ;; + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case $UNAME_MACHINE in - A*) GUESS=alpha-dec-vms ;; - I*) GUESS=ia64-dec-vms ;; - V*) GUESS=vax-dec-vms ;; + case "$UNAME_MACHINE" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; esac ;; *:XENIX:*:SysV) - GUESS=i386-pc-xenix - ;; + echo i386-pc-xenix + exit ;; i*86:skyos:*:*) - SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` - GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL - ;; + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" + exit ;; i*86:rdos:*:*) - GUESS=$UNAME_MACHINE-pc-rdos - ;; - i*86:Fiwix:*:*) - GUESS=$UNAME_MACHINE-pc-fiwix - ;; - *:AROS:*:*) - GUESS=$UNAME_MACHINE-unknown-aros - ;; + echo "$UNAME_MACHINE"-pc-rdos + exit ;; + i*86:AROS:*:*) + echo "$UNAME_MACHINE"-pc-aros + exit ;; x86_64:VMkernel:*:*) - GUESS=$UNAME_MACHINE-unknown-esx - ;; + echo "$UNAME_MACHINE"-unknown-esx + exit ;; amd64:Isilon\ OneFS:*:*) - GUESS=x86_64-unknown-onefs - ;; - *:Unleashed:*:*) - GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE - ;; + echo x86_64-unknown-onefs + exit ;; esac -# Do we have a guess based on uname results? -if test "x$GUESS" != x; then - echo "$GUESS" - exit -fi - -# No uname command or uname output not recognized. -set_cc_for_build -cat > "$dummy.c" < -#include -#endif -#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) -#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#include -#if defined(_SIZE_T_) || defined(SIGLOST) -#include -#endif -#endif -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); -#endif - -#if defined (vax) -#if !defined (ultrix) -#include -#if defined (BSD) -#if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -#else -#if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -#else - printf ("vax-dec-bsd\n"); exit (0); -#endif -#endif -#else - printf ("vax-dec-bsd\n"); exit (0); -#endif -#else -#if defined(_SIZE_T_) || defined(SIGLOST) - struct utsname un; - uname (&un); - printf ("vax-dec-ultrix%s\n", un.release); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif -#endif -#endif -#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) -#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#if defined(_SIZE_T_) || defined(SIGLOST) - struct utsname *un; - uname (&un); - printf ("mips-dec-ultrix%s\n", un.release); exit (0); -#else - printf ("mips-dec-ultrix\n"); exit (0); -#endif -#endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. -test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } - echo "$0: unable to guess system type" >&2 -case $UNAME_MACHINE:$UNAME_SYSTEM in +case "$UNAME_MACHINE:$UNAME_SYSTEM" in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 <&2 + echo "$me: invalid option $1$help" exit 1 ;; *local*) @@ -119,1186 +110,1223 @@ case $# in exit 1;; esac -# Split fields of configuration type -# shellcheck disable=SC2162 -saved_IFS=$IFS -IFS="-" read field1 field2 field3 field4 <&2 - exit 1 +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. ;; - *-*-*-*) - basic_machine=$field1-$field2 - basic_os=$field3-$field4 + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 ;; - *-*-*) - # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two - # parts - maybe_os=$field2-$field3 - case $maybe_os in - nto-qnx* | linux-* | uclinux-uclibc* \ - | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ - | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) - basic_machine=$field1 - basic_os=$maybe_os - ;; - android-linux) - basic_machine=$field1-unknown - basic_os=linux-android - ;; - *) - basic_machine=$field1-$field2 - basic_os=$field3 - ;; - esac + -bluegene*) + os=-cnk ;; - *-*) - # A lone config we happen to match not fitting any pattern - case $field1-$field2 in - decstation-3100) - basic_machine=mips-dec - basic_os= - ;; - *-*) - # Second component is usually, but not always the OS - case $field2 in - # Prevent following clause from handling this valid os - sun*os*) - basic_machine=$field1 - basic_os=$field2 - ;; - zephyr*) - basic_machine=$field1-unknown - basic_os=$field2 - ;; - # Manufacturers - dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ - | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ - | unicom* | ibm* | next | hp | isi* | apollo | altos* \ - | convergent* | ncr* | news | 32* | 3600* | 3100* \ - | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ - | ultra | tti* | harris | dolphin | highlevel | gould \ - | cbm | ns | masscomp | apple | axis | knuth | cray \ - | microblaze* | sim | cisco \ - | oki | wec | wrs | winbond) - basic_machine=$field1-$field2 - basic_os= - ;; - *) - basic_machine=$field1 - basic_os=$field2 - ;; - esac - ;; - esac + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 ;; - *) - # Convert single-component short-hands not valid as part of - # multi-component configurations. - case $field1 in - 386bsd) - basic_machine=i386-pc - basic_os=bsd - ;; - a29khif) - basic_machine=a29k-amd - basic_os=udi - ;; - adobe68k) - basic_machine=m68010-adobe - basic_os=scout - ;; - alliant) - basic_machine=fx80-alliant - basic_os= - ;; - altos | altos3068) - basic_machine=m68k-altos - basic_os= - ;; - am29k) - basic_machine=a29k-none - basic_os=bsd - ;; - amdahl) - basic_machine=580-amdahl - basic_os=sysv - ;; - amiga) - basic_machine=m68k-unknown - basic_os= - ;; - amigaos | amigados) - basic_machine=m68k-unknown - basic_os=amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - basic_os=sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - basic_os=sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - basic_os=bsd - ;; - aros) - basic_machine=i386-pc - basic_os=aros - ;; - aux) - basic_machine=m68k-apple - basic_os=aux - ;; - balance) - basic_machine=ns32k-sequent - basic_os=dynix - ;; - blackfin) - basic_machine=bfin-unknown - basic_os=linux - ;; - cegcc) - basic_machine=arm-unknown - basic_os=cegcc - ;; - convex-c1) - basic_machine=c1-convex - basic_os=bsd - ;; - convex-c2) - basic_machine=c2-convex - basic_os=bsd - ;; - convex-c32) - basic_machine=c32-convex - basic_os=bsd - ;; - convex-c34) - basic_machine=c34-convex - basic_os=bsd - ;; - convex-c38) - basic_machine=c38-convex - basic_os=bsd - ;; - cray) - basic_machine=j90-cray - basic_os=unicos - ;; - crds | unos) - basic_machine=m68k-crds - basic_os= - ;; - da30) - basic_machine=m68k-da30 - basic_os= - ;; - decstation | pmax | pmin | dec3100 | decstatn) - basic_machine=mips-dec - basic_os= - ;; - delta88) - basic_machine=m88k-motorola - basic_os=sysv3 - ;; - dicos) - basic_machine=i686-pc - basic_os=dicos - ;; - djgpp) - basic_machine=i586-pc - basic_os=msdosdjgpp - ;; - ebmon29k) - basic_machine=a29k-amd - basic_os=ebmon - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - basic_os=ose - ;; - gmicro) - basic_machine=tron-gmicro - basic_os=sysv - ;; - go32) - basic_machine=i386-pc - basic_os=go32 - ;; - h8300hms) - basic_machine=h8300-hitachi - basic_os=hms - ;; - h8300xray) - basic_machine=h8300-hitachi - basic_os=xray - ;; - h8500hms) - basic_machine=h8500-hitachi - basic_os=hms - ;; - harris) - basic_machine=m88k-harris - basic_os=sysv3 - ;; - hp300 | hp300hpux) - basic_machine=m68k-hp - basic_os=hpux - ;; - hp300bsd) - basic_machine=m68k-hp - basic_os=bsd - ;; - hppaosf) - basic_machine=hppa1.1-hp - basic_os=osf - ;; - hppro) - basic_machine=hppa1.1-hp - basic_os=proelf - ;; - i386mach) - basic_machine=i386-mach - basic_os=mach - ;; - isi68 | isi) - basic_machine=m68k-isi - basic_os=sysv - ;; - m68knommu) - basic_machine=m68k-unknown - basic_os=linux - ;; - magnum | m3230) - basic_machine=mips-mips - basic_os=sysv - ;; - merlin) - basic_machine=ns32k-utek - basic_os=sysv - ;; - mingw64) - basic_machine=x86_64-pc - basic_os=mingw64 - ;; - mingw32) - basic_machine=i686-pc - basic_os=mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - basic_os=mingw32ce - ;; - monitor) - basic_machine=m68k-rom68k - basic_os=coff - ;; - morphos) - basic_machine=powerpc-unknown - basic_os=morphos - ;; - moxiebox) - basic_machine=moxie-unknown - basic_os=moxiebox - ;; - msdos) - basic_machine=i386-pc - basic_os=msdos - ;; - msys) - basic_machine=i686-pc - basic_os=msys - ;; - mvs) - basic_machine=i370-ibm - basic_os=mvs - ;; - nacl) - basic_machine=le32-unknown - basic_os=nacl - ;; - ncr3000) - basic_machine=i486-ncr - basic_os=sysv4 - ;; - netbsd386) - basic_machine=i386-pc - basic_os=netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - basic_os=linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - basic_os=newsos - ;; - news1000) - basic_machine=m68030-sony - basic_os=newsos - ;; - necv70) - basic_machine=v70-nec - basic_os=sysv - ;; - nh3000) - basic_machine=m68k-harris - basic_os=cxux - ;; - nh[45]000) - basic_machine=m88k-harris - basic_os=cxux - ;; - nindy960) - basic_machine=i960-intel - basic_os=nindy - ;; - mon960) - basic_machine=i960-intel - basic_os=mon960 - ;; - nonstopux) - basic_machine=mips-compaq - basic_os=nonstopux - ;; - os400) - basic_machine=powerpc-ibm - basic_os=os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - basic_os=ose - ;; - os68k) - basic_machine=m68k-none - basic_os=os68k - ;; - paragon) - basic_machine=i860-intel - basic_os=osf - ;; - parisc) - basic_machine=hppa-unknown - basic_os=linux - ;; - psp) - basic_machine=mipsallegrexel-sony - basic_os=psp - ;; - pw32) - basic_machine=i586-unknown - basic_os=pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - basic_os=rdos - ;; - rdos32) - basic_machine=i386-pc - basic_os=rdos - ;; - rom68k) - basic_machine=m68k-rom68k - basic_os=coff - ;; - sa29200) - basic_machine=a29k-amd - basic_os=udi - ;; - sei) - basic_machine=mips-sei - basic_os=seiux - ;; - sequent) - basic_machine=i386-sequent - basic_os= - ;; - sps7) - basic_machine=m68k-bull - basic_os=sysv2 - ;; - st2000) - basic_machine=m68k-tandem - basic_os= - ;; - stratus) - basic_machine=i860-stratus - basic_os=sysv4 - ;; - sun2) - basic_machine=m68000-sun - basic_os= - ;; - sun2os3) - basic_machine=m68000-sun - basic_os=sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - basic_os=sunos4 - ;; - sun3) - basic_machine=m68k-sun - basic_os= - ;; - sun3os3) - basic_machine=m68k-sun - basic_os=sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - basic_os=sunos4 - ;; - sun4) - basic_machine=sparc-sun - basic_os= - ;; - sun4os3) - basic_machine=sparc-sun - basic_os=sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - basic_os=sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - basic_os=solaris2 - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - basic_os= - ;; - sv1) - basic_machine=sv1-cray - basic_os=unicos - ;; - symmetry) - basic_machine=i386-sequent - basic_os=dynix - ;; - t3e) - basic_machine=alphaev5-cray - basic_os=unicos - ;; - t90) - basic_machine=t90-cray - basic_os=unicos - ;; - toad1) - basic_machine=pdp10-xkl - basic_os=tops20 - ;; - tpf) - basic_machine=s390x-ibm - basic_os=tpf - ;; - udi29k) - basic_machine=a29k-amd - basic_os=udi - ;; - ultra3) - basic_machine=a29k-nyu - basic_os=sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - basic_os=none - ;; - vaxv) - basic_machine=vax-dec - basic_os=sysv - ;; - vms) - basic_machine=vax-dec - basic_os=vms - ;; - vsta) - basic_machine=i386-pc - basic_os=vsta - ;; - vxworks960) - basic_machine=i960-wrs - basic_os=vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - basic_os=vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - basic_os=vxworks - ;; - xbox) - basic_machine=i686-pc - basic_os=mingw32 - ;; - ymp) - basic_machine=ymp-cray - basic_os=unicos - ;; - *) - basic_machine=$1 - basic_os= - ;; - esac + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint ;; esac -# Decode 1-component or ad-hoc basic machines +# Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in - # Here we handle the default manufacturer of certain CPU types. It is in - # some cases the only manufacturer, in others, it is the most popular. - w89k) - cpu=hppa1.1 - vendor=winbond + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown ;; - op50n) - cpu=hppa1.1 - vendor=oki + c54x) + basic_machine=tic54x-unknown ;; - op60c) - cpu=hppa1.1 - vendor=oki + c55x) + basic_machine=tic55x-unknown ;; - ibm*) - cpu=i370 - vendor=ibm - ;; - orion105) - cpu=clipper - vendor=highlevel - ;; - mac | mpw | mac-mpw) - cpu=m68k - vendor=apple - ;; - pmac | pmac-mpw) - cpu=powerpc - vendor=apple - ;; - - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - cpu=m68000 - vendor=att - ;; - 3b*) - cpu=we32k - vendor=att - ;; - bluegene*) - cpu=powerpc - vendor=ibm - basic_os=cnk - ;; - decsystem10* | dec10*) - cpu=pdp10 - vendor=dec - basic_os=tops10 - ;; - decsystem20* | dec20*) - cpu=pdp10 - vendor=dec - basic_os=tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - cpu=m68k - vendor=motorola - ;; - dpx2*) - cpu=m68k - vendor=bull - basic_os=sysv3 - ;; - encore | umax | mmax) - cpu=ns32k - vendor=encore - ;; - elxsi) - cpu=elxsi - vendor=elxsi - basic_os=${basic_os:-bsd} - ;; - fx2800) - cpu=i860 - vendor=alliant - ;; - genix) - cpu=ns32k - vendor=ns - ;; - h3050r* | hiux*) - cpu=hppa1.1 - vendor=hitachi - basic_os=hiuxwe2 - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - cpu=hppa1.0 - vendor=hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - cpu=m68000 - vendor=hp - ;; - hp9k3[2-9][0-9]) - cpu=m68k - vendor=hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - cpu=hppa1.0 - vendor=hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - cpu=hppa1.1 - vendor=hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - cpu=hppa1.1 - vendor=hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - cpu=hppa1.0 - vendor=hp - ;; - i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - basic_os=sysv32 - ;; - i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - basic_os=sysv4 - ;; - i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - basic_os=sysv - ;; - i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - basic_os=solaris2 - ;; - j90 | j90-cray) - cpu=j90 - vendor=cray - basic_os=${basic_os:-unicos} - ;; - iris | iris4d) - cpu=mips - vendor=sgi - case $basic_os in - irix*) - ;; - *) - basic_os=irix4 - ;; - esac - ;; - miniframe) - cpu=m68000 - vendor=convergent - ;; - *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) - cpu=m68k - vendor=atari - basic_os=mint - ;; - news-3600 | risc-news) - cpu=mips - vendor=sony - basic_os=newsos - ;; - next | m*-next) - cpu=m68k - vendor=next - case $basic_os in - openstep*) - ;; - nextstep*) - ;; - ns2*) - basic_os=nextstep2 - ;; - *) - basic_os=nextstep3 - ;; - esac - ;; - np1) - cpu=np1 - vendor=gould - ;; - op50n-* | op60c-*) - cpu=hppa1.1 - vendor=oki - basic_os=proelf - ;; - pa-hitachi) - cpu=hppa1.1 - vendor=hitachi - basic_os=hiuxwe2 - ;; - pbd) - cpu=sparc - vendor=tti - ;; - pbb) - cpu=m68k - vendor=tti - ;; - pc532) - cpu=ns32k - vendor=pc532 - ;; - pn) - cpu=pn - vendor=gould - ;; - power) - cpu=power - vendor=ibm - ;; - ps2) - cpu=i386 - vendor=ibm - ;; - rm[46]00) - cpu=mips - vendor=siemens - ;; - rtpc | rtpc-*) - cpu=romp - vendor=ibm - ;; - sde) - cpu=mipsisa32 - vendor=sde - basic_os=${basic_os:-elf} - ;; - simso-wrs) - cpu=sparclite - vendor=wrs - basic_os=vxworks - ;; - tower | tower-32) - cpu=m68k - vendor=ncr - ;; - vpp*|vx|vx-*) - cpu=f301 - vendor=fujitsu - ;; - w65) - cpu=w65 - vendor=wdc - ;; - w89k-*) - cpu=hppa1.1 - vendor=winbond - basic_os=proelf - ;; - none) - cpu=none - vendor=none + c6x) + basic_machine=tic6x-unknown ;; leon|leon[3-9]) - cpu=sparc - vendor=$basic_machine + basic_machine=sparc-$basic_machine ;; - leon-*|leon[3-9]-*) - cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + ;; + ms1) + basic_machine=mt-unknown ;; - *-*) - # shellcheck disable=SC2162 - saved_IFS=$IFS - IFS="-" read cpu vendor <&2 + exit 1 ;; - # These rules are duplicated from below for sake of the special case above; - # i.e. things that normalized to x86 arches should also default to "pc" - pc98) - cpu=i386 - vendor=pc + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ + | pyramid-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | wasm32-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) ;; - x64 | amd64) - cpu=x86_64 - vendor=pc + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; - # Recognize the basic CPU types without company name. - *) - cpu=$basic_machine - vendor=unknown + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-pc + os=-bsd ;; -esac - -unset -v basic_machine - -# Decode basic machines in the full and proper CPU-Company form. -case $cpu-$vendor in - # Here we handle the default manufacturer of certain CPU types in canonical form. It is in - # some cases the only manufacturer, in others, it is the most popular. - craynv-unknown) - vendor=cray - basic_os=${basic_os:-unicosmp} + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att ;; - c90-unknown | c90-cray) - vendor=cray - basic_os=${Basic_os:-unicos} + 3b*) + basic_machine=we32k-att ;; - fx80-unknown) - vendor=alliant + a29khif) + basic_machine=a29k-amd + os=-udi ;; - romp-unknown) - vendor=ibm + abacus) + basic_machine=abacus-unknown ;; - mmix-unknown) - vendor=knuth + adobe68k) + basic_machine=m68010-adobe + os=-scout ;; - microblaze-unknown | microblazeel-unknown) - vendor=xilinx + alliant | fx80) + basic_machine=fx80-alliant ;; - rs6000-unknown) - vendor=ibm + altos | altos3068) + basic_machine=m68k-altos ;; - vax-unknown) - vendor=dec + am29k) + basic_machine=a29k-none + os=-bsd ;; - pdp11-unknown) - vendor=dec + amd64) + basic_machine=x86_64-pc ;; - we32k-unknown) - vendor=att - ;; - cydra-unknown) - vendor=cydrome - ;; - i370-ibm*) - vendor=ibm - ;; - orion-unknown) - vendor=highlevel - ;; - xps-unknown | xps100-unknown) - cpu=xps100 - vendor=honeywell - ;; - - # Here we normalize CPU types with a missing or matching vendor - armh-unknown | armh-alt) - cpu=armv7l - vendor=alt - basic_os=${basic_os:-linux-gnueabihf} - ;; - dpx20-unknown | dpx20-bull) - cpu=rs6000 - vendor=bull - basic_os=${basic_os:-bosx} - ;; - - # Here we normalize CPU types irrespective of the vendor amd64-*) - cpu=x86_64 + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux ;; blackfin-*) - cpu=bfin - basic_os=linux + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk ;; c54x-*) - cpu=tic54x + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) - cpu=tic55x + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) - cpu=tic6x + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2*) + basic_machine=m68k-bull + os=-sysv3 + ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" ;; e500v[12]-*) - cpu=powerpc - basic_os=${basic_os}"spe" + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" ;; - mips3*-*) - cpu=mips64 + ebmon29k) + basic_machine=a29k-amd + os=-ebmon ;; - ms1-*) - cpu=mt + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux ;; m68knommu-*) - cpu=m68k - basic_os=linux + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux ;; - m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) - cpu=s12z + magnum | m3230) + basic_machine=mips-mips + os=-sysv ;; - openrisc-*) - cpu=or32 + merlin) + basic_machine=ns32k-utek + os=-sysv ;; - parisc-*) - cpu=hppa - basic_os=linux + microblaze*) + basic_machine=microblaze-xilinx ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - cpu=i586 + mingw64) + basic_machine=x86_64-pc + os=-mingw64 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) - cpu=i686 + mingw32) + basic_machine=i686-pc + os=-mingw32 ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - cpu=i686 + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce ;; - pentium4-*) - cpu=i786 + miniframe) + basic_machine=m68000-convergent ;; - pc98-*) - cpu=i386 + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint ;; - ppc-* | ppcbe-*) - cpu=powerpc + mips3*-*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; - ppcle-* | powerpclittle-*) - cpu=powerpcle + mips3*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; - ppc64-*) - cpu=powerpc64 + monitor) + basic_machine=m68k-rom68k + os=-coff ;; - ppc64le-* | powerpc64little-*) - cpu=powerpc64le + morphos) + basic_machine=powerpc-unknown + os=-morphos ;; - sb1-*) - cpu=mipsisa64sb1 + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox ;; - sb1el-*) - cpu=mipsisa64sb1el + msdos) + basic_machine=i386-pc + os=-msdos ;; - sh5e[lb]-*) - cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` + ms1-*) + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; - spur-*) - cpu=spur + msys) + basic_machine=i686-pc + os=-msys ;; - strongarm-* | thumb-*) - cpu=arm + mvs) + basic_machine=i370-ibm + os=-mvs ;; - tx39-*) - cpu=mipstx39 + nacl) + basic_machine=le32-unknown + os=-nacl ;; - tx39el-*) - cpu=mipstx39el + ncr3000) + basic_machine=i486-ncr + os=-sysv4 ;; - x64-*) - cpu=x86_64 + netbsd386) + basic_machine=i386-unknown + os=-netbsd ;; - xscale-* | xscalee[bl]-*) - cpu=`echo "$cpu" | sed 's/^xscale/arm/'` + netwinder) + basic_machine=armv4l-rebel + os=-linux ;; - arm64-* | aarch64le-*) - cpu=aarch64 + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos ;; - - # Recognize the canonical CPU Types that limit and/or modify the - # company names they are paired with. - cr16-*) - basic_os=${basic_os:-elf} + news1000) + basic_machine=m68030-sony + os=-newsos ;; - crisv32-* | etraxfs*-*) - cpu=crisv32 - vendor=axis + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos ;; - cris-* | etrax*-*) - cpu=cris - vendor=axis + necv70) + basic_machine=v70-nec + os=-sysv ;; - crx-*) - basic_os=${basic_os:-elf} + next | m*-next) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould ;; neo-tandem) - cpu=neo - vendor=tandem + basic_machine=neo-tandem ;; nse-tandem) - cpu=nse - vendor=tandem + basic_machine=nse-tandem ;; nsr-tandem) - cpu=nsr - vendor=tandem + basic_machine=nsr-tandem ;; nsv-tandem) - cpu=nsv - vendor=tandem + basic_machine=nsv-tandem ;; nsx-tandem) - cpu=nsx - vendor=tandem + basic_machine=nsx-tandem ;; - mipsallegrexel-sony) - cpu=mipsallegrexel - vendor=sony + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf ;; - tile*-*) - basic_os=${basic_os:-linux-gnu} + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + x64) + basic_machine=x86_64-pc + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + none) + basic_machine=none-none + os=-none ;; +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; *) - # Recognize the canonical CPU types that are allowed with any - # company name. - case $cpu in - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | abacus \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ - | alphapca5[67] | alpha64pca5[67] \ - | am33_2.0 \ - | amdgcn \ - | arc | arceb | arc32 | arc64 \ - | arm | arm[lb]e | arme[lb] | armv* \ - | avr | avr32 \ - | asmjs \ - | ba \ - | be32 | be64 \ - | bfin | bpf | bs2000 \ - | c[123]* | c30 | [cjt]90 | c4x \ - | c8051 | clipper | craynv | csky | cydra \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | elxsi | epiphany \ - | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ - | h8300 | h8500 \ - | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i*86 | i860 | i960 | ia16 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | loongarch32 | loongarch64 | loongarchx32 \ - | m32c | m32r | m32rle \ - | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ - | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ - | m88110 | m88k | maxq | mb | mcore | mep | metag \ - | microblaze | microblazeel \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64eb | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r3 | mipsisa32r3el \ - | mipsisa32r5 | mipsisa32r5el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r3 | mipsisa64r3el \ - | mipsisa64r5 | mipsisa64r5el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mmix \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nfp \ - | nios | nios2 | nios2eb | nios2el \ - | none | np1 | ns16k | ns32k | nvptx \ - | open8 \ - | or1k* \ - | or32 \ - | orion \ - | picochip \ - | pdp10 | pdp11 | pj | pjl | pn | power \ - | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ - | pru \ - | pyramid \ - | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ - | rl78 | romp | rs6000 | rx \ - | s390 | s390x \ - | score \ - | sh | shl \ - | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ - | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ - | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ - | spu \ - | tahoe \ - | thumbv7* \ - | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ - | tron \ - | ubicom32 \ - | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ - | vax \ - | visium \ - | w65 \ - | wasm32 | wasm64 \ - | we32k \ - | x86 | x86_64 | xc16x | xgate | xps100 \ - | xstormy16 | xtensa* \ - | ymp \ - | z8k | z80) - ;; - - *) - echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 - exit 1 - ;; - esac + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 ;; esac # Here we canonicalize certain aliases for manufacturers. -case $vendor in - digital*) - vendor=dec +case $basic_machine in + *-digital*) + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; - commodore*) - vendor=cbm + *-commodore*) + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1306,215 +1334,203 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if test x$basic_os != x +if [ x"$os" != x"" ] then - -# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just -# set os. -case $basic_os in - gnu/linux*) - kernel=linux - os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` - ;; - os2-emx) - kernel=os2 - os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` - ;; - nto-qnx*) - kernel=nto - os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` - ;; - *-*) - # shellcheck disable=SC2162 - saved_IFS=$IFS - IFS="-" read kernel os <&2 + exit 1 ;; esac - else # Here we handle the default operating systems that come with various machines. @@ -1527,363 +1543,258 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -kernel= -case $cpu-$vendor in +case $basic_machine in score-*) - os=elf + os=-elf ;; spu-*) - os=elf + os=-elf ;; *-acorn) - os=riscix1.2 + os=-riscix1.2 ;; arm*-rebel) - kernel=linux - os=gnu + os=-linux ;; arm*-semi) - os=aout + os=-aout ;; c4x-* | tic4x-*) - os=coff + os=-coff ;; c8051-*) - os=elf - ;; - clipper-intergraph) - os=clix + os=-elf ;; hexagon-*) - os=elf + os=-elf ;; tic54x-*) - os=coff + os=-coff ;; tic55x-*) - os=coff + os=-coff ;; tic6x-*) - os=coff + os=-coff ;; # This must come before the *-dec entry. pdp10-*) - os=tops20 + os=-tops20 ;; pdp11-*) - os=none + os=-none ;; *-dec | vax-*) - os=ultrix4.2 + os=-ultrix4.2 ;; m68*-apollo) - os=domain + os=-domain ;; i386-sun) - os=sunos4.0.2 + os=-sunos4.0.2 ;; m68000-sun) - os=sunos3 + os=-sunos3 ;; m68*-cisco) - os=aout + os=-aout ;; mep-*) - os=elf + os=-elf ;; mips*-cisco) - os=elf + os=-elf ;; mips*-*) - os=elf + os=-elf ;; or32-*) - os=coff + os=-coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=sysv3 + os=-sysv3 ;; sparc-* | *-sun) - os=sunos4.1.1 + os=-sunos4.1.1 ;; pru-*) - os=elf + os=-elf ;; *-be) - os=beos + os=-beos ;; *-ibm) - os=aix + os=-aix ;; *-knuth) - os=mmixware + os=-mmixware ;; *-wec) - os=proelf + os=-proelf ;; *-winbond) - os=proelf + os=-proelf ;; *-oki) - os=proelf + os=-proelf ;; *-hp) - os=hpux + os=-hpux ;; *-hitachi) - os=hiux + os=-hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=sysv + os=-sysv ;; *-cbm) - os=amigaos + os=-amigaos ;; *-dg) - os=dgux + os=-dgux ;; *-dolphin) - os=sysv3 + os=-sysv3 ;; m68k-ccur) - os=rtu + os=-rtu ;; m88k-omron*) - os=luna + os=-luna ;; *-next) - os=nextstep + os=-nextstep ;; *-sequent) - os=ptx + os=-ptx ;; *-crds) - os=unos + os=-unos ;; *-ns) - os=genix + os=-genix ;; i370-*) - os=mvs + os=-mvs ;; *-gould) - os=sysv + os=-sysv ;; *-highlevel) - os=bsd + os=-bsd ;; *-encore) - os=bsd + os=-bsd ;; *-sgi) - os=irix + os=-irix ;; *-siemens) - os=sysv4 + os=-sysv4 ;; *-masscomp) - os=rtu + os=-rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=uxpv + os=-uxpv ;; *-rom68k) - os=coff + os=-coff ;; *-*bug) - os=coff + os=-coff ;; *-apple) - os=macos + os=-macos ;; *-atari*) - os=mint - ;; - *-wrs) - os=vxworks + os=-mint ;; *) - os=none + os=-none ;; esac - fi -# Now, validate our (potentially fixed-up) OS. -case $os in - # Sometimes we do "kernel-libc", so those need to count as OSes. - musl* | newlib* | relibc* | uclibc*) - ;; - # Likewise for "kernel-abi" - eabi* | gnueabi*) - ;; - # VxWorks passes extra cpu info in the 4th filed. - simlinux | simwindows | spe) - ;; - # Now accept the basic system types. - # The portable systems comes first. - # Each alternative MUST end in a * to match a version number. - gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ - | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ - | hiux* | abug | nacl* | netware* | windows* \ - | os9* | macos* | osx* | ios* \ - | mpw* | magic* | mmixware* | mon960* | lnews* \ - | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ - | aos* | aros* | cloudabi* | sortix* | twizzler* \ - | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ - | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ - | mirbsd* | netbsd* | dicos* | openedition* | ose* \ - | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ - | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ - | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ - | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ - | udi* | lites* | ieee* | go32* | aux* | hcos* \ - | chorusrdb* | cegcc* | glidix* | serenity* \ - | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ - | midipix* | mingw32* | mingw64* | mint* \ - | uxpv* | beos* | mpeix* | udk* | moxiebox* \ - | interix* | uwin* | mks* | rhapsody* | darwin* \ - | openstep* | oskit* | conix* | pw32* | nonstopux* \ - | storm-chaos* | tops10* | tenex* | tops20* | its* \ - | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ - | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ - | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ - | skyos* | haiku* | rdos* | toppers* | drops* | es* \ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* ) - ;; - # This one is extra strict with allowed versions - sco3.2v2 | sco3.2v[4-9]* | sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - ;; - none) - ;; - *) - echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 - exit 1 - ;; -esac - -# As a final step for OS-related things, validate the OS-kernel combination -# (given a valid OS), if there is a kernel. -case $kernel-$os in - linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) - ;; - uclinux-uclibc* ) - ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) - # These are just libc implementations, not actual OSes, and thus - # require a kernel. - echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 - exit 1 - ;; - kfreebsd*-gnu* | kopensolaris*-gnu*) - ;; - vxworks-simlinux | vxworks-simwindows | vxworks-spe) - ;; - nto-qnx*) - ;; - os2-emx) - ;; - *-eabi* | *-gnueabi*) - ;; - -*) - # Blank kernel with real OS is always fine. - ;; - *-*) - echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 - exit 1 - ;; -esac - # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -case $vendor in - unknown) - case $cpu-$os in - *-riscix*) +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) vendor=acorn ;; - *-sunos*) + -sunos*) vendor=sun ;; - *-cnk* | *-aix*) + -cnk*|-aix*) vendor=ibm ;; - *-beos*) + -beos*) vendor=be ;; - *-hpux*) + -hpux*) vendor=hp ;; - *-mpeix*) + -mpeix*) vendor=hp ;; - *-hiux*) + -hiux*) vendor=hitachi ;; - *-unos*) + -unos*) vendor=crds ;; - *-dgux*) + -dgux*) vendor=dg ;; - *-luna*) + -luna*) vendor=omron ;; - *-genix*) + -genix*) vendor=ns ;; - *-clix*) - vendor=intergraph - ;; - *-mvs* | *-opened*) + -mvs* | -opened*) vendor=ibm ;; - *-os400*) + -os400*) vendor=ibm ;; - s390-* | s390x-*) - vendor=ibm - ;; - *-ptx*) + -ptx*) vendor=sequent ;; - *-tpf*) + -tpf*) vendor=ibm ;; - *-vxsim* | *-vxworks* | *-windiss*) + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; - *-aux*) + -aux*) vendor=apple ;; - *-hms*) + -hms*) vendor=hitachi ;; - *-mpw* | *-macos*) + -mpw* | -macos*) vendor=apple ;; - *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; - *-vos*) + -vos*) vendor=stratus ;; esac + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$cpu-$vendor-${kernel:+$kernel-}$os" +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/build-aux/depcomp b/build-aux/depcomp index 715e343..6b39162 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/missing b/build-aux/missing index 1fe1611..8d0eaad 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/test-driver b/build-aux/test-driver index be73b80..9759384 100755 --- a/build-aux/test-driver +++ b/build-aux/test-driver @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2021 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -105,11 +105,8 @@ trap "st=130; $do_exit" 2 trap "st=141; $do_exit" 13 trap "st=143; $do_exit" 15 -# Test script is run here. We create the file first, then append to it, -# to ameliorate tests themselves also writing to the log file. Our tests -# don't, but others can (automake bug#35762). -: >"$log_file" -"$@" >>"$log_file" 2>&1 +# Test script is run here. +"$@" >$log_file 2>&1 estatus=$? if test $enable_hard_errors = no && test $estatus -eq 99; then @@ -131,7 +128,7 @@ esac # know whether the test passed or failed simply by looking at the '.log' # file, without the need of also peaking into the corresponding '.trs' # file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>"$log_file" +echo "$res $test_name (exit status: $estatus)" >>$log_file # Report outcome to console. echo "${col}${res}${std}: $test_name" diff --git a/config.h.in b/config.h.in index 9c5c948..6b0e5a5 100644 --- a/config.h.in +++ b/config.h.in @@ -338,7 +338,8 @@ may be supplied by this distribution. */ #undef HAVE_ALLOCA -/* Define to 1 if works. */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ #undef HAVE_ALLOCA_H /* Define to 1 if you have the header file. */ @@ -859,6 +860,9 @@ /* Define to 1 if you have the `memmove' function. */ #undef HAVE_MEMMOVE +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + /* Define to 1 if you have the header file. */ #undef HAVE_MINIX_CONFIG_H @@ -1060,9 +1064,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDIO_EXT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_STDIO_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -1075,7 +1076,7 @@ /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define if you have `strerror_r'. */ +/* Define to 1 if you have the `strerror_r' function. */ #undef HAVE_STRERROR_R /* Define to 1 if you have the header file. */ @@ -1835,9 +1836,9 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION /* Define if the block counts reported by statfs may be truncated to 2GB and @@ -1873,9 +1874,7 @@ /* Define if statvfs64 should be preferred over statvfs. */ #undef STAT_STATVFS64 -/* Define to 1 if all of the C90 standard headers exist (not just the ones - required in a freestanding environment). This macro is provided for - backward compatibility; new code need not use it. */ +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Define to 1 if strerror_r returns char *. */ @@ -1896,8 +1895,7 @@ /* Define to 1 if time_t is signed. */ #undef TIME_T_IS_SIGNED -/* Define to 1 if you can safely include both and . This - macro is obsolete. */ +/* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME /* Define to 1 if your declares `struct tm'. */ diff --git a/configure b/configure index 468bcec..e5442c7 100755 --- a/configure +++ b/configure @@ -1,10 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for monitoring-plugins 2.4.0. +# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.3.5. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -15,16 +14,14 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -34,46 +31,46 @@ esac fi - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -82,6 +79,13 @@ if ${PATH_SEPARATOR+false} :; then fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -90,12 +94,8 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -107,10 +107,30 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -132,22 +152,20 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop +else case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -167,15 +185,12 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ) -then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -else \$as_nop +else exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 -blah=\$(echo \$(echo blah)) -test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO @@ -190,38 +205,30 @@ test \$(( 1 + 1 )) = 2 || exit 1 PATH=/empty FPATH=/empty; export PATH FPATH test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" - if (eval "$as_required") 2>/dev/null -then : + if (eval "$as_required") 2>/dev/null; then : as_have_required=yes -else $as_nop +else as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null -then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -else $as_nop +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir$as_base + as_shell=$as_dir/$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : CONFIG_SHELL=$as_shell as_have_required=yes - if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null -then : + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : break 2 fi fi @@ -229,21 +236,14 @@ fi esac as_found=false done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : CONFIG_SHELL=$SHELL as_have_required=yes -fi -fi +fi; } +IFS=$as_save_IFS - if test "x$CONFIG_SHELL" != x -then : + if test "x$CONFIG_SHELL" != x; then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -261,19 +261,18 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno -then : - printf "%s\n" "$0: This script requires a shell more modern than all" - printf "%s\n" "$0: the shells that I found on your system." - if test ${ZSH_VERSION+y} ; then - printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" - printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -300,7 +299,6 @@ as_fn_unset () } as_unset=as_fn_unset - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -318,14 +316,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -340,7 +330,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -349,7 +339,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -388,13 +378,12 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : eval 'as_fn_append () { eval $1+=\$2 }' -else $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -406,27 +395,18 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -438,9 +418,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -467,7 +447,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -511,7 +491,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -525,10 +505,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -542,13 +518,6 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -618,48 +587,53 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='monitoring-plugins' PACKAGE_TARNAME='monitoring-plugins' -PACKAGE_VERSION='2.4.0' -PACKAGE_STRING='monitoring-plugins 2.4.0' +PACKAGE_VERSION='2.3.5' +PACKAGE_STRING='monitoring-plugins 2.3.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' ac_unique_file="NPTest.pm" +ac_header_list= # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_STDIO_H -# include +#include +#ifdef HAVE_SYS_TYPES_H +# include #endif -#ifdef HAVE_STDLIB_H +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS # include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif #endif #ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif #ifdef HAVE_UNISTD_H # include #endif" -ac_header_c_list= gl_use_threads_default= gl_use_winpthreads_default= gt_needs= -ac_func_c_list= +ac_func_list= with_openssl_default='no' LIB_CRYPTO= gl_floorf_required=plain @@ -2038,8 +2012,6 @@ ALLOCA GL_COND_LIBTOOL_FALSE GL_COND_LIBTOOL_TRUE PERLMODS_DIR -localedir_c_make -localedir_c POSUB LTLIBINTL LIBINTL @@ -2199,9 +2171,6 @@ AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V -CSCOPE -ETAGS -CTAGS am__untar am__tar AMTAR @@ -2409,6 +2378,8 @@ do *) ac_optarg=yes ;; esac + # Accept the important Cygnus configure options, so we can diagnose typos. + case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -2449,9 +2420,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -2475,9 +2446,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -2688,9 +2659,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -2704,9 +2675,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -2750,9 +2721,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -2768,7 +2739,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -2832,7 +2803,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_myself" | +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -2889,7 +2860,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures monitoring-plugins 2.4.0 to adapt to many kinds of systems. +\`configure' configures monitoring-plugins 2.3.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2961,7 +2932,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of monitoring-plugins 2.4.0:";; + short | recursive ) echo "Configuration of monitoring-plugins 2.3.5:";; esac cat <<\_ACEOF @@ -3109,9 +3080,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -3139,8 +3110,7 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for configure.gnu first; this name is used for a wrapper for - # Metaconfig's "Configure" on case-insensitive file systems. + # Check for guested configure. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -3148,7 +3118,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -3157,10 +3127,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -monitoring-plugins configure 2.4.0 -generated by GNU Autoconf 2.71 +monitoring-plugins configure 2.3.5 +generated by GNU Autoconf 2.69 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -3177,14 +3147,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam + rm -f conftest.$ac_objext if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3192,15 +3162,14 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext -then : + } && test -s conftest.$ac_objext; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3217,28 +3186,26 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -3255,7 +3222,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3263,15 +3230,14 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } -then : + }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3281,20 +3247,62 @@ fi } # ac_fn_c_try_cpp -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3302,18 +3310,17 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - } -then : + }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -3334,12 +3341,11 @@ fi ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -3347,9 +3353,16 @@ else $as_nop #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif -#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -3367,71 +3380,114 @@ choke me #endif int -main (void) +main () { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that -# executables *can* be run. -ac_fn_c_try_run () +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: program exited with status $ac_status" >&5 - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -} # ac_fn_c_try_run +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel # ac_fn_c_check_type LINENO TYPE VAR INCLUDES # ------------------------------------------- @@ -3440,18 +3496,17 @@ fi ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { if (sizeof ($2)) return 0; @@ -3459,13 +3514,12 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { if (sizeof (($2))) return 0; @@ -3473,28 +3527,27 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type -# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR -# ------------------------------------------------------------------ +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. -ac_fn_check_decl () +# accordingly. +ac_fn_c_check_decl () { ac_save_ac_compile="$ac_compile" if test -n "$ac_compile_for_check_decl"; then @@ -3502,20 +3555,17 @@ ac_fn_check_decl () fi as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_decl_name=`echo $2|sed 's/ *(.*//'` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -printf %s "checking whether $as_decl_name is declared... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - eval ac_save_FLAGS=\$$6 - as_fn_append $6 " $5" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { #ifndef $as_decl_name #ifdef __cplusplus @@ -3529,23 +3579,20 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - eval $6=\$ac_save_FLAGS - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ac_compile="$ac_save_ac_compile" -} # ac_fn_check_decl +} # ac_fn_c_check_decl # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES # ---------------------------------------------------- @@ -3554,17 +3601,16 @@ printf "%s\n" "$ac_res" >&6; } ac_fn_c_check_member () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -printf %s "checking for $2.$3... " >&6; } -if eval test \${$4+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if eval \${$4+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main (void) +main () { static $2 ac_aggr; if (ac_aggr.$3) @@ -3573,15 +3619,14 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$4=yes" -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main (void) +main () { static $2 ac_aggr; if (sizeof ac_aggr.$3) @@ -3590,19 +3635,18 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$4=yes" -else $as_nop +else eval "$4=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$4 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member @@ -3621,7 +3665,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { static int test_array [1 - 2 * !(($2) >= 0)]; test_array [0] = 0; @@ -3631,15 +3675,14 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_lo=0 ac_mid=0 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -3649,10 +3692,9 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_hi=$ac_mid; break -else $as_nop +else as_fn_arith $ac_mid + 1 && ac_lo=$as_val if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= @@ -3660,14 +3702,14 @@ else $as_nop fi as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { static int test_array [1 - 2 * !(($2) < 0)]; test_array [0] = 0; @@ -3677,15 +3719,14 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_hi=-1 ac_mid=-1 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; test_array [0] = 0; @@ -3695,10 +3736,9 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_lo=$ac_mid; break -else $as_nop +else as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= @@ -3706,14 +3746,14 @@ else $as_nop fi as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done -else $as_nop +else ac_lo= ac_hi= fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val @@ -3721,7 +3761,7 @@ while test "x$ac_lo" != "x$ac_hi"; do /* end confdefs.h. */ $4 int -main (void) +main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -3731,13 +3771,12 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_hi=$ac_mid -else $as_nop +else as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in #(( ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; @@ -3747,12 +3786,12 @@ esac cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 -static long int longval (void) { return $2; } -static unsigned long int ulongval (void) { return $2; } +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } #include #include int -main (void) +main () { FILE *f = fopen ("conftest.val", "w"); @@ -3780,10 +3819,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : echo >>conftest.val; read $3 config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by monitoring-plugins $as_me 2.4.0, which was -generated by GNU Autoconf 2.71. Invocation command line was +It was created by monitoring-plugins $as_me 2.3.5, which was +generated by GNU Autoconf 2.69. Invocation command line was - $ $0$ac_configure_args_raw + $ $0 $@ _ACEOF exec 5>>config.log @@ -3855,12 +3873,8 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - printf "%s\n" "PATH: $as_dir" + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -3895,7 +3909,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -3930,13 +3944,11 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? - # Sanitize IFS. - IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - printf "%s\n" "## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -3947,8 +3959,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -3972,7 +3984,7 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ) echo - printf "%s\n" "## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -3980,14 +3992,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - printf "%s\n" "## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -3995,15 +4007,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - printf "%s\n" "## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -4011,8 +4023,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} echo fi test "$ac_signal" != 0 && - printf "%s\n" "$as_me: caught signal $ac_signal" - printf "%s\n" "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -4026,48 +4038,63 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -printf "%s\n" "/* confdefs.h */" > confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF -printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF -printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF -printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_files="$CONFIG_SITE" + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then - ac_site_files="$prefix/share/config.site $prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi - -for ac_site_file in $ac_site_files +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - case $ac_site_file in #( - */*) : - ;; #( - *) : - ac_site_file=./$ac_site_file ;; -esac - if test -f "$ac_site_file" && test -r "$ac_site_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -4077,501 +4104,92 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -printf "%s\n" "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -printf "%s\n" "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# Test code for whether the C compiler supports C89 (global declarations) -ac_c_conftest_c89_globals=' -/* Does the compiler advertise C89 conformance? - Do not test the value of __STDC__, because some compilers set it to 0 - while being otherwise adequately conformant. */ -#if !defined __STDC__ -# error "Compiler does not advertise C89 conformance" -#endif - -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ -struct buf { int x; }; -struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not \xHH hex character constants. - These do not provoke an error unfortunately, instead are silently treated - as an "x". The following induces an error, until -std is added to get - proper ANSI mode. Curiously \x00 != x always comes out true, for an - array size at least. It is necessary to write \x00 == 0 to get something - that is true only with -std. */ -int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) '\''x'\'' -int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), - int, int);' - -# Test code for whether the C compiler supports C89 (body of main). -ac_c_conftest_c89_main=' -ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); -' - -# Test code for whether the C compiler supports C99 (global declarations) -ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L -# error "Compiler does not advertise C99 conformance" -#endif - -#include -extern int puts (const char *); -extern int printf (const char *, ...); -extern int dprintf (int, const char *, ...); -extern void *malloc (size_t); - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -// dprintf is used instead of fprintf to avoid needing to declare -// FILE and stderr. -#define debug(...) dprintf (2, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - #error "your preprocessor is broken" -#endif -#if BIG_OK -#else - #error "your preprocessor is broken" -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static bool -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str = ""; - int number = 0; - float fnumber = 0; - - while (*format) - { - switch (*format++) - { - case '\''s'\'': // string - str = va_arg (args_copy, const char *); - break; - case '\''d'\'': // int - number = va_arg (args_copy, int); - break; - case '\''f'\'': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); - - return *str && number && fnumber; -} -' - -# Test code for whether the C compiler supports C99 (body of main). -ac_c_conftest_c99_main=' - // Check bool. - _Bool success = false; - success |= (argc != 0); - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[0] = argv[0][0]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' - || dynamic_array[ni.number - 1] != 543); -' - -# Test code for whether the C compiler supports C11 (global declarations) -ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L -# error "Compiler does not advertise C11 conformance" -#endif - -// Check _Alignas. -char _Alignas (double) aligned_as_double; -char _Alignas (0) no_special_alignment; -extern char aligned_as_int; -char _Alignas (0) _Alignas (int) aligned_as_int; - -// Check _Alignof. -enum -{ - int_alignment = _Alignof (int), - int_array_alignment = _Alignof (int[100]), - char_alignment = _Alignof (char) -}; -_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); - -// Check _Noreturn. -int _Noreturn does_not_return (void) { for (;;) continue; } - -// Check _Static_assert. -struct test_static_assert -{ - int x; - _Static_assert (sizeof (int) <= sizeof (long int), - "_Static_assert does not work in struct"); - long int y; -}; - -// Check UTF-8 literals. -#define u8 syntax error! -char const utf8_literal[] = u8"happens to be ASCII" "another string"; - -// Check duplicate typedefs. -typedef long *long_ptr; -typedef long int *long_ptr; -typedef long_ptr long_ptr; - -// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. -struct anonymous -{ - union { - struct { int i; int j; }; - struct { int k; long int l; } w; - }; - int m; -} v1; -' - -# Test code for whether the C compiler supports C11 (body of main). -ac_c_conftest_c11_main=' - _Static_assert ((offsetof (struct anonymous, i) - == offsetof (struct anonymous, w.k)), - "Anonymous union alignment botch"); - v1.i = 2; - v1.w.k = 5; - ok |= v1.i != 5; -' - -# Test code for whether the C compiler supports C11 (complete). -ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} -${ac_c_conftest_c11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - ${ac_c_conftest_c11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C99 (complete). -ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - return ok; -} -" - -# Test code for whether the C compiler supports C89 (complete). -ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - return ok; -} -" - -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" -as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" -as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" -as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" -as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" -as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" -as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" -as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" -as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" -as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" -as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" -as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H" +as_fn_append ac_header_list " wchar.h" +as_fn_append ac_header_list " minix/config.h" gt_needs="$gt_needs need-ngettext" -as_fn_append ac_header_c_list " arpa/inet.h arpa_inet_h HAVE_ARPA_INET_H" -as_fn_append ac_header_c_list " features.h features_h HAVE_FEATURES_H" -as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H" -as_fn_append ac_func_c_list " btowc HAVE_BTOWC" -as_fn_append ac_func_c_list " _set_invalid_parameter_handler HAVE__SET_INVALID_PARAMETER_HANDLER" -as_fn_append ac_func_c_list " fcntl HAVE_FCNTL" -as_fn_append ac_func_c_list " symlink HAVE_SYMLINK" -as_fn_append ac_header_c_list " stdio_ext.h stdio_ext_h HAVE_STDIO_EXT_H" -as_fn_append ac_func_c_list " fpurge HAVE_FPURGE" -as_fn_append ac_func_c_list " __fpurge HAVE___FPURGE" -as_fn_append ac_func_c_list " __freading HAVE___FREADING" -as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H" -as_fn_append ac_header_c_list " sys/vfs.h sys_vfs_h HAVE_SYS_VFS_H" -as_fn_append ac_header_c_list " sys/fs_types.h sys_fs_types_h HAVE_SYS_FS_TYPES_H" -as_fn_append ac_header_c_list " netdb.h netdb_h HAVE_NETDB_H" -as_fn_append ac_header_c_list " netinet/in.h netinet_in_h HAVE_NETINET_IN_H" -as_fn_append ac_func_c_list " getdelim HAVE_GETDELIM" -as_fn_append ac_func_c_list " getdtablesize HAVE_GETDTABLESIZE" +as_fn_append ac_header_list " arpa/inet.h" +as_fn_append ac_header_list " features.h" +as_fn_append ac_header_list " sys/socket.h" +as_fn_append ac_func_list " btowc" +as_fn_append ac_func_list " _set_invalid_parameter_handler" +as_fn_append ac_header_list " unistd.h" +as_fn_append ac_func_list " fcntl" +as_fn_append ac_func_list " symlink" +as_fn_append ac_header_list " stdio_ext.h" +as_fn_append ac_func_list " fpurge" +as_fn_append ac_func_list " __fpurge" +as_fn_append ac_func_list " __freading" +as_fn_append ac_header_list " sys/stat.h" +as_fn_append ac_header_list " sys/param.h" +as_fn_append ac_header_list " sys/vfs.h" +as_fn_append ac_header_list " sys/fs_types.h" +as_fn_append ac_header_list " netdb.h" +as_fn_append ac_header_list " netinet/in.h" +as_fn_append ac_func_list " getdelim" +as_fn_append ac_func_list " getdtablesize" gl_getopt_required=GNU -as_fn_append ac_header_c_list " getopt.h getopt_h HAVE_GETOPT_H" -as_fn_append ac_header_c_list " sys/cdefs.h sys_cdefs_h HAVE_SYS_CDEFS_H" -as_fn_append ac_func_c_list " getprogname HAVE_GETPROGNAME" -as_fn_append ac_func_c_list " getexecname HAVE_GETEXECNAME" -as_fn_append ac_header_c_list " threads.h threads_h HAVE_THREADS_H" -as_fn_append ac_func_c_list " getuid HAVE_GETUID" -as_fn_append ac_func_c_list " geteuid HAVE_GETEUID" -as_fn_append ac_func_c_list " getresuid HAVE_GETRESUID" -as_fn_append ac_func_c_list " getgid HAVE_GETGID" -as_fn_append ac_func_c_list " getegid HAVE_GETEGID" -as_fn_append ac_func_c_list " getresgid HAVE_GETRESGID" -as_fn_append ac_func_c_list " setresuid HAVE_SETRESUID" -as_fn_append ac_func_c_list " setreuid HAVE_SETREUID" -as_fn_append ac_func_c_list " seteuid HAVE_SETEUID" -as_fn_append ac_func_c_list " setresgid HAVE_SETRESGID" -as_fn_append ac_func_c_list " setregid HAVE_SETREGID" -as_fn_append ac_func_c_list " setegid HAVE_SETEGID" -as_fn_append ac_header_c_list " limits.h limits_h HAVE_LIMITS_H" -as_fn_append ac_header_c_list " langinfo.h langinfo_h HAVE_LANGINFO_H" -as_fn_append ac_header_c_list " xlocale.h xlocale_h HAVE_XLOCALE_H" -as_fn_append ac_header_c_list " math.h math_h HAVE_MATH_H" -as_fn_append ac_func_c_list " mbsinit HAVE_MBSINIT" -as_fn_append ac_func_c_list " mbrtowc HAVE_MBRTOWC" -as_fn_append ac_header_c_list " sys/mman.h sys_mman_h HAVE_SYS_MMAN_H" -as_fn_append ac_func_c_list " mprotect HAVE_MPROTECT" -as_fn_append ac_header_c_list " sys/statvfs.h sys_statvfs_h HAVE_SYS_STATVFS_H" -as_fn_append ac_func_c_list " nl_langinfo HAVE_NL_LANGINFO" -as_fn_append ac_func_c_list " lstat HAVE_LSTAT" -as_fn_append ac_header_c_list " malloc.h malloc_h HAVE_MALLOC_H" -as_fn_append ac_func_c_list " isblank HAVE_ISBLANK" -as_fn_append ac_func_c_list " iswctype HAVE_ISWCTYPE" -as_fn_append ac_func_c_list " setenv HAVE_SETENV" -as_fn_append ac_func_c_list " snprintf HAVE_SNPRINTF" -as_fn_append ac_header_c_list " stdalign.h stdalign_h HAVE_STDALIGN_H" -as_fn_append ac_header_c_list " stdbool.h stdbool_h HAVE_STDBOOL_H" -as_fn_append ac_header_c_list " stdckdint.h stdckdint_h HAVE_STDCKDINT_H" -as_fn_append ac_header_c_list " sys/uio.h sys_uio_h HAVE_SYS_UIO_H" -as_fn_append ac_func_c_list " localtime_r HAVE_LOCALTIME_R" -as_fn_append ac_func_c_list " timegm HAVE_TIMEGM" -as_fn_append ac_func_c_list " vasnprintf HAVE_VASNPRINTF" -as_fn_append ac_header_c_list " crtdefs.h crtdefs_h HAVE_CRTDEFS_H" -as_fn_append ac_func_c_list " wcrtomb HAVE_WCRTOMB" -as_fn_append ac_func_c_list " iswcntrl HAVE_ISWCNTRL" -as_fn_append ac_header_c_list " wctype.h wctype_h HAVE_WCTYPE_H" - -# Auxiliary files required by this configure script. -ac_aux_files="config.rpath ltmain.sh compile config.guess config.sub missing install-sh" - -# Locations in which to look for auxiliary files. -ac_aux_dir_candidates="${srcdir}/build-aux" - -# Search for a directory containing all of the required auxiliary files, -# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. -# If we don't find one directory that contains all the files we need, -# we report the set of missing files from the *first* directory in -# $ac_aux_dir_candidates and give up. -ac_missing_aux_files="" -ac_first_candidate=: -printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in $ac_aux_dir_candidates -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - as_found=: - - printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 - ac_aux_dir_found=yes - ac_install_sh= - for ac_aux in $ac_aux_files - do - # As a special case, if "install-sh" is required, that requirement - # can be satisfied by any of "install-sh", "install.sh", or "shtool", - # and $ac_install_sh is set appropriately for whichever one is found. - if test x"$ac_aux" = x"install-sh" - then - if test -f "${as_dir}install-sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 - ac_install_sh="${as_dir}install-sh -c" - elif test -f "${as_dir}install.sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 - ac_install_sh="${as_dir}install.sh -c" - elif test -f "${as_dir}shtool"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 - ac_install_sh="${as_dir}shtool install -c" - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} install-sh" - else - break - fi - fi - else - if test -f "${as_dir}${ac_aux}"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" - else - break - fi - fi - fi - done - if test "$ac_aux_dir_found" = yes; then - ac_aux_dir="$as_dir" - break - fi - ac_first_candidate=false - - as_found=false -done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 -fi - - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -if test -f "${ac_aux_dir}config.guess"; then - ac_config_guess="$SHELL ${ac_aux_dir}config.guess" -fi -if test -f "${ac_aux_dir}config.sub"; then - ac_config_sub="$SHELL ${ac_aux_dir}config.sub" -fi -if test -f "$ac_aux_dir/configure"; then - ac_configure="$SHELL ${ac_aux_dir}configure" -fi - +as_fn_append ac_header_list " getopt.h" +as_fn_append ac_header_list " sys/cdefs.h" +as_fn_append ac_func_list " getprogname" +as_fn_append ac_func_list " getexecname" +as_fn_append ac_header_list " threads.h" +as_fn_append ac_func_list " getuid" +as_fn_append ac_func_list " geteuid" +as_fn_append ac_func_list " getresuid" +as_fn_append ac_func_list " getgid" +as_fn_append ac_func_list " getegid" +as_fn_append ac_func_list " getresgid" +as_fn_append ac_func_list " setresuid" +as_fn_append ac_func_list " setreuid" +as_fn_append ac_func_list " seteuid" +as_fn_append ac_func_list " setresgid" +as_fn_append ac_func_list " setregid" +as_fn_append ac_func_list " setegid" +as_fn_append ac_header_list " limits.h" +as_fn_append ac_header_list " inttypes.h" +as_fn_append ac_header_list " sys/types.h" +as_fn_append ac_header_list " stdint.h" +as_fn_append ac_header_list " langinfo.h" +as_fn_append ac_header_list " xlocale.h" +as_fn_append ac_header_list " math.h" +as_fn_append ac_func_list " mbsinit" +as_fn_append ac_func_list " mbrtowc" +as_fn_append ac_header_list " sys/mman.h" +as_fn_append ac_func_list " mprotect" +as_fn_append ac_header_list " sys/statvfs.h" +as_fn_append ac_func_list " nl_langinfo" +as_fn_append ac_func_list " lstat" +as_fn_append ac_header_list " malloc.h" +as_fn_append ac_func_list " isblank" +as_fn_append ac_func_list " iswctype" +as_fn_append ac_func_list " setenv" +as_fn_append ac_func_list " snprintf" +as_fn_append ac_header_list " sys/time.h" +as_fn_append ac_header_list " stdalign.h" +as_fn_append ac_header_list " stdbool.h" +as_fn_append ac_header_list " stdckdint.h" +as_fn_append ac_header_list " strings.h" +as_fn_append ac_header_list " sys/uio.h" +as_fn_append ac_func_list " localtime_r" +as_fn_append ac_func_list " timegm" +as_fn_append ac_func_list " vasnprintf" +as_fn_append ac_header_list " crtdefs.h" +as_fn_append ac_func_list " wcrtomb" +as_fn_append ac_func_list " iswcntrl" +as_fn_append ac_header_list " wctype.h" # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -4582,12 +4200,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -4596,24 +4214,24 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -4623,12 +4241,11 @@ printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' - and start over" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -4644,12 +4261,38 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_files="$ac_config_files gl/Makefile" +ac_aux_dir= +for ac_dir in build-aux "$srcdir"/build-aux; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + am__api_version='1.16' - - - # Find a good install program. We prefer a C program (faster), +# Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -4663,25 +4306,20 @@ am__api_version='1.16' # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -printf %s "checking for a BSD-compatible install... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test ${ac_cv_path_install+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - # Account for fact that we put trailing slashes in our PATH walk. -case $as_dir in #(( - ./ | /[cC]/* | \ + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -4691,13 +4329,13 @@ case $as_dir in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -4705,12 +4343,12 @@ case $as_dir in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -4726,7 +4364,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test ${ac_cv_path_install+y}; then + if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -4736,8 +4374,8 @@ fi INSTALL=$ac_install_sh fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -printf "%s\n" "$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -4747,8 +4385,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -printf %s "checking whether build environment is sane... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -4802,8 +4440,8 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -4822,14 +4460,12 @@ test "$program_suffix" != NONE && # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` - +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # Expand $ac_aux_dir to an absolute path. am_aux_dir=`cd "$ac_aux_dir" && pwd` - - if test x"${MISSING+set}" != xset; then +if test x"${MISSING+set}" != xset; then MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL @@ -4837,8 +4473,8 @@ if eval "$MISSING --is-lightweight"; then am_missing_run="$MISSING " else am_missing_run= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh+set}" != xset; then @@ -4858,12 +4494,11 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -4871,15 +4506,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4890,11 +4521,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -printf "%s\n" "$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4903,12 +4534,11 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -4916,15 +4546,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4935,11 +4561,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -printf "%s\n" "$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -4947,8 +4573,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -4960,31 +4586,25 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 -printf %s "checking for a race-free mkdir -p... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test ${ac_cv_path_mkdir+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue - case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir ('*'coreutils) '* | \ - 'BusyBox '* | \ + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext break 3;; esac done @@ -4995,7 +4615,7 @@ IFS=$as_save_IFS fi test -d ./--version && rmdir ./--version - if test ${ac_cv_path_mkdir+y}; then + if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -5005,19 +4625,18 @@ fi MKDIR_P="$ac_install_sh -d" fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -printf "%s\n" "$MKDIR_P" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AWK+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -5025,15 +4644,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5044,25 +4659,24 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -printf "%s\n" "$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -n "$AWK" && break done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval test \${ac_cv_prog_make_${ac_make}_set+y} -then : - printf %s "(cached) " >&6 -else $as_nop +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -5078,12 +4692,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -5097,8 +4711,7 @@ fi rmdir .tst 2>/dev/null # Check whether --enable-silent-rules was given. -if test ${enable_silent_rules+y} -then : +if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi @@ -5108,13 +4721,12 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=1;; esac am_make=${MAKE-make} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -printf %s "checking whether $am_make supports nested variables... " >&6; } -if test ${am_cv_make_support_nested_variables+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if printf "%s\n" 'TRUE=$(BAR$(V)) +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -5126,8 +4738,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -5159,13 +4771,17 @@ fi # Define the identity of the package. PACKAGE='monitoring-plugins' - VERSION='2.4.0' + VERSION='2.3.5' -printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF -printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF # Some tools Automake needs. @@ -5205,20 +4821,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -# Variables for tags utilities; see am/tags.am -if test -z "$CTAGS"; then - CTAGS=ctags -fi - -if test -z "$ETAGS"; then - ETAGS=etags -fi - -if test -z "$CSCOPE"; then - CSCOPE=cscope -fi - - # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile @@ -5263,8 +4865,7 @@ END fi # Check whether --enable-silent-rules was given. -if test ${enable_silent_rules+y} -then : +if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi @@ -5274,13 +4875,12 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -printf %s "checking whether $am_make supports nested variables... " >&6; } -if test ${am_cv_make_support_nested_variables+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if printf "%s\n" 'TRUE=$(BAR$(V)) +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -5292,8 +4892,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -5304,18 +4904,17 @@ fi AM_BACKSLASH='\' -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test ${enable_maintainer_mode+y} -then : +if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else $as_nop +else USE_MAINTAINER_MODE=yes fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -printf "%s\n" "$USE_MAINTAINER_MODE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -5329,29 +4928,26 @@ fi ac_config_headers="$ac_config_headers config.h" +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - - # Make sure we can run config.sub. -$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -printf %s "checking build system type... " >&6; } -if test ${ac_cv_build+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -printf "%s\n" "$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -5370,22 +4966,21 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -printf %s "checking host system type... " >&6; } -if test ${ac_cv_host+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -printf "%s\n" "$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -5414,22 +5009,19 @@ RELEASE=1 extra_install_args="" # Check whether --with-nagios_user was given. -if test ${with_nagios_user+y} -then : +if test "${with_nagios_user+set}" = set; then : withval=$with_nagios_user; extra_install_args="-o $withval" fi # Check whether --with-nagios_group was given. -if test ${with_nagios_group+y} -then : +if test "${with_nagios_group+set}" = set; then : withval=$with_nagios_group; extra_install_args="$extra_install_args -g $withval" fi # Check whether --with-world_permissions was given. -if test ${with_world_permissions+y} -then : +if test "${with_world_permissions+set}" = set; then : withval=$with_world_permissions; fi @@ -5442,15 +5034,6 @@ INSTALL="$INSTALL $extra_install_args" INSTALL_STRIP_PROGRAM="$INSTALL_STRIP_PROGRAM $extra_install_args" - - - - - - - - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5459,12 +5042,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5472,15 +5054,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5491,11 +5069,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5504,12 +5082,11 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -5517,15 +5094,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5536,11 +5109,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -5548,8 +5121,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -5562,12 +5135,11 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5575,15 +5147,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5594,11 +5162,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5607,12 +5175,11 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5621,19 +5188,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5649,18 +5212,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5671,12 +5234,11 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5684,15 +5246,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5703,11 +5261,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5720,12 +5278,11 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -5733,15 +5290,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5752,11 +5305,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5768,8 +5321,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -5781,12 +5334,11 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. set dummy ${ac_tool_prefix}clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5794,15 +5346,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5813,11 +5361,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5826,12 +5374,11 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "clang", so it can be a program name with args. set dummy clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -5839,15 +5386,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5858,11 +5401,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -5870,8 +5413,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -5883,13 +5426,13 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion -version; do @@ -5899,7 +5442,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -5909,7 +5452,7 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -5917,7 +5460,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -5929,9 +5472,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -printf %s "checking whether the C compiler works... " >&6; } -ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -5952,12 +5495,11 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -5974,7 +5516,7 @@ do # certainly right. break;; *.* ) - if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -5990,46 +5532,44 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop +else ac_file='' fi -if test -z "$ac_file" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -printf "%s\n" "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -printf %s "checking for C compiler default output file name... " >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -printf "%s\n" "$ac_file" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -printf %s "checking for suffix of executables... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -6043,15 +5583,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -printf "%s\n" "$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -6060,7 +5600,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -6072,8 +5612,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -printf %s "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -6081,10 +5621,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -6092,40 +5632,39 @@ printf "%s\n" "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot run C compiled programs. + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf "%s\n" "$cross_compiling" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -printf %s "checking for suffix of object files... " >&6; } -if test ${ac_cv_objext+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -6139,12 +5678,11 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -6153,32 +5691,31 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -printf "%s\n" "$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 -printf %s "checking whether the compiler supports GNU C... " >&6; } -if test ${ac_cv_c_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -6188,33 +5725,29 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_c_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+y} +ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -printf %s "checking whether $CC accepts -g... " >&6; } -if test ${ac_cv_prog_cc_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -6223,60 +5756,57 @@ else $as_nop /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else $as_nop +else CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -printf "%s\n" "$ac_cv_prog_cc_g" >&6; } -if test $ac_test_CFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -6291,206 +5821,518 @@ else CFLAGS= fi fi -ac_prog_cc_stdc=no -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 -printf %s "checking for $CC option to enable C11 features... " >&6; } -if test ${ac_cv_prog_cc_c11+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +$as_echo_n "checking for $CC option to enable C11 features... " >&6; } +if ${ac_cv_prog_cc_c11+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_c_conftest_c11_program -_ACEOF -for ac_arg in '' -std=gnu11 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c11" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi +#include +#include +#include +#include +#include +#include -if test "x$ac_cv_prog_cc_c11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 -printf %s "checking for $CC option to enable C99 features... " >&6; } -if test ${ac_cv_prog_cc_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c99_program -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} -if test "x$ac_cv_prog_cc_c99" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 -printf %s "checking for $CC option to enable C89 features... " >&6; } -if test ${ac_cv_prog_cc_c89+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c89_program -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; -if test "x$ac_cv_prog_cc_c89" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 -fi -fi +struct incomplete_array +{ + int datasize; + double data[]; +}; -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +struct named_init { + int number; + const wchar_t *name; + double average; +}; +typedef const char *ccp; - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -printf %s "checking whether $CC understands -c and -o together... " >&6; } -if test ${am_cv_prog_cc_c_o+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; int -main (void) +main () { + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + v1.i = 2; + v1.w.k = 5; + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + ; return 0; } _ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c11=$ac_arg fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + fi +# AC_CACHE_VAL +ac_prog_cc_stdc_options= +case "x$ac_cv_prog_cc_c11" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c11" + CC=$CC$ac_prog_cc_stdc_options + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +$as_echo "$ac_cv_prog_cc_c11" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c11" != xno; then : + ac_prog_cc_stdc=c11 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +$as_echo_n "checking for $CC option to enable C99 features... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +ac_prog_cc_stdc_options= +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c99" + CC=$CC$ac_prog_cc_stdc_options + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; then : + ac_prog_cc_stdc=c99 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +$as_echo_n "checking for $CC option to enable C89 features... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +ac_prog_cc_stdc_options= +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c89" + CC=$CC$ac_prog_cc_stdc_options + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + ac_prog_cc_stdc=c89 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 +else + ac_prog_cc_stdc=no + ac_cv_prog_cc_stdc=no +fi + +fi + +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6498,13 +6340,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5 -printf %s "checking whether the compiler is clang... " >&6; } -if test ${gl_cv_compiler_clang+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5 +$as_echo_n "checking whether the compiler is clang... " >&6; } +if ${gl_cv_compiler_clang+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6513,7 +6353,7 @@ else $as_nop #endif int -main (void) +main () { ; @@ -6521,25 +6361,23 @@ main (void) } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_compiler_clang=no -else $as_nop +else gl_cv_compiler_clang=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5 -printf "%s\n" "$gl_cv_compiler_clang" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5 +$as_echo "$gl_cv_compiler_clang" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5 -printf %s "checking for compiler option needed when checking for declarations... " >&6; } -if test ${gl_cv_compiler_check_decl_option+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5 +$as_echo_n "checking for compiler option needed when checking for declarations... " >&6; } +if ${gl_cv_compiler_check_decl_option+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $gl_cv_compiler_clang = yes; then save_ac_compile="$ac_compile" ac_compile="$ac_compile -Werror=implicit-function-declaration" @@ -6547,28 +6385,27 @@ else $as_nop /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration' -else $as_nop +else gl_cv_compiler_check_decl_option=none fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_compile="$save_ac_compile" else gl_cv_compiler_check_decl_option=none fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5 -printf "%s\n" "$gl_cv_compiler_check_decl_option" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5 +$as_echo "$gl_cv_compiler_check_decl_option" >&6; } if test "x$gl_cv_compiler_check_decl_option" != xnone; then ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option" else @@ -6579,8 +6416,8 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } cat > confinc.mk << 'END' am__doit: @echo this is the am__doit target >confinc.out @@ -6616,12 +6453,11 @@ esac fi done rm -f confinc.* confmf.* -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -printf "%s\n" "${_am_result}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. -if test ${enable_dependency_tracking+y} -then : +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -6642,12 +6478,11 @@ fi depcc="$CC" am_compiler_list= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -printf %s "checking dependency style of $depcc... " >&6; } -if test ${am_cv_CC_dependencies_compiler_type+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -6754,8 +6589,8 @@ else fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -6770,225 +6605,46 @@ fi -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi - - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test ${ac_cv_safe_to_define___extensions__+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_safe_to_define___extensions__=yes -else $as_nop - ac_cv_safe_to_define___extensions__=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 -printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } -if test ${ac_cv_should_define__xopen_source+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_should_define__xopen_source=no - if test $ac_cv_header_wchar_h = yes -then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - mbstate_t x; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #define _XOPEN_SOURCE 500 - #include - mbstate_t x; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_should_define__xopen_source=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 -printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } - - printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h - - printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h - - printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h - - printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h - - printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h - - printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h - - printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h - - printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h - - if test $ac_cv_header_minix_config_h = yes -then : - MINIX=yes - printf "%s\n" "#define _MINIX 1" >>confdefs.h - - printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h - - printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h - -else $as_nop - MINIX= -fi - if test $ac_cv_safe_to_define___extensions__ = yes -then : - printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h - -fi - if test $ac_cv_should_define__xopen_source = yes -then : - printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h - -fi - - - - - - case "$host_os" in - openbsd*) - -printf "%s\n" "#define _ISOC11_SOURCE 1" >>confdefs.h - - ;; - esac ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -printf %s "checking how to run the C preprocessor... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test ${ac_cv_prog_CPP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - # Double quotes because $CC needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" do ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -7000,11 +6656,10 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -7014,8 +6669,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : break fi @@ -7027,24 +6681,29 @@ fi else ac_cv_prog_CPP=$CPP fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -printf "%s\n" "$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : -else $as_nop +else # Broken: fails on valid input. continue fi @@ -7056,11 +6715,10 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue -else $as_nop +else # Passes both tests. ac_preproc_ok=: break @@ -7070,12 +6728,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : +if $ac_preproc_ok; then : -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi @@ -7087,12 +6744,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -printf %s "checking for grep that handles long lines and -e... " >&6; } -if test ${ac_cv_path_GREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$GREP"; then ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -7100,15 +6756,10 @@ else $as_nop for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in grep ggrep - do + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP @@ -7117,13 +6768,13 @@ case `"$ac_path_GREP" --version 2>&1` in ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -7151,17 +6802,16 @@ else fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -printf "%s\n" "$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -printf %s "checking for egrep... " >&6; } -if test ${ac_cv_path_EGREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else @@ -7172,15 +6822,10 @@ else $as_nop for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in egrep - do + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP @@ -7189,13 +6834,13 @@ case `"$ac_path_EGREP" --version 2>&1` in ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -7224,20 +6869,313 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -printf "%s\n" "$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5 -printf %s "checking for Minix Amsterdam compiler... " >&6; } -if test ${gl_cv_c_amsterdam_compiler+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + + for ac_header in $ac_header_list +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if ${ac_cv_safe_to_define___extensions__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_safe_to_define___extensions__=yes +else + ac_cv_safe_to_define___extensions__=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +$as_echo_n "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if ${ac_cv_should_define__xopen_source+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +$as_echo "$ac_cv_should_define__xopen_source" >&6; } + + $as_echo "#define _ALL_SOURCE 1" >>confdefs.h + + $as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + + $as_echo "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + $as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h + + $as_echo "#define _OPENBSD_SOURCE 1" >>confdefs.h + + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + $as_echo "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + $as_echo "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + $as_echo "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + $as_echo "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + $as_echo "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + $as_echo "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + $as_echo "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + $as_echo "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes; then : + MINIX=yes + $as_echo "#define _MINIX 1" >>confdefs.h + + $as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + + $as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else + MINIX= +fi + if test $ac_cv_safe_to_define___extensions__ = yes; then : + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes; then : + $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + + + + + + case "$host_os" in + openbsd*) + +$as_echo "#define _ISOC11_SOURCE 1" >>confdefs.h + + ;; + esac + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5 +$as_echo_n "checking for Minix Amsterdam compiler... " >&6; } +if ${gl_cv_c_amsterdam_compiler+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7248,18 +7186,17 @@ Amsterdam _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Amsterdam" >/dev/null 2>&1 -then : + $EGREP "Amsterdam" >/dev/null 2>&1; then : gl_cv_c_amsterdam_compiler=yes -else $as_nop +else gl_cv_c_amsterdam_compiler=no fi -rm -rf conftest* +rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5 -printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5 +$as_echo "$gl_cv_c_amsterdam_compiler" >&6; } if test $gl_cv_c_amsterdam_compiler = yes; then if test -z "$AR"; then @@ -7275,12 +7212,11 @@ printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; } if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -7288,15 +7224,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="${ac_tool_prefix}ar" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7307,11 +7239,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -printf "%s\n" "$AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7320,12 +7252,11 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_AR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -7333,15 +7264,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="ar" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7352,11 +7279,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -printf "%s\n" "$ac_ct_AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_AR" = x; then @@ -7364,8 +7291,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -7387,12 +7314,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -7400,15 +7326,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7419,11 +7341,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -printf "%s\n" "$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7432,12 +7354,11 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -7445,15 +7366,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7464,11 +7381,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -printf "%s\n" "$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -7476,8 +7393,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -7492,19 +7409,18 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if test ${ac_cv_sys_largefile_source+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } +if ${ac_cv_sys_largefile_source+:} false; then : + $as_echo_n "(cached) " >&6 +else while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include /* for off_t */ #include int -main (void) +main () { int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); @@ -7512,11 +7428,10 @@ int (*fp) (FILE *, off_t, int) = fseeko; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_sys_largefile_source=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7524,7 +7439,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ #include /* for off_t */ #include int -main (void) +main () { int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); @@ -7532,22 +7447,23 @@ int (*fp) (FILE *, off_t, int) = fseeko; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_sys_largefile_source=1; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_cv_sys_largefile_source=unknown break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -printf "%s\n" "$ac_cv_sys_largefile_source" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 +$as_echo "$ac_cv_sys_largefile_source" >&6; } case $ac_cv_sys_largefile_source in #( no | unknown) ;; *) -printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source +_ACEOF ;; esac rm -rf conftest* @@ -7557,32 +7473,29 @@ rm -rf conftest* # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. if test $ac_cv_sys_largefile_source != unknown; then -printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h +$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h fi case "$host_os" in hpux*) -printf "%s\n" "#define _LARGEFILE_SOURCE 1" >>confdefs.h +$as_echo "#define _LARGEFILE_SOURCE 1" >>confdefs.h ;; esac - if test "$enable_largefile" != no -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5 -printf %s "checking for $CC option to enable large file support... " >&6; } -if test ${ac_cv_sys_largefile_opts+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if test "$enable_largefile" != no; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5 +$as_echo_n "checking for $CC option to enable large file support... " >&6; } +if ${ac_cv_sys_largefile_opts+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_CC="$CC" ac_opt_found=no for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do - if test x"$ac_opt" != x"none needed" -then : + if test x"$ac_opt" != x"none needed"; then : CC="$ac_save_CC $ac_opt" fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7597,26 +7510,25 @@ fi && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_opts="$ac_opt" ac_opt_found=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test $ac_opt_found = no || break done CC="$ac_save_CC" test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 -printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 +$as_echo "$ac_cv_sys_largefile_opts" >&6; } ac_have_largefile=yes case $ac_cv_sys_largefile_opts in #( @@ -7626,11 +7538,11 @@ case $ac_cv_sys_largefile_opts in #( ac_have_largefile=no ;; #( "-D_FILE_OFFSET_BITS=64") : -printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h +$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h ;; #( "-D_LARGE_FILES=1") : -printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h +$as_echo "#define _LARGE_FILES 1" >>confdefs.h ;; #( "-n32") : CC="$CC -n32" ;; #( @@ -7638,19 +7550,16 @@ printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;; esac - if test "$enable_year2038" != no -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable timestamps after Jan 2038" >&5 -printf %s "checking for $CC option to enable timestamps after Jan 2038... " >&6; } -if test ${ac_cv_sys_year2038_opts+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if test "$enable_year2038" != no; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable timestamps after Jan 2038" >&5 +$as_echo_n "checking for $CC option to enable timestamps after Jan 2038... " >&6; } +if ${ac_cv_sys_year2038_opts+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_CPPFLAGS="$CPPFLAGS" ac_opt_found=no for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do - if test x"$ac_opt" != x"none needed" -then : + if test x"$ac_opt" != x"none needed"; then : CPPFLAGS="$ac_save_CPPFLAGS $ac_opt" fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7665,26 +7574,25 @@ fi ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_year2038_opts="$ac_opt" ac_opt_found=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test $ac_opt_found = no || break done CPPFLAGS="$ac_save_CPPFLAGS" test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5 -printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5 +$as_echo "$ac_cv_sys_year2038_opts" >&6; } ac_have_year2038=yes case $ac_cv_sys_year2038_opts in #( @@ -7702,14 +7610,12 @@ case $ac_cv_sys_year2038_opts in #( # wide time_t. (It would be inappropriate for us to override an # intentional use of -m32.) Error out, demanding use of # --disable-year2038 if this is intentional. - if test $cross_compiling = no -then : - if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null -then : + if test $cross_compiling = no; then : + if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then : case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( *'Feb 7 2106'* | *'Feb 7 17:10'*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "this system appears to support timestamps after January 2038, but no mechanism for enabling wide 'time_t' was detected. Did you mean to build a 64-bit @@ -7726,15 +7632,15 @@ fi ;; #( esac ;; #( "-D_TIME_BITS=64") : -printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h +$as_echo "#define _TIME_BITS 64" >>confdefs.h ;; #( "-D__MINGW_USE_VC2005_COMPAT=1") : -printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h +$as_echo "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h ;; #( "-U_USE_32_BIT_TIME_T"*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It will stop working after January 2038. Remove _USE_32BIT_TIME_T from the compiler flags. @@ -7757,10 +7663,9 @@ fi # Check whether --enable-threads was given. -if test ${enable_threads+y} -then : +if test "${enable_threads+set}" = set; then : enableval=$enable_threads; gl_use_threads=$enableval -else $as_nop +else if test -n "$gl_use_threads_default"; then gl_use_threads="$gl_use_threads_default" else @@ -7992,12 +7897,11 @@ fi # Code from module xsize: if test $ac_cv_c_compiler_gnu = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 -printf %s "checking whether $CC needs -traditional... " >&6; } -if test ${ac_cv_prog_gcc_traditional+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 +$as_echo_n "checking whether $CC needs -traditional... " >&6; } +if ${ac_cv_prog_gcc_traditional+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_pattern="Autoconf.*'x'" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8005,13 +7909,12 @@ else $as_nop Autoconf TIOCGETP _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1 -then : + $EGREP "$ac_pattern" >/dev/null 2>&1; then : ac_cv_prog_gcc_traditional=yes -else $as_nop +else ac_cv_prog_gcc_traditional=no fi -rm -rf conftest* +rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then @@ -8021,16 +7924,15 @@ rm -rf conftest* Autoconf TCGETA _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1 -then : + $EGREP "$ac_pattern" >/dev/null 2>&1; then : ac_cv_prog_gcc_traditional=yes fi -rm -rf conftest* +rm -f conftest* fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 -printf "%s\n" "$ac_cv_prog_gcc_traditional" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 +$as_echo "$ac_cv_prog_gcc_traditional" >&6; } if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi @@ -8038,8 +7940,8 @@ fi case `pwd` in *\ * | *\ *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac @@ -8059,7 +7961,6 @@ macro_revision='1.3337' - ltmain="$ac_aux_dir/ltmain.sh" # Backslashify metacharacters that are still active within @@ -8083,8 +7984,8 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -printf %s "checking how to print strings... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -8110,12 +8011,12 @@ func_echo_all () } case "$ECHO" in - printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -printf "%s\n" "printf" >&6; } ;; - print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -printf "%s\n" "print -r" >&6; } ;; - *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -printf "%s\n" "cat" >&6; } ;; + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; esac @@ -8131,12 +8032,11 @@ esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -printf %s "checking for a sed that does not truncate output... " >&6; } -if test ${ac_cv_path_SED+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -8150,15 +8050,10 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in sed gsed - do + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -8167,13 +8062,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" '' >> "conftest.nl" + $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -8201,8 +8096,8 @@ else fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -printf "%s\n" "$ac_cv_path_SED" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -8219,12 +8114,11 @@ Xsed="$SED -e 1s/^X//" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -printf %s "checking for fgrep... " >&6; } -if test ${ac_cv_path_FGREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -8235,15 +8129,10 @@ else $as_nop for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in fgrep - do + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -8252,13 +8141,13 @@ case `"$ac_path_FGREP" --version 2>&1` in ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'FGREP' >> "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -8287,8 +8176,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -printf "%s\n" "$ac_cv_path_FGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -8313,18 +8202,17 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. -if test ${with_gnu_ld+y} -then : +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else $as_nop +else with_gnu_ld=no fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -printf %s "checking for ld used by $CC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -8353,16 +8241,15 @@ printf %s "checking for ld used by $CC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -printf %s "checking for GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -printf %s "checking for non-GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if test ${lt_cv_path_LD+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -8391,19 +8278,18 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -printf "%s\n" "$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -printf %s "checking if the linker ($LD) is GNU ld... " >&6; } -if test ${lt_cv_prog_gnu_ld+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -8426,12 +8312,11 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test ${lt_cv_path_NM+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" @@ -8476,8 +8361,8 @@ else : ${lt_cv_path_NM=no} fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -printf "%s\n" "$lt_cv_path_NM" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else @@ -8490,12 +8375,11 @@ else do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DUMPBIN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else @@ -8503,15 +8387,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8522,11 +8402,11 @@ fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -printf "%s\n" "$DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8539,12 +8419,11 @@ if test -z "$DUMPBIN"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_DUMPBIN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else @@ -8552,15 +8431,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8571,11 +8446,11 @@ fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -printf "%s\n" "$ac_ct_DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8587,8 +8462,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN @@ -8616,12 +8491,11 @@ test -z "$NM" && NM=nm -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -printf %s "checking the name lister ($NM) interface... " >&6; } -if test ${lt_cv_nm_interface+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) @@ -8637,27 +8511,26 @@ else $as_nop fi rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -printf "%s\n" "$lt_cv_nm_interface" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -printf %s "checking whether ln -s works... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -printf "%s\n" "no, using $LN_S" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -printf %s "checking the maximum length of command line arguments... " >&6; } -if test ${lt_cv_sys_max_cmd_len+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else i=0 teststring="ABCD" @@ -8783,11 +8656,11 @@ else $as_nop fi if test -n $lt_cv_sys_max_cmd_len ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -8800,8 +8673,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -printf %s "checking whether the shell understands some XSI constructs... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -8810,18 +8683,18 @@ xsi_shell=no && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -printf "%s\n" "$xsi_shell" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -printf %s "checking whether the shell understands \"+=\"... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -printf "%s\n" "$lt_shell_append" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -8855,12 +8728,11 @@ esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -printf %s "checking how to convert $build file names to $host format... " >&6; } -if test ${lt_cv_to_host_file_cmd+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else case $host in *-*-mingw* ) case $build in @@ -8896,19 +8768,18 @@ esac fi to_host_file_cmd=$lt_cv_to_host_file_cmd -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -printf %s "checking how to convert $build file names to toolchain format... " >&6; } -if test ${lt_cv_to_tool_file_cmd+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else #assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in @@ -8924,23 +8795,22 @@ esac fi to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -printf %s "checking for $LD option to reload object files... " >&6; } -if test ${lt_cv_ld_reload_flag+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_ld_reload_flag='-r' fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -8973,12 +8843,11 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OBJDUMP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -8986,15 +8855,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9005,11 +8870,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -printf "%s\n" "$OBJDUMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9018,12 +8883,11 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OBJDUMP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -9031,15 +8895,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9050,11 +8910,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -printf "%s\n" "$ac_ct_OBJDUMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -9062,8 +8922,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -9082,12 +8942,11 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -printf %s "checking how to recognize dependent libraries... " >&6; } -if test ${lt_cv_deplibs_check_method+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' @@ -9281,8 +9140,8 @@ tpf*) esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_glob= want_nocaseglob=no @@ -9326,12 +9185,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DLLTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else @@ -9339,15 +9197,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9358,11 +9212,11 @@ fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -printf "%s\n" "$DLLTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9371,12 +9225,11 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_DLLTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else @@ -9384,15 +9237,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9403,11 +9252,11 @@ fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -printf "%s\n" "$ac_ct_DLLTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -9415,8 +9264,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -9436,12 +9285,11 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -printf %s "checking how to associate runtime and link libraries... " >&6; } -if test ${lt_cv_sharedlib_from_linklib_cmd+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in @@ -9464,8 +9312,8 @@ cygwin* | mingw* | pw32* | cegcc*) esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -9480,12 +9328,11 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -9493,15 +9340,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9512,11 +9355,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -printf "%s\n" "$AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9529,12 +9372,11 @@ if test -z "$AR"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_AR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -9542,15 +9384,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9561,11 +9399,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -printf "%s\n" "$ac_ct_AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9577,8 +9415,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -9598,32 +9436,30 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -printf %s "checking for archiver @FILE support... " >&6; } -if test ${lt_cv_ar_at_file+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_ar_at_file=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test "$ac_status" -eq 0; then # Ensure the archiver fails upon bogus file names. @@ -9631,7 +9467,7 @@ then : { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test "$ac_status" -ne 0; then lt_cv_ar_at_file=@ @@ -9640,11 +9476,11 @@ then : rm -f conftest.* libconftest.a fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -printf "%s\n" "$lt_cv_ar_at_file" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } if test "x$lt_cv_ar_at_file" = xno; then archiver_list_spec= @@ -9661,12 +9497,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -9674,15 +9509,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9693,11 +9524,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -printf "%s\n" "$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9706,12 +9537,11 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -9719,15 +9549,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9738,11 +9564,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -printf "%s\n" "$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -9750,8 +9576,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -9770,12 +9596,11 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -9783,15 +9608,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9802,11 +9623,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -printf "%s\n" "$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9815,12 +9636,11 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -9828,15 +9648,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9847,11 +9663,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -printf "%s\n" "$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -9859,8 +9675,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -9949,12 +9765,11 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -printf %s "checking command to parse $NM output from $compiler object... " >&6; } -if test ${lt_cv_sys_global_symbol_pipe+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -10073,14 +9888,14 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -10149,7 +9964,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -10184,11 +9999,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -printf "%s\n" "failed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf "%s\n" "ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } fi # Response file support. @@ -10224,14 +10039,13 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -printf %s "checking for sysroot... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } # Check whether --with-sysroot was given. -if test ${with_sysroot+y} -then : +if test "${with_sysroot+set}" = set; then : withval=$with_sysroot; -else $as_nop +else with_sysroot=no fi @@ -10249,22 +10063,21 @@ case ${with_sysroot} in #( no|'') ;; #( *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -printf "%s\n" "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -printf "%s\n" "${lt_sysroot:-no}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } # Check whether --enable-libtool-lock was given. -if test ${enable_libtool_lock+y} -then : +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -10279,7 +10092,7 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) @@ -10298,7 +10111,7 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -10336,7 +10149,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) @@ -10386,12 +10199,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -printf %s "checking whether the C compiler needs -belf... " >&6; } -if test ${lt_cv_cc_needs_belf+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10402,20 +10214,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes -else $as_nop +else lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -10424,8 +10235,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -10437,7 +10248,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) @@ -10474,12 +10285,11 @@ need_locks="$enable_libtool_lock" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_MANIFEST_TOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$MANIFEST_TOOL"; then ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else @@ -10487,15 +10297,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10506,11 +10312,11 @@ fi fi MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL if test -n "$MANIFEST_TOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -printf "%s\n" "$MANIFEST_TOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -10519,12 +10325,11 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL # Extract the first word of "mt", so it can be a program name with args. set dummy mt; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_MANIFEST_TOOL"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else @@ -10532,15 +10337,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10551,11 +10352,11 @@ fi fi ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL if test -n "$ac_ct_MANIFEST_TOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_MANIFEST_TOOL" = x; then @@ -10563,8 +10364,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL @@ -10574,12 +10375,11 @@ else fi test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if test ${lt_cv_path_mainfest_tool+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_path_mainfest_tool=no echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out @@ -10589,8 +10389,8 @@ else $as_nop fi rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } if test "x$lt_cv_path_mainfest_tool" != xyes; then MANIFEST_TOOL=: fi @@ -10605,12 +10405,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DSYMUTIL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else @@ -10618,15 +10417,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10637,11 +10432,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -printf "%s\n" "$DSYMUTIL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -10650,12 +10445,11 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else @@ -10663,15 +10457,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10682,11 +10472,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -10694,8 +10484,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -10707,12 +10497,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_NMEDIT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else @@ -10720,15 +10509,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10739,11 +10524,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -printf "%s\n" "$NMEDIT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -10752,12 +10537,11 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_NMEDIT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else @@ -10765,15 +10549,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10784,11 +10564,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -printf "%s\n" "$ac_ct_NMEDIT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -10796,8 +10576,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -10809,12 +10589,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_LIPO+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else @@ -10822,15 +10601,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10841,11 +10616,11 @@ fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -printf "%s\n" "$LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -10854,12 +10629,11 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_LIPO+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else @@ -10867,15 +10641,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10886,11 +10656,11 @@ fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -printf "%s\n" "$ac_ct_LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -10898,8 +10668,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -10911,12 +10681,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else @@ -10924,15 +10693,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10943,11 +10708,11 @@ fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -printf "%s\n" "$OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -10956,12 +10721,11 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else @@ -10969,15 +10733,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10988,11 +10748,11 @@ fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -printf "%s\n" "$ac_ct_OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -11000,8 +10760,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -11013,12 +10773,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OTOOL64+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else @@ -11026,15 +10785,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11045,11 +10800,11 @@ fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -printf "%s\n" "$OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11058,12 +10813,11 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OTOOL64+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else @@ -11071,15 +10825,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11090,11 +10840,11 @@ fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -printf "%s\n" "$ac_ct_OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -11102,8 +10852,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -11138,12 +10888,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -printf %s "checking for -single_module linker flag... " >&6; } -if test ${lt_cv_apple_cc_single_mod+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then # By default we will add the -single_module flag. You can override @@ -11172,15 +10921,14 @@ else $as_nop rm -f conftest.* fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -printf %s "checking for -exported_symbols_list linker flag... " >&6; } -if test ${lt_cv_ld_exported_symbols_list+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym @@ -11189,33 +10937,31 @@ else $as_nop /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes -else $as_nop +else lt_cv_ld_exported_symbols_list=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -printf %s "checking for -force_load linker flag... " >&6; } -if test ${lt_cv_ld_force_load+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF int forced_loaded() { return 2;} @@ -11243,8 +10989,8 @@ _LT_EOF rm -rf conftest.dSYM fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -printf "%s\n" "$lt_cv_ld_force_load" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -11280,14 +11026,19 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; } ;; esac -ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes -then : - printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF fi +done + @@ -11303,8 +11054,7 @@ fi # Check whether --enable-shared was given. -if test ${enable_shared+y} -then : +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -11322,7 +11072,7 @@ then : IFS="$lt_save_ifs" ;; esac -else $as_nop +else enable_shared=yes fi @@ -11335,8 +11085,7 @@ fi # Check whether --enable-static was given. -if test ${enable_static+y} -then : +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -11354,7 +11103,7 @@ then : IFS="$lt_save_ifs" ;; esac -else $as_nop +else enable_static=yes fi @@ -11368,8 +11117,7 @@ fi # Check whether --with-pic was given. -if test ${with_pic+y} -then : +if test "${with_pic+set}" = set; then : withval=$with_pic; lt_p=${PACKAGE-default} case $withval in yes|no) pic_mode=$withval ;; @@ -11386,7 +11134,7 @@ then : IFS="$lt_save_ifs" ;; esac -else $as_nop +else pic_mode=default fi @@ -11400,8 +11148,7 @@ test -z "$pic_mode" && pic_mode=default # Check whether --enable-fast-install was given. -if test ${enable_fast_install+y} -then : +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -11419,7 +11166,7 @@ then : IFS="$lt_save_ifs" ;; esac -else $as_nop +else enable_fast_install=yes fi @@ -11487,12 +11234,11 @@ if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -printf %s "checking for objdir... " >&6; } -if test ${lt_cv_objdir+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -11503,15 +11249,17 @@ else fi rmdir .libs 2>/dev/null fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -printf "%s\n" "$lt_cv_objdir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF @@ -11564,12 +11312,11 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -printf %s "checking for ${ac_tool_prefix}file... " >&6; } -if test ${lt_cv_path_MAGIC_CMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -11618,11 +11365,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -printf "%s\n" "$MAGIC_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11631,12 +11378,11 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -printf %s "checking for file... " >&6; } -if test ${lt_cv_path_MAGIC_CMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -11685,11 +11431,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -printf "%s\n" "$MAGIC_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11774,12 +11520,11 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test ${lt_cv_prog_compiler_rtti_exceptions+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -11810,8 +11555,8 @@ else $as_nop $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -12137,28 +11882,26 @@ case $host_os in ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -printf %s "checking for $compiler option to produce PIC... " >&6; } -if test ${lt_cv_prog_compiler_pic+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_pic=$lt_prog_compiler_pic fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test ${lt_cv_prog_compiler_pic_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -12189,8 +11932,8 @@ else $as_nop $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -12218,12 +11961,11 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test ${lt_cv_prog_compiler_static_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -12247,8 +11989,8 @@ else $as_nop LDFLAGS="$save_LDFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then : @@ -12262,12 +12004,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test ${lt_cv_prog_compiler_c_o+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -12310,20 +12051,19 @@ else $as_nop $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test ${lt_cv_prog_compiler_c_o+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -12366,8 +12106,8 @@ else $as_nop $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -12375,19 +12115,19 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -printf %s "checking if we can lock with hard links... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -printf "%s\n" "$hard_links" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -printf "%s\n" "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -12399,8 +12139,8 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -12888,23 +12628,21 @@ _LT_EOF if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if test ${lt_cv_aix_libpath_+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -12919,7 +12657,7 @@ then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_="/usr/lib:/lib" @@ -12943,23 +12681,21 @@ fi if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if test ${lt_cv_aix_libpath_+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -12974,7 +12710,7 @@ then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_="/usr/lib:/lib" @@ -13212,12 +12948,11 @@ fi # Older versions of the 11.00 compiler do not understand -b yet # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -printf %s "checking if $CC understands -b... " >&6; } -if test ${lt_cv_prog_compiler__b+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler__b=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -b" @@ -13241,8 +12976,8 @@ else $as_nop LDFLAGS="$save_LDFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -printf "%s\n" "$lt_cv_prog_compiler__b" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } if test x"$lt_cv_prog_compiler__b" = xyes; then archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -13282,30 +13017,28 @@ fi # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if test ${lt_cv_irix_exported_symbol+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_cv_irix_exported_symbol=yes -else $as_nop +else lt_cv_irix_exported_symbol=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } if test "$lt_cv_irix_exported_symbol" = yes; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi @@ -13563,8 +13296,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -printf "%s\n" "$ld_shlibs" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -13600,19 +13333,18 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -printf %s "checking whether -lc should be explicitly linked in... " >&6; } -if test ${lt_cv_archive_cmds_need_lc+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -13630,7 +13362,7 @@ else $as_nop if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc=no @@ -13644,8 +13376,8 @@ else $as_nop $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac @@ -13804,8 +13536,8 @@ esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -printf %s "checking dynamic linker characteristics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then case $host_os in @@ -14285,10 +14017,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if test ${lt_cv_shlibpath_overrides_runpath+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -14298,21 +14029,19 @@ else $as_nop /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null -then : +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -14541,8 +14270,8 @@ uts4*) dynamic_linker=no ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -printf "%s\n" "$dynamic_linker" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -14648,8 +14377,8 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -printf %s "checking how to hardcode library paths into programs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -14673,8 +14402,8 @@ else # directories. hardcode_action=unsupported fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -printf "%s\n" "$hardcode_action" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || test "$inherit_rpath" = yes; then @@ -14718,12 +14447,11 @@ else darwin*) # if libdl is installed we need to link against it - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -printf %s "checking for dlopen in -ldl... " >&6; } -if test ${ac_cv_lib_dl_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14732,31 +14460,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes -else $as_nop +else ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else $as_nop +else lt_cv_dlopen="dyld" lt_cv_dlopen_libs= @@ -14768,16 +14497,14 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes -then : +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -printf %s "checking for shl_load in -ldld... " >&6; } -if test ${ac_cv_lib_dld_shl_load+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14786,42 +14513,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char shl_load (); int -main (void) +main () { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_shl_load=yes -else $as_nop +else ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else $as_nop +else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes -then : +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -printf %s "checking for dlopen in -ldl... " >&6; } -if test ${ac_cv_lib_dl_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14830,37 +14556,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes -else $as_nop +else ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -printf %s "checking for dlopen in -lsvld... " >&6; } -if test ${ac_cv_lib_svld_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14869,37 +14595,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes -else $as_nop +else ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -printf %s "checking for dld_link in -ldld... " >&6; } -if test ${ac_cv_lib_dld_dld_link+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14908,29 +14634,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dld_link (); int -main (void) +main () { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes -else $as_nop +else ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -14969,12 +14696,11 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -printf %s "checking whether a program can dlopen itself... " >&6; } -if test ${lt_cv_dlopen_self+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross else @@ -15053,7 +14779,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -15071,17 +14797,16 @@ rm -fr conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -printf "%s\n" "$lt_cv_dlopen_self" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -printf %s "checking whether a statically linked program can dlopen itself... " >&6; } -if test ${lt_cv_dlopen_self_static+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross else @@ -15160,7 +14885,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -15178,8 +14903,8 @@ rm -fr conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -15217,13 +14942,13 @@ fi striplib= old_striplib= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -printf %s "checking whether stripping libraries is possible... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -15231,16 +14956,16 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ;; *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ;; esac fi @@ -15257,13 +14982,13 @@ fi # Report which library types will actually be built - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -printf %s "checking if libtool supports shared libraries... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -printf "%s\n" "$can_build_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -printf %s "checking whether to build shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -15283,15 +15008,15 @@ printf %s "checking whether to build shared libraries... " >&6; } fi ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -printf "%s\n" "$enable_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -printf %s "checking whether to build static libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -printf "%s\n" "$enable_static" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } @@ -15330,34 +15055,32 @@ CC="$lt_save_CC" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -printf %s "checking for error_at_line... " >&6; } -if test ${ac_cv_lib_error_at_line+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +$as_echo_n "checking for error_at_line... " >&6; } +if ${ac_cv_lib_error_at_line+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { error_at_line (0, 0, "", 0, "an error occurred"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_error_at_line=yes -else $as_nop +else ac_cv_lib_error_at_line=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +$as_echo "$ac_cv_lib_error_at_line" >&6; } if test $ac_cv_lib_error_at_line = no; then case " $LIBOBJS " in *" error.$ac_objext "* ) ;; @@ -15369,16 +15092,14 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 -printf %s "checking for working strtod... " >&6; } -if test ${ac_cv_func_strtod+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 +$as_echo_n "checking for working strtod... " >&6; } +if ${ac_cv_func_strtod+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : ac_cv_func_strtod=no -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -15387,7 +15108,7 @@ $ac_includes_default double strtod (); #endif int -main (void) +main() { { /* Some versions of Linux strtod mis-parse strings with leading '+'. */ @@ -15412,10 +15133,9 @@ main (void) } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_strtod=yes -else $as_nop +else ac_cv_func_strtod=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -15423,8 +15143,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 -printf "%s\n" "$ac_cv_func_strtod" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 +$as_echo "$ac_cv_func_strtod" >&6; } if test $ac_cv_func_strtod = no; then case " $LIBOBJS " in *" strtod.$ac_objext "* ) ;; @@ -15433,18 +15153,16 @@ if test $ac_cv_func_strtod = no; then esac ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" -if test "x$ac_cv_func_pow" = xyes -then : +if test "x$ac_cv_func_pow" = xyes; then : fi if test $ac_cv_func_pow = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 -printf %s "checking for pow in -lm... " >&6; } -if test ${ac_cv_lib_m_pow+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 +$as_echo_n "checking for pow in -lm... " >&6; } +if ${ac_cv_lib_m_pow+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15453,33 +15171,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pow (); int -main (void) +main () { return pow (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_pow=yes -else $as_nop +else ac_cv_lib_m_pow=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 -printf "%s\n" "$ac_cv_lib_m_pow" >&6; } -if test "x$ac_cv_lib_m_pow" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 +$as_echo "$ac_cv_lib_m_pow" >&6; } +if test "x$ac_cv_lib_m_pow" = xyes; then : POW_LIB=-lm -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 -printf "%s\n" "$as_me: WARNING: cannot find library containing definition of pow" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 +$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} fi fi @@ -15499,24 +15218,24 @@ SUPPORT="Send email to help@monitoring-plugins.org if you have questions regardi # Check whether --with-cgiurl was given. -if test ${with_cgiurl+y} -then : +if test "${with_cgiurl+set}" = set; then : withval=$with_cgiurl; with_cgiurl=$withval -else $as_nop +else with_cgiurl=/nagios/cgi-bin fi CGIURL="$with_cgiurl" -printf "%s\n" "#define CGIURL \"$CGIURL\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define CGIURL "$CGIURL" +_ACEOF # Check whether --with-trusted_path was given. -if test ${with_trusted_path+y} -then : +if test "${with_trusted_path+set}" = set; then : withval=$with_trusted_path; with_trusted_path=$withval -else $as_nop +else with_trusted_path=$DEFAULT_PATH fi @@ -15560,12 +15279,11 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PERL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PERL+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PERL in [\\/]* | ?:[\\/]*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. @@ -15575,15 +15293,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15595,22 +15309,21 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -printf "%s\n" "$PERL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +$as_echo "$PERL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "hostname", so it can be a program name with args. set dummy hostname; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_HOSTNAME+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_HOSTNAME+:} false; then : + $as_echo_n "(cached) " >&6 +else case $HOSTNAME in [\\/]* | ?:[\\/]*) ac_cv_path_HOSTNAME="$HOSTNAME" # Let the user override the test with a path. @@ -15620,15 +15333,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_HOSTNAME="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_HOSTNAME="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15640,22 +15349,21 @@ esac fi HOSTNAME=$ac_cv_path_HOSTNAME if test -n "$HOSTNAME"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HOSTNAME" >&5 -printf "%s\n" "$HOSTNAME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HOSTNAME" >&5 +$as_echo "$HOSTNAME" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "basename", so it can be a program name with args. set dummy basename; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_BASENAME+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_BASENAME+:} false; then : + $as_echo_n "(cached) " >&6 +else case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. @@ -15665,15 +15373,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_BASENAME="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15685,21 +15389,20 @@ esac fi BASENAME=$ac_cv_path_BASENAME if test -n "$BASENAME"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5 -printf "%s\n" "$BASENAME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5 +$as_echo "$BASENAME" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-perl was given. -if test ${with_perl+y} -then : +if test "${with_perl+set}" = set; then : withval=$with_perl; with_perl=$withval -else $as_nop +else with_perl=$PERL fi @@ -15708,16 +15411,14 @@ PERL=$with_perl # Check whether --with-openssl was given. -if test ${with_openssl+y} -then : +if test "${with_openssl+set}" = set; then : withval=$with_openssl; fi # Check whether --with-gnutls was given. -if test ${with_gnutls+y} -then : +if test "${with_gnutls+set}" = set; then : withval=$with_gnutls; fi @@ -15734,12 +15435,11 @@ OPENSSL_DIRS="/usr /usr/local /usr/slocal /usr/local/openssl /usr/local/ssl \ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -ldce" >&5 -printf %s "checking for main in -ldce... " >&6; } -if test ${ac_cv_lib_dce_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldce" >&5 +$as_echo_n "checking for main in -ldce... " >&6; } +if ${ac_cv_lib_dce_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldce $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15747,36 +15447,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dce_main=yes -else $as_nop +else ac_cv_lib_dce_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dce_main" >&5 -printf "%s\n" "$ac_cv_lib_dce_main" >&6; } -if test "x$ac_cv_lib_dce_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dce_main" >&5 +$as_echo "$ac_cv_lib_dce_main" >&6; } +if test "x$ac_cv_lib_dce_main" = xyes; then : SOCKETLIBS="$SOCKETLIBS -ldce" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl" >&5 -printf %s "checking for main in -lnsl... " >&6; } -if test ${ac_cv_lib_nsl_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl" >&5 +$as_echo_n "checking for main in -lnsl... " >&6; } +if ${ac_cv_lib_nsl_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15784,36 +15481,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_nsl_main=yes -else $as_nop +else ac_cv_lib_nsl_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_main" >&5 -printf "%s\n" "$ac_cv_lib_nsl_main" >&6; } -if test "x$ac_cv_lib_nsl_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_main" >&5 +$as_echo "$ac_cv_lib_nsl_main" >&6; } +if test "x$ac_cv_lib_nsl_main" = xyes; then : SOCKETLIBS="$SOCKETLIBS -lnsl" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 -printf %s "checking for socket in -lsocket... " >&6; } -if test ${ac_cv_lib_socket_socket+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 +$as_echo_n "checking for socket in -lsocket... " >&6; } +if ${ac_cv_lib_socket_socket+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15822,38 +15516,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char socket (); int -main (void) +main () { return socket (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_socket=yes -else $as_nop +else ac_cv_lib_socket_socket=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 -printf "%s\n" "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 +$as_echo "$ac_cv_lib_socket_socket" >&6; } +if test "x$ac_cv_lib_socket_socket" = xyes; then : SOCKETLIBS="$SOCKETLIBS -lsocket" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lresolv" >&5 -printf %s "checking for main in -lresolv... " >&6; } -if test ${ac_cv_lib_resolv_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lresolv" >&5 +$as_echo_n "checking for main in -lresolv... " >&6; } +if ${ac_cv_lib_resolv_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15861,45 +15555,47 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_resolv_main=yes -else $as_nop +else ac_cv_lib_resolv_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_main" >&5 -printf "%s\n" "$ac_cv_lib_resolv_main" >&6; } -if test "x$ac_cv_lib_resolv_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_main" >&5 +$as_echo "$ac_cv_lib_resolv_main" >&6; } +if test "x$ac_cv_lib_resolv_main" = xyes; then : SOCKETLIBS="$SOCKETLIBS -lresolv" fi -ac_fn_c_check_header_compile "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default" -if test "x$ac_cv_header_math_h" = xyes -then : - printf "%s\n" "#define HAVE_MATH_H 1" >>confdefs.h +for ac_header in math.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default" +if test "x$ac_cv_header_math_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MATH_H 1 +_ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 -printf %s "checking for floor in -lm... " >&6; } -if test ${ac_cv_lib_m_floor+y} -then : - printf %s "(cached) " >&6 -else $as_nop +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 +$as_echo_n "checking for floor in -lm... " >&6; } +if ${ac_cv_lib_m_floor+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15908,45 +15604,50 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char floor (); int -main (void) +main () { return floor (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_floor=yes -else $as_nop +else ac_cv_lib_m_floor=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 -printf "%s\n" "$ac_cv_lib_m_floor" >&6; } -if test "x$ac_cv_lib_m_floor" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 +$as_echo "$ac_cv_lib_m_floor" >&6; } +if test "x$ac_cv_lib_m_floor" = xyes; then : MATHLIBS="-lm" fi -ac_fn_c_check_header_compile "$LINENO" "mp.h" "ac_cv_header_mp_h" "$ac_includes_default" -if test "x$ac_cv_header_mp_h" = xyes -then : - printf "%s\n" "#define HAVE_MP_H 1" >>confdefs.h +for ac_header in mp.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "mp.h" "ac_cv_header_mp_h" "$ac_includes_default" +if test "x$ac_cv_header_mp_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MP_H 1 +_ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pow in -lbsd" >&5 -printf %s "checking for pow in -lbsd... " >&6; } -if test ${ac_cv_lib_bsd_pow+y} -then : - printf %s "(cached) " >&6 -else $as_nop +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lbsd" >&5 +$as_echo_n "checking for pow in -lbsd... " >&6; } +if ${ac_cv_lib_bsd_pow+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15955,39 +15656,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pow (); int -main (void) +main () { return pow (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_bsd_pow=yes -else $as_nop +else ac_cv_lib_bsd_pow=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_pow" >&5 -printf "%s\n" "$ac_cv_lib_bsd_pow" >&6; } -if test "x$ac_cv_lib_bsd_pow" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_pow" >&5 +$as_echo "$ac_cv_lib_bsd_pow" >&6; } +if test "x$ac_cv_lib_bsd_pow" = xyes; then : MATHLIBS="$MATHLIBS -lbsd" fi # Check whether --enable-libtap was given. -if test ${enable_libtap+y} -then : +if test "${enable_libtap+set}" = set; then : enableval=$enable_libtap; enable_libtap=$enableval -else $as_nop +else enable_libtap=no fi @@ -16002,12 +15703,11 @@ fi # If not local, check if we can use the system one if test "$enable_libtap" != "yes" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for plan_tests in -ltap" >&5 -printf %s "checking for plan_tests in -ltap... " >&6; } -if test ${ac_cv_lib_tap_plan_tests+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for plan_tests in -ltap" >&5 +$as_echo_n "checking for plan_tests in -ltap... " >&6; } +if ${ac_cv_lib_tap_plan_tests+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ltap $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16016,29 +15716,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char plan_tests (); int -main (void) +main () { return plan_tests (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_tap_plan_tests=yes -else $as_nop +else ac_cv_lib_tap_plan_tests=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tap_plan_tests" >&5 -printf "%s\n" "$ac_cv_lib_tap_plan_tests" >&6; } -if test "x$ac_cv_lib_tap_plan_tests" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tap_plan_tests" >&5 +$as_echo "$ac_cv_lib_tap_plan_tests" >&6; } +if test "x$ac_cv_lib_tap_plan_tests" = xyes; then : enable_libtap="yes" fi @@ -16052,10 +15753,9 @@ if test "$enable_libtap" = "yes" ; then fi # Check whether --enable-extra-opts was given. -if test ${enable_extra_opts+y} -then : +if test "${enable_extra_opts+set}" = set; then : enableval=$enable_extra_opts; enable_extra_opts=$enableval -else $as_nop +else enable_extra_opts=yes fi @@ -16069,7 +15769,7 @@ fi if test "$enable_extra_opts" = "yes" ; then -printf "%s\n" "#define NP_EXTRA_OPTS 1" >>confdefs.h +$as_echo "#define NP_EXTRA_OPTS 1" >>confdefs.h if test "$enable_libtap" = "yes"; then EXTRA_TEST="$EXTRA_TEST test_ini1 test_ini3 test_opts1 test_opts2 test_opts3" @@ -16081,17 +15781,15 @@ _SAVEDLIBS="$LIBS" _SAVEDCPPFLAGS="$CPPFLAGS" # Check whether --with-pgsql was given. -if test ${with_pgsql+y} -then : +if test "${with_pgsql+set}" = set; then : withval=$with_pgsql; PGSQL=$withval fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lcrypt" >&5 -printf %s "checking for main in -lcrypt... " >&6; } -if test ${ac_cv_lib_crypt_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcrypt" >&5 +$as_echo_n "checking for main in -lcrypt... " >&6; } +if ${ac_cv_lib_crypt_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16099,28 +15797,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_crypt_main=yes -else $as_nop +else ac_cv_lib_crypt_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_main" >&5 -printf "%s\n" "$ac_cv_lib_crypt_main" >&6; } -if test "x$ac_cv_lib_crypt_main" = xyes -then : - printf "%s\n" "#define HAVE_LIBCRYPT 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_main" >&5 +$as_echo "$ac_cv_lib_crypt_main" >&6; } +if test "x$ac_cv_lib_crypt_main" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCRYPT 1 +_ACEOF LIBS="-lcrypt $LIBS" @@ -16131,12 +15829,11 @@ if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then LDFLAGS="$LDFLAGS -L$PGSQL/lib" CPPFLAGS="$CPPFLAGS -I$PGSQL/include" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 -printf %s "checking for PQsetdbLogin in -lpq... " >&6; } -if test ${ac_cv_lib_pq_PQsetdbLogin+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 +$as_echo_n "checking for PQsetdbLogin in -lpq... " >&6; } +if ${ac_cv_lib_pq_PQsetdbLogin+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lpq -lcrypt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16145,57 +15842,75 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char PQsetdbLogin (); int -main (void) +main () { return PQsetdbLogin (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pq_PQsetdbLogin=yes -else $as_nop +else ac_cv_lib_pq_PQsetdbLogin=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsetdbLogin" >&5 -printf "%s\n" "$ac_cv_lib_pq_PQsetdbLogin" >&6; } -if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes -then : - printf "%s\n" "#define HAVE_LIBPQ 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsetdbLogin" >&5 +$as_echo "$ac_cv_lib_pq_PQsetdbLogin" >&6; } +if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPQ 1 +_ACEOF LIBS="-lpq $LIBS" fi if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then - ac_fn_c_check_header_compile "$LINENO" "pgsql/libpq-fe.h" "ac_cv_header_pgsql_libpq_fe_h" "$ac_includes_default" -if test "x$ac_cv_header_pgsql_libpq_fe_h" = xyes -then : - printf "%s\n" "#define HAVE_PGSQL_LIBPQ_FE_H 1" >>confdefs.h + for ac_header in pgsql/libpq-fe.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "pgsql/libpq-fe.h" "ac_cv_header_pgsql_libpq_fe_h" "$ac_includes_default" +if test "x$ac_cv_header_pgsql_libpq_fe_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PGSQL_LIBPQ_FE_H 1 +_ACEOF fi - ac_fn_c_check_header_compile "$LINENO" "postgresql/libpq-fe.h" "ac_cv_header_postgresql_libpq_fe_h" "$ac_includes_default" -if test "x$ac_cv_header_postgresql_libpq_fe_h" = xyes -then : - printf "%s\n" "#define HAVE_POSTGRESQL_LIBPQ_FE_H 1" >>confdefs.h +done + + for ac_header in postgresql/libpq-fe.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "postgresql/libpq-fe.h" "ac_cv_header_postgresql_libpq_fe_h" "$ac_includes_default" +if test "x$ac_cv_header_postgresql_libpq_fe_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_POSTGRESQL_LIBPQ_FE_H 1 +_ACEOF fi - ac_fn_c_check_header_compile "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default" -if test "x$ac_cv_header_libpq_fe_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBPQ_FE_H 1" >>confdefs.h +done + + for ac_header in libpq-fe.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default" +if test "x$ac_cv_header_libpq_fe_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPQ_FE_H 1 +_ACEOF fi +done + if [ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]; then PGLIBS="-L$PGSQL/lib -lpq -lcrypt" PGINCLUDE="-I$PGSQL/include" @@ -16210,49 +15925,46 @@ fi PGINCLUDE="-I$PGSQL/include" fi if test -z "$PGINCLUDE"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&5 -printf "%s\n" "$as_me: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: install PostgreSQL headers to compile this plugin (see REQUIREMENTS)." >&5 -printf "%s\n" "$as_me: WARNING: install PostgreSQL headers to compile this plugin (see REQUIREMENTS)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&5 +$as_echo "$as_me: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install PostgreSQL headers to compile this plugin (see REQUIREMENTS)." >&5 +$as_echo "$as_me: WARNING: install PostgreSQL headers to compile this plugin (see REQUIREMENTS)." >&2;} else EXTRAS="$EXTRAS check_pgsql\$(EXEEXT)" fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&5 -printf "%s\n" "$as_me: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: LIBS=\"$LIBS\" CPPFLAGS=\"$CPPFLAGS\"" >&5 -printf "%s\n" "$as_me: WARNING: LIBS=\"$LIBS\" CPPFLAGS=\"$CPPFLAGS\"" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: install PostgreSQL libs to compile this plugin (see REQUIREMENTS)." >&5 -printf "%s\n" "$as_me: WARNING: install PostgreSQL libs to compile this plugin (see REQUIREMENTS)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&5 +$as_echo "$as_me: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: LIBS=\"$LIBS\" CPPFLAGS=\"$CPPFLAGS\"" >&5 +$as_echo "$as_me: WARNING: LIBS=\"$LIBS\" CPPFLAGS=\"$CPPFLAGS\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install PostgreSQL libs to compile this plugin (see REQUIREMENTS)." >&5 +$as_echo "$as_me: WARNING: install PostgreSQL libs to compile this plugin (see REQUIREMENTS)." >&2;} fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&5 -printf "%s\n" "$as_me: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS)." >&5 -printf "%s\n" "$as_me: WARNING: install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&5 +$as_echo "$as_me: WARNING: Skipping PostgreSQL plugin (check_pgsql)" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS)." >&5 +$as_echo "$as_me: WARNING: install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS)." >&2;} fi LIBS="$_SAVEDLIBS" CPPFLAGS="$_SAVEDCPPFLAGS" # Check whether --with-dbi was given. -if test ${with_dbi+y} -then : +if test "${with_dbi+set}" = set; then : withval=$with_dbi; fi -if test "x$with_dbi" != "xno" -then : +if test "x$with_dbi" != "xno"; then : _SAVEDLIBS="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbi_initialize in -ldbi" >&5 -printf %s "checking for dbi_initialize in -ldbi... " >&6; } -if test ${ac_cv_lib_dbi_dbi_initialize+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbi_initialize in -ldbi" >&5 +$as_echo_n "checking for dbi_initialize in -ldbi... " >&6; } +if ${ac_cv_lib_dbi_dbi_initialize+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbi $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16261,30 +15973,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dbi_initialize (); int -main (void) +main () { return dbi_initialize (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dbi_dbi_initialize=yes -else $as_nop +else ac_cv_lib_dbi_dbi_initialize=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbi_dbi_initialize" >&5 -printf "%s\n" "$ac_cv_lib_dbi_dbi_initialize" >&6; } -if test "x$ac_cv_lib_dbi_dbi_initialize" = xyes -then : - printf "%s\n" "#define HAVE_LIBDBI 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbi_dbi_initialize" >&5 +$as_echo "$ac_cv_lib_dbi_dbi_initialize" >&6; } +if test "x$ac_cv_lib_dbi_dbi_initialize" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDBI 1 +_ACEOF LIBS="-ldbi $LIBS" @@ -16295,10 +16010,10 @@ fi DBILIBS="-ldbi" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping dbi plugin" >&5 -printf "%s\n" "$as_me: WARNING: Skipping dbi plugin" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: install DBI libs to compile this plugin (see REQUIREMENTS)." >&5 -printf "%s\n" "$as_me: WARNING: install DBI libs to compile this plugin (see REQUIREMENTS)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping dbi plugin" >&5 +$as_echo "$as_me: WARNING: Skipping dbi plugin" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install DBI libs to compile this plugin (see REQUIREMENTS)." >&5 +$as_echo "$as_me: WARNING: install DBI libs to compile this plugin (see REQUIREMENTS)." >&2;} fi LIBS="$_SAVEDLIBS" @@ -16306,22 +16021,19 @@ fi # Check whether --with-radius was given. -if test ${with_radius+y} -then : +if test "${with_radius+set}" = set; then : withval=$with_radius; fi -if test "x$with_radius" != "xno" -then : +if test "x$with_radius" != "xno"; then : _SAVEDLIBS="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradcli" >&5 -printf %s "checking for rc_read_config in -lradcli... " >&6; } -if test ${ac_cv_lib_radcli_rc_read_config+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradcli" >&5 +$as_echo_n "checking for rc_read_config in -lradcli... " >&6; } +if ${ac_cv_lib_radcli_rc_read_config+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lradcli $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16330,30 +16042,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char rc_read_config (); int -main (void) +main () { return rc_read_config (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_radcli_rc_read_config=yes -else $as_nop +else ac_cv_lib_radcli_rc_read_config=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radcli_rc_read_config" >&5 -printf "%s\n" "$ac_cv_lib_radcli_rc_read_config" >&6; } -if test "x$ac_cv_lib_radcli_rc_read_config" = xyes -then : - printf "%s\n" "#define HAVE_LIBRADCLI 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radcli_rc_read_config" >&5 +$as_echo "$ac_cv_lib_radcli_rc_read_config" >&6; } +if test "x$ac_cv_lib_radcli_rc_read_config" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRADCLI 1 +_ACEOF LIBS="-lradcli $LIBS" @@ -16364,12 +16079,11 @@ fi RADIUSLIBS="-lradcli" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lfreeradius-client" >&5 -printf %s "checking for rc_read_config in -lfreeradius-client... " >&6; } -if test ${ac_cv_lib_freeradius_client_rc_read_config+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lfreeradius-client" >&5 +$as_echo_n "checking for rc_read_config in -lfreeradius-client... " >&6; } +if ${ac_cv_lib_freeradius_client_rc_read_config+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lfreeradius-client $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16378,30 +16092,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char rc_read_config (); int -main (void) +main () { return rc_read_config (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_freeradius_client_rc_read_config=yes -else $as_nop +else ac_cv_lib_freeradius_client_rc_read_config=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeradius_client_rc_read_config" >&5 -printf "%s\n" "$ac_cv_lib_freeradius_client_rc_read_config" >&6; } -if test "x$ac_cv_lib_freeradius_client_rc_read_config" = xyes -then : - printf "%s\n" "#define HAVE_LIBFREERADIUS_CLIENT 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeradius_client_rc_read_config" >&5 +$as_echo "$ac_cv_lib_freeradius_client_rc_read_config" >&6; } +if test "x$ac_cv_lib_freeradius_client_rc_read_config" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBFREERADIUS_CLIENT 1 +_ACEOF LIBS="-lfreeradius-client $LIBS" @@ -16412,12 +16129,11 @@ fi RADIUSLIBS="-lfreeradius-client" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient-ng" >&5 -printf %s "checking for rc_read_config in -lradiusclient-ng... " >&6; } -if test ${ac_cv_lib_radiusclient_ng_rc_read_config+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient-ng" >&5 +$as_echo_n "checking for rc_read_config in -lradiusclient-ng... " >&6; } +if ${ac_cv_lib_radiusclient_ng_rc_read_config+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lradiusclient-ng $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16426,30 +16142,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char rc_read_config (); int -main (void) +main () { return rc_read_config (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_radiusclient_ng_rc_read_config=yes -else $as_nop +else ac_cv_lib_radiusclient_ng_rc_read_config=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5 -printf "%s\n" "$ac_cv_lib_radiusclient_ng_rc_read_config" >&6; } -if test "x$ac_cv_lib_radiusclient_ng_rc_read_config" = xyes -then : - printf "%s\n" "#define HAVE_LIBRADIUSCLIENT_NG 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5 +$as_echo "$ac_cv_lib_radiusclient_ng_rc_read_config" >&6; } +if test "x$ac_cv_lib_radiusclient_ng_rc_read_config" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRADIUSCLIENT_NG 1 +_ACEOF LIBS="-lradiusclient-ng $LIBS" @@ -16460,12 +16179,11 @@ fi RADIUSLIBS="-lradiusclient-ng" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient" >&5 -printf %s "checking for rc_read_config in -lradiusclient... " >&6; } -if test ${ac_cv_lib_radiusclient_rc_read_config+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient" >&5 +$as_echo_n "checking for rc_read_config in -lradiusclient... " >&6; } +if ${ac_cv_lib_radiusclient_rc_read_config+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lradiusclient $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16474,30 +16192,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char rc_read_config (); int -main (void) +main () { return rc_read_config (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_radiusclient_rc_read_config=yes -else $as_nop +else ac_cv_lib_radiusclient_rc_read_config=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_rc_read_config" >&5 -printf "%s\n" "$ac_cv_lib_radiusclient_rc_read_config" >&6; } -if test "x$ac_cv_lib_radiusclient_rc_read_config" = xyes -then : - printf "%s\n" "#define HAVE_LIBRADIUSCLIENT 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_rc_read_config" >&5 +$as_echo "$ac_cv_lib_radiusclient_rc_read_config" >&6; } +if test "x$ac_cv_lib_radiusclient_rc_read_config" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRADIUSCLIENT 1 +_ACEOF LIBS="-lradiusclient $LIBS" @@ -16508,10 +16229,10 @@ fi RADIUSLIBS="-lradiusclient" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping radius plugin" >&5 -printf "%s\n" "$as_me: WARNING: Skipping radius plugin" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&5 -printf "%s\n" "$as_me: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping radius plugin" >&5 +$as_echo "$as_me: WARNING: Skipping radius plugin" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&5 +$as_echo "$as_me: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&2;} fi fi fi @@ -16522,22 +16243,19 @@ fi # Check whether --with-ldap was given. -if test ${with_ldap+y} -then : +if test "${with_ldap+set}" = set; then : withval=$with_ldap; fi -if test "x$with_ldap" != "xno" -then : +if test "x$with_ldap" != "xno"; then : _SAVEDLIBS="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lldap" >&5 -printf %s "checking for main in -lldap... " >&6; } -if test ${ac_cv_lib_ldap_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lldap" >&5 +$as_echo_n "checking for main in -lldap... " >&6; } +if ${ac_cv_lib_ldap_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap -llber $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16545,28 +16263,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ldap_main=yes -else $as_nop +else ac_cv_lib_ldap_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_main" >&5 -printf "%s\n" "$ac_cv_lib_ldap_main" >&6; } -if test "x$ac_cv_lib_ldap_main" = xyes -then : - printf "%s\n" "#define HAVE_LIBLDAP 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_main" >&5 +$as_echo "$ac_cv_lib_ldap_main" >&6; } +if test "x$ac_cv_lib_ldap_main" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBLDAP 1 +_ACEOF LIBS="-lldap $LIBS" @@ -16577,44 +16295,35 @@ fi LDAPINCLUDE="-I/usr/include/ldap" - ac_fn_c_check_func "$LINENO" "ldap_set_option" "ac_cv_func_ldap_set_option" -if test "x$ac_cv_func_ldap_set_option" = xyes -then : - printf "%s\n" "#define HAVE_LDAP_SET_OPTION 1" >>confdefs.h + for ac_func in ldap_set_option +do : + ac_fn_c_check_func "$LINENO" "ldap_set_option" "ac_cv_func_ldap_set_option" +if test "x$ac_cv_func_ldap_set_option" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LDAP_SET_OPTION 1 +_ACEOF fi +done EXTRAS="$EXTRAS check_ldap\$(EXEEXT)" - ac_fn_c_check_func "$LINENO" "ldap_init" "ac_cv_func_ldap_init" -if test "x$ac_cv_func_ldap_init" = xyes -then : - printf "%s\n" "#define HAVE_LDAP_INIT 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "ldap_set_option" "ac_cv_func_ldap_set_option" -if test "x$ac_cv_func_ldap_set_option" = xyes -then : - printf "%s\n" "#define HAVE_LDAP_SET_OPTION 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "ldap_get_option" "ac_cv_func_ldap_get_option" -if test "x$ac_cv_func_ldap_get_option" = xyes -then : - printf "%s\n" "#define HAVE_LDAP_GET_OPTION 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "ldap_start_tls_s" "ac_cv_func_ldap_start_tls_s" -if test "x$ac_cv_func_ldap_start_tls_s" = xyes -then : - printf "%s\n" "#define HAVE_LDAP_START_TLS_S 1" >>confdefs.h + for ac_func in ldap_init ldap_set_option ldap_get_option ldap_start_tls_s +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi +done else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping LDAP plugin" >&5 -printf "%s\n" "$as_me: WARNING: Skipping LDAP plugin" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: install LDAP libs to compile this plugin (see REQUIREMENTS)." >&5 -printf "%s\n" "$as_me: WARNING: install LDAP libs to compile this plugin (see REQUIREMENTS)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping LDAP plugin" >&5 +$as_echo "$as_me: WARNING: Skipping LDAP plugin" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install LDAP libs to compile this plugin (see REQUIREMENTS)." >&5 +$as_echo "$as_me: WARNING: install LDAP libs to compile this plugin (see REQUIREMENTS)." >&2;} fi LIBS="$_SAVEDLIBS" @@ -16623,22 +16332,19 @@ fi # Check whether --with-systemd was given. -if test ${with_systemd+y} -then : +if test "${with_systemd+set}" = set; then : withval=$with_systemd; fi -if test "x$with_systemd" != "xno" -then : +if test "x$with_systemd" != "xno"; then : _SAVEDLIBS="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sd_get_sessions in -lsystemd" >&5 -printf %s "checking for sd_get_sessions in -lsystemd... " >&6; } -if test ${ac_cv_lib_systemd_sd_get_sessions+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_get_sessions in -lsystemd" >&5 +$as_echo_n "checking for sd_get_sessions in -lsystemd... " >&6; } +if ${ac_cv_lib_systemd_sd_get_sessions+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lsystemd -lsystemd $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16647,30 +16353,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char sd_get_sessions (); int -main (void) +main () { return sd_get_sessions (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_systemd_sd_get_sessions=yes -else $as_nop +else ac_cv_lib_systemd_sd_get_sessions=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_sd_get_sessions" >&5 -printf "%s\n" "$ac_cv_lib_systemd_sd_get_sessions" >&6; } -if test "x$ac_cv_lib_systemd_sd_get_sessions" = xyes -then : - printf "%s\n" "#define HAVE_LIBSYSTEMD 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_sd_get_sessions" >&5 +$as_echo "$ac_cv_lib_systemd_sd_get_sessions" >&6; } +if test "x$ac_cv_lib_systemd_sd_get_sessions" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSYSTEMD 1 +_ACEOF LIBS="-lsystemd $LIBS" @@ -16682,8 +16391,8 @@ fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping systemd support" >&5 -printf "%s\n" "$as_me: WARNING: Skipping systemd support" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping systemd support" >&5 +$as_echo "$as_me: WARNING: Skipping systemd support" >&2;} fi LIBS="$_SAVEDLIBS" @@ -16692,62 +16401,62 @@ fi case $host in *linux*) - ac_fn_c_check_header_compile "$LINENO" "linux/hdreg.h" "ac_cv_header_linux_hdreg_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_hdreg_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "linux/hdreg.h" "ac_cv_header_linux_hdreg_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_hdreg_h" = xyes; then : FOUNDINCLUDE=yes -else $as_nop +else FOUNDINCLUDE=no fi + if test "$FOUNDINCLUDE" = "yes" ; then - ac_fn_c_check_header_compile "$LINENO" "linux/types.h" "ac_cv_header_linux_types_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_types_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "linux/types.h" "ac_cv_header_linux_types_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_types_h" = xyes; then : FOUNDINCLUDE=yes -else $as_nop +else FOUNDINCLUDE=no fi + fi if test "$FOUNDINCLUDE" = "no" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping check_ide_smart plugin." >&5 -printf "%s\n" "$as_me: WARNING: Skipping check_ide_smart plugin." >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: check_ide_smart requires linux/hdreg.h and linux/types.h." >&5 -printf "%s\n" "$as_me: WARNING: check_ide_smart requires linux/hdreg.h and linux/types.h." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping check_ide_smart plugin." >&5 +$as_echo "$as_me: WARNING: Skipping check_ide_smart plugin." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: check_ide_smart requires linux/hdreg.h and linux/types.h." >&5 +$as_echo "$as_me: WARNING: check_ide_smart requires linux/hdreg.h and linux/types.h." >&2;} fi ;; *netbsd*) - ac_fn_c_check_header_compile "$LINENO" "dev/ata/atareg.h" "ac_cv_header_dev_ata_atareg_h" "$ac_includes_default" -if test "x$ac_cv_header_dev_ata_atareg_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "dev/ata/atareg.h" "ac_cv_header_dev_ata_atareg_h" "$ac_includes_default" +if test "x$ac_cv_header_dev_ata_atareg_h" = xyes; then : FOUNDINCLUDE=yes -else $as_nop +else FOUNDINCLUDE=no fi + if test "$FOUNDINCLUDE" = "yes" ; then - ac_fn_c_check_header_compile "$LINENO" "dev/ic/wdcreg.h" "ac_cv_header_dev_ic_wdcreg_h" "$ac_includes_default" -if test "x$ac_cv_header_dev_ic_wdcreg_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "dev/ic/wdcreg.h" "ac_cv_header_dev_ic_wdcreg_h" "$ac_includes_default" +if test "x$ac_cv_header_dev_ic_wdcreg_h" = xyes; then : FOUNDINCLUDE=yes -else $as_nop +else FOUNDINCLUDE=no fi + fi if test "$FOUNDINCLUDE" = "no" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping check_ide_smart plugin." >&5 -printf "%s\n" "$as_me: WARNING: Skipping check_ide_smart plugin." >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: check_ide_smart requires dev/ata/atareg.h and dev/ic/wdcreg.h" >&5 -printf "%s\n" "$as_me: WARNING: check_ide_smart requires dev/ata/atareg.h and dev/ic/wdcreg.h" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping check_ide_smart plugin." >&5 +$as_echo "$as_me: WARNING: Skipping check_ide_smart plugin." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: check_ide_smart requires dev/ata/atareg.h and dev/ic/wdcreg.h" >&5 +$as_echo "$as_me: WARNING: check_ide_smart requires dev/ata/atareg.h and dev/ic/wdcreg.h" >&2;} fi ;; *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping check_ide_smart plugin." >&5 -printf "%s\n" "$as_me: WARNING: Skipping check_ide_smart plugin." >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: check_ide_smart works only on Linux and NetBSD" >&5 -printf "%s\n" "$as_me: WARNING: check_ide_smart works only on Linux and NetBSD" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping check_ide_smart plugin." >&5 +$as_echo "$as_me: WARNING: Skipping check_ide_smart plugin." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: check_ide_smart works only on Linux and NetBSD" >&5 +$as_echo "$as_me: WARNING: check_ide_smart works only on Linux and NetBSD" >&2;} esac if test "$FOUNDINCLUDE" = "yes" ; then @@ -16757,10 +16466,9 @@ fi # Check whether --with-mysql was given. -if test ${with_mysql+y} -then : +if test "${with_mysql+set}" = set; then : withval=$with_mysql; with_mysql=$withval -else $as_nop +else with_mysql=yes fi @@ -16769,12 +16477,11 @@ fi if test "x$with_mysql" = "xyes" ; then # Extract the first word of "mysql_config", so it can be a program name with args. set dummy mysql_config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_np_mysql_config+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_np_mysql_config+:} false; then : + $as_echo_n "(cached) " >&6 +else case $np_mysql_config in [\\/]* | ?:[\\/]*) ac_cv_path_np_mysql_config="$np_mysql_config" # Let the user override the test with a path. @@ -16784,15 +16491,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_np_mysql_config="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_np_mysql_config="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16804,11 +16507,11 @@ esac fi np_mysql_config=$ac_cv_path_np_mysql_config if test -n "$np_mysql_config"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $np_mysql_config" >&5 -printf "%s\n" "$np_mysql_config" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $np_mysql_config" >&5 +$as_echo "$np_mysql_config" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -16838,12 +16541,11 @@ fi CPPFLAGS="$CPPFLAGS $np_mysql_include" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmysqlclient" >&5 -printf %s "checking for mysql_init in -lmysqlclient... " >&6; } -if test ${ac_cv_lib_mysqlclient_mysql_init+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmysqlclient" >&5 +$as_echo_n "checking for mysql_init in -lmysqlclient... " >&6; } +if ${ac_cv_lib_mysqlclient_mysql_init+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lmysqlclient $np_mysql_libs $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16852,43 +16554,43 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char mysql_init (); int -main (void) +main () { return mysql_init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_mysqlclient_mysql_init=yes -else $as_nop +else ac_cv_lib_mysqlclient_mysql_init=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_init" >&5 -printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_init" >&6; } -if test "x$ac_cv_lib_mysqlclient_mysql_init" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_init" >&5 +$as_echo "$ac_cv_lib_mysqlclient_mysql_init" >&6; } +if test "x$ac_cv_lib_mysqlclient_mysql_init" = xyes; then : with_mysql=$np_mysql_config -printf "%s\n" "#define HAVE_MYSQLCLIENT 1" >>confdefs.h +$as_echo "#define HAVE_MYSQLCLIENT 1" >>confdefs.h -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmariadbclient" >&5 -printf %s "checking for mysql_init in -lmariadbclient... " >&6; } -if test ${ac_cv_lib_mariadbclient_mysql_init+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmariadbclient" >&5 +$as_echo_n "checking for mysql_init in -lmariadbclient... " >&6; } +if ${ac_cv_lib_mariadbclient_mysql_init+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lmariadbclient $np_mysql_libs $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16897,36 +16599,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char mysql_init (); int -main (void) +main () { return mysql_init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_mariadbclient_mysql_init=yes -else $as_nop +else ac_cv_lib_mariadbclient_mysql_init=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mariadbclient_mysql_init" >&5 -printf "%s\n" "$ac_cv_lib_mariadbclient_mysql_init" >&6; } -if test "x$ac_cv_lib_mariadbclient_mysql_init" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mariadbclient_mysql_init" >&5 +$as_echo "$ac_cv_lib_mariadbclient_mysql_init" >&6; } +if test "x$ac_cv_lib_mariadbclient_mysql_init" = xyes; then : with_mysql=$np_mysql_config -printf "%s\n" "#define HAVE_MYSQLCLIENT 1" >>confdefs.h +$as_echo "#define HAVE_MYSQLCLIENT 1" >>confdefs.h -else $as_nop +else with_mysql=no fi @@ -16941,10 +16644,10 @@ fi fi if test $with_mysql = "no" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping mysql plugin" >&5 -printf "%s\n" "$as_me: WARNING: Skipping mysql plugin" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: install mysql client libs to compile this plugin (see REQUIREMENTS)." >&5 -printf "%s\n" "$as_me: WARNING: install mysql client libs to compile this plugin (see REQUIREMENTS)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping mysql plugin" >&5 +$as_echo "$as_me: WARNING: Skipping mysql plugin" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install mysql client libs to compile this plugin (see REQUIREMENTS)." >&5 +$as_echo "$as_me: WARNING: install mysql client libs to compile this plugin (see REQUIREMENTS)." >&2;} else EXTRAS="$EXTRAS check_mysql\$(EXEEXT) check_mysql_query\$(EXEEXT)" MYSQLINCLUDE="$np_mysql_include" @@ -16955,13 +16658,18 @@ else fi -ac_fn_c_check_header_compile "$LINENO" "utmpx.h" "ac_cv_header_utmpx_h" "$ac_includes_default" -if test "x$ac_cv_header_utmpx_h" = xyes -then : - printf "%s\n" "#define HAVE_UTMPX_H 1" >>confdefs.h +for ac_header in utmpx.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "utmpx.h" "ac_cv_header_utmpx_h" "$ac_includes_default" +if test "x$ac_cv_header_utmpx_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UTMPX_H 1 +_ACEOF fi +done + if test "$ac_cv_header_utmpx_h" = "yes"; then HAVE_UTMPX_TRUE= HAVE_UTMPX_FALSE='#' @@ -16971,14 +16679,19 @@ else fi -ac_fn_c_check_header_compile "$LINENO" "wtsapi32.h" "ac_cv_header_wtsapi32_h" "#include +for ac_header in wtsapi32.h +do : + ac_fn_c_check_header_compile "$LINENO" "wtsapi32.h" "ac_cv_header_wtsapi32_h" "#include " -if test "x$ac_cv_header_wtsapi32_h" = xyes -then : - printf "%s\n" "#define HAVE_WTSAPI32_H 1" >>confdefs.h +if test "x$ac_cv_header_wtsapi32_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WTSAPI32_H 1 +_ACEOF fi +done + if test "$ac_cv_header_wtsapi32_h" = "yes"; then HAVE_WTS32API_TRUE= HAVE_WTS32API_FALSE='#' @@ -17020,10 +16733,9 @@ _can_enable_check_curl=no # Check whether --with-libcurl was given. -if test ${with_libcurl+y} -then : +if test "${with_libcurl+set}" = set; then : withval=$with_libcurl; _libcurl_with=$withval -else $as_nop +else _libcurl_with=yes fi @@ -17034,12 +16746,11 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AWK+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -17047,15 +16758,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17066,11 +16773,11 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -printf "%s\n" "$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17087,12 +16794,11 @@ done _libcurl_ldflags="-L$withval/lib" # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path__libcurl_config+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path__libcurl_config+:} false; then : + $as_echo_n "(cached) " >&6 +else case $_libcurl_config in [\\/]* | ?:[\\/]*) ac_cv_path__libcurl_config="$_libcurl_config" # Let the user override the test with a path. @@ -17102,15 +16808,11 @@ else $as_nop for as_dir in "$withval/bin" do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path__libcurl_config="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path__libcurl_config="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17122,23 +16824,22 @@ esac fi _libcurl_config=$ac_cv_path__libcurl_config if test -n "$_libcurl_config"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5 -printf "%s\n" "$_libcurl_config" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5 +$as_echo "$_libcurl_config" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path__libcurl_config+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path__libcurl_config+:} false; then : + $as_echo_n "(cached) " >&6 +else case $_libcurl_config in [\\/]* | ?:[\\/]*) ac_cv_path__libcurl_config="$_libcurl_config" # Let the user override the test with a path. @@ -17148,15 +16849,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path__libcurl_config="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path__libcurl_config="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17168,38 +16865,36 @@ esac fi _libcurl_config=$ac_cv_path__libcurl_config if test -n "$_libcurl_config"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5 -printf "%s\n" "$_libcurl_config" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5 +$as_echo "$_libcurl_config" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test x$_libcurl_config != "x" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the version of libcurl" >&5 -printf %s "checking for the version of libcurl... " >&6; } -if test ${libcurl_cv_lib_curl_version+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the version of libcurl" >&5 +$as_echo_n "checking for the version of libcurl... " >&6; } +if ${libcurl_cv_lib_curl_version+:} false; then : + $as_echo_n "(cached) " >&6 +else libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $2}'` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_version" >&5 -printf "%s\n" "$libcurl_cv_lib_curl_version" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_version" >&5 +$as_echo "$libcurl_cv_lib_curl_version" >&6; } _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` _libcurl_wanted=`echo 7.15.2 | $_libcurl_version_parse` if test $_libcurl_wanted -gt 0 ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version 7.15.2" >&5 -printf %s "checking for libcurl >= version 7.15.2... " >&6; } -if test ${libcurl_cv_lib_version_ok+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version 7.15.2" >&5 +$as_echo_n "checking for libcurl >= version 7.15.2... " >&6; } +if ${libcurl_cv_lib_version_ok+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $_libcurl_version -ge $_libcurl_wanted ; then libcurl_cv_lib_version_ok=yes @@ -17208,8 +16903,8 @@ else $as_nop fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_version_ok" >&5 -printf "%s\n" "$libcurl_cv_lib_version_ok" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_version_ok" >&5 +$as_echo "$libcurl_cv_lib_version_ok" >&6; } fi if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then @@ -17249,12 +16944,11 @@ printf "%s\n" "$libcurl_cv_lib_version_ok" >&6; } # link line (or failing that, "-lcurl") is enough. LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether libcurl is usable" >&5 -printf %s "checking whether libcurl is usable... " >&6; } -if test ${libcurl_cv_lib_curl_usable+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libcurl is usable" >&5 +$as_echo_n "checking whether libcurl is usable... " >&6; } +if ${libcurl_cv_lib_curl_usable+:} false; then : + $as_echo_n "(cached) " >&6 +else _libcurl_save_cppflags=$CPPFLAGS CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS" @@ -17265,7 +16959,7 @@ else $as_nop /* end confdefs.h. */ #include int -main (void) +main () { /* Try and use a few common options to force a failure if we are @@ -17284,13 +16978,12 @@ if (x) {;} return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : libcurl_cv_lib_curl_usable=yes -else $as_nop +else libcurl_cv_lib_curl_usable=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS=$_libcurl_save_cppflags @@ -17299,8 +16992,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ unset _libcurl_save_libs fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_usable" >&5 -printf "%s\n" "$libcurl_cv_lib_curl_usable" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_usable" >&5 +$as_echo "$libcurl_cv_lib_curl_usable" >&6; } if test $libcurl_cv_lib_curl_usable = yes ; then @@ -17313,12 +17006,11 @@ printf "%s\n" "$libcurl_cv_lib_curl_usable" >&6; } LIBS="$LIBS $LIBCURL" ac_fn_c_check_func "$LINENO" "curl_free" "ac_cv_func_curl_free" -if test "x$ac_cv_func_curl_free" = xyes -then : +if test "x$ac_cv_func_curl_free" = xyes; then : -else $as_nop +else -printf "%s\n" "#define curl_free free" >>confdefs.h +$as_echo "#define curl_free free" >>confdefs.h fi @@ -17329,17 +17021,17 @@ fi unset _libcurl_save_libs -printf "%s\n" "#define HAVE_LIBCURL 1" >>confdefs.h +$as_echo "#define HAVE_LIBCURL 1" >>confdefs.h for _libcurl_feature in $_libcurl_features ; do cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1 +#define `$as_echo "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1 _ACEOF - eval `printf "%s\n" "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes + eval `$as_echo "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes done if test "x$_libcurl_protocols" = "x" ; then @@ -17367,10 +17059,10 @@ _ACEOF for _libcurl_protocol in $_libcurl_protocols ; do cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1 +#define `$as_echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1 _ACEOF - eval `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes + eval `$as_echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes done else unset LIBCURL @@ -17393,10 +17085,10 @@ _ACEOF # This is the IF-NO path _can_enable_check_curl=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping curl plugin" >&5 -printf "%s\n" "$as_me: WARNING: Skipping curl plugin" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: install libcurl libs to compile this plugin (see REQUIREMENTS)." >&5 -printf "%s\n" "$as_me: WARNING: install libcurl libs to compile this plugin (see REQUIREMENTS)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping curl plugin" >&5 +$as_echo "$as_me: WARNING: Skipping curl plugin" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install libcurl libs to compile this plugin (see REQUIREMENTS)." >&5 +$as_echo "$as_me: WARNING: install libcurl libs to compile this plugin (see REQUIREMENTS)." >&2;} else # This is the IF-YES path @@ -17417,10 +17109,9 @@ printf "%s\n" "$as_me: WARNING: install libcurl libs to compile this plugin (see # Check whether --with-uriparser was given. -if test ${with_uriparser+y} -then : +if test "${with_uriparser+set}" = set; then : withval=$with_uriparser; _uriparser_with=$withval -else $as_nop +else _uriparser_with=yes fi @@ -17431,12 +17122,11 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_PKGCONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PKGCONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$PKGCONFIG"; then ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. else @@ -17444,15 +17134,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_PKGCONFIG="pkg-config" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17464,11 +17150,11 @@ fi fi PKGCONFIG=$ac_cv_prog_PKGCONFIG if test -n "$PKGCONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 -printf "%s\n" "$PKGCONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +$as_echo "$PKGCONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17481,27 +17167,25 @@ fi elif test x$PKGCONFIG != xno; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the version of uriparser" >&5 -printf %s "checking for the version of uriparser... " >&6; } -if test ${uriparser_cv_uriparser_version+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the version of uriparser" >&5 +$as_echo_n "checking for the version of uriparser... " >&6; } +if ${uriparser_cv_uriparser_version+:} false; then : + $as_echo_n "(cached) " >&6 +else uriparser_cv_uriparser_version=`$PKGCONFIG liburiparser --modversion` fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $uriparser_cv_uriparser_version" >&5 -printf "%s\n" "$uriparser_cv_uriparser_version" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $uriparser_cv_uriparser_version" >&5 +$as_echo "$uriparser_cv_uriparser_version" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AWK+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -17509,15 +17193,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17528,11 +17208,11 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -printf "%s\n" "$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17546,12 +17226,11 @@ done _uriparser_wanted=`echo 0.7.5 | $_uriparser_version_parse` if test $_uriparser_wanted -gt 0 ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uriparser >= version 0.7.5" >&5 -printf %s "checking for uriparser >= version 0.7.5... " >&6; } -if test ${uriparser_cv_lib_version_ok+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uriparser >= version 0.7.5" >&5 +$as_echo_n "checking for uriparser >= version 0.7.5... " >&6; } +if ${uriparser_cv_lib_version_ok+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $_uriparser_version -ge $_uriparser_wanted ; then uriparser_cv_lib_version_ok=yes @@ -17560,8 +17239,8 @@ else $as_nop fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $uriparser_cv_lib_version_ok" >&5 -printf "%s\n" "$uriparser_cv_lib_version_ok" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $uriparser_cv_lib_version_ok" >&5 +$as_echo "$uriparser_cv_lib_version_ok" >&6; } fi if test $_uriparser_wanted -eq 0 || test x$uriparser_cv_lib_version_ok = xyes ; then @@ -17587,12 +17266,11 @@ printf "%s\n" "$uriparser_cv_lib_version_ok" >&6; } # link line (or failing that, "-luriparser") is enough. URIPARSER=${URIPARSER-"$_uriparser_ldflags -luriparser"} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether uriparser is usable" >&5 -printf %s "checking whether uriparser is usable... " >&6; } -if test ${uriparser_cv_lib_uriparser_usable+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether uriparser is usable" >&5 +$as_echo_n "checking whether uriparser is usable... " >&6; } +if ${uriparser_cv_lib_uriparser_usable+:} false; then : + $as_echo_n "(cached) " >&6 +else _liburiparser_save_cppflags=$CPPFLAGS CPPFLAGS="$URIPARSER_CPPFLAGS $CPPFLAGS" @@ -17603,7 +17281,7 @@ else $as_nop /* end confdefs.h. */ #include int -main (void) +main () { /* Try and use a few common options to force a failure if we are @@ -17619,13 +17297,12 @@ if (x == URI_SUCCESS) {;} return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : uriparser_cv_lib_uriparser_usable=yes -else $as_nop +else uriparser_cv_lib_uriparser_usable=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS=$_liburiparser_save_cppflags @@ -17634,12 +17311,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ unset _liburiparser_save_libs fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $uriparser_cv_lib_uriparser_usable" >&5 -printf "%s\n" "$uriparser_cv_lib_uriparser_usable" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $uriparser_cv_lib_uriparser_usable" >&5 +$as_echo "$uriparser_cv_lib_uriparser_usable" >&6; } if test $uriparser_cv_lib_uriparser_usable = yes ; then -printf "%s\n" "#define HAVE_URIPARSER 1" >>confdefs.h +$as_echo "#define HAVE_URIPARSER 1" >>confdefs.h @@ -17659,10 +17336,10 @@ printf "%s\n" "#define HAVE_URIPARSER 1" >>confdefs.h # This is the IF-NO path _can_enable_check_curl=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Skipping curl plugin" >&5 -printf "%s\n" "$as_me: WARNING: Skipping curl plugin" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: install the uriparser library to compile this plugin (see REQUIREMENTS)." >&5 -printf "%s\n" "$as_me: WARNING: install the uriparser library to compile this plugin (see REQUIREMENTS)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping curl plugin" >&5 +$as_echo "$as_me: WARNING: Skipping curl plugin" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: install the uriparser library to compile this plugin (see REQUIREMENTS)." >&5 +$as_echo "$as_me: WARNING: install the uriparser library to compile this plugin (see REQUIREMENTS)." >&2;} else # This is the IF-YES path @@ -17689,12 +17366,11 @@ if test "$ac_cv_header_utmpx_h" = "no" -a "$ac_cv_header_wtsapi32_h" = "no" then # Extract the first word of "who", so it can be a program name with args. set dummy who; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_WHO+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_WHO+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_WHO in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_WHO="$PATH_TO_WHO" # Let the user override the test with a path. @@ -17704,15 +17380,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_WHO="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_WHO="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17724,11 +17396,11 @@ esac fi PATH_TO_WHO=$ac_cv_path_PATH_TO_WHO if test -n "$PATH_TO_WHO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_WHO" >&5 -printf "%s\n" "$PATH_TO_WHO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_WHO" >&5 +$as_echo "$PATH_TO_WHO" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -17741,27 +17413,27 @@ fi fi -printf "%s\n" "#define WHO_COMMAND \"$ac_cv_path_to_who\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define WHO_COMMAND "$ac_cv_path_to_who" +_ACEOF fi # Check whether --with-ipv6 was given. -if test ${with_ipv6+y} -then : +if test "${with_ipv6+set}" = set; then : withval=$with_ipv6; -else $as_nop +else with_ipv6=check fi if test "$with_ipv6" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5 -printf %s "checking for IPv6 support... " >&6; } -if test ${np_cv_sys_ipv6+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5 +$as_echo_n "checking for IPv6 support... " >&6; } +if ${np_cv_sys_ipv6+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17771,7 +17443,7 @@ else $as_nop #include #include int -main (void) +main () { struct sockaddr_in6 sin6; void *p; @@ -17783,73 +17455,75 @@ struct sockaddr_in6 sin6; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : np_cv_sys_ipv6=yes -else $as_nop +else np_cv_sys_ipv6=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $np_cv_sys_ipv6" >&5 -printf "%s\n" "$np_cv_sys_ipv6" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $np_cv_sys_ipv6" >&5 +$as_echo "$np_cv_sys_ipv6" >&6; } if test "$np_cv_sys_ipv6" = "no" -a "$with_ipv6" != "check"; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "--with-ipv6 was given, but test for IPv6 support failed See \`config.log' for more details" "$LINENO" 5; } fi if test "$np_cv_sys_ipv6" = "yes"; then -printf "%s\n" "#define USE_IPV6 1" >>confdefs.h +$as_echo "#define USE_IPV6 1" >>confdefs.h fi with_ipv6="$np_cv_sys_ipv6" fi - for ac_header in krb5.h +for ac_header in krb5.h do : - ac_fn_c_check_header_compile "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default" -if test "x$ac_cv_header_krb5_h" = xyes -then : - printf "%s\n" "#define HAVE_KRB5_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default" +if test "x$ac_cv_header_krb5_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KRB5_H 1 +_ACEOF FOUNDINCLUDE=yes -else $as_nop +else FOUNDINCLUDE=no fi done + if test "$FOUNDINCLUDE" = "no"; then _SAVEDCPPFLAGS="$CPPFLAGS" CPPFLAGS="$_SAVEDCPPFLAGS -I/usr/kerberos/include" unset ac_cv_header_krb5_h - for ac_header in krb5.h + for ac_header in krb5.h do : - ac_fn_c_check_header_compile "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default" -if test "x$ac_cv_header_krb5_h" = xyes -then : - printf "%s\n" "#define HAVE_KRB5_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default" +if test "x$ac_cv_header_krb5_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KRB5_H 1 +_ACEOF KRB5INCLUDE="-I/usr/kerberos/include" FOUNDINCLUDE=yes -else $as_nop +else FOUNDINCLUDE=no fi done + fi if test "$FOUNDINCLUDE" = "no"; then CPPFLAGS="$_SAVEDCPPFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -printf %s "checking for dlopen in -ldl... " >&6; } -if test ${ac_cv_lib_dl_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17858,41 +17532,43 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes -else $as_nop +else ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes -then : - printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDL 1 +_ACEOF LIBS="-ldl $LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldl" >&5 -printf %s "checking for shl_load in -ldl... " >&6; } -if test ${ac_cv_lib_dl_shl_load+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldl" >&5 +$as_echo_n "checking for shl_load in -ldl... " >&6; } +if ${ac_cv_lib_dl_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17901,30 +17577,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char shl_load (); int -main (void) +main () { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_shl_load=yes -else $as_nop +else ac_cv_lib_dl_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_shl_load" >&5 -printf "%s\n" "$ac_cv_lib_dl_shl_load" >&6; } -if test "x$ac_cv_lib_dl_shl_load" = xyes -then : - printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_shl_load" >&5 +$as_echo "$ac_cv_lib_dl_shl_load" >&6; } +if test "x$ac_cv_lib_dl_shl_load" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDL 1 +_ACEOF LIBS="-ldl $LIBS" @@ -17948,39 +17627,39 @@ if ! test x"$with_openssl" = x"no"; then LDFLAGS="$LDFLAGS -L$with_openssl/lib" fi - for ac_header in openssl/ssl.h openssl/x509.h openssl/rsa.h openssl/pem.h openssl/crypto.h openssl/err.h + for ac_header in openssl/ssl.h openssl/x509.h openssl/rsa.h openssl/pem.h openssl/crypto.h openssl/err.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF SSLINCLUDE="-I$with_openssl/include" FOUNDINCLUDE=yes -else $as_nop +else FOUNDINCLUDE=no fi done + if test "$FOUNDINCLUDE" = "no"; then - for ac_header in ssl.h x509.h rsa.h pem.h crypto.h err.h + for ac_header in ssl.h x509.h rsa.h pem.h crypto.h err.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF SSLINCLUDE="-I$with_openssl/include" FOUNDINCLUDE=yes -else $as_nop +else FOUNDINCLUDE=no fi done + fi if test "$FOUNDINCLUDE" = "no"; then @@ -17990,12 +17669,11 @@ done _SAVEDLIBS="$LIBS" LIBS="-L${with_openssl}/lib" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_new_ex_data in -lcrypto" >&5 -printf %s "checking for CRYPTO_new_ex_data in -lcrypto... " >&6; } -if test ${ac_cv_lib_crypto_CRYPTO_new_ex_data+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_new_ex_data in -lcrypto" >&5 +$as_echo_n "checking for CRYPTO_new_ex_data in -lcrypto... " >&6; } +if ${ac_cv_lib_crypto_CRYPTO_new_ex_data+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18004,42 +17682,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char CRYPTO_new_ex_data (); int -main (void) +main () { return CRYPTO_new_ex_data (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_crypto_CRYPTO_new_ex_data=yes -else $as_nop +else ac_cv_lib_crypto_CRYPTO_new_ex_data=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_new_ex_data" >&5 -printf "%s\n" "$ac_cv_lib_crypto_CRYPTO_new_ex_data" >&6; } -if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = xyes -then : - printf "%s\n" "#define HAVE_LIBCRYPTO 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_new_ex_data" >&5 +$as_echo "$ac_cv_lib_crypto_CRYPTO_new_ex_data" >&6; } +if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCRYPTO 1 +_ACEOF LIBS="-lcrypto $LIBS" fi if test "$ac_cv_lib_crypto_CRYPTO_new_ex_data" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lssl" >&5 -printf %s "checking for main in -lssl... " >&6; } -if test ${ac_cv_lib_ssl_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lssl" >&5 +$as_echo_n "checking for main in -lssl... " >&6; } +if ${ac_cv_lib_ssl_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lssl -lcrypto $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18047,27 +17727,25 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ssl_main=yes -else $as_nop +else ac_cv_lib_ssl_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_main" >&5 -printf "%s\n" "$ac_cv_lib_ssl_main" >&6; } -if test "x$ac_cv_lib_ssl_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_main" >&5 +$as_echo "$ac_cv_lib_ssl_main" >&6; } +if test "x$ac_cv_lib_ssl_main" = xyes; then : SSLLIBS="-lssl -lcrypto" fi @@ -18088,23 +17766,24 @@ if test ! "$FOUNDOPENSSL" = "yes" && test ! "$with_gnutls" = "no"; then if test ! "$with_gnutls" = ""; then CPPFLAGS="$CPPFLAGS -I${with_gnutls}/include" fi - for ac_header in gnutls/openssl.h + for ac_header in gnutls/openssl.h do : - ac_fn_c_check_header_compile "$LINENO" "gnutls/openssl.h" "ac_cv_header_gnutls_openssl_h" "$ac_includes_default" -if test "x$ac_cv_header_gnutls_openssl_h" = xyes -then : - printf "%s\n" "#define HAVE_GNUTLS_OPENSSL_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "gnutls/openssl.h" "ac_cv_header_gnutls_openssl_h" "$ac_includes_default" +if test "x$ac_cv_header_gnutls_openssl_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GNUTLS_OPENSSL_H 1 +_ACEOF FOUNDGNUTLS="yes" fi done + if test "$FOUNDGNUTLS" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lgnutls-openssl" >&5 -printf %s "checking for main in -lgnutls-openssl... " >&6; } -if test ${ac_cv_lib_gnutls_openssl_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgnutls-openssl" >&5 +$as_echo_n "checking for main in -lgnutls-openssl... " >&6; } +if ${ac_cv_lib_gnutls_openssl_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lgnutls-openssl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18112,27 +17791,25 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_gnutls_openssl_main=yes -else $as_nop +else ac_cv_lib_gnutls_openssl_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_openssl_main" >&5 -printf "%s\n" "$ac_cv_lib_gnutls_openssl_main" >&6; } -if test "x$ac_cv_lib_gnutls_openssl_main" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_openssl_main" >&5 +$as_echo "$ac_cv_lib_gnutls_openssl_main" >&6; } +if test "x$ac_cv_lib_gnutls_openssl_main" = xyes; then : SSLLIBS="-lgnutls-openssl" fi @@ -18144,45 +17821,69 @@ if test "$FOUNDOPENSSL" = "yes" || test "$FOUNDGNUTLS" = "yes"; then -printf "%s\n" "#define HAVE_SSL 1" >>confdefs.h +$as_echo "#define HAVE_SSL 1" >>confdefs.h if test "$FOUNDOPENSSL" = "yes"; then -printf "%s\n" "#define USE_OPENSSL 1" >>confdefs.h +$as_echo "#define USE_OPENSSL 1" >>confdefs.h with_openssl="yes" with_gnutls="no" else -printf "%s\n" "#define USE_GNUTLS 1" >>confdefs.h +$as_echo "#define USE_GNUTLS 1" >>confdefs.h with_gnutls="yes" with_openssl="no" fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL or GnuTLS libs could not be found or were disabled" >&5 -printf "%s\n" "$as_me: WARNING: OpenSSL or GnuTLS libs could not be found or were disabled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL or GnuTLS libs could not be found or were disabled" >&5 +$as_echo "$as_me: WARNING: OpenSSL or GnuTLS libs could not be found or were disabled" >&2;} with_openssl="no" with_gnutls="no" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if ${ac_cv_header_time+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_time=yes +else + ac_cv_header_time=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } +if test $ac_cv_header_time = yes; then -# Obsolete code to be removed. -if test $ac_cv_header_sys_time_h = yes; then - -printf "%s\n" "#define TIME_WITH_SYS_TIME 1" >>confdefs.h +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi -# End of obsolete code. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 -printf %s "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if test ${ac_cv_header_sys_wait_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 +$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +if ${ac_cv_header_sys_wait_h+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -18195,7 +17896,7 @@ else $as_nop #endif int -main (void) +main () { int s; wait (&s); @@ -18204,108 +17905,58 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_sys_wait_h=yes -else $as_nop +else ac_cv_header_sys_wait_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 -printf "%s\n" "$ac_cv_header_sys_wait_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 +$as_echo "$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then -printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h +$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "signal.h" "ac_cv_header_signal_h" "$ac_includes_default" -if test "x$ac_cv_header_signal_h" = xyes -then : - printf "%s\n" "#define HAVE_SIGNAL_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default" -if test "x$ac_cv_header_syslog_h" = xyes -then : - printf "%s\n" "#define HAVE_SYSLOG_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "uio.h" "ac_cv_header_uio_h" "$ac_includes_default" -if test "x$ac_cv_header_uio_h" = xyes -then : - printf "%s\n" "#define HAVE_UIO_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" -if test "x$ac_cv_header_errno_h" = xyes -then : - printf "%s\n" "#define HAVE_ERRNO_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_time_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_socket_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_un_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_UN_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_poll_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h +for ac_header in signal.h syslog.h uio.h errno.h sys/time.h sys/socket.h sys/un.h sys/poll.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_header_compile "$LINENO" "features.h" "ac_cv_header_features_h" "$ac_includes_default" -if test "x$ac_cv_header_features_h" = xyes -then : - printf "%s\n" "#define HAVE_FEATURES_H 1" >>confdefs.h +done -fi -ac_fn_c_check_header_compile "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default" -if test "x$ac_cv_header_stdarg_h" = xyes -then : - printf "%s\n" "#define HAVE_STDARG_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/unistd.h" "ac_cv_header_sys_unistd_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_unistd_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_UNISTD_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "ctype.h" "ac_cv_header_ctype_h" "$ac_includes_default" -if test "x$ac_cv_header_ctype_h" = xyes -then : - printf "%s\n" "#define HAVE_CTYPE_H 1" >>confdefs.h +for ac_header in features.h stdarg.h sys/unistd.h ctype.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi +done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -printf %s "checking for an ANSI C-conforming const... " >&6; } -if test ${ac_cv_c_const+y} -then : - printf %s "(cached) " >&6 -else $as_nop + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if ${ac_cv_c_const+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __cplusplus @@ -18318,7 +17969,7 @@ main (void) /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; - /* IBM XL C 1.02.0.0 rejects this. + /* AIX XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant expression */ @@ -18346,7 +17997,7 @@ main (void) iptr p = 0; ++p; } - { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ struct s { int j; const int *ap[3]; } bx; struct s *b = &bx; b->j = 5; @@ -18362,35 +18013,33 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_const=yes -else $as_nop +else ac_cv_c_const=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -printf "%s\n" "$ac_cv_c_const" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -printf "%s\n" "#define const /**/" >>confdefs.h +$as_echo "#define const /**/" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 -printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if test ${ac_cv_struct_tm+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 +$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } +if ${ac_cv_struct_tm+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main (void) +main () { struct tm tm; int *p = &tm.tm_sec; @@ -18399,29 +18048,27 @@ struct tm tm; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_struct_tm=time.h -else $as_nop +else ac_cv_struct_tm=sys/time.h fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 -printf "%s\n" "$ac_cv_struct_tm" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 +$as_echo "$ac_cv_struct_tm" >&6; } if test $ac_cv_struct_tm = sys/time.h; then -printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h +$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default " -if test "x$ac_cv_type_pid_t" = xyes -then : +if test "x$ac_cv_type_pid_t" = xyes; then : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18430,7 +18077,7 @@ else $as_nop #endif int -main (void) +main () { ; @@ -18438,99 +18085,97 @@ main (void) } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_pid_type='int' -else $as_nop - ac_pid_type='__int64' +if ac_fn_c_try_compile "$LINENO"; then : + gl_pid_type='int' +else + gl_pid_type='__int64' fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define pid_t $gl_pid_type +_ACEOF fi ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes -then : +if test "x$ac_cv_type_size_t" = xyes; then : -else $as_nop +else -printf "%s\n" "#define size_t unsigned int" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 -printf %s "checking for va_copy... " >&6; } -if test ${ac_cv_HAVE_VA_COPY+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 +$as_echo_n "checking for va_copy... " >&6; } +if ${ac_cv_HAVE_VA_COPY+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include va_list ap1,ap2; int -main (void) +main () { va_copy(ap1,ap2); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_HAVE_VA_COPY=yes -else $as_nop +else ac_cv_HAVE_VA_COPY=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_HAVE_VA_COPY" >&5 -printf "%s\n" "$ac_cv_HAVE_VA_COPY" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_HAVE_VA_COPY" >&5 +$as_echo "$ac_cv_HAVE_VA_COPY" >&6; } if test x"$ac_cv_HAVE_VA_COPY" = x"yes"; then -printf "%s\n" "#define HAVE_VA_COPY 1" >>confdefs.h +$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5 -printf %s "checking for __va_copy... " >&6; } -if test ${ac_cv_HAVE___VA_COPY+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5 +$as_echo_n "checking for __va_copy... " >&6; } +if ${ac_cv_HAVE___VA_COPY+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include va_list ap1,ap2; int -main (void) +main () { __va_copy(ap1,ap2); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_HAVE___VA_COPY=yes -else $as_nop +else ac_cv_HAVE___VA_COPY=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_HAVE___VA_COPY" >&5 -printf "%s\n" "$ac_cv_HAVE___VA_COPY" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_HAVE___VA_COPY" >&5 +$as_echo "$ac_cv_HAVE___VA_COPY" >&6; } if test x"$ac_cv_HAVE___VA_COPY" = x"yes"; then -printf "%s\n" "#define HAVE___VA_COPY 1" >>confdefs.h +$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h fi fi @@ -18539,7 +18184,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { struct timeval *tv; struct timezone *tz; @@ -18547,21 +18192,20 @@ struct timeval *tv; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -printf "%s\n" "#define HAVE_STRUCT_TIMEVAL 1" >>confdefs.h +$as_echo "#define HAVE_STRUCT_TIMEVAL 1" >>confdefs.h FOUND_STRUCT_TIMEVAL="yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test x"$FOUND_STRUCT_TIMEVAL" = x"yes"; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { struct timeval *tv; struct timezone *tz; @@ -18570,117 +18214,83 @@ struct timeval *tv; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h +$as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h -else $as_nop +else -printf "%s\n" "#define NEED_GETTIMEOFDAY 1" >>confdefs.h +$as_echo "#define NEED_GETTIMEOFDAY 1" >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove" -if test "x$ac_cv_func_memmove" = xyes -then : - printf "%s\n" "#define HAVE_MEMMOVE 1" >>confdefs.h +for ac_func in memmove select socket strdup strstr strtol strtoul floor +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select" -if test "x$ac_cv_func_select" = xyes -then : - printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" -if test "x$ac_cv_func_socket" = xyes -then : - printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup" -if test "x$ac_cv_func_strdup" = xyes -then : - printf "%s\n" "#define HAVE_STRDUP 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" -if test "x$ac_cv_func_strstr" = xyes -then : - printf "%s\n" "#define HAVE_STRSTR 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol" -if test "x$ac_cv_func_strtol" = xyes -then : - printf "%s\n" "#define HAVE_STRTOL 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul" -if test "x$ac_cv_func_strtoul" = xyes -then : - printf "%s\n" "#define HAVE_STRTOUL 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor" -if test "x$ac_cv_func_floor" = xyes -then : - printf "%s\n" "#define HAVE_FLOOR 1" >>confdefs.h - -fi - -ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" -if test "x$ac_cv_func_poll" = xyes -then : - printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h +done + +for ac_func in poll +do : + ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" +if test "x$ac_cv_func_poll" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_POLL 1 +_ACEOF fi +done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking return type of socket size" >&5 -printf %s "checking return type of socket size... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of socket size" >&5 +$as_echo_n "checking return type of socket size... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include #include int -main (void) +main () { int a = send(1, (const void *) buffer, (size_t *) 0, (int *) 0); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_socket_size_type="size_t" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: size_t" >&5 -printf "%s\n" "size_t" >&6; } -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: result: size_t" >&5 +$as_echo "size_t" >&6; } +else ac_cv_socket_size_type="int" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: int" >&5 -printf "%s\n" "int" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5 +$as_echo "int" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -printf "%s\n" "#define SOCKET_SIZE_TYPE $ac_cv_socket_size_type " >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SOCKET_SIZE_TYPE $ac_cv_socket_size_type +_ACEOF # Extract the first word of "ps", so it can be a program name with args. set dummy ps; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_PS+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_PS+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_PS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PS="$PATH_TO_PS" # Let the user override the test with a path. @@ -18690,15 +18300,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_PS="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_PS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18710,22 +18316,21 @@ esac fi PATH_TO_PS=$ac_cv_path_PATH_TO_PS if test -n "$PATH_TO_PS"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_PS" >&5 -printf "%s\n" "$PATH_TO_PS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_PS" >&5 +$as_echo "$PATH_TO_PS" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "env", so it can be a program name with args. set dummy env; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_ENV+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_ENV+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_ENV in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_ENV="$PATH_TO_ENV" # Let the user override the test with a path. @@ -18735,15 +18340,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_ENV="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_ENV="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18755,42 +18356,38 @@ esac fi PATH_TO_ENV=$ac_cv_path_PATH_TO_ENV if test -n "$PATH_TO_ENV"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_ENV" >&5 -printf "%s\n" "$PATH_TO_ENV" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_ENV" >&5 +$as_echo "$PATH_TO_ENV" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ps syntax" >&5 -printf %s "checking for ps syntax... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ps syntax" >&5 +$as_echo_n "checking for ps syntax... " >&6; } # Check whether --with-ps_command was given. -if test ${with_ps_command+y} -then : +if test "${with_ps_command+set}" = set; then : withval=$with_ps_command; PS_COMMAND=$withval fi # Check whether --with-ps_format was given. -if test ${with_ps_format+y} -then : +if test "${with_ps_format+set}" = set; then : withval=$with_ps_format; PS_FORMAT=$withval fi # Check whether --with-ps_cols was given. -if test ${with_ps_cols+y} -then : +if test "${with_ps_cols+set}" = set; then : withval=$with_ps_cols; PS_COLS=$withval fi # Check whether --with-ps_varlist was given. -if test ${with_ps_varlist+y} -then : +if test "${with_ps_varlist+set}" = set; then : withval=$with_ps_varlist; PS_VARLIST=$withval fi @@ -18800,8 +18397,8 @@ if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test - ac_cv_ps_format="$PS_FORMAT" ac_cv_ps_varlist="$PS_VARLIST" ac_cv_ps_cols="$PS_COLS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (command-line) $ac_cv_ps_command" >&5 -printf "%s\n" "(command-line) $ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (command-line) $ac_cv_ps_command" >&5 +$as_echo "(command-line) $ac_cv_ps_command" >&6; } elif test "$ac_cv_uname_s" = "SunOS"; then # @@ -18824,15 +18421,15 @@ elif test "$ac_cv_uname_s" = "SunOS"; then ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using monitoring-plugins internal ps command (pst3) for solaris" >&5 -printf "%s\n" "using monitoring-plugins internal ps command (pst3) for solaris" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using monitoring-plugins internal ps command (pst3) for solaris" >&5 +$as_echo "using monitoring-plugins internal ps command (pst3) for solaris" >&6; } if test `isainfo -b` = 64 ; then pst3_use_64bit=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using 64bit pst3" >&5 -printf "%s\n" "$as_me: using 64bit pst3" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: using 64bit pst3" >&5 +$as_echo "$as_me: using 64bit pst3" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using 32bit pst3" >&5 -printf "%s\n" "$as_me: using 32bit pst3" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: using 32bit pst3" >&5 +$as_echo "$as_me: using 32bit pst3" >&6;} fi EXTRAS_ROOT="$EXTRAS_ROOT pst3\$(EXEEXT)" @@ -18840,18 +18437,17 @@ printf "%s\n" "$as_me: using 32bit pst3" >&6;} old_cflags=$CFLAGS CFLAGS="$CFLAGS -m64" pst3_64bit_working=0 - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return sizeof(void*) == 8 ? 0 : 1; @@ -18861,20 +18457,19 @@ return sizeof(void*) == 8 ? 0 : 1; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : PST3CFLAGS="-m64" pst3_64bit_working=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using -m64 for 64bit code" >&5 -printf "%s\n" "$as_me: using -m64 for 64bit code" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: using -m64 for 64bit code" >&5 +$as_echo "$as_me: using -m64 for 64bit code" >&6;} -else $as_nop +else pst3_64bit_working=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: compiler do not like -m64" >&5 -printf "%s\n" "$as_me: compiler do not like -m64" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: compiler do not like -m64" >&5 +$as_echo "$as_me: compiler do not like -m64" >&6;} fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -18885,18 +18480,17 @@ fi if test "$pst3_64bit_working" = 0; then old_cflags=$CFLAGS CFLAGS="$CFLAGS -xarch=v9" - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return sizeof(void*) == 8 ? 0 : 1; @@ -18906,20 +18500,19 @@ return sizeof(void*) == 8 ? 0 : 1; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : PST3CFLAGS="-xarch=v9" pst3_64bit_working=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using -xarch=v9 for 64bit code" >&5 -printf "%s\n" "$as_me: using -xarch=v9 for 64bit code" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: using -xarch=v9 for 64bit code" >&5 +$as_echo "$as_me: using -xarch=v9 for 64bit code" >&6;} -else $as_nop +else pst3_64bit_working=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: compiler do not like -xarch=v9" >&5 -printf "%s\n" "$as_me: compiler do not like -xarch=v9" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: compiler do not like -xarch=v9" >&5 +$as_echo "$as_me: compiler do not like -xarch=v9" >&6;} fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -18931,18 +18524,17 @@ fi if test "$pst3_64bit_working" = 0; then old_cflags=$CFLAGS CFLAGS="$CFLAGS -xarch=amd64" - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { return sizeof(void*) == 8 ? 0 : 1; @@ -18952,20 +18544,19 @@ return sizeof(void*) == 8 ? 0 : 1; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : PST3CFLAGS="-xarch=amd64" pst3_64bit_working=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using -xarch=amd64 for 64bit code" >&5 -printf "%s\n" "$as_me: using -xarch=amd64 for 64bit code" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: using -xarch=amd64 for 64bit code" >&5 +$as_echo "$as_me: using -xarch=amd64 for 64bit code" >&6;} -else $as_nop +else pst3_64bit_working=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: compiler do not like -xarch=amd64" >&5 -printf "%s\n" "$as_me: compiler do not like -xarch=amd64" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: compiler do not like -xarch=amd64" >&5 +$as_echo "$as_me: compiler do not like -xarch=amd64" >&6;} fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -18987,8 +18578,8 @@ then ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu etime comm args'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n" ac_cv_ps_cols=10 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ grep -E -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null @@ -18997,8 +18588,8 @@ then ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ grep -E -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null @@ -19007,8 +18598,8 @@ then ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \ grep -E -i "^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND" > /dev/null @@ -19017,8 +18608,8 @@ then ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu ucomm command'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \ grep -E -i "^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+" >/dev/null @@ -19027,8 +18618,8 @@ then ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n" ac_cv_ps_cols=10 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null | \ grep -E -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID" >/dev/null @@ -19037,8 +18628,8 @@ then ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \ grep -E -i "^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null @@ -19047,8 +18638,8 @@ then ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -laxnwww 2>/dev/null | head -1 | \ grep -E -i "^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND" >/dev/null @@ -19057,8 +18648,8 @@ then ac_cv_ps_command="$PATH_TO_PS -laxnwww" ac_cv_ps_format="%*s %d %d %d %*s %*s %*s %d %d %*s %s %*s %*s %n%s" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps laxnwww 2>/dev/null | \ grep -E -i "^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND" >/dev/null @@ -19067,8 +18658,8 @@ then ac_cv_ps_command="$PATH_TO_PS laxnwww" ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ grep -E -i "^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+" >/dev/null @@ -19077,8 +18668,8 @@ then ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \ grep -E -i "^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+" > /dev/null @@ -19087,8 +18678,8 @@ then ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'" ac_cv_ps_format="%s%*[ +<>] %d %d %d %f %s %s %n" ac_cv_ps_cols=8 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \ grep -E -i "^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+" >/dev/null @@ -19097,8 +18688,8 @@ then ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \ grep -E -i "^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND" >/dev/null @@ -19107,8 +18698,8 @@ then ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'" ac_cv_ps_format="%s %d %d %d %d %f %s %n" ac_cv_ps_cols=8 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command - with no RSS" >&5 -printf "%s\n" "$ac_cv_ps_command - with no RSS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command - with no RSS" >&5 +$as_echo "$ac_cv_ps_command - with no RSS" >&6; } elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \ grep -E -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null @@ -19119,8 +18710,8 @@ then # it will return %n as longer than the line length ac_cv_ps_format="%s %d %d %d %d %d %f %s%n" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \ grep -E -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null @@ -19129,8 +18720,8 @@ then ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \ grep -E -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null @@ -19139,8 +18730,8 @@ then ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=9 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \ grep -E -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null @@ -19149,8 +18740,8 @@ then ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=8 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -el 2>/dev/null | \ grep -E -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null @@ -19159,8 +18750,8 @@ then ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)" ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s" ac_cv_ps_cols=8 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -el 2>/dev/null | \ grep -E -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null @@ -19169,8 +18760,8 @@ then ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)" ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s" ac_cv_ps_cols=6 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif env UNIX95=1 ps -eo 'state uid ruid user ruser pid ppid vsz pcpu comm args' 2>/dev/null | head -n 1 | \ grep -E -i "^ *S +UID +RUID +USER +RUSER +PID +PPID +VSZ +%CPU +COMMAND +COMMAND" >/dev/null @@ -19179,8 +18770,8 @@ then ac_cv_ps_command="$PATH_TO_ENV UNIX95=1 $PATH_TO_PS -eo 'state uid pid ppid vsz pcpu comm args'" ac_cv_ps_format="%s %d %d %d %d %f %s %n" ac_cv_ps_cols=8 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -el 2>/dev/null | \ grep -E -i "^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null @@ -19189,8 +18780,8 @@ then ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)" ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s" ac_cv_ps_cols=6 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps glaxen 2>/dev/null | \ grep -E -i "^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND" >/dev/null @@ -19199,8 +18790,8 @@ then ac_cv_ps_command="$PATH_TO_PS glaxen" ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s" ac_cv_ps_cols=8 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null | \ grep -E -i "^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND" >/dev/null @@ -19209,8 +18800,8 @@ then ac_cv_ps_varlist="procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos" ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ac_cv_ps_cols=8 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } elif ps -Al 2>/dev/null | \ grep -E -i "^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD" >/dev/null @@ -19219,48 +18810,55 @@ then ac_cv_ps_command="$PATH_TO_PS -Al" ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s" ac_cv_ps_cols=8 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 -printf "%s\n" "$ac_cv_ps_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unable to find usable ps syntax - check_procs and check_nagios will not be compiled" >&5 -printf "%s\n" "$as_me: WARNING: unable to find usable ps syntax - check_procs and check_nagios will not be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to find usable ps syntax - check_procs and check_nagios will not be compiled" >&5 +$as_echo "$as_me: WARNING: unable to find usable ps syntax - check_procs and check_nagios will not be compiled" >&2;} fi if test -n "$ac_cv_ps_varlist" ; then -printf "%s\n" "#define PS_VARLIST $ac_cv_ps_varlist" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PS_VARLIST $ac_cv_ps_varlist +_ACEOF -printf "%s\n" "#define PS_COMMAND \"$ac_cv_ps_command\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PS_COMMAND "$ac_cv_ps_command" +_ACEOF -printf "%s\n" "#define PS_FORMAT \"$ac_cv_ps_format\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PS_FORMAT "$ac_cv_ps_format" +_ACEOF -printf "%s\n" "#define PS_COLS $ac_cv_ps_cols" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PS_COLS $ac_cv_ps_cols +_ACEOF EXTRAS="$EXTRAS check_procs check_nagios\$(EXEEXT)" if echo "$ac_cv_ps_varlist" | grep "procetime" >/dev/null; then -printf "%s\n" "#define PS_USES_PROCETIME \"yes\"" >>confdefs.h +$as_echo "#define PS_USES_PROCETIME \"yes\"" >>confdefs.h fi if echo "$ac_cv_ps_varlist" | grep "procpcpu" >/dev/null; then -printf "%s\n" "#define PS_USES_PROCPCPU \"yes\"" >>confdefs.h +$as_echo "#define PS_USES_PROCPCPU \"yes\"" >>confdefs.h fi fi # Extract the first word of "ping", so it can be a program name with args. set dummy ping; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_PING+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_PING+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_PING in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PING="$PATH_TO_PING" # Let the user override the test with a path. @@ -19270,15 +18868,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_PING="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_PING="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19290,22 +18884,21 @@ esac fi PATH_TO_PING=$ac_cv_path_PATH_TO_PING if test -n "$PATH_TO_PING"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_PING" >&5 -printf "%s\n" "$PATH_TO_PING" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_PING" >&5 +$as_echo "$PATH_TO_PING" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "ping6", so it can be a program name with args. set dummy ping6; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_PING6+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_PING6+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_PING6 in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PING6="$PATH_TO_PING6" # Let the user override the test with a path. @@ -19315,15 +18908,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_PING6="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_PING6="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19335,31 +18924,30 @@ esac fi PATH_TO_PING6=$ac_cv_path_PATH_TO_PING6 if test -n "$PATH_TO_PING6"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_PING6" >&5 -printf "%s\n" "$PATH_TO_PING6" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_PING6" >&5 +$as_echo "$PATH_TO_PING6" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-ping_command was given. -if test ${with_ping_command+y} -then : +if test "${with_ping_command+set}" = set; then : withval=$with_ping_command; with_ping_command=$withval fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ICMP ping syntax" >&5 -printf %s "checking for ICMP ping syntax... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICMP ping syntax" >&5 +$as_echo_n "checking for ICMP ping syntax... " >&6; } ac_cv_ping_packets_first=no ac_cv_ping_has_timeout=no if test -n "$with_ping_command" then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (command-line) $with_ping_command" >&5 -printf "%s\n" "(command-line) $with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (command-line) $with_ping_command" >&5 +$as_echo "(command-line) $with_ping_command" >&6; } if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null then ac_cv_ping_packets_first=yes @@ -19378,8 +18966,8 @@ then with_ping_command="$PATH_TO_PING -n %d -w %d000 %s" ac_cv_ping_packets_first=yes ac_cv_ping_has_timeout=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \ $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ @@ -19387,8 +18975,8 @@ elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \ then with_ping_command="$PATH_TO_PING -n -U -c %d %s" ac_cv_ping_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -4 -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null @@ -19397,116 +18985,117 @@ then with_ping_command="$PATH_TO_PING -4 -n -U -w %d -c %d %s" ac_cv_ping_packets_first=yes ac_cv_ping_has_timeout=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" ac_cv_ping_packets_first=yes ac_cv_ping_has_timeout=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -U -c %d %s" ac_cv_ping_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -c %d %s" ac_cv_ping_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n %s -c %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING %s -n %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -s %s 56 %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s" ac_cv_ping_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -c %d %s" ac_cv_ping_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unable to find usable ping syntax" >&5 -printf "%s\n" "$as_me: WARNING: unable to find usable ping syntax" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to find usable ping syntax" >&5 +$as_echo "$as_me: WARNING: unable to find usable ping syntax" >&2;} fi -printf "%s\n" "#define PING_COMMAND \"$with_ping_command\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PING_COMMAND "$with_ping_command" +_ACEOF if test "x$ac_cv_ping_packets_first" != "xno" then -printf "%s\n" "#define PING_PACKETS_FIRST 1" >>confdefs.h +$as_echo "#define PING_PACKETS_FIRST 1" >>confdefs.h fi if test "x$ac_cv_ping_has_timeout" != "xno" then -printf "%s\n" "#define PING_HAS_TIMEOUT 1" >>confdefs.h +$as_echo "#define PING_HAS_TIMEOUT 1" >>confdefs.h fi # Check whether --with-ping6_command was given. -if test ${with_ping6_command+y} -then : +if test "${with_ping6_command+set}" = set; then : withval=$with_ping6_command; with_ping6_command=$withval fi if test x"$with_ipv6" != xno ; then -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ICMPv6 ping syntax" >&5 -printf %s "checking for ICMPv6 ping syntax... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICMPv6 ping syntax" >&5 +$as_echo_n "checking for ICMPv6 ping syntax... " >&6; } ac_cv_ping6_packets_first=no if test -n "$with_ping6_command" then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (command-line) $with_ping6_command" >&5 -printf "%s\n" "(command-line) $with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (command-line) $with_ping6_command" >&5 +$as_echo "(command-line) $with_ping6_command" >&6; } if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null then ac_cv_ping6_packets_first=yes @@ -19523,8 +19112,8 @@ elif [ "z$ac_cv_uname_o" = "zCygwin" -a "x$PATH_TO_PING" != "x" ]; then with_ping6_command="$PATH_TO_PING -6 -n %d -w %d000 %s" ac_cv_ping6_packets_first=yes ac_cv_ping_has_timeout=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif test "x$PATH_TO_PING6" != "x"; then if [ "z$ac_cv_uname_s" = "zUnixWare" ] && \ $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ @@ -19532,8 +19121,8 @@ elif test "x$PATH_TO_PING6" != "x"; then then with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -U -w 10 -c 1 ::1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null @@ -19541,68 +19130,68 @@ printf "%s\n" "$with_ping6_command" >&6; } with_ping6_command="$PATH_TO_PING6 -n -U -w %d -c %d %s" ac_cv_ping6_packets_first=yes ac_cv_ping_has_timeout=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -c %d %s" ac_cv_ping6_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n ::1 -c 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n %s -c %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 ::1 -n 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 %s -n %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -s %s 56 %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -h ::1 -s 56 -c 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -h %s -s 56 -c %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -s 56 -c 1 ::1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -s 56 -c %d %s" ac_cv_ping6_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -c %d %s" ac_cv_ping6_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } fi @@ -19613,68 +19202,68 @@ elif test "x$PATH_TO_PING" != "x"; then then with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s" ac_cv_ping6_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n ::1 -c 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n %s -c %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 ::1 -n 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 %s -n %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -s %s 56 %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n -h ::1 -s 56 -c 1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -h %s -s 56 -c %d" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n -s 56 -c 1 ::1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -s 56 -c %d %s" ac_cv_ping6_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 -printf "%s\n" "$with_ping_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 +$as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \ grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s" ac_cv_ping6_packets_first=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 -printf "%s\n" "$with_ping6_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 +$as_echo "$with_ping6_command" >&6; } fi @@ -19682,16 +19271,18 @@ fi if test "x$with_ping6_command" != "x"; then -printf "%s\n" "#define PING6_COMMAND \"$with_ping6_command\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PING6_COMMAND "$with_ping6_command" +_ACEOF else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi if test "x$ac_cv_ping6_packets_first" != "xno"; then -printf "%s\n" "#define PING6_PACKETS_FIRST 1" >>confdefs.h +$as_echo "#define PING6_PACKETS_FIRST 1" >>confdefs.h fi fi @@ -19699,23 +19290,21 @@ fi # Check whether --with-nslookup_command was given. -if test ${with_nslookup_command+y} -then : +if test "${with_nslookup_command+set}" = set; then : withval=$with_nslookup_command; ac_cv_nslookup_command=$withval fi if test -n "$ac_cv_nslookup_command"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using specific nslookup at $ac_cv_nslookup_command" >&5 -printf "%s\n" "$as_me: Using specific nslookup at $ac_cv_nslookup_command" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Using specific nslookup at $ac_cv_nslookup_command" >&5 +$as_echo "$as_me: Using specific nslookup at $ac_cv_nslookup_command" >&6;} else # Extract the first word of "nslookup", so it can be a program name with args. set dummy nslookup; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_NSLOOKUP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_NSLOOKUP+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_NSLOOKUP in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_NSLOOKUP="$PATH_TO_NSLOOKUP" # Let the user override the test with a path. @@ -19725,15 +19314,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_NSLOOKUP="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_NSLOOKUP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19745,105 +19330,104 @@ esac fi PATH_TO_NSLOOKUP=$ac_cv_path_PATH_TO_NSLOOKUP if test -n "$PATH_TO_NSLOOKUP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_NSLOOKUP" >&5 -printf "%s\n" "$PATH_TO_NSLOOKUP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_NSLOOKUP" >&5 +$as_echo "$PATH_TO_NSLOOKUP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -n "$PATH_TO_NSLOOKUP" then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nslookup syntax" >&5 -printf %s "checking for nslookup syntax... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nslookup syntax" >&5 +$as_echo_n "checking for nslookup syntax... " >&6; } if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null then ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_nslookup_command" >&5 -printf "%s\n" "$ac_cv_nslookup_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_nslookup_command" >&5 +$as_echo "$ac_cv_nslookup_command" >&6; } else ac_cv_nslookup_command="$PATH_TO_NSLOOKUP -sil" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_nslookup_command" >&5 -printf "%s\n" "$ac_cv_nslookup_command" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_nslookup_command" >&5 +$as_echo "$ac_cv_nslookup_command" >&6; } fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: nslookup command not found" >&5 -printf "%s\n" "$as_me: WARNING: nslookup command not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nslookup command not found" >&5 +$as_echo "$as_me: WARNING: nslookup command not found" >&2;} fi fi if test -n "$ac_cv_nslookup_command"; then EXTRAS="$EXTRAS check_dns\$(EXEEXT)" -printf "%s\n" "#define NSLOOKUP_COMMAND \"$ac_cv_nslookup_command\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define NSLOOKUP_COMMAND "$ac_cv_nslookup_command" +_ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for number of online cpus" >&5 -printf %s "checking for number of online cpus... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of online cpus" >&5 +$as_echo_n "checking for number of online cpus... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { sysconf(_SC_NPROCESSORS_ONLN) > 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -printf "%s\n" "#define HAVE_SYSCONF__SC_NPROCESSORS_ONLN 1" >>confdefs.h +$as_echo "#define HAVE_SYSCONF__SC_NPROCESSORS_ONLN 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: sysconf(_SC_NPROCESSORS_ONLN)" >&5 -printf "%s\n" "sysconf(_SC_NPROCESSORS_ONLN)" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot calculate" >&5 -printf "%s\n" "cannot calculate" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: sysconf(_SC_NPROCESSORS_ONLN)" >&5 +$as_echo "sysconf(_SC_NPROCESSORS_ONLN)" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot calculate" >&5 +$as_echo "cannot calculate" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for number of available cpus" >&5 -printf %s "checking for number of available cpus... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of available cpus" >&5 +$as_echo_n "checking for number of available cpus... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { sysconf(_SC_NPROCESSORS_CONF) > 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -printf "%s\n" "#define HAVE_SYSCONF__SC_NPROCESSORS_CONF 1" >>confdefs.h +$as_echo "#define HAVE_SYSCONF__SC_NPROCESSORS_CONF 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: sysconf(_SC_NPROCESSORS_CONF)" >&5 -printf "%s\n" "sysconf(_SC_NPROCESSORS_CONF)" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot calculate" >&5 -printf "%s\n" "cannot calculate" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: sysconf(_SC_NPROCESSORS_CONF)" >&5 +$as_echo "sysconf(_SC_NPROCESSORS_CONF)" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot calculate" >&5 +$as_echo "cannot calculate" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Extract the first word of "uptime", so it can be a program name with args. set dummy uptime; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_UPTIME+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_UPTIME+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_UPTIME in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_UPTIME="$PATH_TO_UPTIME" # Let the user override the test with a path. @@ -19853,15 +19437,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_UPTIME="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_UPTIME="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19873,33 +19453,33 @@ esac fi PATH_TO_UPTIME=$ac_cv_path_PATH_TO_UPTIME if test -n "$PATH_TO_UPTIME"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_UPTIME" >&5 -printf "%s\n" "$PATH_TO_UPTIME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_UPTIME" >&5 +$as_echo "$PATH_TO_UPTIME" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-uptime_command was given. -if test ${with_uptime_command+y} -then : +if test "${with_uptime_command+set}" = set; then : withval=$with_uptime_command; PATH_TO_UPTIME=$withval fi -printf "%s\n" "#define PATH_TO_UPTIME \"$PATH_TO_UPTIME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_UPTIME "$PATH_TO_UPTIME" +_ACEOF # Extract the first word of "rpcinfo", so it can be a program name with args. set dummy rpcinfo; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_RPCINFO+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_RPCINFO+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_RPCINFO in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_RPCINFO="$PATH_TO_RPCINFO" # Let the user override the test with a path. @@ -19909,15 +19489,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_RPCINFO="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_RPCINFO="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19929,33 +19505,33 @@ esac fi PATH_TO_RPCINFO=$ac_cv_path_PATH_TO_RPCINFO if test -n "$PATH_TO_RPCINFO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_RPCINFO" >&5 -printf "%s\n" "$PATH_TO_RPCINFO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_RPCINFO" >&5 +$as_echo "$PATH_TO_RPCINFO" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-rpcinfo_command was given. -if test ${with_rpcinfo_command+y} -then : +if test "${with_rpcinfo_command+set}" = set; then : withval=$with_rpcinfo_command; PATH_TO_RPCINFO=$withval fi -printf "%s\n" "#define PATH_TO_RPCINFO \"$PATH_TO_RPCINFO\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_RPCINFO "$PATH_TO_RPCINFO" +_ACEOF # Extract the first word of "lmstat", so it can be a program name with args. set dummy lmstat; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_LMSTAT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_LMSTAT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_LMSTAT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LMSTAT="$PATH_TO_LMSTAT" # Let the user override the test with a path. @@ -19965,15 +19541,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_LMSTAT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_LMSTAT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19985,32 +19557,33 @@ esac fi PATH_TO_LMSTAT=$ac_cv_path_PATH_TO_LMSTAT if test -n "$PATH_TO_LMSTAT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_LMSTAT" >&5 -printf "%s\n" "$PATH_TO_LMSTAT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_LMSTAT" >&5 +$as_echo "$PATH_TO_LMSTAT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -x "$PATH_TO_LMSTAT" then -printf "%s\n" "#define PATH_TO_LMSTAT \"$PATH_TO_LMSTAT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_LMSTAT "$PATH_TO_LMSTAT" +_ACEOF else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Get lmstat from Globetrotter Software to monitor flexlm licenses" >&5 -printf "%s\n" "$as_me: WARNING: Get lmstat from Globetrotter Software to monitor flexlm licenses" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Get lmstat from Globetrotter Software to monitor flexlm licenses" >&5 +$as_echo "$as_me: WARNING: Get lmstat from Globetrotter Software to monitor flexlm licenses" >&2;} fi # Extract the first word of "smbclient", so it can be a program name with args. set dummy smbclient; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_SMBCLIENT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_SMBCLIENT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_SMBCLIENT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_SMBCLIENT="$PATH_TO_SMBCLIENT" # Let the user override the test with a path. @@ -20020,15 +19593,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_SMBCLIENT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_SMBCLIENT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20040,39 +19609,39 @@ esac fi PATH_TO_SMBCLIENT=$ac_cv_path_PATH_TO_SMBCLIENT if test -n "$PATH_TO_SMBCLIENT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SMBCLIENT" >&5 -printf "%s\n" "$PATH_TO_SMBCLIENT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SMBCLIENT" >&5 +$as_echo "$PATH_TO_SMBCLIENT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-smbclient_command was given. -if test ${with_smbclient_command+y} -then : +if test "${with_smbclient_command+set}" = set; then : withval=$with_smbclient_command; PATH_TO_SMBCLIENT=$withval fi if test -n "$PATH_TO_SMBCLIENT" then -printf "%s\n" "#define PATH_TO_SMBCLIENT \"$PATH_TO_SMBCLIENT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_SMBCLIENT "$PATH_TO_SMBCLIENT" +_ACEOF else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Get smbclient from Samba.org to monitor SMB shares" >&5 -printf "%s\n" "$as_me: WARNING: Get smbclient from Samba.org to monitor SMB shares" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Get smbclient from Samba.org to monitor SMB shares" >&5 +$as_echo "$as_me: WARNING: Get smbclient from Samba.org to monitor SMB shares" >&2;} fi # Extract the first word of "snmpget", so it can be a program name with args. set dummy snmpget; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_SNMPGET+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_SNMPGET+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_SNMPGET in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_SNMPGET="$PATH_TO_SNMPGET" # Let the user override the test with a path. @@ -20082,15 +19651,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_SNMPGET="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_SNMPGET="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20102,40 +19667,40 @@ esac fi PATH_TO_SNMPGET=$ac_cv_path_PATH_TO_SNMPGET if test -n "$PATH_TO_SNMPGET"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SNMPGET" >&5 -printf "%s\n" "$PATH_TO_SNMPGET" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SNMPGET" >&5 +$as_echo "$PATH_TO_SNMPGET" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-snmpget_command was given. -if test ${with_snmpget_command+y} -then : +if test "${with_snmpget_command+set}" = set; then : withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval fi if test -n "$PATH_TO_SNMPGET" then -printf "%s\n" "#define PATH_TO_SNMPGET \"$PATH_TO_SNMPGET\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_SNMPGET "$PATH_TO_SNMPGET" +_ACEOF EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&5 -printf "%s\n" "$as_me: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&5 +$as_echo "$as_me: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&2;} fi # Extract the first word of "snmpgetnext", so it can be a program name with args. set dummy snmpgetnext; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_SNMPGETNEXT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_SNMPGETNEXT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_SNMPGETNEXT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_SNMPGETNEXT="$PATH_TO_SNMPGETNEXT" # Let the user override the test with a path. @@ -20145,15 +19710,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_SNMPGETNEXT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_SNMPGETNEXT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20165,47 +19726,47 @@ esac fi PATH_TO_SNMPGETNEXT=$ac_cv_path_PATH_TO_SNMPGETNEXT if test -n "$PATH_TO_SNMPGETNEXT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SNMPGETNEXT" >&5 -printf "%s\n" "$PATH_TO_SNMPGETNEXT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SNMPGETNEXT" >&5 +$as_echo "$PATH_TO_SNMPGETNEXT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-snmpgetnext_command was given. -if test ${with_snmpgetnext_command+y} -then : +if test "${with_snmpgetnext_command+set}" = set; then : withval=$with_snmpgetnext_command; PATH_TO_SNMPGETNEXT=$withval fi if test -n "$PATH_TO_SNMPGETNEXT" then -printf "%s\n" "#define PATH_TO_SNMPGETNEXT \"$PATH_TO_SNMPGETNEXT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_SNMPGETNEXT "$PATH_TO_SNMPGETNEXT" +_ACEOF fi if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null ) then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Net::SNMP perl module" >&5 -printf %s "checking for Net::SNMP perl module... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 -printf "%s\n" "found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Net::SNMP perl module" >&5 +$as_echo_n "checking for Net::SNMP perl module... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins" >&5 -printf "%s\n" "$as_me: WARNING: Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins" >&5 +$as_echo "$as_me: WARNING: Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins" >&2;} fi # Extract the first word of "quakestat", so it can be a program name with args. set dummy quakestat; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_QUAKESTAT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_QUAKESTAT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_QUAKESTAT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_QUAKESTAT="$PATH_TO_QUAKESTAT" # Let the user override the test with a path. @@ -20215,15 +19776,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_QUAKESTAT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_QUAKESTAT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20235,22 +19792,21 @@ esac fi PATH_TO_QUAKESTAT=$ac_cv_path_PATH_TO_QUAKESTAT if test -n "$PATH_TO_QUAKESTAT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_QUAKESTAT" >&5 -printf "%s\n" "$PATH_TO_QUAKESTAT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_QUAKESTAT" >&5 +$as_echo "$PATH_TO_QUAKESTAT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "qstat", so it can be a program name with args. set dummy qstat; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_QSTAT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_QSTAT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_QSTAT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_QSTAT="$PATH_TO_QSTAT" # Let the user override the test with a path. @@ -20260,15 +19816,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_QSTAT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_QSTAT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20280,18 +19832,17 @@ esac fi PATH_TO_QSTAT=$ac_cv_path_PATH_TO_QSTAT if test -n "$PATH_TO_QSTAT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_QSTAT" >&5 -printf "%s\n" "$PATH_TO_QSTAT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_QSTAT" >&5 +$as_echo "$PATH_TO_QSTAT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-qstat_command was given. -if test ${with_qstat_command+y} -then : +if test "${with_qstat_command+set}" = set; then : withval=$with_qstat_command; PATH_TO_QSTAT=$withval fi @@ -20306,25 +19857,26 @@ then ac_cv_path_to_qstat="$PATH_TO_QSTAT" EXTRAS="$EXTRAS check_game\$(EXEEXT)" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin" >&5 -printf "%s\n" "$as_me: WARNING: Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin" >&5 +$as_echo "$as_me: WARNING: Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin" >&2;} fi if test $ac_cv_path_to_qstat then -printf "%s\n" "#define PATH_TO_QSTAT \"$ac_cv_path_to_qstat\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_QSTAT "$ac_cv_path_to_qstat" +_ACEOF fi # Extract the first word of "fping", so it can be a program name with args. set dummy fping; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_FPING+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_FPING+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_FPING in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_FPING="$PATH_TO_FPING" # Let the user override the test with a path. @@ -20334,15 +19886,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_FPING="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_FPING="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20354,22 +19902,21 @@ esac fi PATH_TO_FPING=$ac_cv_path_PATH_TO_FPING if test -n "$PATH_TO_FPING"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_FPING" >&5 -printf "%s\n" "$PATH_TO_FPING" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_FPING" >&5 +$as_echo "$PATH_TO_FPING" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "fping6", so it can be a program name with args. set dummy fping6; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_FPING6+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_FPING6+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_FPING6 in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_FPING6="$PATH_TO_FPING6" # Let the user override the test with a path. @@ -20379,15 +19926,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_FPING6="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_FPING6="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20399,26 +19942,24 @@ esac fi PATH_TO_FPING6=$ac_cv_path_PATH_TO_FPING6 if test -n "$PATH_TO_FPING6"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_FPING6" >&5 -printf "%s\n" "$PATH_TO_FPING6" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_FPING6" >&5 +$as_echo "$PATH_TO_FPING6" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-fping_command was given. -if test ${with_fping_command+y} -then : +if test "${with_fping_command+set}" = set; then : withval=$with_fping_command; PATH_TO_FPING=$withval fi # Check whether --with-fping6_command was given. -if test ${with_fping6_command+y} -then : +if test "${with_fping6_command+set}" = set; then : withval=$with_fping6_command; PATH_TO_FPING6=$withval fi @@ -20426,27 +19967,30 @@ fi if test -n "$PATH_TO_FPING" then -printf "%s\n" "#define PATH_TO_FPING \"$PATH_TO_FPING\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_FPING "$PATH_TO_FPING" +_ACEOF EXTRAS="$EXTRAS check_fping\$(EXEEXT)" if test x"$with_ipv6" != xno && test -n "$PATH_TO_FPING6"; then -printf "%s\n" "#define PATH_TO_FPING6 \"$PATH_TO_FPING6\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_FPING6 "$PATH_TO_FPING6" +_ACEOF fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Get fping from http://www.fping.com in order to make check_fping plugin" >&5 -printf "%s\n" "$as_me: WARNING: Get fping from http://www.fping.com in order to make check_fping plugin" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Get fping from http://www.fping.com in order to make check_fping plugin" >&5 +$as_echo "$as_me: WARNING: Get fping from http://www.fping.com in order to make check_fping plugin" >&2;} fi # Extract the first word of "ssh", so it can be a program name with args. set dummy ssh; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_SSH+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_SSH+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_SSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_SSH="$PATH_TO_SSH" # Let the user override the test with a path. @@ -20456,15 +20000,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_SSH="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_SSH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20476,40 +20016,40 @@ esac fi PATH_TO_SSH=$ac_cv_path_PATH_TO_SSH if test -n "$PATH_TO_SSH"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SSH" >&5 -printf "%s\n" "$PATH_TO_SSH" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SSH" >&5 +$as_echo "$PATH_TO_SSH" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-ssh_command was given. -if test ${with_ssh_command+y} -then : +if test "${with_ssh_command+set}" = set; then : withval=$with_ssh_command; PATH_TO_SSH=$withval fi if test -n "$PATH_TO_SSH" then -printf "%s\n" "#define SSH_COMMAND \"$PATH_TO_SSH\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SSH_COMMAND "$PATH_TO_SSH" +_ACEOF EXTRAS="$EXTRAS check_by_ssh\$(EXEEXT)" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Get ssh in order to make check_by_ssh plugin" >&5 -printf "%s\n" "$as_me: WARNING: Get ssh in order to make check_by_ssh plugin" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Get ssh in order to make check_by_ssh plugin" >&5 +$as_echo "$as_me: WARNING: Get ssh in order to make check_by_ssh plugin" >&2;} fi # Extract the first word of "sudo", so it can be a program name with args. set dummy sudo; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_SUDO+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_SUDO+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_SUDO in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_SUDO="$PATH_TO_SUDO" # Let the user override the test with a path. @@ -20519,15 +20059,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_SUDO="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_SUDO="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20539,39 +20075,39 @@ esac fi PATH_TO_SUDO=$ac_cv_path_PATH_TO_SUDO if test -n "$PATH_TO_SUDO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SUDO" >&5 -printf "%s\n" "$PATH_TO_SUDO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SUDO" >&5 +$as_echo "$PATH_TO_SUDO" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-sudo_command was given. -if test ${with_sudo_command+y} -then : +if test "${with_sudo_command+set}" = set; then : withval=$with_sudo_command; PATH_TO_SUDO=$withval fi if test -n "$PATH_TO_SUDO" then -printf "%s\n" "#define PATH_TO_SUDO \"$PATH_TO_SUDO\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_SUDO "$PATH_TO_SUDO" +_ACEOF else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Could not find sudo or equivalent" >&5 -printf "%s\n" "$as_me: WARNING: Could not find sudo or equivalent" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find sudo or equivalent" >&5 +$as_echo "$as_me: WARNING: Could not find sudo or equivalent" >&2;} fi # Extract the first word of "mailq", so it can be a program name with args. set dummy mailq; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_MAILQ+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_MAILQ+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_MAILQ in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_MAILQ="$PATH_TO_MAILQ" # Let the user override the test with a path. @@ -20581,15 +20117,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_MAILQ="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_MAILQ="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20601,39 +20133,39 @@ esac fi PATH_TO_MAILQ=$ac_cv_path_PATH_TO_MAILQ if test -n "$PATH_TO_MAILQ"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_MAILQ" >&5 -printf "%s\n" "$PATH_TO_MAILQ" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_MAILQ" >&5 +$as_echo "$PATH_TO_MAILQ" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-mailq_command was given. -if test ${with_mailq_command+y} -then : +if test "${with_mailq_command+set}" = set; then : withval=$with_mailq_command; PATH_TO_MAILQ=$withval fi if test -n "$PATH_TO_MAILQ" then -printf "%s\n" "#define PATH_TO_MAILQ \"$PATH_TO_MAILQ\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_MAILQ "$PATH_TO_MAILQ" +_ACEOF else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Could not find mailq or equivalent" >&5 -printf "%s\n" "$as_me: WARNING: Could not find mailq or equivalent" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find mailq or equivalent" >&5 +$as_echo "$as_me: WARNING: Could not find mailq or equivalent" >&2;} fi # Extract the first word of "qmail-qstat", so it can be a program name with args. set dummy qmail-qstat; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_QMAIL_QSTAT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_QMAIL_QSTAT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_QMAIL_QSTAT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_QMAIL_QSTAT="$PATH_TO_QMAIL_QSTAT" # Let the user override the test with a path. @@ -20643,15 +20175,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_QMAIL_QSTAT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_QMAIL_QSTAT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20663,39 +20191,39 @@ esac fi PATH_TO_QMAIL_QSTAT=$ac_cv_path_PATH_TO_QMAIL_QSTAT if test -n "$PATH_TO_QMAIL_QSTAT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_QMAIL_QSTAT" >&5 -printf "%s\n" "$PATH_TO_QMAIL_QSTAT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_QMAIL_QSTAT" >&5 +$as_echo "$PATH_TO_QMAIL_QSTAT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-qmail_qstat_command was given. -if test ${with_qmail_qstat_command+y} -then : +if test "${with_qmail_qstat_command+set}" = set; then : withval=$with_qmail_qstat_command; PATH_TO_QMAIL_QSTAT=$withval fi if test -n "$PATH_TO_QMAIL_QSTAT" then -printf "%s\n" "#define PATH_TO_QMAIL_QSTAT \"$PATH_TO_QMAIL_QSTAT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_QMAIL_QSTAT "$PATH_TO_QMAIL_QSTAT" +_ACEOF else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Could not find qmail-qstat or equivalent" >&5 -printf "%s\n" "$as_me: WARNING: Could not find qmail-qstat or equivalent" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find qmail-qstat or equivalent" >&5 +$as_echo "$as_me: WARNING: Could not find qmail-qstat or equivalent" >&2;} fi # Extract the first word of "swap", so it can be a program name with args. set dummy swap; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_SWAP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_SWAP+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_SWAP in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_SWAP="$PATH_TO_SWAP" # Let the user override the test with a path. @@ -20705,15 +20233,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_SWAP="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_SWAP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20725,18 +20249,18 @@ esac fi PATH_TO_SWAP=$ac_cv_path_PATH_TO_SWAP if test -n "$PATH_TO_SWAP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SWAP" >&5 -printf "%s\n" "$PATH_TO_SWAP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SWAP" >&5 +$as_echo "$PATH_TO_SWAP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if (test -n "$PATH_TO_SWAP") then -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $PATH_TO_SWAP format" >&5 -printf %s "checking for $PATH_TO_SWAP format... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PATH_TO_SWAP format" >&5 +$as_echo_n "checking for $PATH_TO_SWAP format... " >&6; } if $PATH_TO_SWAP -l 2>&1 >/dev/null then ac_cv_have_swap=yes @@ -20747,15 +20271,15 @@ then then ac_cv_swap_format=" %*d %*s %*d,%*d %*d %*d %lu %lu" ac_cv_swap_conv=2048 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using IRIX format swap" >&5 -printf "%s\n" "using IRIX format swap" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using IRIX format swap" >&5 +$as_echo "using IRIX format swap" >&6; } elif $PATH_TO_SWAP -l 2>/dev/null | grep -E -i "^path +dev +swaplo +blocks +free" >/dev/null then ac_cv_swap_format="%*s %*[0-9,-] %*d %lu %lu" ac_cv_swap_conv=2048 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using Unixware format swap" >&5 -printf "%s\n" "using Unixware format swap" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using Unixware format swap" >&5 +$as_echo "using Unixware format swap" >&6; } else ac_cv_have_swap="" ac_cv_swap_command="" @@ -20765,12 +20289,11 @@ fi # Extract the first word of "swapinfo", so it can be a program name with args. set dummy swapinfo; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_SWAPINFO+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_SWAPINFO+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_SWAPINFO in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_SWAPINFO="$PATH_TO_SWAPINFO" # Let the user override the test with a path. @@ -20780,15 +20303,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_SWAPINFO="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_SWAPINFO="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20800,18 +20319,18 @@ esac fi PATH_TO_SWAPINFO=$ac_cv_path_PATH_TO_SWAPINFO if test -n "$PATH_TO_SWAPINFO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SWAPINFO" >&5 -printf "%s\n" "$PATH_TO_SWAPINFO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_SWAPINFO" >&5 +$as_echo "$PATH_TO_SWAPINFO" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if (test -n "$PATH_TO_SWAPINFO") then -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $PATH_TO_SWAPINFO format" >&5 -printf %s "checking for $PATH_TO_SWAPINFO format... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PATH_TO_SWAPINFO format" >&5 +$as_echo_n "checking for $PATH_TO_SWAPINFO format... " >&6; } if $PATH_TO_SWAPINFO -k 2>&1 | grep -E -i "^Device" >/dev/null then ac_cv_have_swap=yes @@ -20821,8 +20340,8 @@ then then ac_cv_swap_format="%*s %lu %*d %lu" ac_cv_swap_conv=1024 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using FreeBSD format swapinfo" >&5 -printf "%s\n" "using FreeBSD format swapinfo" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using FreeBSD format swapinfo" >&5 +$as_echo "using FreeBSD format swapinfo" >&6; } fi elif $PATH_TO_SWAPINFO -dfM 2>/dev/null | grep -E -i "^TYPE +AVAIL +USED +FREE" >/dev/null @@ -20831,19 +20350,18 @@ then ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM" ac_cv_swap_format="%*s %lu %*d %lu" ac_cv_swap_conv=1024 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using HP-UX format swapinfo" >&5 -printf "%s\n" "using HP-UX format swapinfo" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using HP-UX format swapinfo" >&5 +$as_echo "using HP-UX format swapinfo" >&6; } fi fi # Extract the first word of "lsps", so it can be a program name with args. set dummy lsps; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_LSPS+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_LSPS+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_LSPS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LSPS="$PATH_TO_LSPS" # Let the user override the test with a path. @@ -20853,15 +20371,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_LSPS="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_LSPS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20873,150 +20387,77 @@ esac fi PATH_TO_LSPS=$ac_cv_path_PATH_TO_LSPS if test -n "$PATH_TO_LSPS"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_LSPS" >&5 -printf "%s\n" "$PATH_TO_LSPS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_LSPS" >&5 +$as_echo "$PATH_TO_LSPS" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if (test -n "$PATH_TO_LSPS") then -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $PATH_TO_LSPS format" >&5 -printf %s "checking for $PATH_TO_LSPS format... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PATH_TO_LSPS format" >&5 +$as_echo_n "checking for $PATH_TO_LSPS format... " >&6; } if $PATH_TO_LSPS -a 2>/dev/null | grep -E -i "^Page Space" > /dev/null then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_LSPS -a" ac_cv_swap_format="%*s %*s %*s %lu%*s %lu %*s" ac_cv_swap_conv=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using AIX lsps" >&5 -printf "%s\n" "using AIX lsps" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using AIX lsps" >&5 +$as_echo "using AIX lsps" >&6; } fi fi -ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_stat_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_param_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h +for ac_header in sys/stat.h sys/param.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_header_compile "$LINENO" "sys/swap.h" "ac_cv_header_sys_swap_h" " +done + +for ac_header in sys/swap.h +do : + ac_fn_c_check_header_compile "$LINENO" "sys/swap.h" "ac_cv_header_sys_swap_h" " #ifdef HAVE_SYS_PARAM_H #include #endif " -if test "x$ac_cv_header_sys_swap_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_SWAP_H 1" >>confdefs.h - -fi - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 -printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } -if test ${ac_cv_c_undeclared_builtin_options+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_save_CFLAGS=$CFLAGS - ac_cv_c_undeclared_builtin_options='cannot detect' - for ac_arg in '' -fno-builtin; do - CFLAGS="$ac_save_CFLAGS $ac_arg" - # This test program should *not* compile successfully. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ -(void) strchr; - ; - return 0; -} +if test "x$ac_cv_header_sys_swap_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_SWAP_H 1 _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - -else $as_nop - # This test program should compile successfully. - # No library function is consistently available on - # freestanding implementations, so test against a dummy - # declaration. Include always-available headers on the - # off chance that they somehow elicit warnings. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -extern void ac_decl (int, char *); - -int -main (void) -{ -(void) ac_decl (0, (char *) 0); - (void) ac_decl; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - if test x"$ac_arg" = x -then : - ac_cv_c_undeclared_builtin_options='none needed' -else $as_nop - ac_cv_c_undeclared_builtin_options=$ac_arg -fi - break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - done - CFLAGS=$ac_save_CFLAGS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 -printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } - case $ac_cv_c_undeclared_builtin_options in #( - 'cannot detect') : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot make $CC report undeclared builtins -See \`config.log' for more details" "$LINENO" 5; } ;; #( - 'none needed') : - ac_c_undeclared_builtin_options='' ;; #( - *) : - ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; -esac -ac_fn_check_decl "$LINENO" "swapctl" "ac_cv_have_decl_swapctl" " +done + +ac_fn_c_check_decl "$LINENO" "swapctl" "ac_cv_have_decl_swapctl" " #include #include #include #include #include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_swapctl" = xyes -then : +" +if test "x$ac_cv_have_decl_swapctl" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_SWAPCTL $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SWAPCTL $ac_have_decl +_ACEOF ac_fn_c_check_type "$LINENO" "swaptbl_t" "ac_cv_type_swaptbl_t" " #include @@ -21025,10 +20466,11 @@ ac_fn_c_check_type "$LINENO" "swaptbl_t" "ac_cv_type_swaptbl_t" " #include " -if test "x$ac_cv_type_swaptbl_t" = xyes -then : +if test "x$ac_cv_type_swaptbl_t" = xyes; then : -printf "%s\n" "#define HAVE_SWAPTBL_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_SWAPTBL_T 1 +_ACEOF fi @@ -21039,10 +20481,11 @@ ac_fn_c_check_type "$LINENO" "swapent_t" "ac_cv_type_swapent_t" " #include " -if test "x$ac_cv_type_swapent_t" = xyes -then : +if test "x$ac_cv_type_swapent_t" = xyes; then : -printf "%s\n" "#define HAVE_SWAPENT_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_SWAPENT_T 1 +_ACEOF fi @@ -21055,10 +20498,11 @@ ac_fn_c_check_member "$LINENO" "struct swapent" "se_nblks" "ac_cv_member_struct_ #include " -if test "x$ac_cv_member_struct_swapent_se_nblks" = xyes -then : +if test "x$ac_cv_member_struct_swapent_se_nblks" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_SWAPENT_SE_NBLKS 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_SWAPENT_SE_NBLKS 1 +_ACEOF fi @@ -21067,68 +20511,72 @@ fi if test "$ac_cv_have_decl_swapctl" = "yes"; then EXTRAS="$EXTRAS check_swap\$(EXEEXT)" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 2-arg (SVR4) swapctl" >&5 -printf %s "checking for 2-arg (SVR4) swapctl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 2-arg (SVR4) swapctl" >&5 +$as_echo_n "checking for 2-arg (SVR4) swapctl... " >&6; } if test "$ac_cv_type_swaptbl_t" = "yes" -a \ "$ac_cv_type_swapent_t" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ac_cv_check_swap_swapctl_svr4="1"; -printf "%s\n" "#define CHECK_SWAP_SWAPCTL_SVR4 1" >>confdefs.h +$as_echo "#define CHECK_SWAP_SWAPCTL_SVR4 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 3-arg (*BSD) swapctl" >&5 -printf %s "checking for 3-arg (*BSD) swapctl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3-arg (*BSD) swapctl" >&5 +$as_echo_n "checking for 3-arg (*BSD) swapctl... " >&6; } if test "$ac_cv_member_struct_swapent_se_nblks" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -printf "%s\n" "#define CHECK_SWAP_SWAPCTL_BSD 1" >>confdefs.h +$as_echo "#define CHECK_SWAP_SWAPCTL_BSD 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for whether swapctl uses blocks or pages" >&5 -printf %s "checking for whether swapctl uses blocks or pages... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether swapctl uses blocks or pages" >&5 +$as_echo_n "checking for whether swapctl uses blocks or pages... " >&6; } if test "$ac_cv_check_swap_swapctl_svr4" = "1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: page" >&5 -printf "%s\n" "page" >&6; } - ac_fn_check_decl "$LINENO" "sysconf" "ac_cv_have_decl_sysconf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_sysconf" = xyes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: page" >&5 +$as_echo "page" >&6; } + ac_fn_c_check_decl "$LINENO" "sysconf" "ac_cv_have_decl_sysconf" "$ac_includes_default" +if test "x$ac_cv_have_decl_sysconf" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_SYSCONF $ac_have_decl" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for system page size" >&5 -printf %s "checking for system page size... " >&6; } +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SYSCONF $ac_have_decl +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for system page size" >&5 +$as_echo_n "checking for system page size... " >&6; } if test "$ac_cv_have_decl_sysconf" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: determined by sysconf(3)" >&5 -printf "%s\n" "determined by sysconf(3)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: determined by sysconf(3)" >&5 +$as_echo "determined by sysconf(3)" >&6; } ac_cv_swap_conv="(1048576/sysconf(_SC_PAGESIZE))" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: don't know. guessing 4096k" >&5 -printf "%s\n" "$as_me: WARNING: don't know. guessing 4096k" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: don't know. guessing 4096k" >&5 +$as_echo "$as_me: WARNING: don't know. guessing 4096k" >&2;} ac_cv_swap_conv=256 fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: blocks (assuming 512b)" >&5 -printf "%s\n" "blocks (assuming 512b)" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: blocks (assuming 512b)" >&5 +$as_echo "blocks (assuming 512b)" >&6; } ac_cv_swap_conv=2048 fi -printf "%s\n" "#define SWAP_CONVERSION $ac_cv_swap_conv" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SWAP_CONVERSION $ac_cv_swap_conv +_ACEOF fi @@ -21136,62 +20584,68 @@ fi if test "x$ac_cv_have_swap" != "x" then -printf "%s\n" "#define HAVE_SWAP 1" >>confdefs.h +$as_echo "#define HAVE_SWAP 1" >>confdefs.h EXTRAS="$EXTRAS check_swap\$(EXEEXT)" fi if test "x$ac_cv_swap_command" != "x" then -printf "%s\n" "#define SWAP_COMMAND \"$ac_cv_swap_command\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SWAP_COMMAND "$ac_cv_swap_command" +_ACEOF -printf "%s\n" "#define SWAP_FORMAT \"$ac_cv_swap_format\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SWAP_FORMAT "$ac_cv_swap_format" +_ACEOF -printf "%s\n" "#define SWAP_CONVERSION $ac_cv_swap_conv" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SWAP_CONVERSION $ac_cv_swap_conv +_ACEOF fi # Check whether --with-proc-meminfo was given. -if test ${with_proc_meminfo+y} -then : +if test "${with_proc_meminfo+set}" = set; then : withval=$with_proc_meminfo; ac_cv_proc_meminfo=$withval fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /proc/meminfo" >&5 -printf %s "checking for /proc/meminfo... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/meminfo" >&5 +$as_echo_n "checking for /proc/meminfo... " >&6; } if test -n "$ac_cv_proc_meminfo"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (command line) $ac_cv_proc_meminfo" >&5 -printf "%s\n" "(command line) $ac_cv_proc_meminfo" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (command line) $ac_cv_proc_meminfo" >&5 +$as_echo "(command line) $ac_cv_proc_meminfo" >&6; } elif cat /proc/meminfo > /dev/null 2>&1; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found /proc/meminfo" >&5 -printf "%s\n" "found /proc/meminfo" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found /proc/meminfo" >&5 +$as_echo "found /proc/meminfo" >&6; } ac_cv_proc_meminfo="/proc/meminfo" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -n "$ac_cv_proc_meminfo"; then -printf "%s\n" "#define HAVE_PROC_MEMINFO 1" >>confdefs.h +$as_echo "#define HAVE_PROC_MEMINFO 1" >>confdefs.h -printf "%s\n" "#define PROC_MEMINFO \"$ac_cv_proc_meminfo\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PROC_MEMINFO "$ac_cv_proc_meminfo" +_ACEOF EXTRAS="$EXTRAS check_swap\$(EXEEXT)" fi # Extract the first word of "dig", so it can be a program name with args. set dummy dig; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_DIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_DIG+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_DIG in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_DIG="$PATH_TO_DIG" # Let the user override the test with a path. @@ -21201,15 +20655,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_DIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_DIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21221,36 +20671,36 @@ esac fi PATH_TO_DIG=$ac_cv_path_PATH_TO_DIG if test -n "$PATH_TO_DIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_DIG" >&5 -printf "%s\n" "$PATH_TO_DIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_DIG" >&5 +$as_echo "$PATH_TO_DIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-dig_command was given. -if test ${with_dig_command+y} -then : +if test "${with_dig_command+set}" = set; then : withval=$with_dig_command; PATH_TO_DIG=$withval fi if test -n "$PATH_TO_DIG"; then EXTRAS="$EXTRAS check_dig\$(EXEEXT)" -printf "%s\n" "#define PATH_TO_DIG \"$PATH_TO_DIG\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_DIG "$PATH_TO_DIG" +_ACEOF fi # Extract the first word of "apt-get", so it can be a program name with args. set dummy apt-get; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PATH_TO_APTGET+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PATH_TO_APTGET+:} false; then : + $as_echo_n "(cached) " >&6 +else case $PATH_TO_APTGET in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_APTGET="$PATH_TO_APTGET" # Let the user override the test with a path. @@ -21260,15 +20710,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PATH_TO_APTGET="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PATH_TO_APTGET="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21280,25 +20726,26 @@ esac fi PATH_TO_APTGET=$ac_cv_path_PATH_TO_APTGET if test -n "$PATH_TO_APTGET"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_APTGET" >&5 -printf "%s\n" "$PATH_TO_APTGET" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_APTGET" >&5 +$as_echo "$PATH_TO_APTGET" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --with-apt-get_command was given. -if test ${with_apt_get_command+y} -then : +if test "${with_apt_get_command+set}" = set; then : withval=$with_apt_get_command; with_apt_get_command=$withval -else $as_nop +else with_apt_get_command=$PATH_TO_APTGET fi -printf "%s\n" "#define PATH_TO_APTGET \"$PATH_TO_APTGET\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PATH_TO_APTGET "$PATH_TO_APTGET" +_ACEOF if test -n "$PATH_TO_APTGET" ; then EXTRAS="$EXTRAS check_apt\$(EXEEXT)" @@ -21310,33 +20757,38 @@ if test -f $srcdir/plugins/check_nt.c ; then fi -ac_fn_c_check_header_compile "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_sockio_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h +for ac_header in sys/sockio.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sockio_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_SOCKIO_H 1 +_ACEOF fi +done + case $host in *bsd*) -printf "%s\n" "#define __bsd__ 1" >>confdefs.h +$as_echo "#define __bsd__ 1" >>confdefs.h ;; *linux*) -printf "%s\n" "#define __linux__ 1" >>confdefs.h +$as_echo "#define __linux__ 1" >>confdefs.h ;; *sun* | *solaris*) -printf "%s\n" "#define __sun__ 1" >>confdefs.h +$as_echo "#define __sun__ 1" >>confdefs.h ;; *hpux*) -printf "%s\n" "#define __hpux__ 1" >>confdefs.h +$as_echo "#define __hpux__ 1" >>confdefs.h ;; esac @@ -21347,18 +20799,17 @@ esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -printf %s "checking whether NLS is requested... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test ${enable_nls+y} -then : +if test "${enable_nls+set}" = set; then : enableval=$enable_nls; USE_NLS=$enableval -else $as_nop +else USE_NLS=yes fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -printf "%s\n" "$USE_NLS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } @@ -21397,20 +20848,19 @@ rm -f conf$$.file # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_MSGFMT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$MSGFMT" in [\\/]* | ?:[\\/]*) ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; *) - gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$gt_saved_IFS" + IFS="$ac_save_IFS" test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then @@ -21423,28 +20873,27 @@ else $as_nop fi done done - IFS="$gt_saved_IFS" + IFS="$ac_save_IFS" test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" ;; esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -printf "%s\n" "$MSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_GMSGFMT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GMSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else case $GMSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. @@ -21454,15 +20903,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21475,11 +20920,11 @@ esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -printf "%s\n" "$GMSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -21520,20 +20965,19 @@ rm -f conf$$.file # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_XGETTEXT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XGETTEXT+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$XGETTEXT" in [\\/]* | ?:[\\/]*) ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; *) - gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$gt_saved_IFS" + IFS="$ac_save_IFS" test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then @@ -21546,18 +20990,18 @@ else $as_nop fi done done - IFS="$gt_saved_IFS" + IFS="$ac_save_IFS" test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ;; esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -printf "%s\n" "$XGETTEXT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f messages.po @@ -21598,20 +21042,19 @@ rm -f conf$$.file # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_MSGMERGE+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGMERGE+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$MSGMERGE" in [\\/]* | ?:[\\/]*) ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ;; *) - gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$gt_saved_IFS" + IFS="$ac_save_IFS" test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then @@ -21623,18 +21066,18 @@ else $as_nop fi done done - IFS="$gt_saved_IFS" + IFS="$ac_save_IFS" test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" ;; esac fi MSGMERGE="$ac_cv_path_MSGMERGE" if test "$MSGMERGE" != ":"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -printf "%s\n" "$MSGMERGE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -21666,18 +21109,17 @@ fi else acl_final_exec_prefix="$exec_prefix" fi - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_saved_prefix" + prefix="$acl_save_prefix" # Check whether --with-gnu-ld was given. -if test ${with_gnu_ld+y} -then : +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else $as_nop +else with_gnu_ld=no fi @@ -21695,33 +21137,32 @@ if test "${PATH_SEPARATOR+set}" != set; then fi if test -n "$LD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5 -printf %s "checking for ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld" >&5 +$as_echo_n "checking for ld... " >&6; } elif test "$GCC" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -printf %s "checking for ld used by $CC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } elif test "$with_gnu_ld" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -printf %s "checking for GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -printf %s "checking for non-GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi if test -n "$LD"; then # Let the user override the test with a path. : else - if test ${acl_cv_path_LD+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${acl_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else acl_cv_path_LD= # Final result of this test ac_prog=ld # Program to search in $PATH if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. case $host in - *-*-mingw* | windows*) + *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) @@ -21751,9 +21192,9 @@ else $as_nop fi if test -n "$ac_prog"; then # Search for $ac_prog in $PATH. - acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$acl_saved_IFS" + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" @@ -21770,21 +21211,20 @@ else $as_nop esac fi done - IFS="$acl_saved_IFS" + IFS="$acl_save_ifs" fi case $host in *-*-aix*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#if defined __powerpc64__ || defined __LP64__ +#if defined __powerpc64__ || defined _ARCH_PPC64 int ok; #else error fail #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # The compiler produces 64-bit code. Add option '-b64' so that the # linker groks 64-bit object files. case "$acl_cv_path_LD " in @@ -21793,7 +21233,7 @@ then : esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; sparc64-*-netbsd*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21805,10 +21245,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else # The compiler produces 32-bit code. Add option '-m elf32_sparc' # so that the linker groks 32-bit object files. case "$acl_cv_path_LD " in @@ -21817,7 +21256,7 @@ else $as_nop esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac @@ -21826,19 +21265,18 @@ fi LD="$acl_cv_path_LD" fi if test -n "$LD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -printf "%s\n" "$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -printf %s "checking if the linker ($LD) is GNU ld... " >&6; } -if test ${acl_cv_prog_gnu_ld+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${acl_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 +$as_echo "$acl_cv_prog_gnu_ld" >&6; } with_gnu_ld=$acl_cv_prog_gnu_ld - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 -printf %s "checking for shared library run path origin... " >&6; } -if test ${acl_cv_rpath+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 +$as_echo_n "checking for shared library run path origin... " >&6; } +if ${acl_cv_rpath+:} false; then : + $as_echo_n "(cached) " >&6 +else CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh @@ -21871,8 +21307,8 @@ else $as_nop acl_cv_rpath=done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 -printf "%s\n" "$acl_cv_rpath" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 +$as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" acl_libext="$acl_cv_libext" acl_shlibext="$acl_cv_shlibext" @@ -21883,83 +21319,270 @@ printf "%s\n" "$acl_cv_rpath" >&6; } acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. -if test ${enable_rpath+y} -then : +if test "${enable_rpath+set}" = set; then : enableval=$enable_rpath; : -else $as_nop +else enable_rpath=yes fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5 -printf %s "checking 32-bit host C ABI... " >&6; } -if test ${gl_cv_host_cpu_c_abi_32bit+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case "$host_cpu" in + { $as_echo "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5 +$as_echo_n "checking 32-bit host C ABI... " >&6; } +if ${gl_cv_host_cpu_c_abi_32bit+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$gl_cv_host_cpu_c_abi"; then + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; + x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; + esac + else + case "$host_cpu" in - # CPUs that only support a 32-bit ABI. - arc \ - | bfin \ - | cris* \ - | csky \ - | epiphany \ - | ft32 \ - | h8300 \ - | m68k \ - | microblaze | microblazeel \ - | nds32 | nds32le | nds32be \ - | nios2 | nios2eb | nios2el \ - | or1k* \ - | or32 \ - | sh | sh1234 | sh1234elb \ - | tic6x \ - | xtensa* ) - gl_cv_host_cpu_c_abi_32bit=yes - ;; + # CPUs that only support a 32-bit ABI. + arc \ + | bfin \ + | cris* \ + | csky \ + | epiphany \ + | ft32 \ + | h8300 \ + | m68k \ + | microblaze | microblazeel \ + | nds32 | nds32le | nds32be \ + | nios2 | nios2eb | nios2el \ + | or1k* \ + | or32 \ + | sh | sh1234 | sh1234elb \ + | tic6x \ + | xtensa* ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; - # CPUs that only support a 64-bit ABI. - alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ - | mmix ) - gl_cv_host_cpu_c_abi_32bit=no - ;; + # CPUs that only support a 64-bit ABI. + alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ + | mmix ) + gl_cv_host_cpu_c_abi_32bit=no + ;; - *) - if test -n "$gl_cv_host_cpu_c_abi"; then - case "$gl_cv_host_cpu_c_abi" in - i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) - gl_cv_host_cpu_c_abi_32bit=yes ;; - x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) - gl_cv_host_cpu_c_abi_32bit=no ;; - *) - gl_cv_host_cpu_c_abi_32bit=unknown ;; - esac - else - gl_cv_host_cpu_c_abi_32bit=unknown - fi - if test $gl_cv_host_cpu_c_abi_32bit = unknown; then + i[34567]86 ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; + + x86_64 ) + # On x86_64 systems, the C compiler may be generating code in one of + # these ABIs: + # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64. + # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64 + # with native Windows (mingw, MSVC). + # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int test_pointer_size[sizeof (void *) - 5]; +#if (defined __x86_64__ || defined __amd64__ \ + || defined _M_X64 || defined _M_AMD64) \ + && !(defined __ILP32__ || defined _ILP32) + int ok; + #else + error fail + #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_host_cpu_c_abi_32bit=no -else $as_nop +else gl_cv_host_cpu_c_abi_32bit=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - ;; - esac +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + arm* | aarch64 ) + # Assume arm with EABI. + # On arm64 systems, the C compiler may be generating code in one of + # these ABIs: + # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64. + # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32) + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi_32bit=no +else + gl_cv_host_cpu_c_abi_32bit=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + hppa1.0 | hppa1.1 | hppa2.0* | hppa64 ) + # On hppa, the C compiler may be generating 32-bit code or 64-bit + # code. In the latter case, it defines _LP64 and __LP64__. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __LP64__ + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi_32bit=no +else + gl_cv_host_cpu_c_abi_32bit=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + ia64* ) + # On ia64 on HP-UX, the C compiler may be generating 64-bit code or + # 32-bit code. In the latter case, it defines _ILP32. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef _ILP32 + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi_32bit=yes +else + gl_cv_host_cpu_c_abi_32bit=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + mips* ) + # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this + # at 32. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64) + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi_32bit=no +else + gl_cv_host_cpu_c_abi_32bit=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + powerpc* ) + # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD. + # No need to distinguish them here; the caller may distinguish + # them based on the OS. + # On powerpc64 systems, the C compiler may still be generating + # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may + # be generating 64-bit code. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __powerpc64__ || defined _ARCH_PPC64 + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi_32bit=no +else + gl_cv_host_cpu_c_abi_32bit=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + rs6000 ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; + + riscv32 | riscv64 ) + # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. + # Size of 'long' and 'void *': + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __LP64__ + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi_32bit=no +else + gl_cv_host_cpu_c_abi_32bit=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + s390* ) + # On s390x, the C compiler may be generating 64-bit (= s390x) code + # or 31-bit (= s390) code. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __LP64__ || defined __s390x__ + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi_32bit=no +else + gl_cv_host_cpu_c_abi_32bit=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + sparc | sparc64 ) + # UltraSPARCs running Linux have `uname -m` = "sparc64", but the + # C compiler still generates 32-bit code. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __sparcv9 || defined __arch64__ + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi_32bit=no +else + gl_cv_host_cpu_c_abi_32bit=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + *) + gl_cv_host_cpu_c_abi_32bit=unknown + ;; + esac + fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5 -printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5 +$as_echo "$gl_cv_host_cpu_c_abi_32bit" >&6; } HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit" @@ -21967,33 +21590,31 @@ printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5 -printf %s "checking for ELF binary format... " >&6; } -if test ${gl_cv_elf+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5 +$as_echo_n "checking for ELF binary format... " >&6; } +if ${gl_cv_elf+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#if defined __ELF__ || (defined __linux__ && defined __EDG__) +#ifdef __ELF__ Extensible Linking Format #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Extensible Linking Format" >/dev/null 2>&1 -then : + $EGREP "Extensible Linking Format" >/dev/null 2>&1; then : gl_cv_elf=yes -else $as_nop +else gl_cv_elf=no fi -rm -rf conftest* +rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5 -printf "%s\n" "$gl_cv_elf" >&6; } - if test $gl_cv_elf = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5 +$as_echo "$gl_cv_elf" >&6; } + if test $gl_cv_elf; then # Extract the ELF class of a file (5th byte) in decimal. # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header if od -A x < /dev/null >/dev/null 2>/dev/null; then @@ -22010,22 +21631,19 @@ printf "%s\n" "$gl_cv_elf" >&6; } echo } fi - # Use 'expr', not 'test', to compare the values of func_elfclass, because on - # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002, - # not 1 or 2. case $HOST_CPU_C_ABI_32BIT in yes) # 32-bit ABI. acl_is_expected_elfclass () { - expr "`func_elfclass | sed -e 's/[ ]//g'`" = 1 > /dev/null + test "`func_elfclass | sed -e 's/[ ]//g'`" = 1 } ;; no) # 64-bit ABI. acl_is_expected_elfclass () { - expr "`func_elfclass | sed -e 's/[ ]//g'`" = 2 > /dev/null + test "`func_elfclass | sed -e 's/[ ]//g'`" = 2 } ;; *) @@ -22043,12 +21661,11 @@ printf "%s\n" "$gl_cv_elf" >&6; } } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5 -printf %s "checking for the common suffixes of directories in the library search path... " >&6; } -if test ${acl_cv_libdirstems+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5 +$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; } +if ${acl_cv_libdirstems+:} false; then : + $as_echo_n "(cached) " >&6 +else acl_libdirstem=lib acl_libdirstem2= acl_libdirstem3= @@ -22062,13 +21679,6 @@ else $as_nop esac fi ;; - netbsd*) - if test $HOST_CPU_C_ABI_32BIT != no; then - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparc ;; - esac - fi - ;; *) searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` @@ -22085,7 +21695,7 @@ else $as_nop fi fi if test -n "$searchpath"; then - acl_saved_IFS="${IFS= }"; IFS=":" + acl_save_IFS="${IFS= }"; IFS=":" for searchdir in $searchpath; do if test -d "$searchdir"; then case "$searchdir" in @@ -22102,7 +21712,7 @@ else $as_nop esac fi done - IFS="$acl_saved_IFS" + IFS="$acl_save_IFS" if test $HOST_CPU_C_ABI_32BIT = yes; then # 32-bit ABI. acl_libdirstem3= @@ -22119,8 +21729,8 @@ else $as_nop acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5 -printf "%s\n" "$acl_cv_libdirstems" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5 +$as_echo "$acl_cv_libdirstems" >&6; } acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'` acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'` @@ -22137,9 +21747,9 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; } use_additional=yes - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -22147,22 +21757,21 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; } eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" # Check whether --with-libiconv-prefix was given. -if test ${with_libiconv_prefix+y} -then : +if test "${with_libiconv_prefix+set}" = set; then : withval=$with_libiconv_prefix; if test "X$withval" = "Xno"; then use_additional=no else if test "X$withval" = "X"; then - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -22170,8 +21779,8 @@ then : eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" else additional_includedir="$withval/include" @@ -22283,13 +21892,13 @@ fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBICONV; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" case "$x" in -L*) @@ -22377,13 +21986,13 @@ fi haveit= for x in $LDFLAGS $LIBICONV; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" if test "X$x" = "X-L$found_dir"; then haveit=yes @@ -22445,13 +22054,13 @@ fi if test -z "$haveit"; then for x in $CPPFLAGS $INCICONV; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" if test "X$x" = "X-I$additional_includedir"; then haveit=yes @@ -22467,12 +22076,12 @@ fi fi fi if test -n "$found_la"; then - saved_libdir="$libdir" + save_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$saved_libdir" + libdir="$save_libdir" for dep in $dependency_libs; do case "$dep" in -L*) @@ -22494,13 +22103,13 @@ fi haveit= for x in $LDFLAGS $LIBICONV; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -22515,13 +22124,13 @@ fi haveit= for x in $LDFLAGS $LTLIBICONV; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -22562,14 +22171,7 @@ fi fi ;; -l*) - dep=`echo "X$dep" | sed -e 's/^X-l//'` - if test "X$dep" != Xc \ - || case $host_os in - linux* | gnu* | k*bsd*-gnu) false ;; - *) true ;; - esac; then - names_next_round="$names_next_round $dep" - fi + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; *.la) names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` @@ -22595,17 +22197,17 @@ fi for found_dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - acl_saved_libdir="$libdir" + acl_save_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_saved_libdir" + libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" else for found_dir in $rpathdirs; do - acl_saved_libdir="$libdir" + acl_save_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_saved_libdir" + libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" done fi @@ -22622,14 +22224,6 @@ fi - gl_sed_double_backslashes='s/\\/\\\\/g' - gl_sed_escape_doublequotes='s/"/\\"/g' - gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" - gl_sed_escape_for_make_2='s,\$,\\$$,g' - case `echo r | tr -d '\r'` in - '') gl_tr_cr='\015' ;; - *) gl_tr_cr='\r' ;; - esac @@ -22652,83 +22246,78 @@ fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 -printf %s "checking for CFPreferencesCopyAppValue... " >&6; } -if test ${gt_cv_func_CFPreferencesCopyAppValue+y} -then : - printf %s "(cached) " >&6 -else $as_nop - gt_saved_LIBS="$LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { CFPreferencesCopyAppValue(NULL, NULL) ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_CFPreferencesCopyAppValue=yes -else $as_nop +else gt_cv_func_CFPreferencesCopyAppValue=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_saved_LIBS" + LIBS="$gt_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 -printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then -printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5 -printf %s "checking for CFLocaleCopyPreferredLanguages... " >&6; } -if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y} -then : - printf %s "(cached) " >&6 -else $as_nop - gt_saved_LIBS="$LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5 +$as_echo_n "checking for CFLocaleCopyPreferredLanguages... " >&6; } +if ${gt_cv_func_CFLocaleCopyPreferredLanguages+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { CFLocaleCopyPreferredLanguages(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_CFLocaleCopyPreferredLanguages=yes -else $as_nop +else gt_cv_func_CFLocaleCopyPreferredLanguages=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_saved_LIBS" + LIBS="$gt_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5 -printf "%s\n" "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; } if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then -printf "%s\n" "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h +$as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h fi INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" fi @@ -22768,12 +22357,11 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; gt_expression_test_code= fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 -printf %s "checking for GNU gettext in libc... " >&6; } -if eval test \${$gt_func_gnugettext_libc+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 +$as_echo_n "checking for GNU gettext in libc... " >&6; } +if eval \${$gt_func_gnugettext_libc+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22788,7 +22376,7 @@ extern int *_nl_domain_bindings; $gt_revision_test_code int -main (void) +main () { bindtextdomain ("", ""); @@ -22798,18 +22386,17 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$gt_func_gnugettext_libc=yes" -else $as_nop +else eval "$gt_func_gnugettext_libc=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$gt_func_gnugettext_libc - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then @@ -22817,19 +22404,19 @@ printf "%s\n" "$ac_res" >&6; } - gl_saved_CPPFLAGS="$CPPFLAGS" + am_save_CPPFLAGS="$CPPFLAGS" for element in $INCICONV; do haveit= for x in $CPPFLAGS; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" if test "X$x" = "X$element"; then haveit=yes @@ -22842,12 +22429,11 @@ printf "%s\n" "$ac_res" >&6; } done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -printf %s "checking for iconv... " >&6; } -if test ${am_cv_func_iconv+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if ${am_cv_func_iconv+:} false; then : + $as_echo_n "(cached) " >&6 +else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no @@ -22858,7 +22444,7 @@ else $as_nop #include int -main (void) +main () { iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); @@ -22867,14 +22453,13 @@ iconv_t cd = iconv_open("",""); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : am_cv_func_iconv=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then - gl_saved_LIBS="$LIBS" + am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22883,7 +22468,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ #include int -main (void) +main () { iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); @@ -22892,40 +22477,37 @@ iconv_t cd = iconv_open("",""); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : am_cv_lib_iconv=yes am_cv_func_iconv=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_saved_LIBS" + LIBS="$am_save_LIBS" fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -printf "%s\n" "$am_cv_func_iconv" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 -printf %s "checking for working iconv... " >&6; } -if test ${am_cv_func_iconv_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else - gl_saved_LIBS="$LIBS" + am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi am_cv_func_iconv_works=no for ac_iconv_const in '' 'const'; do - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22937,12 +22519,11 @@ else $as_nop #endif int -main (void) +main () { int result = 0; - /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from - successful returns. This is even documented in - */ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) @@ -23050,8 +22631,7 @@ int result = 0; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : am_cv_func_iconv_works=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -23060,11 +22640,11 @@ fi test "$am_cv_func_iconv_works" = no || break done - LIBS="$gl_saved_LIBS" + LIBS="$am_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 -printf "%s\n" "$am_cv_func_iconv_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } case "$am_cv_func_iconv_works" in *no) am_func_iconv=no am_cv_lib_iconv=no ;; *) am_func_iconv=yes ;; @@ -23074,16 +22654,16 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; } fi if test "$am_func_iconv" = yes; then -printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h +$as_echo "#define HAVE_ICONV 1" >>confdefs.h fi if test "$am_cv_lib_iconv" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 -printf %s "checking how to link with libiconv... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 -printf "%s\n" "$LIBICONV" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +$as_echo_n "checking how to link with libiconv... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +$as_echo "$LIBICONV" >&6; } else - CPPFLAGS="$gl_saved_CPPFLAGS" + CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= LTLIBICONV= fi @@ -23099,9 +22679,9 @@ printf "%s\n" "$LIBICONV" >&6; } use_additional=yes - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -23109,22 +22689,21 @@ printf "%s\n" "$LIBICONV" >&6; } eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" # Check whether --with-libintl-prefix was given. -if test ${with_libintl_prefix+y} -then : +if test "${with_libintl_prefix+set}" = set; then : withval=$with_libintl_prefix; if test "X$withval" = "Xno"; then use_additional=no else if test "X$withval" = "X"; then - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\" @@ -23132,8 +22711,8 @@ then : eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" else additional_includedir="$withval/include" @@ -23245,13 +22824,13 @@ fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBINTL; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" case "$x" in -L*) @@ -23339,13 +22918,13 @@ fi haveit= for x in $LDFLAGS $LIBINTL; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" if test "X$x" = "X-L$found_dir"; then haveit=yes @@ -23407,13 +22986,13 @@ fi if test -z "$haveit"; then for x in $CPPFLAGS $INCINTL; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" if test "X$x" = "X-I$additional_includedir"; then haveit=yes @@ -23429,12 +23008,12 @@ fi fi fi if test -n "$found_la"; then - saved_libdir="$libdir" + save_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$saved_libdir" + libdir="$save_libdir" for dep in $dependency_libs; do case "$dep" in -L*) @@ -23456,13 +23035,13 @@ fi haveit= for x in $LDFLAGS $LIBINTL; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -23477,13 +23056,13 @@ fi haveit= for x in $LDFLAGS $LTLIBINTL; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" if test "X$x" = "X-L$dependency_libdir"; then haveit=yes @@ -23524,14 +23103,7 @@ fi fi ;; -l*) - dep=`echo "X$dep" | sed -e 's/^X-l//'` - if test "X$dep" != Xc \ - || case $host_os in - linux* | gnu* | k*bsd*-gnu) false ;; - *) true ;; - esac; then - names_next_round="$names_next_round $dep" - fi + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; *.la) names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` @@ -23557,17 +23129,17 @@ fi for found_dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - acl_saved_libdir="$libdir" + acl_save_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_saved_libdir" + libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" else for found_dir in $rpathdirs; do - acl_saved_libdir="$libdir" + acl_save_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_saved_libdir" + libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" done fi @@ -23582,12 +23154,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 -printf %s "checking for GNU gettext in libintl... " >&6; } -if eval test \${$gt_func_gnugettext_libintl+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +$as_echo_n "checking for GNU gettext in libintl... " >&6; } +if eval \${$gt_func_gnugettext_libintl+:} false; then : + $as_echo_n "(cached) " >&6 +else gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" @@ -23610,7 +23181,7 @@ const char *_nl_expand_alias (const char *); $gt_revision_test_code int -main (void) +main () { bindtextdomain ("", ""); @@ -23620,22 +23191,15 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$gt_func_gnugettext_libintl=yes" -else $as_nop +else eval "$gt_func_gnugettext_libintl=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS" - - case "$host_os" in - aix*) gt_LIBINTL_EXTRA="-lpthread" ;; - esac - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \ - && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then - LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA" + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23654,7 +23218,7 @@ const char *_nl_expand_alias (const char *); $gt_revision_test_code int -main (void) +main () { bindtextdomain ("", ""); @@ -23664,29 +23228,27 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA" - LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA" +if ac_fn_c_try_link "$LINENO"; then : + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" eval "$gt_func_gnugettext_libintl=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" fi eval ac_res=\$$gt_func_gnugettext_libintl - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools \ - && test "$PACKAGE" != libintl; }; then + && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes else LIBINTL= @@ -23707,20 +23269,20 @@ printf "%s\n" "$ac_res" >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then -printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h +$as_echo "#define ENABLE_NLS 1" >>confdefs.h else USE_NLS=no fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 -printf %s "checking whether to use NLS... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -printf "%s\n" "$USE_NLS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +$as_echo_n "checking whether to use NLS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } if test "$USE_NLS" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 -printf %s "checking where the gettext function comes from... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +$as_echo_n "checking where the gettext function comes from... " >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" @@ -23730,30 +23292,30 @@ printf %s "checking where the gettext function comes from... " >&6; } else gt_source="included intl directory" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 -printf "%s\n" "$gt_source" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +$as_echo "$gt_source" >&6; } fi if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 -printf %s "checking how to link with libintl... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 -printf "%s\n" "$LIBINTL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +$as_echo_n "checking how to link with libintl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +$as_echo "$LIBINTL" >&6; } for element in $INCINTL; do haveit= for x in $CPPFLAGS; do - acl_saved_prefix="$prefix" + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - acl_saved_exec_prefix="$exec_prefix" + acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\" - exec_prefix="$acl_saved_exec_prefix" - prefix="$acl_saved_prefix" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" if test "X$x" = "X$element"; then haveit=yes @@ -23768,10 +23330,10 @@ printf "%s\n" "$LIBINTL" >&6; } fi -printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h -printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h +$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h fi @@ -23780,8 +23342,7 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h - - INTLLIBS="$LIBINTL" + INTLLIBS="$LIBINTL" @@ -23789,81 +23350,42 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h - gt_save_prefix="${prefix}" - gt_save_datarootdir="${datarootdir}" - gt_save_localedir="${localedir}" - if test "X$prefix" = "XNONE"; then - prefix="$ac_default_prefix" - fi - eval datarootdir="$datarootdir" - eval localedir="$localedir" - - - - - - gl_final_localedir="$localedir" - case "$build_os" in - cygwin*) - case "$host_os" in - mingw* | windows*) - gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;; - esac - ;; - esac - localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"` - localedir_c='"'"$localedir_c"'"' - - - localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"` - if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then - localedir_c_make='\"$(localedir)\"' - fi - - - localedir="${gt_save_localedir}" - datarootdir="${gt_save_datarootdir}" - prefix="${gt_save_prefix}" - - # Check whether --enable-redhat-pthread-workaround was given. -if test ${enable_redhat_pthread_workaround+y} -then : +if test "${enable_redhat_pthread_workaround+set}" = set; then : enableval=$enable_redhat_pthread_workaround; ac_cv_enable_redhat_pthread_workaround=$enableval -else $as_nop +else ac_cv_enable_redhat_pthread_workaround=test fi if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then if echo $ac_cv_uname_r | grep -E "\.EL(smp)?$" >/dev/null 2>&1 ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time" >&5 -printf "%s\n" "$as_me: See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time" >&6;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for redhat spopen problem" >&5 -printf %s "checking for redhat spopen problem... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time" >&5 +$as_echo "$as_me: See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for redhat spopen problem" >&5 +$as_echo_n "checking for redhat spopen problem... " >&6; } ( cd config_test && make && make test ) > /dev/null 2>&1 if test $? -eq 0 ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: okay" >&5 -printf "%s\n" "okay" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5 +$as_echo "okay" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: error" >&5 -printf "%s\n" "error" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 +$as_echo "error" >&6; } -printf "%s\n" "#define REDHAT_SPOPEN_ERROR 1" >>confdefs.h +$as_echo "#define REDHAT_SPOPEN_ERROR 1" >>confdefs.h fi fi elif test "$ac_cv_enable_redhat_pthread_workaround" = "yes" ; then -printf "%s\n" "#define REDHAT_SPOPEN_ERROR 1" >>confdefs.h +$as_echo "#define REDHAT_SPOPEN_ERROR 1" >>confdefs.h fi # Check whether --enable-perl-modules was given. -if test ${enable_perl_modules+y} -then : +if test "${enable_perl_modules+set}" = set; then : enableval=$enable_perl_modules; enable_perl_modules=$enableval -else $as_nop +else enable_perl_modules=no fi @@ -23880,12 +23402,11 @@ case "$host" in HAVE_LIBPTHREAD=1 ;; *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 -printf %s "checking for main in -lpthread... " >&6; } -if test ${ac_cv_lib_pthread_main+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 +$as_echo_n "checking for main in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_main+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -23893,28 +23414,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main (void) +main () { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pthread_main=yes -else $as_nop +else ac_cv_lib_pthread_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_main" >&5 -printf "%s\n" "$ac_cv_lib_pthread_main" >&6; } -if test "x$ac_cv_lib_pthread_main" = xyes -then : - printf "%s\n" "#define HAVE_LIBPTHREAD 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_main" >&5 +$as_echo "$ac_cv_lib_pthread_main" >&6; } +if test "x$ac_cv_lib_pthread_main" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPTHREAD 1 +_ACEOF LIBS="-lpthread $LIBS" @@ -23932,15 +23453,14 @@ esac # Check whether --enable-cross-guesses was given. -if test ${enable_cross_guesses+y} -then : +if test "${enable_cross_guesses+set}" = set; then : enableval=$enable_cross_guesses; if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5 -printf "%s\n" "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5 +$as_echo "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;} enableval=conservative fi gl_cross_guesses="$enableval" -else $as_nop +else gl_cross_guesses=conservative fi @@ -23957,17 +23477,16 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 -printf %s "checking for working alloca.h... " >&6; } -if test ${ac_cv_working_alloca_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +$as_echo_n "checking for working alloca.h... " >&6; } +if ${ac_cv_working_alloca_h+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { char *p = (char *) alloca (2 * sizeof (int)); if (p) return 0; @@ -23975,52 +23494,52 @@ char *p = (char *) alloca (2 * sizeof (int)); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_working_alloca_h=yes -else $as_nop +else ac_cv_working_alloca_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 -printf "%s\n" "$ac_cv_working_alloca_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 +$as_echo "$ac_cv_working_alloca_h" >&6; } if test $ac_cv_working_alloca_h = yes; then -printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 -printf %s "checking for alloca... " >&6; } -if test ${ac_cv_func_alloca_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test $ac_cv_working_alloca_h = yes; then - ac_cv_func_alloca_works=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 +$as_echo_n "checking for alloca... " >&6; } +if ${ac_cv_func_alloca_works+:} false; then : + $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#ifndef alloca -# ifdef __GNUC__ -# define alloca __builtin_alloca -# elif defined _MSC_VER +#ifdef __GNUC__ +# define alloca __builtin_alloca +#else +# ifdef _MSC_VER # include # define alloca _alloca # else -# ifdef __cplusplus -extern "C" -# endif +# ifdef HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ void *alloca (size_t); +# endif +# endif +# endif # endif #endif int -main (void) +main () { char *p = (char *) alloca (1); if (p) return 0; @@ -24028,22 +23547,20 @@ char *p = (char *) alloca (1); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_alloca_works=yes -else $as_nop +else ac_cv_func_alloca_works=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 -printf "%s\n" "$ac_cv_func_alloca_works" >&6; } -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 +$as_echo "$ac_cv_func_alloca_works" >&6; } if test $ac_cv_func_alloca_works = yes; then -printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h else # The SVR3 libPW and SVR4 libucb both contain incompatible functions @@ -24057,19 +23574,17 @@ else ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h +$as_echo "#define C_ALLOCA 1" >>confdefs.h -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 -printf %s "checking stack direction for C alloca... " >&6; } -if test ${ac_cv_c_stack_direction+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 +$as_echo_n "checking stack direction for C alloca... " >&6; } +if ${ac_cv_c_stack_direction+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : ac_cv_c_stack_direction=0 -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default @@ -24090,10 +23605,9 @@ main (int argc, char **argv) return find_stack_direction (0, argc + !argv + 20) < 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_stack_direction=1 -else $as_nop +else ac_cv_c_stack_direction=-1 fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -24101,9 +23615,11 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 -printf "%s\n" "$ac_cv_c_stack_direction" >&6; } -printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 +$as_echo "$ac_cv_c_stack_direction" >&6; } +cat >>confdefs.h <<_ACEOF +#define STACK_DIRECTION $ac_cv_c_stack_direction +_ACEOF fi @@ -24117,12 +23633,12 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5 -printf %s "checking whether the preprocessor supports include_next... " >&6; } -if test ${gl_cv_have_include_next+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5 +$as_echo_n "checking whether the preprocessor supports include_next... " >&6; } +if ${gl_cv_have_include_next+:} false; then : + $as_echo_n "(cached) " >&6 +else rm -rf conftestd1a conftestd1b conftestd2 mkdir conftestd1a conftestd1b conftestd2 cat < conftestd1a/conftest.h @@ -24156,31 +23672,29 @@ EOF /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_have_include_next=yes -else $as_nop +else CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_have_include_next=buggy -else $as_nop +else gl_cv_have_include_next=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$gl_save_CPPFLAGS" rm -rf conftestd1a conftestd1b conftestd2 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5 -printf "%s\n" "$gl_cv_have_include_next" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5 +$as_echo "$gl_cv_have_include_next" >&6; } PRAGMA_SYSTEM_HEADER= if test $gl_cv_have_include_next = yes; then INCLUDE_NEXT=include_next @@ -24201,12 +23715,11 @@ printf "%s\n" "$gl_cv_have_include_next" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5 -printf %s "checking whether source code line length is unlimited... " >&6; } -if test ${gl_cv_source_line_length_unlimited+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5 +$as_echo_n "checking whether source code line length is unlimited... " >&6; } +if ${gl_cv_source_line_length_unlimited+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24216,18 +23729,17 @@ choke me _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "choke me" >/dev/null 2>&1 -then : + $EGREP "choke me" >/dev/null 2>&1; then : gl_cv_source_line_length_unlimited=no -else $as_nop +else gl_cv_source_line_length_unlimited=yes fi -rm -rf conftest* +rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5 -printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5 +$as_echo "$gl_cv_source_line_length_unlimited" >&6; } if test $gl_cv_source_line_length_unlimited = no; then PRAGMA_COLUMNS="#pragma COLUMNS 10000" else @@ -24238,6 +23750,7 @@ printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; } + if test $ac_cv_header_features_h = yes; then HAVE_FEATURES_H=1 else @@ -24247,14 +23760,20 @@ printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; } + if test $ac_cv_header_sys_socket_h = no; then - ac_fn_c_check_header_compile "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default" -if test "x$ac_cv_header_ws2tcpip_h" = xyes -then : - printf "%s\n" "#define HAVE_WS2TCPIP_H 1" >>confdefs.h + for ac_header in ws2tcpip.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default" +if test "x$ac_cv_header_ws2tcpip_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WS2TCPIP_H 1 +_ACEOF fi +done + fi @@ -24279,12 +23798,11 @@ fi if test $gl_cv_have_include_next = yes; then gl_cv_next_arpa_inet_h='<'arpa/inet.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_arpa_inet_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_arpa_inet_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_arpa_inet_h = yes; then @@ -24329,8 +23847,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_arpa_inet_h" >&5 -printf "%s\n" "$gl_cv_next_arpa_inet_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_arpa_inet_h" >&5 +$as_echo "$gl_cv_next_arpa_inet_h" >&6; } fi NEXT_ARPA_INET_H=$gl_cv_next_arpa_inet_h @@ -24377,12 +23895,11 @@ printf "%s\n" "$gl_cv_next_arpa_inet_h" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 -printf %s "checking for C/C++ restrict keyword... " >&6; } -if test ${ac_cv_c_restrict+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 +$as_echo_n "checking for C/C++ restrict keyword... " >&6; } +if ${ac_cv_c_restrict+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_c_restrict=no # Put '__restrict__' first, to avoid problems with glibc and non-GCC; see: # https://lists.gnu.org/archive/html/bug-autoconf/2016-02/msg00006.html @@ -24391,39 +23908,40 @@ else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ typedef int *int_ptr; - int foo (int_ptr $ac_kw ip) { return ip[0]; } - int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ - int bar (int ip[$ac_kw]) { return ip[0]; } + int foo (int_ptr $ac_kw ip) { return ip[0]; } + int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ + int bar (int ip[$ac_kw]) { return ip[0]; } int -main (void) +main () { int s[1]; - int *$ac_kw t = s; - t[0] = 0; - return foo (t) + bar (t); + int *$ac_kw t = s; + t[0] = 0; + return foo (t) + bar (t); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_restrict=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test "$ac_cv_c_restrict" != no && break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 -printf "%s\n" "$ac_cv_c_restrict" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 +$as_echo "$ac_cv_c_restrict" >&6; } case $ac_cv_c_restrict in restrict) ;; - no) printf "%s\n" "#define restrict /**/" >>confdefs.h + no) $as_echo "#define restrict /**/" >>confdefs.h ;; - *) printf "%s\n" "#define restrict $ac_cv_c_restrict" >>confdefs.h + *) cat >>confdefs.h <<_ACEOF +#define restrict $ac_cv_c_restrict +_ACEOF ;; esac @@ -24488,12 +24006,11 @@ printf "%s\n" "$ac_cv_c_restrict" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether uses 'inline' correctly" >&5 -printf %s "checking whether uses 'inline' correctly... " >&6; } -if test ${gl_cv_header_wchar_h_correct_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether uses 'inline' correctly" >&5 +$as_echo_n "checking whether uses 'inline' correctly... " >&6; } +if ${gl_cv_header_wchar_h_correct_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_header_wchar_h_correct_inline=yes case "$host_os" in *-gnu* | gnu*) @@ -24513,7 +24030,7 @@ _ACEOF && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24529,7 +24046,7 @@ _ACEOF && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then : @@ -24544,8 +24061,8 @@ _ACEOF esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5 -printf "%s\n" "$gl_cv_header_wchar_h_correct_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5 +$as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; } if test $gl_cv_header_wchar_h_correct_inline = no; then as_fn_error $? " cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS). This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in @@ -24558,64 +24075,65 @@ C99 mode. You have four options: Configuration aborted." "$LINENO" 5 fi -ac_func= -for ac_item in $ac_func_c_list -do - if test $ac_func; then - ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func - if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then - echo "#define $ac_item 1" >> confdefs.h - fi - ac_func= - else - ac_func=$ac_item - fi + + + + for ac_func in $ac_func_list +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 -printf %s "checking for nl_langinfo and CODESET... " >&6; } -if test ${am_cv_langinfo_codeset+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 +$as_echo_n "checking for nl_langinfo and CODESET... " >&6; } +if ${am_cv_langinfo_codeset+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { char* cs = nl_langinfo(CODESET); return !cs; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : am_cv_langinfo_codeset=yes -else $as_nop +else am_cv_langinfo_codeset=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5 -printf "%s\n" "$am_cv_langinfo_codeset" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5 +$as_echo "$am_cv_langinfo_codeset" >&6; } if test $am_cv_langinfo_codeset = yes; then -printf "%s\n" "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h +$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5 -printf %s "checking for a traditional french locale... " >&6; } -if test ${gt_cv_locale_fr+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5 +$as_echo_n "checking for a traditional french locale... " >&6; } +if ${gt_cv_locale_fr+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24689,7 +24207,7 @@ _ACEOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest$ac_exeext; then case "$host_os" in # Handle native Windows specially, because there setlocale() interprets @@ -24745,8 +24263,8 @@ _ACEOF rm -fr conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5 -printf "%s\n" "$gt_cv_locale_fr" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5 +$as_echo "$gt_cv_locale_fr" >&6; } LOCALE_FR=$gt_cv_locale_fr @@ -25192,18 +24710,17 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } REPLACE_WCTOMB=0; - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5 -printf %s "checking whether malloc is ptrdiff_t safe... " >&6; } -if test ${gl_cv_malloc_ptrdiff+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5 +$as_echo_n "checking whether malloc is ptrdiff_t safe... " >&6; } +if ${gl_cv_malloc_ptrdiff+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { /* 64-bit ptrdiff_t is so wide that no practical platform can exceed it. */ @@ -25229,17 +24746,16 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_malloc_ptrdiff=yes -else $as_nop +else gl_cv_malloc_ptrdiff=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5 -printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5 +$as_echo "$gl_cv_malloc_ptrdiff" >&6; } @@ -25248,12 +24764,11 @@ printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5 -printf %s "checking whether malloc, realloc, calloc set errno on failure... " >&6; } -if test ${gl_cv_func_malloc_posix+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5 +$as_echo_n "checking whether malloc, realloc, calloc set errno on failure... " >&6; } +if ${gl_cv_func_malloc_posix+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in mingw*) @@ -25266,8 +24781,8 @@ else $as_nop esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5 -printf "%s\n" "$gl_cv_func_malloc_posix" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5 +$as_echo "$gl_cv_func_malloc_posix" >&6; } @@ -25275,7 +24790,7 @@ printf "%s\n" "$gl_cv_func_malloc_posix" >&6; } if test "$gl_cv_func_malloc_posix" = yes; then -printf "%s\n" "#define HAVE_MALLOC_POSIX 1" >>confdefs.h +$as_echo "#define HAVE_MALLOC_POSIX 1" >>confdefs.h else REPLACE_MALLOC_FOR_MALLOC_POSIX=1 @@ -25389,10 +24904,11 @@ printf "%s\n" "#define HAVE_MALLOC_POSIX 1" >>confdefs.h + if test $ac_cv_func__set_invalid_parameter_handler = yes; then HAVE_MSVC_INVALID_PARAMETER_HANDLER=1 -printf "%s\n" "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h +$as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h else HAVE_MSVC_INVALID_PARAMETER_HANDLER=0 @@ -25751,79 +25267,79 @@ printf "%s\n" "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h case "$host_os" in osf*) -printf "%s\n" "#define _POSIX_PII_SOCKET 1" >>confdefs.h +$as_echo "#define _POSIX_PII_SOCKET 1" >>confdefs.h ;; esac GL_GENERATE_SYS_SOCKET_H=false - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether is self-contained" >&5 -printf %s "checking whether is self-contained... " >&6; } -if test ${gl_cv_header_sys_socket_h_selfcontained+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether is self-contained" >&5 +$as_echo_n "checking whether is self-contained... " >&6; } +if ${gl_cv_header_sys_socket_h_selfcontained+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_sys_socket_h_selfcontained=yes -else $as_nop +else gl_cv_header_sys_socket_h_selfcontained=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_socket_h_selfcontained" >&5 -printf "%s\n" "$gl_cv_header_sys_socket_h_selfcontained" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_socket_h_selfcontained" >&5 +$as_echo "$gl_cv_header_sys_socket_h_selfcontained" >&6; } if test $gl_cv_header_sys_socket_h_selfcontained = yes; then - ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown" -if test "x$ac_cv_func_shutdown" = xyes -then : - printf "%s\n" "#define HAVE_SHUTDOWN 1" >>confdefs.h + for ac_func in shutdown +do : + ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown" +if test "x$ac_cv_func_shutdown" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SHUTDOWN 1 +_ACEOF fi +done if test $ac_cv_func_shutdown = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether defines the SHUT_* macros" >&5 -printf %s "checking whether defines the SHUT_* macros... " >&6; } -if test ${gl_cv_header_sys_socket_h_shut+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether defines the SHUT_* macros" >&5 +$as_echo_n "checking whether defines the SHUT_* macros... " >&6; } +if ${gl_cv_header_sys_socket_h_shut+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR }; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_sys_socket_h_shut=yes -else $as_nop +else gl_cv_header_sys_socket_h_shut=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_socket_h_shut" >&5 -printf "%s\n" "$gl_cv_header_sys_socket_h_shut" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_socket_h_shut" >&5 +$as_echo "$gl_cv_header_sys_socket_h_shut" >&6; } if test $gl_cv_header_sys_socket_h_shut = no; then GL_GENERATE_SYS_SOCKET_H=true fi @@ -25844,12 +25360,11 @@ printf "%s\n" "$gl_cv_header_sys_socket_h_shut" >&6; } if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_socket_h='<'sys/socket.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_sys_socket_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_sys_socket_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_sys_socket_h = yes; then @@ -25894,8 +25409,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_socket_h" >&5 -printf "%s\n" "$gl_cv_next_sys_socket_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_socket_h" >&5 +$as_echo "$gl_cv_next_sys_socket_h" >&6; } fi NEXT_SYS_SOCKET_H=$gl_cv_next_sys_socket_h @@ -25944,10 +25459,11 @@ printf "%s\n" "$gl_cv_next_sys_socket_h" >&6; } #endif " -if test "x$ac_cv_type_struct_sockaddr_storage" = xyes -then : +if test "x$ac_cv_type_struct_sockaddr_storage" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_SOCKADDR_STORAGE 1 +_ACEOF fi @@ -25964,10 +25480,11 @@ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" " #endif " -if test "x$ac_cv_type_sa_family_t" = xyes -then : +if test "x$ac_cv_type_sa_family_t" = xyes; then : -printf "%s\n" "#define HAVE_SA_FAMILY_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_SA_FAMILY_T 1 +_ACEOF fi @@ -25988,13 +25505,14 @@ fi #endif " -if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes -then : +if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1 +_ACEOF -else $as_nop +else HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0 fi @@ -26008,13 +25526,18 @@ fi if test $ac_cv_header_sys_socket_h != yes; then - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes -then : - printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h + for ac_header in winsock2.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" +if test "x$ac_cv_header_winsock2_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINSOCK2_H 1 +_ACEOF fi +done + fi if test "$ac_cv_header_winsock2_h" = yes; then HAVE_WINSOCK2_H=1 @@ -26032,34 +25555,32 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -printf %s "checking for inline... " >&6; } -if test ${ac_cv_c_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if ${ac_cv_c_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -static $ac_kw foo_t static_foo (void) {return 0; } -$ac_kw foo_t foo (void) {return 0; } +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_inline=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -printf "%s\n" "$ac_cv_c_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in inline | yes) ;; @@ -26080,12 +25601,11 @@ esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether linux/if_alg.h has struct sockaddr_alg." >&5 -printf %s "checking whether linux/if_alg.h has struct sockaddr_alg.... " >&6; } -if test ${gl_cv_header_linux_if_alg_salg+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether linux/if_alg.h has struct sockaddr_alg." >&5 +$as_echo_n "checking whether linux/if_alg.h has struct sockaddr_alg.... " >&6; } +if ${gl_cv_header_linux_if_alg_salg+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -26096,43 +25616,41 @@ else $as_nop .salg_name = "sha1", }; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_linux_if_alg_salg=yes -else $as_nop +else gl_cv_header_linux_if_alg_salg=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_linux_if_alg_salg" >&5 -printf "%s\n" "$gl_cv_header_linux_if_alg_salg" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_linux_if_alg_salg" >&5 +$as_echo "$gl_cv_header_linux_if_alg_salg" >&6; } if test "$gl_cv_header_linux_if_alg_salg" = yes; then -printf "%s\n" "#define HAVE_LINUX_IF_ALG_H 1" >>confdefs.h +$as_echo "#define HAVE_LINUX_IF_ALG_H 1" >>confdefs.h fi use_af_alg=no # Check whether --with-linux-crypto was given. -if test ${with_linux_crypto+y} -then : +if test "${with_linux_crypto+set}" = set; then : withval=$with_linux_crypto; use_af_alg=$withval -else $as_nop +else use_af_alg=no fi if test "$gl_cv_header_linux_if_alg_salg" != yes; then if test "$use_af_alg" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Linux kernel cryptographic API not found" >&5 -printf "%s\n" "$as_me: WARNING: Linux kernel cryptographic API not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Linux kernel cryptographic API not found" >&5 +$as_echo "$as_me: WARNING: Linux kernel cryptographic API not found" >&2;} fi use_af_alg=no fi @@ -26143,16 +25661,17 @@ printf "%s\n" "$as_me: WARNING: Linux kernel cryptographic API not found" >&2;} USE_AF_ALG=0 fi -printf "%s\n" "#define USE_LINUX_CRYPTO_API $USE_AF_ALG" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define USE_LINUX_CRYPTO_API $USE_AF_ALG +_ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -printf %s "checking whether byte ordering is bigendian... " >&6; } -if test ${ac_cv_c_bigendian+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if ${ac_cv_c_bigendian+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26163,8 +25682,7 @@ else $as_nop typedef int dummy; _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # Check for potential -arch flags. It is not universal unless # there are at least two -arch flags with different values. @@ -26188,7 +25706,7 @@ then : fi done fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26197,7 +25715,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext #include int -main (void) +main () { #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ @@ -26209,8 +25727,7 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26218,7 +25735,7 @@ then : #include int -main (void) +main () { #if BYTE_ORDER != BIG_ENDIAN not big endian @@ -26228,15 +25745,14 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes -else $as_nop +else ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). @@ -26245,7 +25761,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext #include int -main (void) +main () { #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) bogus endian macros @@ -26255,15 +25771,14 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to _BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { #ifndef _BIG_ENDIAN not big endian @@ -26273,33 +25788,31 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes -else $as_nop +else ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : # Try to guess by grepping values from an object file. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -unsigned short int ascii_mm[] = +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - unsigned short int ascii_ii[] = + short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; int use_ascii (int i) { return ascii_mm[i] + ascii_ii[i]; } - unsigned short int ebcdic_ii[] = + short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - unsigned short int ebcdic_mm[] = + short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; @@ -26307,15 +25820,14 @@ unsigned short int ascii_mm[] = extern int foo; int -main (void) +main () { return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -26328,13 +25840,13 @@ then : fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else $as_nop +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main (void) +main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -26350,10 +25862,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian=no -else $as_nop +else ac_cv_c_bigendian=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -26362,17 +25873,17 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -printf "%s\n" "$ac_cv_c_bigendian" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) - printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h ;; #( no) ;; #( universal) -printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) @@ -26443,12 +25954,13 @@ gl_mda_defines=' - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5 -printf %s "checking if environ is properly declared... " >&6; } -if test ${gt_cv_var_environ_declaration+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5 +$as_echo_n "checking if environ is properly declared... " >&6; } +if ${gt_cv_var_environ_declaration+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if HAVE_UNISTD_H @@ -26460,26 +25972,25 @@ else $as_nop typedef struct { int foo; } foo_t; extern foo_t environ; int -main (void) +main () { environ.foo = 1; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gt_cv_var_environ_declaration=no -else $as_nop +else gt_cv_var_environ_declaration=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5 -printf "%s\n" "$gt_cv_var_environ_declaration" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5 +$as_echo "$gt_cv_var_environ_declaration" >&6; } if test $gt_cv_var_environ_declaration = yes; then -printf "%s\n" "#define HAVE_ENVIRON_DECL 1" >>confdefs.h +$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h fi @@ -26490,12 +26001,11 @@ printf "%s\n" "#define HAVE_ENVIRON_DECL 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5 -printf %s "checking for complete errno.h... " >&6; } -if test ${gl_cv_header_errno_h_complete+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5 +$as_echo_n "checking for complete errno.h... " >&6; } +if ${gl_cv_header_errno_h_complete+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26555,18 +26065,17 @@ booboo _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "booboo" >/dev/null 2>&1 -then : + $EGREP "booboo" >/dev/null 2>&1; then : gl_cv_header_errno_h_complete=no -else $as_nop +else gl_cv_header_errno_h_complete=yes fi -rm -rf conftest* +rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5 -printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5 +$as_echo "$gl_cv_header_errno_h_complete" >&6; } if test $gl_cv_header_errno_h_complete = yes; then GL_GENERATE_ERRNO_H=false else @@ -26581,12 +26090,11 @@ printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; } if test $gl_cv_have_include_next = yes; then gl_cv_next_errno_h='<'errno.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_errno_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_errno_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -26625,8 +26133,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5 -printf "%s\n" "$gl_cv_next_errno_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5 +$as_echo "$gl_cv_next_errno_h" >&6; } fi NEXT_ERRNO_H=$gl_cv_next_errno_h @@ -26646,12 +26154,11 @@ printf "%s\n" "$gl_cv_next_errno_h" >&6; } fi if $GL_GENERATE_ERRNO_H; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5 -printf %s "checking for EMULTIHOP value... " >&6; } -if test ${gl_cv_header_errno_h_EMULTIHOP+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5 +$as_echo_n "checking for EMULTIHOP value... " >&6; } +if ${gl_cv_header_errno_h_EMULTIHOP+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26663,13 +26170,12 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 -then : + $EGREP "yes" >/dev/null 2>&1; then : gl_cv_header_errno_h_EMULTIHOP=yes -else $as_nop +else gl_cv_header_errno_h_EMULTIHOP=no fi -rm -rf conftest* +rm -f conftest* if test $gl_cv_header_errno_h_EMULTIHOP = no; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26683,11 +26189,10 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 -then : + $EGREP "yes" >/dev/null 2>&1; then : gl_cv_header_errno_h_EMULTIHOP=hidden fi -rm -rf conftest* +rm -f conftest* if test $gl_cv_header_errno_h_EMULTIHOP = hidden; then if ac_fn_c_compute_int "$LINENO" "EMULTIHOP" "gl_cv_header_errno_h_EMULTIHOP" " @@ -26696,8 +26201,7 @@ rm -rf conftest* /* The following two lines are a workaround against an autoconf-2.52 bug. */ #include #include -" -then : +"; then : fi @@ -26705,8 +26209,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5 -printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5 +$as_echo "$gl_cv_header_errno_h_EMULTIHOP" >&6; } case $gl_cv_header_errno_h_EMULTIHOP in yes | no) EMULTIHOP_HIDDEN=0; EMULTIHOP_VALUE= @@ -26721,12 +26225,11 @@ printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; } if $GL_GENERATE_ERRNO_H; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5 -printf %s "checking for ENOLINK value... " >&6; } -if test ${gl_cv_header_errno_h_ENOLINK+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5 +$as_echo_n "checking for ENOLINK value... " >&6; } +if ${gl_cv_header_errno_h_ENOLINK+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26738,13 +26241,12 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 -then : + $EGREP "yes" >/dev/null 2>&1; then : gl_cv_header_errno_h_ENOLINK=yes -else $as_nop +else gl_cv_header_errno_h_ENOLINK=no fi -rm -rf conftest* +rm -f conftest* if test $gl_cv_header_errno_h_ENOLINK = no; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26758,11 +26260,10 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 -then : + $EGREP "yes" >/dev/null 2>&1; then : gl_cv_header_errno_h_ENOLINK=hidden fi -rm -rf conftest* +rm -f conftest* if test $gl_cv_header_errno_h_ENOLINK = hidden; then if ac_fn_c_compute_int "$LINENO" "ENOLINK" "gl_cv_header_errno_h_ENOLINK" " @@ -26771,8 +26272,7 @@ rm -rf conftest* /* The following two lines are a workaround against an autoconf-2.52 bug. */ #include #include -" -then : +"; then : fi @@ -26780,8 +26280,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5 -printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5 +$as_echo "$gl_cv_header_errno_h_ENOLINK" >&6; } case $gl_cv_header_errno_h_ENOLINK in yes | no) ENOLINK_HIDDEN=0; ENOLINK_VALUE= @@ -26796,12 +26296,11 @@ printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; } if $GL_GENERATE_ERRNO_H; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5 -printf %s "checking for EOVERFLOW value... " >&6; } -if test ${gl_cv_header_errno_h_EOVERFLOW+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5 +$as_echo_n "checking for EOVERFLOW value... " >&6; } +if ${gl_cv_header_errno_h_EOVERFLOW+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26813,13 +26312,12 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 -then : + $EGREP "yes" >/dev/null 2>&1; then : gl_cv_header_errno_h_EOVERFLOW=yes -else $as_nop +else gl_cv_header_errno_h_EOVERFLOW=no fi -rm -rf conftest* +rm -f conftest* if test $gl_cv_header_errno_h_EOVERFLOW = no; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26833,11 +26331,10 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1 -then : + $EGREP "yes" >/dev/null 2>&1; then : gl_cv_header_errno_h_EOVERFLOW=hidden fi -rm -rf conftest* +rm -f conftest* if test $gl_cv_header_errno_h_EOVERFLOW = hidden; then if ac_fn_c_compute_int "$LINENO" "EOVERFLOW" "gl_cv_header_errno_h_EOVERFLOW" " @@ -26846,8 +26343,7 @@ rm -rf conftest* /* The following two lines are a workaround against an autoconf-2.52 bug. */ #include #include -" -then : +"; then : fi @@ -26855,8 +26351,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5 -printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5 +$as_echo "$gl_cv_header_errno_h_EOVERFLOW" >&6; } case $gl_cv_header_errno_h_EOVERFLOW in yes | no) EOVERFLOW_HIDDEN=0; EOVERFLOW_VALUE= @@ -26870,39 +26366,41 @@ printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; } fi -ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_strerror_r" = xyes -then : +ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" +if test "x$ac_cv_have_decl_strerror_r" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRERROR_R $ac_have_decl +_ACEOF -if test $ac_cv_have_decl_strerror_r = yes; then - # For backward compatibility's sake, define HAVE_STRERROR_R. - # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well - # as AC_CHECK_DECLS_ONCE.) - -printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h +for ac_func in strerror_r +do : + ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r" +if test "x$ac_cv_func_strerror_r" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRERROR_R 1 +_ACEOF fi +done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5 -printf %s "checking whether strerror_r returns char *... " >&6; } -if test ${ac_cv_func_strerror_r_char_p+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5 +$as_echo_n "checking whether strerror_r returns char *... " >&6; } +if ${ac_cv_func_strerror_r_char_p+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_func_strerror_r_char_p=no if test $ac_cv_have_decl_strerror_r = yes; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +$ac_includes_default int -main (void) +main () { char buf[100]; @@ -26914,20 +26412,49 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_func_strerror_r_char_p=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else + # strerror_r is not declared. Choose between + # systems that have relatively inaccessible declarations for the + # function. BeOS and DEC UNIX 4.0 fall in this category, but the + # former has a strerror_r that returns char*, while the latter + # has a strerror_r that returns `int'. + # This test should segfault on the DEC system. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default + extern char *strerror_r (); +int +main () +{ +char buf[100]; + char x = *strerror_r (0, buf, sizeof buf); + return ! isalpha (x); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_strerror_r_char_p=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5 -printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5 +$as_echo "$ac_cv_func_strerror_r_char_p" >&6; } if test $ac_cv_func_strerror_r_char_p = yes; then -printf "%s\n" "#define STRERROR_R_CHAR_P 1" >>confdefs.h +$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h fi @@ -26935,12 +26462,11 @@ fi XGETTEXT_EXTRA_OPTIONS= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5 -printf %s "checking whether ctype.h defines __header_inline... " >&6; } -if test ${gl_cv_have___header_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5 +$as_echo_n "checking whether ctype.h defines __header_inline... " >&6; } +if ${gl_cv_have___header_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -26949,19 +26475,18 @@ else $as_nop #endif _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : gl_cv_have___header_inline=yes -else $as_nop +else gl_cv_have___header_inline=no fi rm -f conftest.err conftest.i conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5 -printf "%s\n" "$gl_cv_have___header_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5 +$as_echo "$gl_cv_have___header_inline" >&6; } if test "$gl_cv_have___header_inline" = yes; then -printf "%s\n" "#define HAVE___HEADER_INLINE 1" >>confdefs.h +$as_echo "#define HAVE___HEADER_INLINE 1" >>confdefs.h fi @@ -26978,6 +26503,7 @@ printf "%s\n" "#define HAVE___HEADER_INLINE 1" >>confdefs.h + GL_GNULIB_CREAT=0 @@ -27012,21 +26538,20 @@ printf "%s\n" "#define HAVE___HEADER_INLINE 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5 -printf %s "checking for working fcntl.h... " >&6; } -if test ${gl_cv_header_working_fcntl_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5 +$as_echo_n "checking for working fcntl.h... " >&6; } +if ${gl_cv_header_working_fcntl_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess 'no' on native Windows. mingw*) gl_cv_header_working_fcntl_h='no' ;; *) gl_cv_header_working_fcntl_h=cross-compiling ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -27056,7 +26581,7 @@ $gl_mda_defines }; int -main (void) +main () { int result = !constants; @@ -27126,10 +26651,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_header_working_fcntl_h=yes -else $as_nop +else case $? in #( 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #( @@ -27143,15 +26667,17 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5 -printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5 +$as_echo "$gl_cv_header_working_fcntl_h" >&6; } case $gl_cv_header_working_fcntl_h in #( *O_NOATIME* | no | cross-compiling) ac_val=0;; #( *) ac_val=1;; esac -printf "%s\n" "#define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_WORKING_O_NOATIME $ac_val +_ACEOF case $gl_cv_header_working_fcntl_h in #( @@ -27159,16 +26685,19 @@ printf "%s\n" "#define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h *) ac_val=1;; esac -printf "%s\n" "#define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_WORKING_O_NOFOLLOW $ac_val +_ACEOF ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = xyes -then : +if test "x$ac_cv_type_mode_t" = xyes; then : -else $as_nop +else -printf "%s\n" "#define mode_t int" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define mode_t int +_ACEOF fi @@ -27186,12 +26715,11 @@ fi if test $gl_cv_have_include_next = yes; then gl_cv_next_fcntl_h='<'fcntl.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_fcntl_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_fcntl_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -27230,8 +26758,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5 -printf "%s\n" "$gl_cv_next_fcntl_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5 +$as_echo "$gl_cv_next_fcntl_h" >&6; } fi NEXT_FCNTL_H=$gl_cv_next_fcntl_h @@ -28138,17 +27666,20 @@ printf "%s\n" "$gl_cv_next_fcntl_h" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdin defaults to large file offsets" >&5 -printf %s "checking whether stdin defaults to large file offsets... " >&6; } -if test ${gl_cv_var_stdin_large_offset+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdin defaults to large file offsets" >&5 +$as_echo_n "checking whether stdin defaults to large file offsets... " >&6; } +if ${gl_cv_var_stdin_large_offset+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { #if defined __SL64 && defined __SCLE /* cygwin */ /* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making @@ -28163,17 +27694,16 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_var_stdin_large_offset=yes -else $as_nop +else gl_cv_var_stdin_large_offset=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var_stdin_large_offset" >&5 -printf "%s\n" "$gl_cv_var_stdin_large_offset" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var_stdin_large_offset" >&5 +$as_echo "$gl_cv_var_stdin_large_offset" >&6; } @@ -28181,47 +27711,44 @@ printf "%s\n" "$gl_cv_var_stdin_large_offset" >&6; } case "$host_os" in mingw*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5 -printf %s "checking for 64-bit off_t... " >&6; } -if test ${gl_cv_type_off_t_64+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5 +$as_echo_n "checking for 64-bit off_t... " >&6; } +if ${gl_cv_type_off_t_64+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_type_off_t_64=yes -else $as_nop +else gl_cv_type_off_t_64=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5 -printf "%s\n" "$gl_cv_type_off_t_64" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5 +$as_echo "$gl_cv_type_off_t_64" >&6; } if test $gl_cv_type_off_t_64 = no; then WINDOWS_64_BIT_OFF_T=1 else WINDOWS_64_BIT_OFF_T=0 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5 -printf %s "checking for 64-bit st_size... " >&6; } -if test ${gl_cv_member_st_size_64+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5 +$as_echo_n "checking for 64-bit st_size... " >&6; } +if ${gl_cv_member_st_size_64+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -28229,24 +27756,23 @@ else $as_nop int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_member_st_size_64=yes -else $as_nop +else gl_cv_member_st_size_64=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5 -printf "%s\n" "$gl_cv_member_st_size_64" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5 +$as_echo "$gl_cv_member_st_size_64" >&6; } if test $gl_cv_member_st_size_64 = no; then WINDOWS_64_BIT_ST_SIZE=1 else @@ -28269,7 +27795,7 @@ printf "%s\n" "$gl_cv_member_st_size_64" >&6; } -printf "%s\n" "#define _USE_STD_STAT 1" >>confdefs.h +$as_echo "#define _USE_STD_STAT 1" >>confdefs.h @@ -28283,12 +27809,11 @@ printf "%s\n" "#define _USE_STD_STAT 1" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_types_h='<'sys/types.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_sys_types_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_sys_types_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -28327,8 +27852,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5 -printf "%s\n" "$gl_cv_next_sys_types_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5 +$as_echo "$gl_cv_next_sys_types_h" >&6; } fi NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h @@ -28356,14 +27881,16 @@ printf "%s\n" "$gl_cv_next_sys_types_h" >&6; } -ac_fn_check_decl "$LINENO" "fseeko" "ac_cv_have_decl_fseeko" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_fseeko" = xyes -then : +ac_fn_c_check_decl "$LINENO" "fseeko" "ac_cv_have_decl_fseeko" "$ac_includes_default" +if test "x$ac_cv_have_decl_fseeko" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FSEEKO $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FSEEKO $ac_have_decl +_ACEOF @@ -28373,37 +27900,35 @@ printf "%s\n" "#define HAVE_DECL_FSEEKO $ac_have_decl" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 -printf %s "checking for fseeko... " >&6; } -if test ${gl_cv_func_fseeko+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 +$as_echo_n "checking for fseeko... " >&6; } +if ${gl_cv_func_fseeko+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { fseeko (stdin, 0, 0); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_func_fseeko=yes -else $as_nop +else gl_cv_func_fseeko=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fseeko" >&5 -printf "%s\n" "$gl_cv_func_fseeko" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fseeko" >&5 +$as_echo "$gl_cv_func_fseeko" >&6; } if test $ac_cv_have_decl_fseeko = no; then @@ -28422,22 +27947,20 @@ printf "%s\n" "$gl_cv_func_fseeko" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5 -printf %s "checking whether fflush works on input streams... " >&6; } -if test ${gl_cv_func_fflush_stdin+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5 +$as_echo_n "checking whether fflush works on input streams... " >&6; } +if ${gl_cv_func_fflush_stdin+:} false; then : + $as_echo_n "(cached) " >&6 +else echo hello world > conftest.txt - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on native Windows. mingw*) gl_cv_func_fflush_stdin="guessing no" ;; *) gl_cv_func_fflush_stdin=cross ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28452,7 +27975,7 @@ else $as_nop $gl_mda_defines int -main (void) +main () { FILE *f = fopen ("conftest.txt", "r"); char buffer[10]; @@ -28495,10 +28018,9 @@ FILE *f = fopen ("conftest.txt", "r"); return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_fflush_stdin=yes -else $as_nop +else gl_cv_func_fflush_stdin=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -28508,15 +28030,17 @@ fi rm conftest.txt fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 -printf "%s\n" "$gl_cv_func_fflush_stdin" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 +$as_echo "$gl_cv_func_fflush_stdin" >&6; } case "$gl_cv_func_fflush_stdin" in *yes) gl_func_fflush_stdin=1 ;; *no) gl_func_fflush_stdin=0 ;; *) gl_func_fflush_stdin='(-1)' ;; esac -printf "%s\n" "#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin +_ACEOF case "$gl_cv_func_fflush_stdin" in @@ -28553,12 +28077,11 @@ printf "%s\n" "#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin" >>confdefs.h REPLACE_STAT=0; REPLACE_UTIMENSAT=0; -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 -printf %s "checking whether stat file-mode macros are broken... " >&6; } -if test ${ac_cv_header_stat_broken+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 +$as_echo_n "checking whether stat file-mode macros are broken... " >&6; } +if ${ac_cv_header_stat_broken+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -28581,19 +28104,18 @@ extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1]; #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stat_broken=no -else $as_nop +else ac_cv_header_stat_broken=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 -printf "%s\n" "$ac_cv_header_stat_broken" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 +$as_echo "$ac_cv_header_stat_broken" >&6; } if test $ac_cv_header_stat_broken = yes; then -printf "%s\n" "#define STAT_MACROS_BROKEN 1" >>confdefs.h +$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h fi @@ -28611,15 +28133,16 @@ fi + + if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_stat_h='<'sys/stat.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_sys_stat_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_sys_stat_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_sys_stat_h = yes; then @@ -28664,8 +28187,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5 -printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5 +$as_echo "$gl_cv_next_sys_stat_h" >&6; } fi NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h @@ -28697,12 +28220,11 @@ printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; } ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include #include " -if test "x$ac_cv_type_nlink_t" = xyes -then : +if test "x$ac_cv_type_nlink_t" = xyes; then : -else $as_nop +else -printf "%s\n" "#define nlink_t int" >>confdefs.h +$as_echo "#define nlink_t int" >>confdefs.h fi @@ -28717,13 +28239,18 @@ fi case "$host_os" in mingw*) - ac_fn_c_check_header_compile "$LINENO" "sdkddkver.h" "ac_cv_header_sdkddkver_h" "$ac_includes_default" -if test "x$ac_cv_header_sdkddkver_h" = xyes -then : - printf "%s\n" "#define HAVE_SDKDDKVER_H 1" >>confdefs.h + for ac_header in sdkddkver.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sdkddkver.h" "ac_cv_header_sdkddkver_h" "$ac_includes_default" +if test "x$ac_cv_header_sdkddkver_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SDKDDKVER_H 1 +_ACEOF fi +done + ;; esac @@ -28816,26 +28343,29 @@ fi -ac_fn_check_decl "$LINENO" "ftello" "ac_cv_have_decl_ftello" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_ftello" = xyes -then : + + + +ac_fn_c_check_decl "$LINENO" "ftello" "ac_cv_have_decl_ftello" "$ac_includes_default" +if test "x$ac_cv_have_decl_ftello" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FTELLO $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FTELLO $ac_have_decl +_ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ungetc works on arbitrary bytes" >&5 -printf %s "checking whether ungetc works on arbitrary bytes... " >&6; } -if test ${gl_cv_func_ungetc_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ungetc works on arbitrary bytes" >&5 +$as_echo_n "checking whether ungetc works on arbitrary bytes... " >&6; } +if ${gl_cv_func_ungetc_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_ungetc_works="guessing yes" ;; @@ -28849,14 +28379,14 @@ then : *) gl_cv_func_ungetc_works="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { FILE *f; if (!(f = fopen ("conftest.tmp", "w+"))) @@ -28889,10 +28419,9 @@ FILE *f; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_ungetc_works=yes -else $as_nop +else gl_cv_func_ungetc_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -28901,8 +28430,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ungetc_works" >&5 -printf "%s\n" "$gl_cv_func_ungetc_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ungetc_works" >&5 +$as_echo "$gl_cv_func_ungetc_works" >&6; } gl_ftello_broken_after_ungetc=no case "$gl_cv_func_ungetc_works" in *yes) ;; @@ -28911,7 +28440,7 @@ printf "%s\n" "$gl_cv_func_ungetc_works" >&6; } darwin*) gl_ftello_broken_after_ungetc=yes ;; *) -printf "%s\n" "#define FUNC_UNGETC_BROKEN 1" >>confdefs.h +$as_echo "#define FUNC_UNGETC_BROKEN 1" >>confdefs.h ;; esac @@ -28931,36 +28460,34 @@ printf "%s\n" "#define FUNC_UNGETC_BROKEN 1" >>confdefs.h HAVE_DECL_FTELLO=0 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ftello" >&5 -printf %s "checking for ftello... " >&6; } -if test ${gl_cv_func_ftello+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ftello" >&5 +$as_echo_n "checking for ftello... " >&6; } +if ${gl_cv_func_ftello+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { ftello (stdin); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_func_ftello=yes -else $as_nop +else gl_cv_func_ftello=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello" >&5 -printf "%s\n" "$gl_cv_func_ftello" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello" >&5 +$as_echo "$gl_cv_func_ftello" >&6; } if test $gl_cv_func_ftello = no; then HAVE_FTELLO=0 else @@ -28972,12 +28499,11 @@ printf "%s\n" "$gl_cv_func_ftello" >&6; } fi if test $REPLACE_FTELLO = 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ftello works" >&5 -printf %s "checking whether ftello works... " >&6; } -if test ${gl_cv_func_ftello_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ftello works" >&5 +$as_echo_n "checking whether ftello works... " >&6; } +if ${gl_cv_func_ftello_works+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on Solaris. @@ -28987,10 +28513,9 @@ else $as_nop # Guess yes otherwise. *) gl_cv_func_ftello_works="guessing yes" ;; esac - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29052,10 +28577,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_ftello_works=yes -else $as_nop +else gl_cv_func_ftello_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -29064,14 +28588,14 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello_works" >&5 -printf "%s\n" "$gl_cv_func_ftello_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello_works" >&5 +$as_echo "$gl_cv_func_ftello_works" >&6; } case "$gl_cv_func_ftello_works" in *yes) ;; *) REPLACE_FTELLO=1 -printf "%s\n" "#define FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE 1" >>confdefs.h +$as_echo "#define FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE 1" >>confdefs.h ;; esac @@ -29081,7 +28605,7 @@ printf "%s\n" "#define FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE 1" >>con if test $gl_ftello_broken_after_ungetc = yes; then REPLACE_FTELLO=1 -printf "%s\n" "#define FTELLO_BROKEN_AFTER_UNGETC 1" >>confdefs.h +$as_echo "#define FTELLO_BROKEN_AFTER_UNGETC 1" >>confdefs.h fi fi @@ -29108,15 +28632,15 @@ printf "%s\n" "#define FTELLO_BROKEN_AFTER_UNGETC 1" >>confdefs.h + if test $gl_cv_have_include_next = yes; then gl_cv_next_netdb_h='<'netdb.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_netdb_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_netdb_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_netdb_h = yes; then @@ -29161,8 +28685,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_netdb_h" >&5 -printf "%s\n" "$gl_cv_next_netdb_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_netdb_h" >&5 +$as_echo "$gl_cv_next_netdb_h" >&6; } fi NEXT_NETDB_H=$gl_cv_next_netdb_h @@ -29192,12 +28716,11 @@ printf "%s\n" "$gl_cv_next_netdb_h" >&6; } HOSTENT_LIB= gl_saved_libs="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 -printf %s "checking for library containing gethostbyname... " >&6; } -if test ${ac_cv_search_gethostbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 +$as_echo_n "checking for library containing gethostbyname... " >&6; } +if ${ac_cv_search_gethostbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29205,48 +28728,46 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char gethostbyname (); int -main (void) +main () { return gethostbyname (); ; return 0; } _ACEOF -for ac_lib in '' nsl network net -do +for ac_lib in '' nsl network net; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_gethostbyname=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_gethostbyname+y} -then : + if ${ac_cv_search_gethostbyname+:} false; then : break fi done -if test ${ac_cv_search_gethostbyname+y} -then : +if ${ac_cv_search_gethostbyname+:} false; then : -else $as_nop +else ac_cv_search_gethostbyname=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 -printf "%s\n" "$ac_cv_search_gethostbyname" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 +$as_echo "$ac_cv_search_gethostbyname" >&6; } ac_res=$ac_cv_search_gethostbyname -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" if test "$ac_cv_search_gethostbyname" != "none required"; then HOSTENT_LIB="$ac_cv_search_gethostbyname" @@ -29255,22 +28776,21 @@ fi LIBS="$gl_saved_libs" if test -z "$HOSTENT_LIB"; then - - for ac_func in gethostbyname + for ac_func in gethostbyname do : ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = xyes -then : - printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h +if test "x$ac_cv_func_gethostbyname" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETHOSTBYNAME 1 +_ACEOF -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in winsock2.h and -lws2_32" >&5 -printf %s "checking for gethostbyname in winsock2.h and -lws2_32... " >&6; } -if test ${gl_cv_w32_gethostbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in winsock2.h and -lws2_32" >&5 +$as_echo_n "checking for gethostbyname in winsock2.h and -lws2_32... " >&6; } +if ${gl_cv_w32_gethostbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_w32_gethostbyname=no gl_save_LIBS="$LIBS" LIBS="$LIBS -lws2_32" @@ -29283,43 +28803,41 @@ else $as_nop #include int -main (void) +main () { gethostbyname(NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_w32_gethostbyname=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$gl_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_gethostbyname" >&5 -printf "%s\n" "$gl_cv_w32_gethostbyname" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_gethostbyname" >&5 +$as_echo "$gl_cv_w32_gethostbyname" >&6; } if test "$gl_cv_w32_gethostbyname" = "yes"; then HOSTENT_LIB="-lws2_32" fi fi - done + fi SERVENT_LIB= gl_saved_libs="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getservbyname" >&5 -printf %s "checking for library containing getservbyname... " >&6; } -if test ${ac_cv_search_getservbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getservbyname" >&5 +$as_echo_n "checking for library containing getservbyname... " >&6; } +if ${ac_cv_search_getservbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29327,48 +28845,46 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char getservbyname (); int -main (void) +main () { return getservbyname (); ; return 0; } _ACEOF -for ac_lib in '' socket network net -do +for ac_lib in '' socket network net; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_getservbyname=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_getservbyname+y} -then : + if ${ac_cv_search_getservbyname+:} false; then : break fi done -if test ${ac_cv_search_getservbyname+y} -then : +if ${ac_cv_search_getservbyname+:} false; then : -else $as_nop +else ac_cv_search_getservbyname=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getservbyname" >&5 -printf "%s\n" "$ac_cv_search_getservbyname" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getservbyname" >&5 +$as_echo "$ac_cv_search_getservbyname" >&6; } ac_res=$ac_cv_search_getservbyname -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" if test "$ac_cv_search_getservbyname" != "none required"; then SERVENT_LIB="$ac_cv_search_getservbyname" @@ -29377,22 +28893,21 @@ fi LIBS="$gl_saved_libs" if test -z "$SERVENT_LIB"; then - - for ac_func in getservbyname + for ac_func in getservbyname do : ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname" -if test "x$ac_cv_func_getservbyname" = xyes -then : - printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h +if test "x$ac_cv_func_getservbyname" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETSERVBYNAME 1 +_ACEOF -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getservbyname in winsock2.h and -lws2_32" >&5 -printf %s "checking for getservbyname in winsock2.h and -lws2_32... " >&6; } -if test ${gl_cv_w32_getservbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getservbyname in winsock2.h and -lws2_32" >&5 +$as_echo_n "checking for getservbyname in winsock2.h and -lws2_32... " >&6; } +if ${gl_cv_w32_getservbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_w32_getservbyname=no gl_save_LIBS="$LIBS" LIBS="$LIBS -lws2_32" @@ -29405,31 +28920,30 @@ else $as_nop #include int -main (void) +main () { getservbyname(NULL,NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_w32_getservbyname=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$gl_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_getservbyname" >&5 -printf "%s\n" "$gl_cv_w32_getservbyname" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_getservbyname" >&5 +$as_echo "$gl_cv_w32_getservbyname" >&6; } if test "$gl_cv_w32_getservbyname" = "yes"; then SERVENT_LIB="-lws2_32" fi fi - done + fi @@ -29447,13 +28961,18 @@ done if test $ac_cv_header_sys_socket_h != yes; then - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes -then : - printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h + for ac_header in winsock2.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" +if test "x$ac_cv_header_winsock2_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINSOCK2_H 1 +_ACEOF fi +done + fi if test "$ac_cv_header_winsock2_h" = yes; then HAVE_WINSOCK2_H=1 @@ -29466,15 +28985,17 @@ fi if test $HAVE_WINSOCK2_H = 1; then REPLACE_INET_NTOP=1 - ac_fn_check_decl "$LINENO" "inet_ntop" "ac_cv_have_decl_inet_ntop" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_inet_ntop" = xyes -then : + ac_fn_c_check_decl "$LINENO" "inet_ntop" "ac_cv_have_decl_inet_ntop" "#include +" +if test "x$ac_cv_have_decl_inet_ntop" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_INET_NTOP $ac_have_decl +_ACEOF if test $ac_cv_have_decl_inet_ntop = yes; then INET_NTOP_LIB="-lws2_32" @@ -29483,12 +29004,11 @@ printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h fi else gl_save_LIBS=$LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 -printf %s "checking for library containing inet_ntop... " >&6; } -if test ${ac_cv_search_inet_ntop+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 +$as_echo_n "checking for library containing inet_ntop... " >&6; } +if ${ac_cv_search_inet_ntop+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29496,57 +29016,59 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char inet_ntop (); int -main (void) +main () { return inet_ntop (); ; return 0; } _ACEOF -for ac_lib in '' nsl resolv network -do +for ac_lib in '' nsl resolv network; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_inet_ntop=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_inet_ntop+y} -then : + if ${ac_cv_search_inet_ntop+:} false; then : break fi done -if test ${ac_cv_search_inet_ntop+y} -then : +if ${ac_cv_search_inet_ntop+:} false; then : -else $as_nop +else ac_cv_search_inet_ntop=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5 -printf "%s\n" "$ac_cv_search_inet_ntop" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5 +$as_echo "$ac_cv_search_inet_ntop" >&6; } ac_res=$ac_cv_search_inet_ntop -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else + for ac_func in inet_ntop +do : ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" -if test "x$ac_cv_func_inet_ntop" = xyes -then : - printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h +if test "x$ac_cv_func_inet_ntop" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_INET_NTOP 1 +_ACEOF fi +done if test $ac_cv_func_inet_ntop = no; then HAVE_INET_NTOP=0 @@ -29562,19 +29084,21 @@ fi fi - ac_fn_check_decl "$LINENO" "inet_ntop" "ac_cv_have_decl_inet_ntop" "#include + ac_fn_c_check_decl "$LINENO" "inet_ntop" "ac_cv_have_decl_inet_ntop" "#include #if HAVE_NETDB_H # include #endif -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_inet_ntop" = xyes -then : +" +if test "x$ac_cv_have_decl_inet_ntop" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_INET_NTOP $ac_have_decl +_ACEOF if test $ac_cv_have_decl_inet_ntop = no; then HAVE_DECL_INET_NTOP=0 @@ -29587,12 +29111,12 @@ printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IPv4 sockets" >&5 -printf %s "checking for IPv4 sockets... " >&6; } -if test ${gl_cv_socket_ipv4+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv4 sockets" >&5 +$as_echo_n "checking for IPv4 sockets... " >&6; } +if ${gl_cv_socket_ipv4+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -29606,7 +29130,7 @@ else $as_nop #include #endif int -main (void) +main () { int x = AF_INET; struct in_addr y; struct sockaddr_in z; if (&x && &y && &z) return 0; @@ -29614,28 +29138,26 @@ int x = AF_INET; struct in_addr y; struct sockaddr_in z; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_socket_ipv4=yes -else $as_nop +else gl_cv_socket_ipv4=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socket_ipv4" >&5 -printf "%s\n" "$gl_cv_socket_ipv4" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socket_ipv4" >&5 +$as_echo "$gl_cv_socket_ipv4" >&6; } if test $gl_cv_socket_ipv4 = yes; then -printf "%s\n" "#define HAVE_IPV4 1" >>confdefs.h +$as_echo "#define HAVE_IPV4 1" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IPv6 sockets" >&5 -printf %s "checking for IPv6 sockets... " >&6; } -if test ${gl_cv_socket_ipv6+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 sockets" >&5 +$as_echo_n "checking for IPv6 sockets... " >&6; } +if ${gl_cv_socket_ipv6+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -29652,7 +29174,7 @@ else $as_nop #include #endif int -main (void) +main () { int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z; if (&x && &y && &z) return 0; @@ -29660,19 +29182,18 @@ int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_socket_ipv6=yes -else $as_nop +else gl_cv_socket_ipv6=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socket_ipv6" >&5 -printf "%s\n" "$gl_cv_socket_ipv6" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socket_ipv6" >&5 +$as_echo "$gl_cv_socket_ipv6" >&6; } if test $gl_cv_socket_ipv6 = yes; then -printf "%s\n" "#define HAVE_IPV6 1" >>confdefs.h +$as_echo "#define HAVE_IPV6 1" >>confdefs.h fi @@ -29682,34 +29203,43 @@ printf "%s\n" "#define HAVE_IPV6 1" >>confdefs.h -ac_fn_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getdelim" = xyes -then : +ac_fn_c_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_default" +if test "x$ac_cv_have_decl_getdelim" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GETDELIM $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETDELIM $ac_have_decl +_ACEOF -ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getdtablesize" = xyes -then : + + +ac_fn_c_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" +if test "x$ac_cv_have_decl_getdtablesize" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getline" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETDTABLESIZE $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_default" +if test "x$ac_cv_have_decl_getline" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GETLINE $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETLINE $ac_have_decl +_ACEOF + @@ -29728,12 +29258,11 @@ printf "%s\n" "#define HAVE_DECL_GETLINE $ac_have_decl" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_getopt_h='<'getopt.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_getopt_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_getopt_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_getopt_h = yes; then @@ -29778,8 +29307,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5 -printf "%s\n" "$gl_cv_next_getopt_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5 +$as_echo "$gl_cv_next_getopt_h" >&6; } fi NEXT_GETOPT_H=$gl_cv_next_getopt_h @@ -29805,52 +29334,52 @@ printf "%s\n" "$gl_cv_next_getopt_h" >&6; } gl_replace_getopt= if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then - for ac_header in getopt.h + for ac_header in getopt.h do : - ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" -if test "x$ac_cv_header_getopt_h" = xyes -then : - printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" +if test "x$ac_cv_header_getopt_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETOPT_H 1 +_ACEOF -else $as_nop +else gl_replace_getopt=yes fi done + fi if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then - - for ac_func in getopt_long_only + for ac_func in getopt_long_only do : ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only" -if test "x$ac_cv_func_getopt_long_only" = xyes -then : - printf "%s\n" "#define HAVE_GETOPT_LONG_ONLY 1" >>confdefs.h +if test "x$ac_cv_func_getopt_long_only" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETOPT_LONG_ONLY 1 +_ACEOF -else $as_nop +else gl_replace_getopt=yes fi - done + fi if test -z "$gl_replace_getopt"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5 -printf %s "checking whether getopt is POSIX compatible... " >&6; } -if test ${gl_cv_func_getopt_posix+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5 +$as_echo_n "checking whether getopt is POSIX compatible... " >&6; } +if ${gl_cv_func_getopt_posix+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $cross_compiling = no; then - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29880,10 +29409,9 @@ main () } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_getopt_posix=maybe -else $as_nop +else gl_cv_func_getopt_posix=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -29891,13 +29419,12 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi if test $gl_cv_func_getopt_posix = maybe; then - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29941,10 +29468,9 @@ main () } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_getopt_posix=maybe -else $as_nop +else gl_cv_func_getopt_posix=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -29953,13 +29479,12 @@ fi fi if test $gl_cv_func_getopt_posix = maybe; then - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29985,10 +29510,9 @@ main () } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_getopt_posix=yes -else $as_nop +else gl_cv_func_getopt_posix=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -30004,20 +29528,19 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_posix" >&5 -printf "%s\n" "$gl_cv_func_getopt_posix" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_posix" >&5 +$as_echo "$gl_cv_func_getopt_posix" >&6; } case "$gl_cv_func_getopt_posix" in *no) gl_replace_getopt=yes ;; esac fi if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5 -printf %s "checking for working GNU getopt function... " >&6; } -if test ${gl_cv_func_getopt_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5 +$as_echo_n "checking for working GNU getopt function... " >&6; } +if ${gl_cv_func_getopt_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the # optstring is necessary for programs like m4 that have POSIX-mandated # semantics for supporting options interspersed with files. @@ -30032,11 +29555,10 @@ else $as_nop esac POSIXLY_CORRECT=1 export POSIXLY_CORRECT - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : gl_cv_func_getopt_gnu="$gl_cross_guess_normal" -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -30158,7 +29680,7 @@ nocrash_init (void) int -main (void) +main () { int result = 0; @@ -30236,10 +29758,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_getopt_gnu=yes -else $as_nop +else gl_cv_func_getopt_gnu=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -30253,25 +29774,23 @@ fi esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_gnu" >&5 -printf "%s\n" "$gl_cv_func_getopt_gnu" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_gnu" >&5 +$as_echo "$gl_cv_func_getopt_gnu" >&6; } if test "$gl_cv_func_getopt_gnu" != yes; then gl_replace_getopt=yes else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt_long function" >&5 -printf %s "checking for working GNU getopt_long function... " >&6; } -if test ${gl_cv_func_getopt_long_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt_long function" >&5 +$as_echo_n "checking for working GNU getopt_long function... " >&6; } +if ${gl_cv_func_getopt_long_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in openbsd*) gl_cv_func_getopt_long_gnu="guessing no";; *) gl_cv_func_getopt_long_gnu="guessing yes";; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -30279,7 +29798,7 @@ else $as_nop #include int -main (void) +main () { static const struct option long_options[] = { @@ -30305,10 +29824,9 @@ static const struct option long_options[] = return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_getopt_long_gnu=yes -else $as_nop +else gl_cv_func_getopt_long_gnu=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -30317,8 +29835,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_long_gnu" >&5 -printf "%s\n" "$gl_cv_func_getopt_long_gnu" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_long_gnu" >&5 +$as_echo "$gl_cv_func_getopt_long_gnu" >&6; } case "$gl_cv_func_getopt_long_gnu" in *yes) ;; *) gl_replace_getopt=yes ;; @@ -30333,20 +29851,23 @@ printf "%s\n" "$gl_cv_func_getopt_long_gnu" >&6; } + + + if test -z "$gl_pthreadlib_body_done"; then gl_pthread_api=no LIBPTHREAD= LIBPMULTITHREAD= # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that # it groks . It's added above, in gl_ANYTHREADLIB_EARLY. - ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" -if test "x$ac_cv_header_pthread_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" +if test "x$ac_cv_header_pthread_h" = xyes; then : gl_have_pthread_h=yes -else $as_nop +else gl_have_pthread_h=no fi + if test "$gl_have_pthread_h" = yes; then # Other possible tests: # -lpthreads (FSU threads, PCthreads) @@ -30368,7 +29889,7 @@ fi pthread_mutexattr_t ma; int -main (void) +main () { pthread_mutex_lock (&m); pthread_mutexattr_init (&ma); @@ -30376,19 +29897,18 @@ pthread_mutex_lock (&m); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_pthread_api=yes LIBPTHREAD=$gl_pthread LIBPMULTITHREAD=$gl_pthread fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:30390: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:30391: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:29910: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:29911: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -30406,27 +29926,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 -then : + $EGREP "Lucky user" >/dev/null 2>&1; then : gl_pthread_in_glibc=yes fi -rm -rf conftest* +rm -f conftest* ;; esac - echo "$as_me:30417: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:29936: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then # The program links fine without libpthread. But it may actually # need to link with libpthread in order to create multiple threads. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 -printf %s "checking for pthread_kill in -lpthread... " >&6; } -if test ${ac_cv_lib_pthread_pthread_kill+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30435,29 +29953,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_kill (); int -main (void) +main () { return pthread_kill (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop +else ac_cv_lib_pthread_pthread_kill=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 -printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } -if test "x$ac_cv_lib_pthread_pthread_kill" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } +if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : if test $gl_pthread_in_glibc = yes; then LIBPMULTITHREAD= else @@ -30471,7 +29990,7 @@ then : case "$host_os" in solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h +$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h esac fi @@ -30480,12 +29999,11 @@ fi elif test $gl_pthread_api != yes; then # Some library is needed. Try libpthread and libc_r. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 -printf %s "checking for pthread_kill in -lpthread... " >&6; } -if test ${ac_cv_lib_pthread_pthread_kill+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30494,29 +30012,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_kill (); int -main (void) +main () { return pthread_kill (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop +else ac_cv_lib_pthread_pthread_kill=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 -printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } -if test "x$ac_cv_lib_pthread_pthread_kill" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } +if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : gl_pthread_api=yes LIBPTHREAD=-lpthread LIBPMULTITHREAD=-lpthread @@ -30524,12 +30043,11 @@ fi if test $gl_pthread_api != yes; then # For FreeBSD 4. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 -printf %s "checking for pthread_kill in -lc_r... " >&6; } -if test ${ac_cv_lib_c_r_pthread_kill+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 +$as_echo_n "checking for pthread_kill in -lc_r... " >&6; } +if ${ac_cv_lib_c_r_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lc_r $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30538,29 +30056,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_kill (); int -main (void) +main () { return pthread_kill (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_c_r_pthread_kill=yes -else $as_nop +else ac_cv_lib_c_r_pthread_kill=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 -printf "%s\n" "$ac_cv_lib_c_r_pthread_kill" >&6; } -if test "x$ac_cv_lib_c_r_pthread_kill" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 +$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; } +if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then : gl_pthread_api=yes LIBPTHREAD=-lc_r LIBPMULTITHREAD=-lc_r @@ -30568,17 +30087,17 @@ fi fi fi - echo "$as_me:30571: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:30090: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 -printf %s "checking whether POSIX threads API is available... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5 -printf "%s\n" "$gl_pthread_api" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 +$as_echo_n "checking whether POSIX threads API is available... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5 +$as_echo "$gl_pthread_api" >&6; } if test $gl_pthread_api = yes; then -printf "%s\n" "#define HAVE_PTHREAD_API 1" >>confdefs.h +$as_echo "#define HAVE_PTHREAD_API 1" >>confdefs.h fi @@ -30586,24 +30105,22 @@ printf "%s\n" "#define HAVE_PTHREAD_API 1" >>confdefs.h /* end confdefs.h. */ #include int -main (void) +main () { sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : LIB_SCHED_YIELD= -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 -printf %s "checking for sched_yield in -lrt... " >&6; } -if test ${ac_cv_lib_rt_sched_yield+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 +$as_echo_n "checking for sched_yield in -lrt... " >&6; } +if ${ac_cv_lib_rt_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30612,37 +30129,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char sched_yield (); int -main (void) +main () { return sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_rt_sched_yield=yes -else $as_nop +else ac_cv_lib_rt_sched_yield=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 -printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; } -if test "x$ac_cv_lib_rt_sched_yield" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 +$as_echo "$ac_cv_lib_rt_sched_yield" >&6; } +if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : LIB_SCHED_YIELD=-lrt -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 -printf %s "checking for sched_yield in -lposix4... " >&6; } -if test ${ac_cv_lib_posix4_sched_yield+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 +$as_echo_n "checking for sched_yield in -lposix4... " >&6; } +if ${ac_cv_lib_posix4_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix4 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30651,29 +30168,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char sched_yield (); int -main (void) +main () { return sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_posix4_sched_yield=yes -else $as_nop +else ac_cv_lib_posix4_sched_yield=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 -printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } -if test "x$ac_cv_lib_posix4_sched_yield" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 +$as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } +if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : LIB_SCHED_YIELD=-lposix4 fi @@ -30681,7 +30199,7 @@ fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30695,12 +30213,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5 -printf %s "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >&6; } -if test ${gl_cv_func_setlocale_null_all_mtsafe+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5 +$as_echo_n "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >&6; } +if ${gl_cv_func_setlocale_null_all_mtsafe+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin. *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku* | cygwin*) @@ -30714,8 +30232,8 @@ else $as_nop esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5 -printf "%s\n" "$gl_cv_func_setlocale_null_all_mtsafe" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5 +$as_echo "$gl_cv_func_setlocale_null_all_mtsafe" >&6; } case "$host_os" in mingw*) ;; *) @@ -30729,15 +30247,16 @@ printf "%s\n" "$gl_cv_func_setlocale_null_all_mtsafe" >&6; } *) SETLOCALE_NULL_ALL_MTSAFE=0 ;; esac -printf "%s\n" "#define SETLOCALE_NULL_ALL_MTSAFE $SETLOCALE_NULL_ALL_MTSAFE" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SETLOCALE_NULL_ALL_MTSAFE $SETLOCALE_NULL_ALL_MTSAFE +_ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setlocale (category, NULL) is multithread-safe" >&5 -printf %s "checking whether setlocale (category, NULL) is multithread-safe... " >&6; } -if test ${gl_cv_func_setlocale_null_one_mtsafe+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setlocale (category, NULL) is multithread-safe" >&5 +$as_echo_n "checking whether setlocale (category, NULL) is multithread-safe... " >&6; } +if ${gl_cv_func_setlocale_null_one_mtsafe+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on OpenBSD, AIX. openbsd* | aix*) @@ -30751,8 +30270,8 @@ else $as_nop esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5 -printf "%s\n" "$gl_cv_func_setlocale_null_one_mtsafe" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5 +$as_echo "$gl_cv_func_setlocale_null_one_mtsafe" >&6; } case "$host_os" in mingw*) ;; *) @@ -30766,7 +30285,9 @@ printf "%s\n" "$gl_cv_func_setlocale_null_one_mtsafe" >&6; } *) SETLOCALE_NULL_ONE_MTSAFE=0 ;; esac -printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE +_ACEOF if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then @@ -30775,12 +30296,11 @@ printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>c *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 -printf %s "checking whether imported symbols can be declared weak... " >&6; } -if test ${gl_cv_have_weak+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 +$as_echo_n "checking whether imported symbols can be declared weak... " >&6; } +if ${gl_cv_have_weak+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in cygwin*) gl_cv_have_weak="guessing no" @@ -30792,22 +30312,20 @@ else $as_nop extern void xyzzy (); #pragma weak xyzzy int -main (void) +main () { xyzzy(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_have_weak=maybe fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test $gl_cv_have_weak = maybe; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __ELF__ @@ -30816,16 +30334,15 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Extensible Linking Format" >/dev/null 2>&1 -then : + $EGREP "Extensible Linking Format" >/dev/null 2>&1; then : gl_cv_have_weak="guessing yes" -else $as_nop +else gl_cv_have_weak="guessing no" fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30836,10 +30353,9 @@ int main () return (fputs == NULL); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_have_weak=yes -else $as_nop +else gl_cv_have_weak=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -30875,12 +30391,12 @@ EOF esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 -printf "%s\n" "$gl_cv_have_weak" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 +$as_echo "$gl_cv_have_weak" >&6; } case "$gl_cv_have_weak" in *yes) -printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h +$as_echo "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h ;; esac @@ -30911,6 +30427,19 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h + + + + + + + + + + + + + @@ -30922,12 +30451,11 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_limits_h='<'limits.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_limits_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_limits_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_limits_h = yes; then @@ -30972,8 +30500,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5 -printf "%s\n" "$gl_cv_next_limits_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5 +$as_echo "$gl_cv_next_limits_h" >&6; } fi NEXT_LIMITS_H=$gl_cv_next_limits_h @@ -30990,12 +30518,11 @@ printf "%s\n" "$gl_cv_next_limits_h" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5 -printf %s "checking whether limits.h has WORD_BIT, BOOL_WIDTH etc.... " >&6; } -if test ${gl_cv_header_limits_width+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5 +$as_echo_n "checking whether limits.h has WORD_BIT, BOOL_WIDTH etc.... " >&6; } +if ${gl_cv_header_limits_width+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ @@ -31008,23 +30535,22 @@ else $as_nop int bw = BOOL_WIDTH; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_limits_width=yes -else $as_nop +else gl_cv_header_limits_width=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5 -printf "%s\n" "$gl_cv_header_limits_width" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5 +$as_echo "$gl_cv_header_limits_width" >&6; } if test "$gl_cv_header_limits_width" = yes; then GL_GENERATE_LIMITS_H=false else @@ -31032,68 +30558,64 @@ printf "%s\n" "$gl_cv_header_limits_width" >&6; } fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 -printf %s "checking for wint_t... " >&6; } -if test ${gt_cv_c_wint_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 +$as_echo_n "checking for wint_t... " >&6; } +if ${gt_cv_c_wint_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include wint_t foo = (wchar_t)'\0'; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gt_cv_c_wint_t=yes -else $as_nop +else gt_cv_c_wint_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 -printf "%s\n" "$gt_cv_c_wint_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 +$as_echo "$gt_cv_c_wint_t" >&6; } if test $gt_cv_c_wint_t = yes; then -printf "%s\n" "#define HAVE_WINT_T 1" >>confdefs.h +$as_echo "#define HAVE_WINT_T 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5 -printf %s "checking whether wint_t is large enough... " >&6; } -if test ${gl_cv_type_wint_t_large_enough+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5 +$as_echo_n "checking whether wint_t is large enough... " >&6; } +if ${gl_cv_type_wint_t_large_enough+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_type_wint_t_large_enough=yes -else $as_nop +else gl_cv_type_wint_t_large_enough=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5 -printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5 +$as_echo "$gl_cv_type_wint_t_large_enough" >&6; } if test $gl_cv_type_wint_t_large_enough = no; then GNULIBHEADERS_OVERRIDE_WINT_T=1 else @@ -31105,12 +30627,17 @@ printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5 -printf %s "checking whether the compiler produces multi-arch binaries... " >&6; } -if test ${gl_cv_c_multiarch+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5 +$as_echo_n "checking whether the compiler produces multi-arch binaries... " >&6; } +if ${gl_cv_c_multiarch+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_c_multiarch=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31120,8 +30647,7 @@ else $as_nop typedef int dummy; _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : arch= prev= @@ -31145,11 +30671,11 @@ then : done fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5 -printf "%s\n" "$gl_cv_c_multiarch" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5 +$as_echo "$gl_cv_c_multiarch" >&6; } if test $gl_cv_c_multiarch = yes; then APPLE_UNIVERSAL_BUILD=1 else @@ -31163,10 +30689,10 @@ printf "%s\n" "$gl_cv_c_multiarch" >&6; } -printf "%s\n" "#define HAVE_LONG_LONG_INT 1" >>confdefs.h +$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h -printf "%s\n" "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h +$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h @@ -31205,12 +30731,11 @@ printf "%s\n" "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_stdint_h='<'stdint.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_stdint_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_stdint_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_stdint_h = yes; then @@ -31255,8 +30780,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5 -printf "%s\n" "$gl_cv_next_stdint_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5 +$as_echo "$gl_cv_next_stdint_h" >&6; } fi NEXT_STDINT_H=$gl_cv_next_stdint_h @@ -31280,12 +30805,11 @@ printf "%s\n" "$gl_cv_next_stdint_h" >&6; } if test $ac_cv_header_stdint_h = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5 -printf %s "checking whether stdint.h conforms to C99... " >&6; } -if test ${gl_cv_header_working_stdint_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5 +$as_echo_n "checking whether stdint.h conforms to C99... " >&6; } +if ${gl_cv_header_working_stdint_h+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_header_working_stdint_h=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31450,17 +30974,15 @@ struct s { }; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - if test "$cross_compiling" = yes -then : +if ac_fn_c_try_compile "$LINENO"; then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on native Windows. mingw*) gl_cv_header_working_stdint_h="guessing yes" ;; @@ -31468,7 +30990,7 @@ then : *) gl_cv_header_working_stdint_h="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31520,7 +31042,7 @@ static const char *macro_values[] = }; int -main (void) +main () { const char **mv; @@ -31542,8 +31064,7 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_header_working_stdint_h=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -31552,11 +31073,11 @@ fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5 -printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5 +$as_echo "$gl_cv_header_working_stdint_h" >&6; } fi HAVE_C99_STDINT_H=0 @@ -31566,12 +31087,11 @@ printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; } case "$gl_cv_header_working_stdint_h" in *yes) HAVE_C99_STDINT_H=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5 -printf %s "checking whether stdint.h works without ISO C predefines... " >&6; } -if test ${gl_cv_header_stdint_without_STDC_macros+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5 +$as_echo_n "checking whether stdint.h works without ISO C predefines... " >&6; } +if ${gl_cv_header_stdint_without_STDC_macros+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_header_stdint_without_STDC_macros=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31592,37 +31112,35 @@ intmax_t im = INTMAX_MAX; int32_t i32 = INT32_C (0x7fffffff); int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_stdint_without_STDC_macros=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5 -printf "%s\n" "$gl_cv_header_stdint_without_STDC_macros" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5 +$as_echo "$gl_cv_header_stdint_without_STDC_macros" >&6; } if test $gl_cv_header_stdint_without_STDC_macros = no; then -printf "%s\n" "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h +$as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h -printf "%s\n" "#define __STDC_LIMIT_MACROS 1" >>confdefs.h +$as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5 -printf %s "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; } -if test ${gl_cv_header_stdint_width+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5 +$as_echo_n "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; } +if ${gl_cv_header_stdint_width+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_header_stdint_width=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31643,38 +31161,37 @@ else $as_nop int iw = UINTMAX_WIDTH; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_stdint_width=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5 -printf "%s\n" "$gl_cv_header_stdint_width" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5 +$as_echo "$gl_cv_header_stdint_width" >&6; } if test "$gl_cv_header_stdint_width" = yes; then GL_GENERATE_STDINT_H=false fi ;; *) - ac_fn_c_check_header_compile "$LINENO" "sys/inttypes.h" "ac_cv_header_sys_inttypes_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_inttypes_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_INTTYPES_H 1" >>confdefs.h + for ac_header in sys/inttypes.h sys/bitypes.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_header_compile "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_bitypes_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_BITYPES_H 1" >>confdefs.h -fi +done if test $ac_cv_header_sys_inttypes_h = yes; then HAVE_SYS_INTTYPES_H=1 @@ -31688,12 +31205,11 @@ fi for gltype in ptrdiff_t size_t ; do - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 -printf %s "checking for bit size of $gltype... " >&6; } -if eval test \${gl_cv_bitsizeof_${gltype}+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 +$as_echo_n "checking for bit size of $gltype... " >&6; } +if eval \${gl_cv_bitsizeof_${gltype}+:} false; then : + $as_echo_n "(cached) " >&6 +else if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " #include #include @@ -31701,10 +31217,9 @@ else $as_nop # include #endif -#include " -then : +#include "; then : -else $as_nop +else result=unknown fi @@ -31712,14 +31227,16 @@ fi fi eval ac_res=\$gl_cv_bitsizeof_${gltype} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval result=\$gl_cv_bitsizeof_${gltype} if test $result = unknown; then result=0 fi GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - printf "%s\n" "#define BITSIZEOF_${GLTYPE} $result" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define BITSIZEOF_${GLTYPE} $result +_ACEOF eval BITSIZEOF_${GLTYPE}=\$result done @@ -31729,12 +31246,11 @@ printf "%s\n" "$ac_res" >&6; } for gltype in sig_atomic_t wchar_t wint_t ; do - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 -printf %s "checking for bit size of $gltype... " >&6; } -if eval test \${gl_cv_bitsizeof_${gltype}+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 +$as_echo_n "checking for bit size of $gltype... " >&6; } +if eval \${gl_cv_bitsizeof_${gltype}+:} false; then : + $as_echo_n "(cached) " >&6 +else if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " #include #include @@ -31742,10 +31258,9 @@ else $as_nop # include #endif -#include " -then : +#include "; then : -else $as_nop +else result=unknown fi @@ -31753,14 +31268,16 @@ fi fi eval ac_res=\$gl_cv_bitsizeof_${gltype} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval result=\$gl_cv_bitsizeof_${gltype} if test $result = unknown; then result=0 fi GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - printf "%s\n" "#define BITSIZEOF_${GLTYPE} $result" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define BITSIZEOF_${GLTYPE} $result +_ACEOF eval BITSIZEOF_${GLTYPE}=\$result done @@ -31769,12 +31286,11 @@ printf "%s\n" "$ac_res" >&6; } for gltype in sig_atomic_t wchar_t wint_t ; do - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5 -printf %s "checking whether $gltype is signed... " >&6; } -if eval test \${gl_cv_type_${gltype}_signed+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5 +$as_echo_n "checking whether $gltype is signed... " >&6; } +if eval \${gl_cv_type_${gltype}_signed+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31786,30 +31302,31 @@ else $as_nop int verify[2 * (($gltype) -1 < ($gltype) 0) - 1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : result=yes -else $as_nop +else result=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext eval gl_cv_type_${gltype}_signed=\$result fi eval ac_res=\$gl_cv_type_${gltype}_signed - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval result=\$gl_cv_type_${gltype}_signed GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` if test "$result" = yes; then - printf "%s\n" "#define HAVE_SIGNED_${GLTYPE} 1" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define HAVE_SIGNED_${GLTYPE} 1 +_ACEOF eval HAVE_SIGNED_${GLTYPE}=1 else @@ -31824,12 +31341,11 @@ printf "%s\n" "$ac_res" >&6; } for gltype in ptrdiff_t size_t ; do - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5 -printf %s "checking for $gltype integer literal suffix... " >&6; } -if eval test \${gl_cv_type_${gltype}_suffix+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5 +$as_echo_n "checking for $gltype integer literal suffix... " >&6; } +if eval \${gl_cv_type_${gltype}_suffix+:} false; then : + $as_echo_n "(cached) " >&6 +else eval gl_cv_type_${gltype}_suffix=no eval result=\$gl_cv_type_${gltype}_signed if test "$result" = yes; then @@ -31860,30 +31376,31 @@ else $as_nop extern $gltype foo; extern $gltype1 foo; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval gl_cv_type_${gltype}_suffix=\$glsuf fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext eval result=\$gl_cv_type_${gltype}_suffix test "$result" != no && break done fi eval ac_res=\$gl_cv_type_${gltype}_suffix - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` eval result=\$gl_cv_type_${gltype}_suffix test "$result" = no && result= eval ${GLTYPE}_SUFFIX=\$result - printf "%s\n" "#define ${GLTYPE}_SUFFIX $result" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define ${GLTYPE}_SUFFIX $result +_ACEOF done @@ -31892,12 +31409,11 @@ printf "%s\n" "$ac_res" >&6; } for gltype in sig_atomic_t wchar_t wint_t ; do - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5 -printf %s "checking for $gltype integer literal suffix... " >&6; } -if eval test \${gl_cv_type_${gltype}_suffix+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5 +$as_echo_n "checking for $gltype integer literal suffix... " >&6; } +if eval \${gl_cv_type_${gltype}_suffix+:} false; then : + $as_echo_n "(cached) " >&6 +else eval gl_cv_type_${gltype}_suffix=no eval result=\$gl_cv_type_${gltype}_signed if test "$result" = yes; then @@ -31928,30 +31444,31 @@ else $as_nop extern $gltype foo; extern $gltype1 foo; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval gl_cv_type_${gltype}_suffix=\$glsuf fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext eval result=\$gl_cv_type_${gltype}_suffix test "$result" != no && break done fi eval ac_res=\$gl_cv_type_${gltype}_suffix - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` eval result=\$gl_cv_type_${gltype}_suffix test "$result" = no && result= eval ${GLTYPE}_SUFFIX=\$result - printf "%s\n" "#define ${GLTYPE}_SUFFIX $result" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define ${GLTYPE}_SUFFIX $result +_ACEOF done @@ -32004,12 +31521,11 @@ printf "%s\n" "$ac_res" >&6; } if test $gl_cv_have_include_next = yes; then gl_cv_next_inttypes_h='<'inttypes.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_inttypes_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_inttypes_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_inttypes_h = yes; then @@ -32054,8 +31570,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5 -printf "%s\n" "$gl_cv_next_inttypes_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5 +$as_echo "$gl_cv_next_inttypes_h" >&6; } fi NEXT_INTTYPES_H=$gl_cv_next_inttypes_h @@ -32117,15 +31633,15 @@ printf "%s\n" "$gl_cv_next_inttypes_h" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_langinfo_h='<'langinfo.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_langinfo_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_langinfo_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_langinfo_h = yes; then @@ -32170,8 +31686,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_langinfo_h" >&5 -printf "%s\n" "$gl_cv_next_langinfo_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_langinfo_h" >&5 +$as_echo "$gl_cv_next_langinfo_h" >&6; } fi NEXT_LANGINFO_H=$gl_cv_next_langinfo_h @@ -32196,168 +31712,158 @@ printf "%s\n" "$gl_cv_next_langinfo_h" >&6; } if test $ac_cv_header_langinfo_h = yes; then HAVE_LANGINFO_H=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5 -printf %s "checking whether langinfo.h defines CODESET... " >&6; } -if test ${gl_cv_header_langinfo_codeset+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5 +$as_echo_n "checking whether langinfo.h defines CODESET... " >&6; } +if ${gl_cv_header_langinfo_codeset+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int a = CODESET; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_langinfo_codeset=yes -else $as_nop +else gl_cv_header_langinfo_codeset=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_codeset" >&5 -printf "%s\n" "$gl_cv_header_langinfo_codeset" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_codeset" >&5 +$as_echo "$gl_cv_header_langinfo_codeset" >&6; } if test $gl_cv_header_langinfo_codeset = yes; then HAVE_LANGINFO_CODESET=1 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines T_FMT_AMPM" >&5 -printf %s "checking whether langinfo.h defines T_FMT_AMPM... " >&6; } -if test ${gl_cv_header_langinfo_t_fmt_ampm+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines T_FMT_AMPM" >&5 +$as_echo_n "checking whether langinfo.h defines T_FMT_AMPM... " >&6; } +if ${gl_cv_header_langinfo_t_fmt_ampm+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int a = T_FMT_AMPM; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_langinfo_t_fmt_ampm=yes -else $as_nop +else gl_cv_header_langinfo_t_fmt_ampm=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_t_fmt_ampm" >&5 -printf "%s\n" "$gl_cv_header_langinfo_t_fmt_ampm" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_t_fmt_ampm" >&5 +$as_echo "$gl_cv_header_langinfo_t_fmt_ampm" >&6; } if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then HAVE_LANGINFO_T_FMT_AMPM=1 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ALTMON_1" >&5 -printf %s "checking whether langinfo.h defines ALTMON_1... " >&6; } -if test ${gl_cv_header_langinfo_altmon+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ALTMON_1" >&5 +$as_echo_n "checking whether langinfo.h defines ALTMON_1... " >&6; } +if ${gl_cv_header_langinfo_altmon+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int a = ALTMON_1; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_langinfo_altmon=yes -else $as_nop +else gl_cv_header_langinfo_altmon=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_altmon" >&5 -printf "%s\n" "$gl_cv_header_langinfo_altmon" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_altmon" >&5 +$as_echo "$gl_cv_header_langinfo_altmon" >&6; } if test $gl_cv_header_langinfo_altmon = yes; then HAVE_LANGINFO_ALTMON=1 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ERA" >&5 -printf %s "checking whether langinfo.h defines ERA... " >&6; } -if test ${gl_cv_header_langinfo_era+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ERA" >&5 +$as_echo_n "checking whether langinfo.h defines ERA... " >&6; } +if ${gl_cv_header_langinfo_era+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int a = ERA; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_langinfo_era=yes -else $as_nop +else gl_cv_header_langinfo_era=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_era" >&5 -printf "%s\n" "$gl_cv_header_langinfo_era" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_era" >&5 +$as_echo "$gl_cv_header_langinfo_era" >&6; } if test $gl_cv_header_langinfo_era = yes; then HAVE_LANGINFO_ERA=1 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines YESEXPR" >&5 -printf %s "checking whether langinfo.h defines YESEXPR... " >&6; } -if test ${gl_cv_header_langinfo_yesexpr+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines YESEXPR" >&5 +$as_echo_n "checking whether langinfo.h defines YESEXPR... " >&6; } +if ${gl_cv_header_langinfo_yesexpr+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int a = YESEXPR; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_langinfo_yesexpr=yes -else $as_nop +else gl_cv_header_langinfo_yesexpr=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_yesexpr" >&5 -printf "%s\n" "$gl_cv_header_langinfo_yesexpr" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_yesexpr" >&5 +$as_echo "$gl_cv_header_langinfo_yesexpr" >&6; } if test $gl_cv_header_langinfo_yesexpr = yes; then HAVE_LANGINFO_YESEXPR=1 fi @@ -32399,37 +31905,35 @@ printf "%s\n" "$gl_cv_header_langinfo_yesexpr" >&6; } HAVE_WCHAR_T=1; - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5 -printf %s "checking for wchar_t... " >&6; } -if test ${gt_cv_c_wchar_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5 +$as_echo_n "checking for wchar_t... " >&6; } +if ${gt_cv_c_wchar_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include wchar_t foo = (wchar_t)'\0'; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gt_cv_c_wchar_t=yes -else $as_nop +else gt_cv_c_wchar_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5 -printf "%s\n" "$gt_cv_c_wchar_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5 +$as_echo "$gt_cv_c_wchar_t" >&6; } if test $gt_cv_c_wchar_t = yes; then -printf "%s\n" "#define HAVE_WCHAR_T 1" >>confdefs.h +$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h fi @@ -32441,12 +31945,11 @@ printf "%s\n" "#define HAVE_WCHAR_T 1" >>confdefs.h GL_GENERATE_STDDEF_H=false - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5 -printf %s "checking for good max_align_t... " >&6; } -if test ${gl_cv_type_max_align_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5 +$as_echo_n "checking for good max_align_t... " >&6; } +if ${gl_cv_type_max_align_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* On FreeBSD 12.0/x86, max_align_t defined by has @@ -32471,24 +31974,23 @@ else $as_nop int check5[2 * (offsetof (long_double_helper, b) <= offsetof (max_helper, b)) - 1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_type_max_align_t=yes -else $as_nop +else gl_cv_type_max_align_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5 -printf "%s\n" "$gl_cv_type_max_align_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5 +$as_echo "$gl_cv_type_max_align_t" >&6; } if test $gl_cv_type_max_align_t = no; then HAVE_MAX_ALIGN_T=0 GL_GENERATE_STDDEF_H=true @@ -32499,35 +32001,33 @@ printf "%s\n" "$gl_cv_type_max_align_t" >&6; } GL_GENERATE_STDDEF_H=true fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5 -printf %s "checking whether NULL can be used in arbitrary expressions... " >&6; } -if test ${gl_cv_decl_null_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5 +$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; } +if ${gl_cv_decl_null_works+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int test[2 * (sizeof NULL == sizeof (void *)) -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_decl_null_works=yes -else $as_nop +else gl_cv_decl_null_works=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5 -printf "%s\n" "$gl_cv_decl_null_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5 +$as_echo "$gl_cv_decl_null_works" >&6; } if test $gl_cv_decl_null_works = no; then REPLACE_NULL=1 GL_GENERATE_STDDEF_H=true @@ -32545,12 +32045,11 @@ printf "%s\n" "$gl_cv_decl_null_works" >&6; } if test $gl_cv_have_include_next = yes; then gl_cv_next_stddef_h='<'stddef.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_stddef_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_stddef_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -32589,8 +32088,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5 -printf "%s\n" "$gl_cv_next_stddef_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5 +$as_echo "$gl_cv_next_stddef_h" >&6; } fi NEXT_STDDEF_H=$gl_cv_next_stddef_h @@ -32612,35 +32111,34 @@ printf "%s\n" "$gl_cv_next_stddef_h" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5 -printf %s "checking whether locale.h defines locale_t... " >&6; } -if test ${gl_cv_header_locale_has_locale_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5 +$as_echo_n "checking whether locale.h defines locale_t... " >&6; } +if ${gl_cv_header_locale_has_locale_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include locale_t x; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_locale_has_locale_t=yes -else $as_nop +else gl_cv_header_locale_has_locale_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_has_locale_t" >&5 -printf "%s\n" "$gl_cv_header_locale_has_locale_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_has_locale_t" >&5 +$as_echo "$gl_cv_header_locale_has_locale_t" >&6; } if test $ac_cv_header_xlocale_h = yes; then @@ -32675,47 +32173,44 @@ printf "%s\n" "$gl_cv_header_locale_has_locale_t" >&6; } case "$host_os" in solaris*) -printf "%s\n" "#define _LCONV_C99 1" >>confdefs.h +$as_echo "#define _LCONV_C99 1" >>confdefs.h ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether locale.h conforms to POSIX:2001" >&5 -printf %s "checking whether locale.h conforms to POSIX:2001... " >&6; } -if test ${gl_cv_header_locale_h_posix2001+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h conforms to POSIX:2001" >&5 +$as_echo_n "checking whether locale.h conforms to POSIX:2001... " >&6; } +if ${gl_cv_header_locale_h_posix2001+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int x = LC_MESSAGES; int y = sizeof (((struct lconv *) 0)->decimal_point); int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_locale_h_posix2001=yes -else $as_nop +else gl_cv_header_locale_h_posix2001=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_h_posix2001" >&5 -printf "%s\n" "$gl_cv_header_locale_h_posix2001" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_h_posix2001" >&5 +$as_echo "$gl_cv_header_locale_h_posix2001" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct lconv is properly defined" >&5 -printf %s "checking whether struct lconv is properly defined... " >&6; } -if test ${gl_cv_sys_struct_lconv_ok+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct lconv is properly defined" >&5 +$as_echo_n "checking whether struct lconv is properly defined... " >&6; } +if ${gl_cv_sys_struct_lconv_ok+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -32723,24 +32218,23 @@ else $as_nop int x = sizeof (l.decimal_point); int y = sizeof (l.int_p_cs_precedes); int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_sys_struct_lconv_ok=yes -else $as_nop +else gl_cv_sys_struct_lconv_ok=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_lconv_ok" >&5 -printf "%s\n" "$gl_cv_sys_struct_lconv_ok" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_lconv_ok" >&5 +$as_echo "$gl_cv_sys_struct_lconv_ok" >&6; } if test $gl_cv_sys_struct_lconv_ok = no; then case "$host_os" in mingw*) @@ -32753,13 +32247,12 @@ printf "%s\n" "$gl_cv_sys_struct_lconv_ok" >&6; } _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Special" >/dev/null 2>&1 -then : + $EGREP "Special" >/dev/null 2>&1; then : -else $as_nop +else REPLACE_STRUCT_LCONV=1 fi -rm -rf conftest* +rm -f conftest* ;; *) REPLACE_STRUCT_LCONV=1 ;; @@ -32777,12 +32270,11 @@ rm -rf conftest* if test $gl_cv_have_include_next = yes; then gl_cv_next_locale_h='<'locale.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_locale_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_locale_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -32821,8 +32313,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_locale_h" >&5 -printf "%s\n" "$gl_cv_next_locale_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_locale_h" >&5 +$as_echo "$gl_cv_next_locale_h" >&6; } fi NEXT_LOCALE_H=$gl_cv_next_locale_h @@ -32875,12 +32367,11 @@ printf "%s\n" "$gl_cv_next_locale_h" >&6; } if test "$gl_use_threads" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 -printf %s "checking whether imported symbols can be declared weak... " >&6; } -if test ${gl_cv_have_weak+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 +$as_echo_n "checking whether imported symbols can be declared weak... " >&6; } +if ${gl_cv_have_weak+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in cygwin*) gl_cv_have_weak="guessing no" @@ -32892,22 +32383,20 @@ else $as_nop extern void xyzzy (); #pragma weak xyzzy int -main (void) +main () { xyzzy(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_have_weak=maybe fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test $gl_cv_have_weak = maybe; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __ELF__ @@ -32916,16 +32405,15 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Extensible Linking Format" >/dev/null 2>&1 -then : + $EGREP "Extensible Linking Format" >/dev/null 2>&1; then : gl_cv_have_weak="guessing yes" -else $as_nop +else gl_cv_have_weak="guessing no" fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -32936,10 +32424,9 @@ int main () return (fputs == NULL); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_have_weak=yes -else $as_nop +else gl_cv_have_weak=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -32975,12 +32462,12 @@ EOF esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 -printf "%s\n" "$gl_cv_have_weak" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 +$as_echo "$gl_cv_have_weak" >&6; } case "$gl_cv_have_weak" in *yes) -printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h +$as_echo "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h ;; esac @@ -33004,14 +32491,14 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h LIBPMULTITHREAD= # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that # it groks . It's added above, in gl_ANYTHREADLIB_EARLY. - ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" -if test "x$ac_cv_header_pthread_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" +if test "x$ac_cv_header_pthread_h" = xyes; then : gl_have_pthread_h=yes -else $as_nop +else gl_have_pthread_h=no fi + if test "$gl_have_pthread_h" = yes; then # Other possible tests: # -lpthreads (FSU threads, PCthreads) @@ -33033,7 +32520,7 @@ fi pthread_mutexattr_t ma; int -main (void) +main () { pthread_mutex_lock (&m); pthread_mutexattr_init (&ma); @@ -33041,19 +32528,18 @@ pthread_mutex_lock (&m); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_pthread_api=yes LIBPTHREAD=$gl_pthread LIBPMULTITHREAD=$gl_pthread fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:33055: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:33056: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:32541: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:32542: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -33071,27 +32557,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 -then : + $EGREP "Lucky user" >/dev/null 2>&1; then : gl_pthread_in_glibc=yes fi -rm -rf conftest* +rm -f conftest* ;; esac - echo "$as_me:33082: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:32567: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then # The program links fine without libpthread. But it may actually # need to link with libpthread in order to create multiple threads. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 -printf %s "checking for pthread_kill in -lpthread... " >&6; } -if test ${ac_cv_lib_pthread_pthread_kill+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33100,29 +32584,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_kill (); int -main (void) +main () { return pthread_kill (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop +else ac_cv_lib_pthread_pthread_kill=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 -printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } -if test "x$ac_cv_lib_pthread_pthread_kill" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } +if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : if test $gl_pthread_in_glibc = yes; then LIBPMULTITHREAD= else @@ -33136,7 +32621,7 @@ then : case "$host_os" in solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h +$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h esac fi @@ -33145,12 +32630,11 @@ fi elif test $gl_pthread_api != yes; then # Some library is needed. Try libpthread and libc_r. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 -printf %s "checking for pthread_kill in -lpthread... " >&6; } -if test ${ac_cv_lib_pthread_pthread_kill+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33159,29 +32643,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_kill (); int -main (void) +main () { return pthread_kill (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop +else ac_cv_lib_pthread_pthread_kill=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 -printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } -if test "x$ac_cv_lib_pthread_pthread_kill" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } +if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : gl_pthread_api=yes LIBPTHREAD=-lpthread LIBPMULTITHREAD=-lpthread @@ -33189,12 +32674,11 @@ fi if test $gl_pthread_api != yes; then # For FreeBSD 4. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 -printf %s "checking for pthread_kill in -lc_r... " >&6; } -if test ${ac_cv_lib_c_r_pthread_kill+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 +$as_echo_n "checking for pthread_kill in -lc_r... " >&6; } +if ${ac_cv_lib_c_r_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lc_r $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33203,29 +32687,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_kill (); int -main (void) +main () { return pthread_kill (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_c_r_pthread_kill=yes -else $as_nop +else ac_cv_lib_c_r_pthread_kill=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 -printf "%s\n" "$ac_cv_lib_c_r_pthread_kill" >&6; } -if test "x$ac_cv_lib_c_r_pthread_kill" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 +$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; } +if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then : gl_pthread_api=yes LIBPTHREAD=-lc_r LIBPMULTITHREAD=-lc_r @@ -33233,17 +32718,17 @@ fi fi fi - echo "$as_me:33236: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:32721: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 -printf %s "checking whether POSIX threads API is available... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5 -printf "%s\n" "$gl_pthread_api" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 +$as_echo_n "checking whether POSIX threads API is available... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5 +$as_echo "$gl_pthread_api" >&6; } if test $gl_pthread_api = yes; then -printf "%s\n" "#define HAVE_PTHREAD_API 1" >>confdefs.h +$as_echo "#define HAVE_PTHREAD_API 1" >>confdefs.h fi @@ -33251,24 +32736,22 @@ printf "%s\n" "#define HAVE_PTHREAD_API 1" >>confdefs.h /* end confdefs.h. */ #include int -main (void) +main () { sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : LIB_SCHED_YIELD= -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 -printf %s "checking for sched_yield in -lrt... " >&6; } -if test ${ac_cv_lib_rt_sched_yield+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 +$as_echo_n "checking for sched_yield in -lrt... " >&6; } +if ${ac_cv_lib_rt_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33277,37 +32760,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char sched_yield (); int -main (void) +main () { return sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_rt_sched_yield=yes -else $as_nop +else ac_cv_lib_rt_sched_yield=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 -printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; } -if test "x$ac_cv_lib_rt_sched_yield" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 +$as_echo "$ac_cv_lib_rt_sched_yield" >&6; } +if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : LIB_SCHED_YIELD=-lrt -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 -printf %s "checking for sched_yield in -lposix4... " >&6; } -if test ${ac_cv_lib_posix4_sched_yield+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 +$as_echo_n "checking for sched_yield in -lposix4... " >&6; } +if ${ac_cv_lib_posix4_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix4 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33316,29 +32799,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char sched_yield (); int -main (void) +main () { return sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_posix4_sched_yield=yes -else $as_nop +else ac_cv_lib_posix4_sched_yield=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 -printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } -if test "x$ac_cv_lib_posix4_sched_yield" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 +$as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } +if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : LIB_SCHED_YIELD=-lposix4 fi @@ -33346,7 +32830,7 @@ fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -33359,22 +32843,22 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ if test "$gl_use_threads" = isoc+posix && test "$gl_have_isoc_threads" = yes; then gl_threads_api='isoc+posix' -printf "%s\n" "#define USE_ISOC_AND_POSIX_THREADS 1" >>confdefs.h +$as_echo "#define USE_ISOC_AND_POSIX_THREADS 1" >>confdefs.h LIBTHREAD= LTLIBTHREAD= else gl_threads_api=posix -printf "%s\n" "#define USE_POSIX_THREADS 1" >>confdefs.h +$as_echo "#define USE_POSIX_THREADS 1" >>confdefs.h if test -z "$LIBMULTITHREAD" && test -z "$LTLIBMULTITHREAD"; then -printf "%s\n" "#define USE_POSIX_THREADS_FROM_LIBC 1" >>confdefs.h +$as_echo "#define USE_POSIX_THREADS_FROM_LIBC 1" >>confdefs.h else if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then -printf "%s\n" "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h +$as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h LIBTHREAD= LTLIBTHREAD= else @@ -33382,7 +32866,7 @@ printf "%s\n" "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h freebsd* | dragonfly* | midnightbsd*) if test "x$LIBTHREAD" != "x$LIBMULTITHREAD"; then -printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h +$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h fi ;; @@ -33413,14 +32897,14 @@ printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h LIBPMULTITHREAD= # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that # it groks . It's added above, in gl_ANYTHREADLIB_EARLY. - ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" -if test "x$ac_cv_header_pthread_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" +if test "x$ac_cv_header_pthread_h" = xyes; then : gl_have_pthread_h=yes -else $as_nop +else gl_have_pthread_h=no fi + if test "$gl_have_pthread_h" = yes; then # Other possible tests: # -lpthreads (FSU threads, PCthreads) @@ -33442,7 +32926,7 @@ fi pthread_mutexattr_t ma; int -main (void) +main () { pthread_mutex_lock (&m); pthread_mutexattr_init (&ma); @@ -33450,19 +32934,18 @@ pthread_mutex_lock (&m); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_pthread_api=yes LIBPTHREAD=$gl_pthread LIBPMULTITHREAD=$gl_pthread fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:33464: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:33465: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:32947: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:32948: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -33480,27 +32963,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 -then : + $EGREP "Lucky user" >/dev/null 2>&1; then : gl_pthread_in_glibc=yes fi -rm -rf conftest* +rm -f conftest* ;; esac - echo "$as_me:33491: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:32973: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then # The program links fine without libpthread. But it may actually # need to link with libpthread in order to create multiple threads. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 -printf %s "checking for pthread_kill in -lpthread... " >&6; } -if test ${ac_cv_lib_pthread_pthread_kill+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33509,29 +32990,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_kill (); int -main (void) +main () { return pthread_kill (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop +else ac_cv_lib_pthread_pthread_kill=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 -printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } -if test "x$ac_cv_lib_pthread_pthread_kill" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } +if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : if test $gl_pthread_in_glibc = yes; then LIBPMULTITHREAD= else @@ -33545,7 +33027,7 @@ then : case "$host_os" in solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h +$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h esac fi @@ -33554,12 +33036,11 @@ fi elif test $gl_pthread_api != yes; then # Some library is needed. Try libpthread and libc_r. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 -printf %s "checking for pthread_kill in -lpthread... " >&6; } -if test ${ac_cv_lib_pthread_pthread_kill+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33568,29 +33049,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_kill (); int -main (void) +main () { return pthread_kill (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pthread_pthread_kill=yes -else $as_nop +else ac_cv_lib_pthread_pthread_kill=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 -printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; } -if test "x$ac_cv_lib_pthread_pthread_kill" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } +if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : gl_pthread_api=yes LIBPTHREAD=-lpthread LIBPMULTITHREAD=-lpthread @@ -33598,12 +33080,11 @@ fi if test $gl_pthread_api != yes; then # For FreeBSD 4. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 -printf %s "checking for pthread_kill in -lc_r... " >&6; } -if test ${ac_cv_lib_c_r_pthread_kill+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 +$as_echo_n "checking for pthread_kill in -lc_r... " >&6; } +if ${ac_cv_lib_c_r_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lc_r $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33612,29 +33093,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_kill (); int -main (void) +main () { return pthread_kill (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_c_r_pthread_kill=yes -else $as_nop +else ac_cv_lib_c_r_pthread_kill=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 -printf "%s\n" "$ac_cv_lib_c_r_pthread_kill" >&6; } -if test "x$ac_cv_lib_c_r_pthread_kill" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 +$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; } +if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then : gl_pthread_api=yes LIBPTHREAD=-lc_r LIBPMULTITHREAD=-lc_r @@ -33642,17 +33124,17 @@ fi fi fi - echo "$as_me:33645: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:33127: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 -printf %s "checking whether POSIX threads API is available... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5 -printf "%s\n" "$gl_pthread_api" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 +$as_echo_n "checking whether POSIX threads API is available... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5 +$as_echo "$gl_pthread_api" >&6; } if test $gl_pthread_api = yes; then -printf "%s\n" "#define HAVE_PTHREAD_API 1" >>confdefs.h +$as_echo "#define HAVE_PTHREAD_API 1" >>confdefs.h fi @@ -33660,24 +33142,22 @@ printf "%s\n" "#define HAVE_PTHREAD_API 1" >>confdefs.h /* end confdefs.h. */ #include int -main (void) +main () { sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : LIB_SCHED_YIELD= -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 -printf %s "checking for sched_yield in -lrt... " >&6; } -if test ${ac_cv_lib_rt_sched_yield+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 +$as_echo_n "checking for sched_yield in -lrt... " >&6; } +if ${ac_cv_lib_rt_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33686,37 +33166,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char sched_yield (); int -main (void) +main () { return sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_rt_sched_yield=yes -else $as_nop +else ac_cv_lib_rt_sched_yield=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 -printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; } -if test "x$ac_cv_lib_rt_sched_yield" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 +$as_echo "$ac_cv_lib_rt_sched_yield" >&6; } +if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : LIB_SCHED_YIELD=-lrt -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 -printf %s "checking for sched_yield in -lposix4... " >&6; } -if test ${ac_cv_lib_posix4_sched_yield+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 +$as_echo_n "checking for sched_yield in -lposix4... " >&6; } +if ${ac_cv_lib_posix4_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix4 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33725,29 +33205,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char sched_yield (); int -main (void) +main () { return sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_posix4_sched_yield=yes -else $as_nop +else ac_cv_lib_posix4_sched_yield=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 -printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } -if test "x$ac_cv_lib_posix4_sched_yield" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 +$as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } +if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : LIB_SCHED_YIELD=-lposix4 fi @@ -33755,7 +33236,7 @@ fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -33763,22 +33244,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ fi if test $ac_cv_header_threads_h = yes; then - ac_fn_c_check_func "$LINENO" "thrd_create" "ac_cv_func_thrd_create" -if test "x$ac_cv_func_thrd_create" = xyes -then : - printf "%s\n" "#define HAVE_THRD_CREATE 1" >>confdefs.h + for ac_func in thrd_create +do : + ac_fn_c_check_func "$LINENO" "thrd_create" "ac_cv_func_thrd_create" +if test "x$ac_cv_func_thrd_create" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_THRD_CREATE 1 +_ACEOF fi +done if test $ac_cv_func_thrd_create = yes; then LIBSTDTHREAD= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for thrd_create in -lstdthreads" >&5 -printf %s "checking for thrd_create in -lstdthreads... " >&6; } -if test ${ac_cv_lib_stdthreads_thrd_create+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thrd_create in -lstdthreads" >&5 +$as_echo_n "checking for thrd_create in -lstdthreads... " >&6; } +if ${ac_cv_lib_stdthreads_thrd_create+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lstdthreads $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -33787,33 +33271,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char thrd_create (); int -main (void) +main () { return thrd_create (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_stdthreads_thrd_create=yes -else $as_nop +else ac_cv_lib_stdthreads_thrd_create=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdthreads_thrd_create" >&5 -printf "%s\n" "$ac_cv_lib_stdthreads_thrd_create" >&6; } -if test "x$ac_cv_lib_stdthreads_thrd_create" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdthreads_thrd_create" >&5 +$as_echo "$ac_cv_lib_stdthreads_thrd_create" >&6; } +if test "x$ac_cv_lib_stdthreads_thrd_create" = xyes; then : LIBSTDTHREAD='-lstdthreads -lpthread' -else $as_nop +else LIBSTDTHREAD="$LIBPMULTITHREAD" @@ -33827,10 +33312,10 @@ fi esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ISO C threads API is available" >&5 -printf %s "checking whether ISO C threads API is available... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_threads_h" >&5 -printf "%s\n" "$ac_cv_header_threads_h" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ISO C threads API is available" >&5 +$as_echo_n "checking whether ISO C threads API is available... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_threads_h" >&5 +$as_echo "$ac_cv_header_threads_h" >&6; } gl_stdthreadlib_body_done=done fi @@ -33838,7 +33323,7 @@ printf "%s\n" "$ac_cv_header_threads_h" >&6; } LIBMULTITHREAD=$LIBSTDTHREAD LTLIBMULTITHREAD=$LIBSTDTHREAD gl_threads_api=isoc -printf "%s\n" "#define USE_ISOC_THREADS 1" >>confdefs.h +$as_echo "#define USE_ISOC_THREADS 1" >>confdefs.h fi fi @@ -33852,17 +33337,17 @@ printf "%s\n" "#define USE_ISOC_THREADS 1" >>confdefs.h }; then gl_threads_api=windows -printf "%s\n" "#define USE_WINDOWS_THREADS 1" >>confdefs.h +$as_echo "#define USE_WINDOWS_THREADS 1" >>confdefs.h fi ;; esac fi fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5 -printf %s "checking for multithread API to use... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_threads_api" >&5 -printf "%s\n" "$gl_threads_api" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5 +$as_echo_n "checking for multithread API to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_threads_api" >&5 +$as_echo "$gl_threads_api" >&6; } @@ -33874,14 +33359,12 @@ printf "%s\n" "$gl_threads_api" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5 -printf %s "checking whether malloc (0) returns nonnull... " >&6; } -if test ${ac_cv_func_malloc_0_nonnull+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5 +$as_echo_n "checking whether malloc (0) returns nonnull... " >&6; } +if ${ac_cv_func_malloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ @@ -33892,13 +33375,13 @@ then : *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { void *p = malloc (0); int result = !p; @@ -33909,10 +33392,9 @@ void *p = malloc (0); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_malloc_0_nonnull=yes -else $as_nop +else ac_cv_func_malloc_0_nonnull=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -33921,8 +33403,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 -printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } case $ac_cv_func_malloc_0_nonnull in #( *yes) : gl_cv_func_malloc_0_nonnull=1 ;; #( @@ -33931,7 +33413,10 @@ printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; } esac -printf "%s\n" "#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull +_ACEOF + @@ -33949,12 +33434,11 @@ printf "%s\n" "#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confd if test $gl_cv_have_include_next = yes; then gl_cv_next_math_h='<'math.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_math_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_math_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_math_h = yes; then @@ -33999,8 +33483,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_math_h" >&5 -printf "%s\n" "$gl_cv_next_math_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_math_h" >&5 +$as_echo "$gl_cv_next_math_h" >&6; } fi NEXT_MATH_H=$gl_cv_next_math_h @@ -34017,17 +33501,16 @@ printf "%s\n" "$gl_cv_next_math_h" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NAN macro works" >&5 -printf %s "checking whether NAN macro works... " >&6; } -if test ${gl_cv_header_math_nan_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NAN macro works" >&5 +$as_echo_n "checking whether NAN macro works... " >&6; } +if ${gl_cv_header_math_nan_works+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { /* Solaris 10 has a broken definition of NAN. Other platforms fail to provide NAN, or provide it only in C99 mode; this @@ -34041,30 +33524,28 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_math_nan_works=yes -else $as_nop +else gl_cv_header_math_nan_works=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_nan_works" >&5 -printf "%s\n" "$gl_cv_header_math_nan_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_nan_works" >&5 +$as_echo "$gl_cv_header_math_nan_works" >&6; } if test $gl_cv_header_math_nan_works = no; then REPLACE_NAN=1 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL works" >&5 -printf %s "checking whether HUGE_VAL works... " >&6; } -if test ${gl_cv_header_math_huge_val_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL works" >&5 +$as_echo_n "checking whether HUGE_VAL works... " >&6; } +if ${gl_cv_header_math_huge_val_works+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { /* Solaris 10 has a broken definition of HUGE_VAL. */ double d = HUGE_VAL; @@ -34073,16 +33554,15 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_math_huge_val_works=yes -else $as_nop +else gl_cv_header_math_huge_val_works=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_huge_val_works" >&5 -printf "%s\n" "$gl_cv_header_math_huge_val_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_huge_val_works" >&5 +$as_echo "$gl_cv_header_math_huge_val_works" >&6; } if test $gl_cv_header_math_huge_val_works = no; then REPLACE_HUGE_VAL=1 fi @@ -34093,41 +33573,39 @@ printf "%s\n" "$gl_cv_header_math_huge_val_works" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 -printf %s "checking for mbstate_t... " >&6; } -if test ${ac_cv_type_mbstate_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 +$as_echo_n "checking for mbstate_t... " >&6; } +if ${ac_cv_type_mbstate_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default #include int -main (void) +main () { mbstate_t x; return sizeof x; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_type_mbstate_t=yes -else $as_nop +else ac_cv_type_mbstate_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5 -printf "%s\n" "$ac_cv_type_mbstate_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5 +$as_echo "$ac_cv_type_mbstate_t" >&6; } if test $ac_cv_type_mbstate_t = yes; then -printf "%s\n" "#define HAVE_MBSTATE_T 1" >>confdefs.h +$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h else -printf "%s\n" "#define mbstate_t int" >>confdefs.h +$as_echo "#define mbstate_t int" >>confdefs.h fi @@ -34136,12 +33614,13 @@ printf "%s\n" "#define mbstate_t int" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5 -printf %s "checking for a traditional japanese locale... " >&6; } -if test ${gt_cv_locale_ja+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5 +$as_echo_n "checking for a traditional japanese locale... " >&6; } +if ${gt_cv_locale_ja+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34219,7 +33698,7 @@ _ACEOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest$ac_exeext; then case "$host_os" in # Handle native Windows specially, because there setlocale() interprets @@ -34277,19 +33756,18 @@ _ACEOF rm -fr conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5 -printf "%s\n" "$gt_cv_locale_ja" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5 +$as_echo "$gt_cv_locale_ja" >&6; } LOCALE_JA=$gt_cv_locale_ja - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5 -printf %s "checking for a french Unicode locale... " >&6; } -if test ${gt_cv_locale_fr_utf8+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5 +$as_echo_n "checking for a french Unicode locale... " >&6; } +if ${gt_cv_locale_fr_utf8+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34360,7 +33838,7 @@ _ACEOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest$ac_exeext; then case "$host_os" in # Handle native Windows specially, because there setlocale() interprets @@ -34406,20 +33884,19 @@ _ACEOF rm -fr conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5 -printf "%s\n" "$gt_cv_locale_fr_utf8" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5 +$as_echo "$gt_cv_locale_fr_utf8" >&6; } LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5 -printf %s "checking for a transitional chinese locale... " >&6; } -if test ${gt_cv_locale_zh_CN+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5 +$as_echo_n "checking for a transitional chinese locale... " >&6; } +if ${gt_cv_locale_zh_CN+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34498,7 +33975,7 @@ _ACEOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest$ac_exeext; then case "$host_os" in # Handle native Windows specially, because there setlocale() interprets @@ -34549,8 +34026,8 @@ _ACEOF rm -fr conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5 -printf "%s\n" "$gt_cv_locale_zh_CN" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5 +$as_echo "$gt_cv_locale_zh_CN" >&6; } LOCALE_ZH_CN=$gt_cv_locale_zh_CN @@ -34561,10 +34038,9 @@ printf "%s\n" "$gt_cv_locale_zh_CN" >&6; } # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is # irrelevant for anonymous mappings. ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" -if test "x$ac_cv_func_mmap" = xyes -then : +if test "x$ac_cv_func_mmap" = xyes; then : gl_have_mmap=yes -else $as_nop +else gl_have_mmap=no fi @@ -34572,8 +34048,8 @@ fi # Try to allow MAP_ANONYMOUS. gl_have_mmap_anonymous=no if test $gl_have_mmap = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5 -printf %s "checking for MAP_ANONYMOUS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5 +$as_echo_n "checking for MAP_ANONYMOUS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34584,11 +34060,10 @@ printf %s "checking for MAP_ANONYMOUS... " >&6; } _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cannot identify this map" >/dev/null 2>&1 -then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : gl_have_mmap_anonymous=yes fi -rm -rf conftest* +rm -f conftest* if test $gl_have_mmap_anonymous != yes; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -34601,21 +34076,20 @@ rm -rf conftest* _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cannot identify this map" >/dev/null 2>&1 -then : + $EGREP "I cannot identify this map" >/dev/null 2>&1; then : -printf "%s\n" "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h +$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h gl_have_mmap_anonymous=yes fi -rm -rf conftest* +rm -f conftest* fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5 -printf "%s\n" "$gl_have_mmap_anonymous" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5 +$as_echo "$gl_have_mmap_anonymous" >&6; } if test $gl_have_mmap_anonymous = yes; then -printf "%s\n" "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h +$as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h fi fi @@ -34623,6 +34097,8 @@ printf "%s\n" "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h + + HAVE_MBSLEN=0; HAVE_EXPLICIT_BZERO=1; HAVE_FFSL=1; @@ -34682,14 +34158,12 @@ printf "%s\n" "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h # memchr should cast the second argument to 'unsigned char'. # This bug exists in Android 4.3. # Assume that memchr works on platforms that lack mprotect. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5 -printf %s "checking whether memchr works... " >&6; } -if test ${gl_cv_func_memchr_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5 +$as_echo_n "checking whether memchr works... " >&6; } +if ${gl_cv_func_memchr_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on Android. linux*-android*) gl_cv_func_memchr_works="guessing no" ;; @@ -34699,7 +34173,7 @@ then : *) gl_cv_func_memchr_works="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34715,7 +34189,7 @@ else $as_nop #endif int -main (void) +main () { int result = 0; @@ -34768,10 +34242,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_memchr_works=yes -else $as_nop +else gl_cv_func_memchr_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -34780,8 +34253,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5 -printf "%s\n" "$gl_cv_func_memchr_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5 +$as_echo "$gl_cv_func_memchr_works" >&6; } case "$gl_cv_func_memchr_works" in *yes) ;; *) REPLACE_MEMCHR=1 ;; @@ -34969,37 +34442,35 @@ printf "%s\n" "$gl_cv_func_memchr_works" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether defines MIN and MAX" >&5 -printf %s "checking whether defines MIN and MAX... " >&6; } -if test ${gl_cv_minmax_in_limits_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether defines MIN and MAX" >&5 +$as_echo_n "checking whether defines MIN and MAX... " >&6; } +if ${gl_cv_minmax_in_limits_h+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int x = MIN (42, 17); int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_minmax_in_limits_h=yes -else $as_nop +else gl_cv_minmax_in_limits_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5 -printf "%s\n" "$gl_cv_minmax_in_limits_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5 +$as_echo "$gl_cv_minmax_in_limits_h" >&6; } if test $gl_cv_minmax_in_limits_h = yes; then -printf "%s\n" "#define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h +$as_echo "#define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h fi @@ -35008,37 +34479,35 @@ printf "%s\n" "#define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether defines MIN and MAX" >&5 -printf %s "checking whether defines MIN and MAX... " >&6; } -if test ${gl_cv_minmax_in_sys_param_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether defines MIN and MAX" >&5 +$as_echo_n "checking whether defines MIN and MAX... " >&6; } +if ${gl_cv_minmax_in_sys_param_h+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int x = MIN (42, 17); int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_minmax_in_sys_param_h=yes -else $as_nop +else gl_cv_minmax_in_sys_param_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5 -printf "%s\n" "$gl_cv_minmax_in_sys_param_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5 +$as_echo "$gl_cv_minmax_in_sys_param_h" >&6; } if test $gl_cv_minmax_in_sys_param_h = yes; then -printf "%s\n" "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h +$as_echo "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h fi @@ -35066,48 +34535,48 @@ printf "%s\n" "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h REPLACE_LOCALTIME=0; - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether time_t is signed" >&5 -printf %s "checking whether time_t is signed... " >&6; } -if test ${gl_cv_time_t_is_signed+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time_t is signed" >&5 +$as_echo_n "checking whether time_t is signed... " >&6; } +if ${gl_cv_time_t_is_signed+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include char time_t_signed[(time_t) -1 < 0 ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_time_t_is_signed=yes -else $as_nop +else gl_cv_time_t_is_signed=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_t_is_signed" >&5 -printf "%s\n" "$gl_cv_time_t_is_signed" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_t_is_signed" >&5 +$as_echo "$gl_cv_time_t_is_signed" >&6; } if test $gl_cv_time_t_is_signed = yes; then -printf "%s\n" "#define TIME_T_IS_SIGNED 1" >>confdefs.h +$as_echo "#define TIME_T_IS_SIGNED 1" >>confdefs.h fi -ac_fn_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_alarm" = xyes -then : +ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default" +if test "x$ac_cv_have_decl_alarm" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_ALARM $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ALARM $ac_have_decl +_ACEOF @@ -35115,27 +34584,25 @@ printf "%s\n" "#define HAVE_DECL_ALARM $ac_have_decl" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 -printf %s "checking for working mktime... " >&6; } -if test ${gl_cv_func_working_mktime+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 +$as_echo_n "checking for working mktime... " >&6; } +if ${gl_cv_func_working_mktime+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $APPLE_UNIVERSAL_BUILD = 1; then # A universal build on Apple Mac OS X platforms. # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. # But we need a configuration result that is valid in both modes. gl_cv_func_working_mktime="guessing no" else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on native Windows. mingw*) gl_cv_func_working_mktime="guessing no" ;; *) gl_cv_func_working_mktime="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Test program from Paul Eggert and Tony Leneis. */ @@ -35362,10 +34829,9 @@ main () return result; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_working_mktime=yes -else $as_nop +else gl_cv_func_working_mktime=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -35375,8 +34841,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mktime" >&5 -printf "%s\n" "$gl_cv_func_working_mktime" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mktime" >&5 +$as_echo "$gl_cv_func_working_mktime" >&6; } @@ -35438,12 +34904,13 @@ printf "%s\n" "$gl_cv_func_working_mktime" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5 -printf %s "checking for O_CLOEXEC... " >&6; } -if test ${gl_cv_macro_O_CLOEXEC+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5 +$as_echo_n "checking for O_CLOEXEC... " >&6; } +if ${gl_cv_macro_O_CLOEXEC+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -35452,58 +34919,58 @@ else $as_nop #endif int -main (void) +main () { return O_CLOEXEC; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_macro_O_CLOEXEC=yes -else $as_nop +else gl_cv_macro_O_CLOEXEC=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5 -printf "%s\n" "$gl_cv_macro_O_CLOEXEC" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5 +$as_echo "$gl_cv_macro_O_CLOEXEC" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5 -printf %s "checking for promoted mode_t type... " >&6; } -if test ${gl_cv_promoted_mode_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5 +$as_echo_n "checking for promoted mode_t type... " >&6; } +if ${gl_cv_promoted_mode_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { typedef int array[2 * (sizeof (mode_t) < sizeof (int)) - 1]; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_promoted_mode_t='int' -else $as_nop +else gl_cv_promoted_mode_t='mode_t' fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5 -printf "%s\n" "$gl_cv_promoted_mode_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5 +$as_echo "$gl_cv_promoted_mode_t" >&6; } -printf "%s\n" "#define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PROMOTED_MODE_T $gl_cv_promoted_mode_t +_ACEOF @@ -35516,14 +34983,20 @@ printf "%s\n" "#define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h -ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_setenv" = xyes -then : + + + +ac_fn_c_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" +if test "x$ac_cv_have_decl_setenv" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SETENV $ac_have_decl +_ACEOF + @@ -35537,19 +35010,28 @@ printf "%s\n" "#define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h - ac_fn_c_check_header_compile "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default" -if test "x$ac_cv_header_search_h" = xyes -then : - printf "%s\n" "#define HAVE_SEARCH_H 1" >>confdefs.h + for ac_header in search.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default" +if test "x$ac_cv_header_search_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SEARCH_H 1 +_ACEOF fi +done + + for ac_func in tsearch +do : ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch" -if test "x$ac_cv_func_tsearch" = xyes -then : - printf "%s\n" "#define HAVE_TSEARCH 1" >>confdefs.h +if test "x$ac_cv_func_tsearch" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_TSEARCH 1 +_ACEOF fi +done @@ -35560,15 +35042,14 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf returns a byte count as in C99" >&5 -printf %s "checking whether snprintf returns a byte count as in C99... " >&6; } -if test ${gl_cv_func_snprintf_retval_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf returns a byte count as in C99" >&5 +$as_echo_n "checking whether snprintf returns a byte count as in C99... " >&6; } +if ${gl_cv_func_snprintf_retval_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else + + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; @@ -35609,20 +35090,19 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Known" >/dev/null 2>&1 -then : + $EGREP "Known" >/dev/null 2>&1; then : gl_cv_func_snprintf_retval_c99="guessing yes" -else $as_nop +else gl_cv_func_snprintf_retval_c99="guessing no" fi -rm -rf conftest* +rm -f conftest* ;; # If we don't know, obey --enable-cross-guesses. *) gl_cv_func_snprintf_retval_c99="$gl_cross_guess_normal";; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -35655,10 +35135,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_snprintf_retval_c99=yes -else $as_nop +else gl_cv_func_snprintf_retval_c99=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -35667,17 +35146,19 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_retval_c99" >&5 -printf "%s\n" "$gl_cv_func_snprintf_retval_c99" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_retval_c99" >&5 +$as_echo "$gl_cv_func_snprintf_retval_c99" >&6; } -ac_fn_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_snprintf" = xyes -then : +ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default" +if test "x$ac_cv_have_decl_snprintf" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_SNPRINTF $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SNPRINTF $ac_have_decl +_ACEOF @@ -35685,13 +35166,18 @@ printf "%s\n" "#define HAVE_DECL_SNPRINTF $ac_have_decl" >>confdefs.h if test $ac_cv_header_sys_socket_h != yes; then - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes -then : - printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h + for ac_header in winsock2.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" +if test "x$ac_cv_header_winsock2_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINSOCK2_H 1 +_ACEOF fi +done + fi if test "$ac_cv_header_winsock2_h" = yes; then HAVE_WINSOCK2_H=1 @@ -35703,12 +35189,11 @@ fi LIBSOCKET= if test $HAVE_WINSOCK2_H = 1; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WSAStartup" >&5 -printf %s "checking for WSAStartup... " >&6; } -if test ${gl_cv_func_wsastartup+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WSAStartup" >&5 +$as_echo_n "checking for WSAStartup... " >&6; } +if ${gl_cv_func_wsastartup+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_save_LIBS="$LIBS" LIBS="$LIBS -lws2_32" @@ -35719,7 +35204,7 @@ else $as_nop # include #endif int -main (void) +main () { WORD wVersionRequested = MAKEWORD(1, 1); @@ -35732,32 +35217,30 @@ main (void) } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_func_wsastartup=yes -else $as_nop +else gl_cv_func_wsastartup=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$gl_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wsastartup" >&5 -printf "%s\n" "$gl_cv_func_wsastartup" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wsastartup" >&5 +$as_echo "$gl_cv_func_wsastartup" >&6; } if test "$gl_cv_func_wsastartup" = "yes"; then -printf "%s\n" "#define WINDOWS_SOCKETS 1" >>confdefs.h +$as_echo "#define WINDOWS_SOCKETS 1" >>confdefs.h LIBSOCKET='-lws2_32' fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5 -printf %s "checking for library containing setsockopt... " >&6; } -if test ${gl_cv_lib_socket+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5 +$as_echo_n "checking for library containing setsockopt... " >&6; } +if ${gl_cv_lib_socket+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_lib_socket= cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -35768,17 +35251,16 @@ extern #endif char setsockopt(); int -main (void) +main () { setsockopt(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : -else $as_nop +else gl_save_LIBS="$LIBS" LIBS="$gl_save_LIBS -lsocket" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -35789,18 +35271,17 @@ extern #endif char setsockopt(); int -main (void) +main () { setsockopt(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_lib_socket="-lsocket" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$gl_cv_lib_socket"; then LIBS="$gl_save_LIBS -lnetwork" @@ -35812,18 +35293,17 @@ extern #endif char setsockopt(); int -main (void) +main () { setsockopt(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_lib_socket="-lnetwork" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$gl_cv_lib_socket"; then LIBS="$gl_save_LIBS -lnet" @@ -35835,33 +35315,32 @@ extern #endif char setsockopt(); int -main (void) +main () { setsockopt(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_lib_socket="-lnet" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi fi LIBS="$gl_save_LIBS" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$gl_cv_lib_socket"; then gl_cv_lib_socket="none needed" fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_lib_socket" >&5 -printf "%s\n" "$gl_cv_lib_socket" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_lib_socket" >&5 +$as_echo "$gl_cv_lib_socket" >&6; } if test "$gl_cv_lib_socket" != "none needed"; then LIBSOCKET="$gl_cv_lib_socket" fi @@ -35880,19 +35359,26 @@ printf "%s\n" "$gl_cv_lib_socket" >&6; } -ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_fcloseall" = xyes -then : + + + + + +ac_fn_c_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" +if test "x$ac_cv_have_decl_fcloseall" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FCLOSEALL $ac_have_decl +_ACEOF - printf "%s\n" "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h + $as_echo "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h @@ -35905,12 +35391,11 @@ printf "%s\n" "#define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_stdio_h='<'stdio.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_stdio_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_stdio_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -35949,8 +35434,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5 -printf "%s\n" "$gl_cv_next_stdio_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5 +$as_echo "$gl_cv_next_stdio_h" >&6; } fi NEXT_STDIO_H=$gl_cv_next_stdio_h @@ -35967,12 +35452,11 @@ printf "%s\n" "$gl_cv_next_stdio_h" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5 -printf %s "checking which flavor of printf attribute matches inttypes macros... " >&6; } -if test ${gl_cv_func_printf_attribute_flavor+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5 +$as_echo_n "checking which flavor of printf attribute matches inttypes macros... " >&6; } +if ${gl_cv_func_printf_attribute_flavor+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -35988,26 +35472,25 @@ else $as_nop #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_func_printf_attribute_flavor=system -else $as_nop +else gl_cv_func_printf_attribute_flavor=gnu fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5 -printf "%s\n" "$gl_cv_func_printf_attribute_flavor" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5 +$as_echo "$gl_cv_func_printf_attribute_flavor" >&6; } if test "$gl_cv_func_printf_attribute_flavor" = gnu; then -printf "%s\n" "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h +$as_echo "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h fi @@ -36027,32 +35510,38 @@ printf "%s\n" "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h HAVE_DECL_FCLOSEALL=0 fi -ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_ecvt" = xyes -then : +ac_fn_c_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" +if test "x$ac_cv_have_decl_ecvt" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_fcvt" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ECVT $ac_have_decl +_ACEOF -ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_gcvt" = xyes -then : +ac_fn_c_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" +if test "x$ac_cv_have_decl_fcvt" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FCVT $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" +if test "x$ac_cv_have_decl_gcvt" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GCVT $ac_have_decl +_ACEOF @@ -36067,12 +35556,11 @@ printf "%s\n" "#define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_stdlib_h='<'stdlib.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_stdlib_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_stdlib_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -36111,8 +35599,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5 -printf "%s\n" "$gl_cv_next_stdlib_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5 +$as_echo "$gl_cv_next_stdlib_h" >&6; } fi NEXT_STDLIB_H=$gl_cv_next_stdlib_h @@ -36159,12 +35647,16 @@ printf "%s\n" "$gl_cv_next_stdlib_h" >&6; } + for ac_func in strcasestr +do : ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr" -if test "x$ac_cv_func_strcasestr" = xyes -then : - printf "%s\n" "#define HAVE_STRCASESTR 1" >>confdefs.h +if test "x$ac_cv_func_strcasestr" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRCASESTR 1 +_ACEOF fi +done if test $ac_cv_func_strcasestr = no; then HAVE_STRCASESTR=0 @@ -36172,14 +35664,12 @@ fi if test $REPLACE_MEMCHR = 1; then REPLACE_STRCASESTR=1 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strcasestr works" >&5 -printf %s "checking whether strcasestr works... " >&6; } -if test ${gl_cv_func_strcasestr_works_always+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strcasestr works" >&5 +$as_echo_n "checking whether strcasestr works... " >&6; } +if ${gl_cv_func_strcasestr_works_always+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -36201,16 +35691,15 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 -then : + $EGREP "Lucky user" >/dev/null 2>&1; then : gl_cv_func_strcasestr_works_always="guessing yes" -else $as_nop +else gl_cv_func_strcasestr_works_always="$gl_cross_guess_normal" fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -36226,7 +35715,7 @@ else $as_nop #define NEEDLE P P P P P int -main (void) +main () { return !!strcasestr (HAYSTACK, NEEDLE); @@ -36234,10 +35723,9 @@ return !!strcasestr (HAYSTACK, NEEDLE); return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_strcasestr_works_always=yes -else $as_nop +else gl_cv_func_strcasestr_works_always=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -36246,8 +35734,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strcasestr_works_always" >&5 -printf "%s\n" "$gl_cv_func_strcasestr_works_always" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strcasestr_works_always" >&5 +$as_echo "$gl_cv_func_strcasestr_works_always" >&6; } case "$gl_cv_func_strcasestr_works_always" in *yes) ;; *) @@ -36259,14 +35747,12 @@ printf "%s\n" "$gl_cv_func_strcasestr_works_always" >&6; } REPLACE_STRERROR_0=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5 -printf %s "checking whether strerror(0) succeeds... " >&6; } -if test ${gl_cv_func_strerror_0_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5 +$as_echo_n "checking whether strerror(0) succeeds... " >&6; } +if ${gl_cv_func_strerror_0_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; @@ -36278,14 +35764,14 @@ then : *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main (void) +main () { int result = 0; char *str; @@ -36300,10 +35786,9 @@ int result = 0; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_strerror_0_works=yes -else $as_nop +else gl_cv_func_strerror_0_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -36312,14 +35797,14 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5 -printf "%s\n" "$gl_cv_func_strerror_0_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5 +$as_echo "$gl_cv_func_strerror_0_works" >&6; } case "$gl_cv_func_strerror_0_works" in *yes) ;; *) REPLACE_STRERROR_0=1 -printf "%s\n" "#define REPLACE_STRERROR_0 1" >>confdefs.h +$as_echo "#define REPLACE_STRERROR_0 1" >>confdefs.h ;; esac @@ -36337,12 +35822,11 @@ printf "%s\n" "#define REPLACE_STRERROR_0 1" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_string_h='<'string.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_string_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_string_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -36381,8 +35865,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5 -printf "%s\n" "$gl_cv_next_string_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5 +$as_echo "$gl_cv_next_string_h" >&6; } fi NEXT_STRING_H=$gl_cv_next_string_h @@ -36414,18 +35898,19 @@ printf "%s\n" "$gl_cv_next_string_h" >&6; } + + if test $gl_cv_have_include_next = yes; then gl_cv_next_strings_h='<'strings.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_strings_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_strings_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_strings_h = yes; then @@ -36470,8 +35955,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_strings_h" >&5 -printf "%s\n" "$gl_cv_next_strings_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_strings_h" >&5 +$as_echo "$gl_cv_next_strings_h" >&6; } fi NEXT_STRINGS_H=$gl_cv_next_strings_h @@ -36582,15 +36067,15 @@ printf "%s\n" "$gl_cv_next_strings_h" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_uio_h='<'sys/uio.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_sys_uio_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_sys_uio_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_sys_uio_h = yes; then @@ -36635,8 +36120,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_uio_h" >&5 -printf "%s\n" "$gl_cv_next_sys_uio_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_uio_h" >&5 +$as_echo "$gl_cv_next_sys_uio_h" >&6; } fi NEXT_SYS_UIO_H=$gl_cv_next_sys_uio_h @@ -36663,34 +36148,32 @@ printf "%s\n" "$gl_cv_next_sys_uio_h" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 -printf %s "checking for struct timespec in ... " >&6; } -if test ${gl_cv_sys_struct_timespec_in_time_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 +$as_echo_n "checking for struct timespec in ... " >&6; } +if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { static struct timespec x; x.tv_sec = x.tv_nsec; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_sys_struct_timespec_in_time_h=yes -else $as_nop +else gl_cv_sys_struct_timespec_in_time_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5 -printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5 +$as_echo "$gl_cv_sys_struct_timespec_in_time_h" >&6; } TIME_H_DEFINES_STRUCT_TIMESPEC=0 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 @@ -36699,96 +36182,90 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; } if test $gl_cv_sys_struct_timespec_in_time_h = yes; then TIME_H_DEFINES_STRUCT_TIMESPEC=1 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 -printf %s "checking for struct timespec in ... " >&6; } -if test ${gl_cv_sys_struct_timespec_in_sys_time_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 +$as_echo_n "checking for struct timespec in ... " >&6; } +if ${gl_cv_sys_struct_timespec_in_sys_time_h+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { static struct timespec x; x.tv_sec = x.tv_nsec; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_sys_struct_timespec_in_sys_time_h=yes -else $as_nop +else gl_cv_sys_struct_timespec_in_sys_time_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5 -printf "%s\n" "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5 +$as_echo "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; } if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 -printf %s "checking for struct timespec in ... " >&6; } -if test ${gl_cv_sys_struct_timespec_in_pthread_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 +$as_echo_n "checking for struct timespec in ... " >&6; } +if ${gl_cv_sys_struct_timespec_in_pthread_h+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { static struct timespec x; x.tv_sec = x.tv_nsec; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_sys_struct_timespec_in_pthread_h=yes -else $as_nop +else gl_cv_sys_struct_timespec_in_pthread_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5 -printf "%s\n" "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5 +$as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; } if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 -printf %s "checking for struct timespec in ... " >&6; } -if test ${gl_cv_sys_struct_timespec_in_unistd_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 +$as_echo_n "checking for struct timespec in ... " >&6; } +if ${gl_cv_sys_struct_timespec_in_unistd_h+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { static struct timespec x; x.tv_sec = x.tv_nsec; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_sys_struct_timespec_in_unistd_h=yes -else $as_nop +else gl_cv_sys_struct_timespec_in_unistd_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5 -printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5 +$as_echo "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; } if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then UNISTD_H_DEFINES_STRUCT_TIMESPEC=1 fi @@ -36814,12 +36291,11 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; } if test $gl_cv_have_include_next = yes; then gl_cv_next_time_h='<'time.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_time_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_time_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -36858,8 +36334,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5 -printf "%s\n" "$gl_cv_next_time_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5 +$as_echo "$gl_cv_next_time_h" >&6; } fi NEXT_TIME_H=$gl_cv_next_time_h @@ -36883,34 +36359,32 @@ printf "%s\n" "$gl_cv_next_time_h" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in " >&5 -printf %s "checking for TIME_UTC in ... " >&6; } -if test ${gl_cv_time_h_has_TIME_UTC+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in " >&5 +$as_echo_n "checking for TIME_UTC in ... " >&6; } +if ${gl_cv_time_h_has_TIME_UTC+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { static int x = TIME_UTC; x++; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_time_h_has_TIME_UTC=yes -else $as_nop +else gl_cv_time_h_has_TIME_UTC=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5 -printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5 +$as_echo "$gl_cv_time_h_has_TIME_UTC" >&6; } if test $gl_cv_time_h_has_TIME_UTC = yes; then TIME_H_DEFINES_TIME_UTC=1 else @@ -36920,14 +36394,18 @@ printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; } -ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_execvpe" = xyes -then : + + +ac_fn_c_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" +if test "x$ac_cv_have_decl_execvpe" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_EXECVPE $ac_have_decl +_ACEOF @@ -36944,12 +36422,11 @@ printf "%s\n" "#define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_unistd_h='<'unistd.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_unistd_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_unistd_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_unistd_h = yes; then @@ -36994,8 +36471,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5 -printf "%s\n" "$gl_cv_next_unistd_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5 +$as_echo "$gl_cv_next_unistd_h" >&6; } fi NEXT_UNISTD_H=$gl_cv_next_unistd_h @@ -37033,140 +36510,168 @@ printf "%s\n" "$gl_cv_next_unistd_h" >&6; } HAVE_DECL_EXECVPE=0 fi -ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes -then : +ac_fn_c_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_feof_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_feof_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_ferror_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_ferror_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_fflush_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_fflush_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_fgets_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_fgets_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_fputc_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_fputc_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_fputs_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_fputs_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_fread_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_fread_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getc_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getchar_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_getchar_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_putc_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_putc_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_putchar_unlocked" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_putchar_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "unsetenv" "ac_cv_have_decl_unsetenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_unsetenv" = xyes -then : +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "unsetenv" "ac_cv_have_decl_unsetenv" "$ac_includes_default" +if test "x$ac_cv_have_decl_unsetenv" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_UNSETENV $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_UNSETENV $ac_have_decl +_ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5 -printf %s "checking for inttypes.h... " >&6; } -if test ${gl_cv_header_inttypes_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5 +$as_echo_n "checking for inttypes.h... " >&6; } +if ${gl_cv_header_inttypes_h+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37174,73 +36679,73 @@ else $as_nop #include int -main (void) +main () { uintmax_t i = (uintmax_t) -1; return !i; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_inttypes_h=yes -else $as_nop +else gl_cv_header_inttypes_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_inttypes_h" >&5 -printf "%s\n" "$gl_cv_header_inttypes_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_inttypes_h" >&5 +$as_echo "$gl_cv_header_inttypes_h" >&6; } if test $gl_cv_header_inttypes_h = yes; then -printf "%s\n" "#define HAVE_INTTYPES_H_WITH_UINTMAX 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_INTTYPES_H_WITH_UINTMAX 1 +_ACEOF fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5 -printf %s "checking for stdint.h... " >&6; } -if test ${gl_cv_header_stdint_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5 +$as_echo_n "checking for stdint.h... " >&6; } +if ${gl_cv_header_stdint_h+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main (void) +main () { uintmax_t i = (uintmax_t) -1; return !i; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_stdint_h=yes -else $as_nop +else gl_cv_header_stdint_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_h" >&5 -printf "%s\n" "$gl_cv_header_stdint_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_h" >&5 +$as_echo "$gl_cv_header_stdint_h" >&6; } if test $gl_cv_header_stdint_h = yes; then -printf "%s\n" "#define HAVE_STDINT_H_WITH_UINTMAX 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STDINT_H_WITH_UINTMAX 1 +_ACEOF fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5 -printf %s "checking for intmax_t... " >&6; } -if test ${gt_cv_c_intmax_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5 +$as_echo_n "checking for intmax_t... " >&6; } +if ${gt_cv_c_intmax_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37254,43 +36759,42 @@ else $as_nop #endif int -main (void) +main () { intmax_t x = -1; return !x; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gt_cv_c_intmax_t=yes -else $as_nop +else gt_cv_c_intmax_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5 -printf "%s\n" "$gt_cv_c_intmax_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5 +$as_echo "$gt_cv_c_intmax_t" >&6; } if test $gt_cv_c_intmax_t = yes; then -printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h +$as_echo "#define HAVE_INTMAX_T 1" >>confdefs.h else -printf "%s\n" "#define intmax_t long long" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define intmax_t long long +_ACEOF fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'double'" >&5 -printf %s "checking where to find the exponent in a 'double'... " >&6; } -if test ${gl_cv_cc_double_expbit0+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'double'" >&5 +$as_echo_n "checking where to find the exponent in a 'double'... " >&6; } +if ${gl_cv_cc_double_expbit0+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37301,16 +36805,14 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "mixed_endianness" >/dev/null 2>&1 -then : + $EGREP "mixed_endianness" >/dev/null 2>&1; then : gl_cv_cc_double_expbit0="unknown" -else $as_nop +else : -if test ${ac_cv_c_bigendian+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${ac_cv_c_bigendian+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -37321,8 +36823,7 @@ else $as_nop typedef int dummy; _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # Check for potential -arch flags. It is not universal unless # there are at least two -arch flags with different values. @@ -37346,7 +36847,7 @@ then : fi done fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -37355,7 +36856,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext #include int -main (void) +main () { #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ @@ -37367,8 +36868,7 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37376,7 +36876,7 @@ then : #include int -main (void) +main () { #if BYTE_ORDER != BIG_ENDIAN not big endian @@ -37386,15 +36886,14 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes -else $as_nop +else ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). @@ -37403,7 +36902,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext #include int -main (void) +main () { #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) bogus endian macros @@ -37413,15 +36912,14 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to _BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { #ifndef _BIG_ENDIAN not big endian @@ -37431,33 +36929,31 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes -else $as_nop +else ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : # Try to guess by grepping values from an object file. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -unsigned short int ascii_mm[] = +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - unsigned short int ascii_ii[] = + short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; int use_ascii (int i) { return ascii_mm[i] + ascii_ii[i]; } - unsigned short int ebcdic_ii[] = + short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - unsigned short int ebcdic_mm[] = + short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; @@ -37465,15 +36961,14 @@ unsigned short int ascii_mm[] = extern int foo; int -main (void) +main () { return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -37486,13 +36981,13 @@ then : fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else $as_nop +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main (void) +main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -37508,10 +37003,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian=no -else $as_nop +else ac_cv_c_bigendian=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -37528,7 +37022,7 @@ fi gl_cv_cc_double_expbit0="word 1 bit 20" ;; #( universal) -printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) @@ -37537,10 +37031,10 @@ printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37608,10 +37102,9 @@ int main () } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_cc_double_expbit0=`cat conftest.out` -else $as_nop +else gl_cv_cc_double_expbit0="unknown" fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -37621,17 +37114,21 @@ fi rm -f conftest.out fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_double_expbit0" >&5 -printf "%s\n" "$gl_cv_cc_double_expbit0" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_double_expbit0" >&5 +$as_echo "$gl_cv_cc_double_expbit0" >&6; } case "$gl_cv_cc_double_expbit0" in word*bit*) word=`echo "$gl_cv_cc_double_expbit0" | sed -e 's/word //' -e 's/ bit.*//'` bit=`echo "$gl_cv_cc_double_expbit0" | sed -e 's/word.*bit //'` -printf "%s\n" "#define DBL_EXPBIT0_WORD $word" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define DBL_EXPBIT0_WORD $word +_ACEOF -printf "%s\n" "#define DBL_EXPBIT0_BIT $bit" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define DBL_EXPBIT0_BIT $bit +_ACEOF ;; esac @@ -37639,15 +37136,13 @@ printf "%s\n" "#define DBL_EXPBIT0_BIT $bit" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf truncates the result as in C99" >&5 -printf %s "checking whether snprintf truncates the result as in C99... " >&6; } -if test ${gl_cv_func_snprintf_truncation_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf truncates the result as in C99" >&5 +$as_echo_n "checking whether snprintf truncates the result as in C99... " >&6; } +if ${gl_cv_func_snprintf_truncation_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on glibc systems. @@ -37694,7 +37189,7 @@ then : *) gl_cv_func_snprintf_truncation_c99="$gl_cross_guess_normal";; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37724,10 +37219,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_snprintf_truncation_c99=yes -else $as_nop +else gl_cv_func_snprintf_truncation_c99=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -37736,66 +37230,43 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_truncation_c99" >&5 -printf "%s\n" "$gl_cv_func_snprintf_truncation_c99" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_truncation_c99" >&5 +$as_echo "$gl_cv_func_snprintf_truncation_c99" >&6; } - ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" -if test "x$ac_cv_func_snprintf" = xyes -then : - printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h + for ac_func in snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" -if test "x$ac_cv_func_strnlen" = xyes -then : - printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h +done -fi -ac_fn_c_check_func "$LINENO" "wcslen" "ac_cv_func_wcslen" -if test "x$ac_cv_func_wcslen" = xyes -then : - printf "%s\n" "#define HAVE_WCSLEN 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "wcsnlen" "ac_cv_func_wcsnlen" -if test "x$ac_cv_func_wcsnlen" = xyes -then : - printf "%s\n" "#define HAVE_WCSNLEN 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "mbrtowc" "ac_cv_func_mbrtowc" -if test "x$ac_cv_func_mbrtowc" = xyes -then : - printf "%s\n" "#define HAVE_MBRTOWC 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "wcrtomb" "ac_cv_func_wcrtomb" -if test "x$ac_cv_func_wcrtomb" = xyes -then : - printf "%s\n" "#define HAVE_WCRTOMB 1" >>confdefs.h - -fi - - ac_fn_check_decl "$LINENO" "_snprintf" "ac_cv_have_decl__snprintf" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl__snprintf" = xyes -then : + ac_fn_c_check_decl "$LINENO" "_snprintf" "ac_cv_have_decl__snprintf" "#include +" +if test "x$ac_cv_have_decl__snprintf" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL__SNPRINTF $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL__SNPRINTF $ac_have_decl +_ACEOF case "$gl_cv_func_snprintf_retval_c99" in *yes) -printf "%s\n" "#define HAVE_SNPRINTF_RETVAL_C99 1" >>confdefs.h +$as_echo "#define HAVE_SNPRINTF_RETVAL_C99 1" >>confdefs.h ;; esac @@ -37803,19 +37274,22 @@ printf "%s\n" "#define HAVE_SNPRINTF_RETVAL_C99 1" >>confdefs.h case "$gl_cv_func_snprintf_truncation_c99" in *yes) -printf "%s\n" "#define HAVE_SNPRINTF_TRUNCATION_C99 1" >>confdefs.h +$as_echo "#define HAVE_SNPRINTF_TRUNCATION_C99 1" >>confdefs.h ;; esac -ac_fn_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_vsnprintf" = xyes -then : +ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default" +if test "x$ac_cv_have_decl_vsnprintf" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_VSNPRINTF $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_VSNPRINTF $ac_have_decl +_ACEOF + @@ -37842,12 +37316,11 @@ printf "%s\n" "#define HAVE_DECL_VSNPRINTF $ac_have_decl" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_wchar_h='<'wchar.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_wchar_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_wchar_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_wchar_h = yes; then @@ -37892,8 +37365,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5 -printf "%s\n" "$gl_cv_next_wchar_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5 +$as_echo "$gl_cv_next_wchar_h" >&6; } fi NEXT_WCHAR_H=$gl_cv_next_wchar_h @@ -37934,17 +37407,19 @@ printf "%s\n" "$gl_cv_next_wchar_h" >&6; } - ac_fn_check_decl "$LINENO" "wcsdup" "ac_cv_have_decl_wcsdup" " + ac_fn_c_check_decl "$LINENO" "wcsdup" "ac_cv_have_decl_wcsdup" " #include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_wcsdup" = xyes -then : +" +if test "x$ac_cv_have_decl_wcsdup" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_WCSDUP $ac_have_decl +_ACEOF if test $ac_cv_have_decl_wcsdup = no; then HAVE_DECL_WCSDUP=0 @@ -37952,6 +37427,7 @@ printf "%s\n" "#define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h + HAVE_ISWBLANK=1; HAVE_WCTYPE_T=1; HAVE_WCTRANS_T=1; @@ -37966,6 +37442,8 @@ printf "%s\n" "#define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h + + if test $ac_cv_func_iswcntrl = yes; then HAVE_ISWCNTRL=1 else @@ -37995,12 +37473,11 @@ printf "%s\n" "#define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_wctype_h='<'wctype.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_wctype_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_wctype_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_wctype_h = yes; then @@ -38045,8 +37522,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5 -printf "%s\n" "$gl_cv_next_wctype_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5 +$as_echo "$gl_cv_next_wctype_h" >&6; } fi NEXT_WCTYPE_H=$gl_cv_next_wctype_h @@ -38064,15 +37541,13 @@ printf "%s\n" "$gl_cv_next_wctype_h" >&6; } if test $ac_cv_header_wctype_h = yes; then if test $ac_cv_func_iswcntrl = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5 -printf %s "checking whether iswcntrl works... " >&6; } -if test ${gl_cv_func_iswcntrl_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5 +$as_echo_n "checking whether iswcntrl works... " >&6; } +if ${gl_cv_func_iswcntrl_works+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -38080,22 +37555,21 @@ then : Linux libc5 i18n is broken. #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_func_iswcntrl_works="guessing yes" -else $as_nop +else gl_cv_func_iswcntrl_works="guessing no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38104,10 +37578,9 @@ else $as_nop int main () { return iswprint ('x') == 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_iswcntrl_works=yes -else $as_nop +else gl_cv_func_iswcntrl_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -38116,8 +37589,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5 -printf "%s\n" "$gl_cv_func_iswcntrl_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5 +$as_echo "$gl_cv_func_iswcntrl_works" >&6; } fi HAVE_WCTYPE_H=1 else @@ -38142,29 +37615,35 @@ printf "%s\n" "$gl_cv_func_iswcntrl_works" >&6; } if test $REPLACE_ISWCNTRL = 1; then REPLACE_TOWLOWER=1 else - ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower" -if test "x$ac_cv_func_towlower" = xyes -then : - printf "%s\n" "#define HAVE_TOWLOWER 1" >>confdefs.h + for ac_func in towlower +do : + ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower" +if test "x$ac_cv_func_towlower" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_TOWLOWER 1 +_ACEOF fi +done if test $ac_cv_func_towlower = yes; then REPLACE_TOWLOWER=0 else - ac_fn_check_decl "$LINENO" "towlower" "ac_cv_have_decl_towlower" "#include + ac_fn_c_check_decl "$LINENO" "towlower" "ac_cv_have_decl_towlower" "#include #if HAVE_WCTYPE_H # include #endif -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_towlower" = xyes -then : +" +if test "x$ac_cv_have_decl_towlower" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_TOWLOWER $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_TOWLOWER $ac_have_decl +_ACEOF if test $ac_cv_have_decl_towlower = yes; then REPLACE_TOWLOWER=1 @@ -38179,12 +37658,11 @@ printf "%s\n" "#define HAVE_DECL_TOWLOWER $ac_have_decl" >>confdefs.h : fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5 -printf %s "checking for wctype_t... " >&6; } -if test ${gl_cv_type_wctype_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5 +$as_echo_n "checking for wctype_t... " >&6; } +if ${gl_cv_type_wctype_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -38194,34 +37672,32 @@ else $as_nop wctype_t a; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_type_wctype_t=yes -else $as_nop +else gl_cv_type_wctype_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5 -printf "%s\n" "$gl_cv_type_wctype_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5 +$as_echo "$gl_cv_type_wctype_t" >&6; } if test $gl_cv_type_wctype_t = no; then HAVE_WCTYPE_T=0 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5 -printf %s "checking for wctrans_t... " >&6; } -if test ${gl_cv_type_wctrans_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5 +$as_echo_n "checking for wctrans_t... " >&6; } +if ${gl_cv_type_wctrans_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -38229,24 +37705,23 @@ else $as_nop wctrans_t a; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_type_wctrans_t=yes -else $as_nop +else gl_cv_type_wctrans_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5 -printf "%s\n" "$gl_cv_type_wctrans_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5 +$as_echo "$gl_cv_type_wctrans_t" >&6; } if test $gl_cv_type_wctrans_t = no; then HAVE_WCTRANS_T=0 fi @@ -38287,25 +37762,24 @@ printf "%s\n" "$gl_cv_type_wctrans_t" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5 -printf %s "checking for C compiler option to allow warnings... " >&6; } -if test ${gl_cv_cc_wallow+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5 +$as_echo_n "checking for C compiler option to allow warnings... " >&6; } +if ${gl_cv_cc_wallow+:} false; then : + $as_echo_n "(cached) " >&6 +else rm -f conftest* echo 'int dummy;' > conftest.c { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; } >/dev/null { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; } >/dev/null if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then gl_cv_cc_wallow='-Wno-error' @@ -38315,8 +37789,8 @@ else $as_nop rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5 -printf "%s\n" "$gl_cv_cc_wallow" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5 +$as_echo "$gl_cv_cc_wallow" >&6; } case "$gl_cv_cc_wallow" in none) GL_CFLAG_ALLOW_WARNINGS='' ;; *) GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;; @@ -38358,7 +37832,7 @@ EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gl_command\""; } >&5 (eval $gl_command) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then gl_options=`grep -v '#' conftest.out` for word in $gl_options; do @@ -38404,12 +37878,11 @@ fi # Define an additional variable used in the Makefile substitution. if test $ac_cv_working_alloca_h = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca as a compiler built-in" >&5 -printf %s "checking for alloca as a compiler built-in... " >&6; } -if test ${gl_cv_rpl_alloca+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca as a compiler built-in" >&5 +$as_echo_n "checking for alloca as a compiler built-in... " >&6; } +if ${gl_cv_rpl_alloca+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38420,21 +37893,20 @@ else $as_nop _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Need own alloca" >/dev/null 2>&1 -then : + $EGREP "Need own alloca" >/dev/null 2>&1; then : gl_cv_rpl_alloca=yes -else $as_nop +else gl_cv_rpl_alloca=no fi -rm -rf conftest* +rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_rpl_alloca" >&5 -printf "%s\n" "$gl_cv_rpl_alloca" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_rpl_alloca" >&5 +$as_echo "$gl_cv_rpl_alloca" >&6; } if test $gl_cv_rpl_alloca = yes; then -printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h GL_GENERATE_ALLOCA_H=true else @@ -38492,12 +37964,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for static_assert" >&5 -printf %s "checking for static_assert... " >&6; } -if test ${gl_cv_static_assert+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for static_assert" >&5 +$as_echo_n "checking for static_assert... " >&6; } +if ${gl_cv_static_assert+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_save_CFLAGS=$CFLAGS for gl_working in "yes, a keyword" "yes, an macro"; do case $gl_working in #( @@ -38520,7 +37991,7 @@ esac static_assert (2 + 2 == 4); int -main (void) +main () { static_assert (sizeof (char) == 1, "sizeof does not work"); @@ -38530,25 +38001,24 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_static_assert=$gl_working -else $as_nop +else gl_cv_static_assert=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$gl_save_CFLAGS test "$gl_cv_static_assert" != no && break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_static_assert" >&5 -printf "%s\n" "$gl_cv_static_assert" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_static_assert" >&5 +$as_echo "$gl_cv_static_assert" >&6; } GL_GENERATE_ASSERT_H=false case $gl_cv_static_assert in #( yes*keyword*) : -printf "%s\n" "#define HAVE_C_STATIC_ASSERT 1" >>confdefs.h +$as_echo "#define HAVE_C_STATIC_ASSERT 1" >>confdefs.h ;; #( no) : GL_GENERATE_ASSERT_H=true @@ -38563,12 +38033,11 @@ printf "%s\n" "#define HAVE_C_STATIC_ASSERT 1" >>confdefs.h if test $gl_cv_have_include_next = yes; then gl_cv_next_assert_h='<'assert.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_assert_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_assert_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -38607,8 +38076,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_assert_h" >&5 -printf "%s\n" "$gl_cv_next_assert_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_assert_h" >&5 +$as_echo "$gl_cv_next_assert_h" >&6; } fi NEXT_ASSERT_H=$gl_cv_next_assert_h @@ -38681,15 +38150,13 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether btowc(0) is correct" >&5 -printf %s "checking whether btowc(0) is correct... " >&6; } -if test ${gl_cv_func_btowc_nul+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(0) is correct" >&5 +$as_echo_n "checking whether btowc(0) is correct... " >&6; } +if ${gl_cv_func_btowc_nul+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on Cygwin. @@ -38700,7 +38167,7 @@ then : *) gl_cv_func_btowc_nul="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38712,10 +38179,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_btowc_nul=yes -else $as_nop +else gl_cv_func_btowc_nul=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -38724,15 +38190,14 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_nul" >&5 -printf "%s\n" "$gl_cv_func_btowc_nul" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_nul" >&5 +$as_echo "$gl_cv_func_btowc_nul" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether btowc(EOF) is correct" >&5 -printf %s "checking whether btowc(EOF) is correct... " >&6; } -if test ${gl_cv_func_btowc_eof+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(EOF) is correct" >&5 +$as_echo_n "checking whether btowc(EOF) is correct... " >&6; } +if ${gl_cv_func_btowc_eof+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on IRIX. @@ -38743,10 +38208,9 @@ else $as_nop *) gl_cv_func_btowc_eof="guessing yes" ;; esac if test $LOCALE_FR != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38763,10 +38227,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_btowc_eof=yes -else $as_nop +else gl_cv_func_btowc_eof=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -38776,8 +38239,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_eof" >&5 -printf "%s\n" "$gl_cv_func_btowc_eof" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_eof" >&5 +$as_echo "$gl_cv_func_btowc_eof" >&6; } case "$gl_cv_func_btowc_nul" in *yes) ;; @@ -38830,17 +38293,16 @@ fi -printf "%s\n" "#define GNULIB_TEST_BTOWC 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5 -printf %s "checking for __builtin_expect... " >&6; } -if test ${gl_cv___builtin_expect+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5 +$as_echo_n "checking for __builtin_expect... " >&6; } +if ${gl_cv___builtin_expect+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38851,10 +38313,9 @@ else $as_nop return argv[argc != 100][0]; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv___builtin_expect=yes -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38866,40 +38327,40 @@ else $as_nop return argv[argc != 100][0]; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv___builtin_expect="in " -else $as_nop +else gl_cv___builtin_expect=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5 -printf "%s\n" "$gl_cv___builtin_expect" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5 +$as_echo "$gl_cv___builtin_expect" >&6; } if test "$gl_cv___builtin_expect" = yes; then - printf "%s\n" "#define HAVE___BUILTIN_EXPECT 1" >>confdefs.h + $as_echo "#define HAVE___BUILTIN_EXPECT 1" >>confdefs.h elif test "$gl_cv___builtin_expect" = "in "; then - printf "%s\n" "#define HAVE___BUILTIN_EXPECT 2" >>confdefs.h + $as_echo "#define HAVE___BUILTIN_EXPECT 2" >>confdefs.h fi - for ac_header in byteswap.h + for ac_header in byteswap.h do : - ac_fn_c_check_header_compile "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default" -if test "x$ac_cv_header_byteswap_h" = xyes -then : - printf "%s\n" "#define HAVE_BYTESWAP_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default" +if test "x$ac_cv_header_byteswap_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BYTESWAP_H 1 +_ACEOF GL_GENERATE_BYTESWAP_H=false -else $as_nop +else GL_GENERATE_BYTESWAP_H=true @@ -38911,6 +38372,7 @@ done + case "$GL_GENERATE_BYTESWAP_H" in false) BYTESWAP_H='' ;; true) @@ -38946,26 +38408,24 @@ fi REPLACE_CALLOC_FOR_CALLOC_GNU="$REPLACE_CALLOC_FOR_CALLOC_POSIX" if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether calloc (0, n) and calloc (n, 0) return nonnull" >&5 -printf %s "checking whether calloc (0, n) and calloc (n, 0) return nonnull... " >&6; } -if test ${ac_cv_func_calloc_0_nonnull+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether calloc (0, n) and calloc (n, 0) return nonnull" >&5 +$as_echo_n "checking whether calloc (0, n) and calloc (n, 0) return nonnull... " >&6; } +if ${ac_cv_func_calloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $cross_compiling != yes; then ac_cv_func_calloc_0_nonnull=yes - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main (void) +main () { int result = 0; char * volatile p = calloc (0, 0); @@ -38978,10 +38438,9 @@ int result = 0; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : -else $as_nop +else ac_cv_func_calloc_0_nonnull=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -39002,8 +38461,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_calloc_0_nonnull" >&5 -printf "%s\n" "$ac_cv_func_calloc_0_nonnull" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_calloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_calloc_0_nonnull" >&6; } case $ac_cv_func_calloc_0_nonnull in #( *yes) : ;; #( @@ -39040,7 +38499,7 @@ esac -printf "%s\n" "#define GNULIB_TEST_CALLOC_GNU 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_CALLOC_GNU 1" >>confdefs.h @@ -39078,13 +38537,13 @@ printf "%s\n" "#define GNULIB_TEST_CALLOC_GNU 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_CALLOC_POSIX 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_CALLOC_POSIX 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h @@ -39101,13 +38560,18 @@ printf "%s\n" "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h if test $ac_cv_header_sys_socket_h != yes; then - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes -then : - printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h + for ac_header in winsock2.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" +if test "x$ac_cv_header_winsock2_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINSOCK2_H 1 +_ACEOF fi +done + fi if test "$ac_cv_header_winsock2_h" = yes; then HAVE_WINSOCK2_H=1 @@ -39153,7 +38617,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_CLOSE 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_CLOSE 1" >>confdefs.h @@ -39169,10 +38633,9 @@ printf "%s\n" "#define GNULIB_TEST_CLOSE 1" >>confdefs.h # Check whether --with-openssl was given. -if test ${with_openssl+y} -then : +if test "${with_openssl+set}" = set; then : withval=$with_openssl; -else $as_nop +else with_openssl=$with_openssl_default fi @@ -39180,12 +38643,11 @@ fi if test "x$with_openssl" != xno; then if test "x$with_openssl" = xauto-gpl-compat; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether openssl is GPL compatible" >&5 -printf %s "checking whether openssl is GPL compatible... " >&6; } -if test ${gl_cv_openssl_gpl_compat+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether openssl is GPL compatible" >&5 +$as_echo_n "checking whether openssl is GPL compatible... " >&6; } +if ${gl_cv_openssl_gpl_compat+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39195,32 +38657,30 @@ else $as_nop #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_openssl_gpl_compat=yes -else $as_nop +else gl_cv_openssl_gpl_compat=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_openssl_gpl_compat" >&5 -printf "%s\n" "$gl_cv_openssl_gpl_compat" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_openssl_gpl_compat" >&5 +$as_echo "$gl_cv_openssl_gpl_compat" >&6; } fi if test "x$with_openssl" != xauto-gpl-compat || test "x$gl_cv_openssl_gpl_compat" = xyes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA256 in -lcrypto" >&5 -printf %s "checking for SHA256 in -lcrypto... " >&6; } -if test ${ac_cv_lib_crypto_SHA256+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA256 in -lcrypto" >&5 +$as_echo_n "checking for SHA256 in -lcrypto... " >&6; } +if ${ac_cv_lib_crypto_SHA256+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -39229,42 +38689,45 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char SHA256 (); int -main (void) +main () { return SHA256 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_crypto_SHA256=yes -else $as_nop +else ac_cv_lib_crypto_SHA256=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA256" >&5 -printf "%s\n" "$ac_cv_lib_crypto_SHA256" >&6; } -if test "x$ac_cv_lib_crypto_SHA256" = xyes -then : - for ac_header in openssl/sha.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA256" >&5 +$as_echo "$ac_cv_lib_crypto_SHA256" >&6; } +if test "x$ac_cv_lib_crypto_SHA256" = xyes; then : + for ac_header in openssl/sha.h do : - ac_fn_c_check_header_compile "$LINENO" "openssl/sha.h" "ac_cv_header_openssl_sha_h" "$ac_includes_default" -if test "x$ac_cv_header_openssl_sha_h" = xyes -then : - printf "%s\n" "#define HAVE_OPENSSL_SHA_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "openssl/sha.h" "ac_cv_header_openssl_sha_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_sha_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_OPENSSL_SHA_H 1 +_ACEOF LIB_CRYPTO=-lcrypto -printf "%s\n" "#define HAVE_OPENSSL_SHA256 1" >>confdefs.h +$as_echo "#define HAVE_OPENSSL_SHA256 1" >>confdefs.h fi done + fi fi @@ -39277,8 +38740,8 @@ fi if test "x$with_openssl" = xyes; then as_fn_error $? "$message" "$LINENO" 5 elif test "x$with_openssl" = xoptional; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $message" >&5 -printf "%s\n" "$as_me: WARNING: $message" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $message" >&5 +$as_echo "$as_me: WARNING: $message" >&2;} fi fi fi @@ -39286,17 +38749,18 @@ printf "%s\n" "$as_me: WARNING: $message" >&2;} -printf "%s\n" "#define GNULIB_DIRNAME 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_DIRNAME 1 +_ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5 -printf %s "checking whether // is distinct from /... " >&6; } -if test ${gl_cv_double_slash_root+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5 +$as_echo_n "checking whether // is distinct from /... " >&6; } +if ${gl_cv_double_slash_root+:} false; then : + $as_echo_n "(cached) " >&6 +else if test x"$cross_compiling" = xyes ; then # When cross-compiling, there is no way to tell whether // is special # short of a list of hosts. However, the only known hosts to date @@ -39321,25 +38785,23 @@ else $as_nop fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5 -printf "%s\n" "$gl_cv_double_slash_root" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5 +$as_echo "$gl_cv_double_slash_root" >&6; } if test "$gl_cv_double_slash_root" = yes; then -printf "%s\n" "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h +$as_echo "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5 -printf %s "checking whether dup2 works... " >&6; } -if test ${gl_cv_func_dup2_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5 +$as_echo_n "checking whether dup2 works... " >&6; } +if ${gl_cv_func_dup2_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in mingw*) # on this platform, dup2 always returns 0 for success gl_cv_func_dup2_works="guessing no" ;; @@ -39357,7 +38819,7 @@ then : gl_cv_func_dup2_works="guessing no" ;; *) gl_cv_func_dup2_works="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39378,7 +38840,7 @@ $gl_mda_defines #endif int -main (void) +main () { int result = 0; int bad_fd = INT_MAX; @@ -39425,10 +38887,9 @@ int result = 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_dup2_works=yes -else $as_nop +else gl_cv_func_dup2_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -39437,18 +38898,22 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5 -printf "%s\n" "$gl_cv_func_dup2_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5 +$as_echo "$gl_cv_func_dup2_works" >&6; } case "$gl_cv_func_dup2_works" in *yes) ;; *) REPLACE_DUP2=1 - ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize" -if test "x$ac_cv_func_setdtablesize" = xyes -then : - printf "%s\n" "#define HAVE_SETDTABLESIZE 1" >>confdefs.h + for ac_func in setdtablesize +do : + ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize" +if test "x$ac_cv_func_setdtablesize" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SETDTABLESIZE 1 +_ACEOF fi +done ;; esac @@ -39488,7 +38953,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_DUP2 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_DUP2 1" >>confdefs.h @@ -39508,7 +38973,7 @@ printf "%s\n" "#define GNULIB_TEST_DUP2 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_ENVIRON 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_ENVIRON 1" >>confdefs.h @@ -39547,34 +39012,32 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -printf %s "checking for error_at_line... " >&6; } -if test ${ac_cv_lib_error_at_line+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +$as_echo_n "checking for error_at_line... " >&6; } +if ${ac_cv_lib_error_at_line+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { error_at_line (0, 0, "", 0, "an error occurred"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_error_at_line=yes -else $as_nop +else ac_cv_lib_error_at_line=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +$as_echo "$ac_cv_lib_error_at_line" >&6; } if test "$ac_cv_lib_error_at_line" = no; then @@ -39625,20 +39088,18 @@ fi fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5 -printf %s "checking whether fcntl handles F_DUPFD correctly... " >&6; } -if test ${gl_cv_func_fcntl_f_dupfd_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5 +$as_echo_n "checking whether fcntl handles F_DUPFD correctly... " >&6; } +if ${gl_cv_func_fcntl_f_dupfd_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case $host_os in aix* | cygwin* | haiku*) gl_cv_func_fcntl_f_dupfd_works="guessing no" ;; *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -39658,7 +39119,7 @@ $gl_mda_defines #endif int -main (void) +main () { int result = 0; int bad_fd = INT_MAX; @@ -39689,10 +39150,9 @@ int result = 0; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_fcntl_f_dupfd_works=yes -else $as_nop +else gl_cv_func_fcntl_f_dupfd_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -39700,8 +39160,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5 -printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5 +$as_echo "$gl_cv_func_fcntl_f_dupfd_works" >&6; } case $gl_cv_func_fcntl_f_dupfd_works in *yes) ;; *) @@ -39714,25 +39174,23 @@ printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; } fi -printf "%s\n" "#define FCNTL_DUPFD_BUGGY 1" >>confdefs.h +$as_echo "#define FCNTL_DUPFD_BUGGY 1" >>confdefs.h ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5 -printf %s "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; } -if test ${gl_cv_func_fcntl_f_dupfd_cloexec+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5 +$as_echo_n "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; } +if ${gl_cv_func_fcntl_f_dupfd_cloexec+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on NetBSD. netbsd*) gl_cv_func_fcntl_f_dupfd_cloexec="guessing no" ;; *) gl_cv_func_fcntl_f_dupfd_cloexec="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -39753,8 +39211,7 @@ else $as_nop _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39765,22 +39222,21 @@ choke me #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_func_fcntl_f_dupfd_cloexec=yes -else $as_nop +else gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else $as_nop +else gl_cv_func_fcntl_f_dupfd_cloexec=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -39789,8 +39245,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5 -printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5 +$as_echo "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; } case "$gl_cv_func_fcntl_f_dupfd_cloexec" in *yes) ;; *) @@ -39836,7 +39292,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_FCNTL 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FCNTL 1" >>confdefs.h @@ -39851,22 +39307,20 @@ printf "%s\n" "#define GNULIB_TEST_FCNTL 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5 -printf %s "checking whether fflush works on input streams... " >&6; } -if test ${gl_cv_func_fflush_stdin+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5 +$as_echo_n "checking whether fflush works on input streams... " >&6; } +if ${gl_cv_func_fflush_stdin+:} false; then : + $as_echo_n "(cached) " >&6 +else echo hello world > conftest.txt - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on native Windows. mingw*) gl_cv_func_fflush_stdin="guessing no" ;; *) gl_cv_func_fflush_stdin=cross ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39881,7 +39335,7 @@ else $as_nop $gl_mda_defines int -main (void) +main () { FILE *f = fopen ("conftest.txt", "r"); char buffer[10]; @@ -39924,10 +39378,9 @@ FILE *f = fopen ("conftest.txt", "r"); return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_fflush_stdin=yes -else $as_nop +else gl_cv_func_fflush_stdin=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -39937,15 +39390,17 @@ fi rm conftest.txt fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 -printf "%s\n" "$gl_cv_func_fflush_stdin" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 +$as_echo "$gl_cv_func_fflush_stdin" >&6; } case "$gl_cv_func_fflush_stdin" in *yes) gl_func_fflush_stdin=1 ;; *no) gl_func_fflush_stdin=0 ;; *) gl_func_fflush_stdin='(-1)' ;; esac -printf "%s\n" "#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin +_ACEOF case "$gl_cv_func_fflush_stdin" in @@ -39974,7 +39429,9 @@ fi fi -printf "%s\n" "#define GNULIB_FFLUSH 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_FFLUSH 1 +_ACEOF @@ -39992,7 +39449,7 @@ printf "%s\n" "#define GNULIB_FFLUSH 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_FFLUSH 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FFLUSH 1" >>confdefs.h @@ -40022,13 +39479,12 @@ printf "%s\n" "#define GNULIB_TEST_FFLUSH 1" >>confdefs.h #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else GL_GENERATE_FLOAT_H=true fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac ;; @@ -40049,15 +39505,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext esac REPLACE_ITOLD=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether conversion from 'int' to 'long double' works" >&5 -printf %s "checking whether conversion from 'int' to 'long double' works... " >&6; } -if test ${gl_cv_func_itold_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether conversion from 'int' to 'long double' works" >&5 +$as_echo_n "checking whether conversion from 'int' to 'long double' works... " >&6; } +if ${gl_cv_func_itold_works+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host" in sparc*-*-linux*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -40069,20 +39523,19 @@ then : #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_func_itold_works="guessing no" -else $as_nop +else gl_cv_func_itold_works="guessing yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; # Guess yes on native Windows. mingw*) gl_cv_func_itold_works="guessing yes" ;; *) gl_cv_func_itold_works="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40096,10 +39549,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_itold_works=yes -else $as_nop +else gl_cv_func_itold_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -40108,8 +39560,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_itold_works" >&5 -printf "%s\n" "$gl_cv_func_itold_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_itold_works" >&5 +$as_echo "$gl_cv_func_itold_works" >&6; } case "$gl_cv_func_itold_works" in *no) REPLACE_ITOLD=1 @@ -40129,12 +39581,11 @@ printf "%s\n" "$gl_cv_func_itold_works" >&6; } if test $gl_cv_have_include_next = yes; then gl_cv_next_float_h='<'float.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_float_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_float_h+:} false; then : + $as_echo_n "(cached) " >&6 +else @@ -40173,8 +39624,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_float_h" >&5 -printf "%s\n" "$gl_cv_next_float_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_float_h" >&5 +$as_echo "$gl_cv_next_float_h" >&6; } fi NEXT_FLOAT_H=$gl_cv_next_float_h @@ -40258,15 +39709,17 @@ fi - ac_fn_check_decl "$LINENO" "floorf" "ac_cv_have_decl_floorf" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_floorf" = xyes -then : + ac_fn_c_check_decl "$LINENO" "floorf" "ac_cv_have_decl_floorf" "#include +" +if test "x$ac_cv_have_decl_floorf" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FLOORF $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FLOORF $ac_have_decl +_ACEOF if test "$ac_cv_have_decl_floorf" = yes; then @@ -40274,10 +39727,9 @@ printf "%s\n" "#define HAVE_DECL_FLOORF $ac_have_decl" >>confdefs.h exec 9>&6 6>/dev/null - if test ${gl_cv_func_floorf_libm+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${gl_cv_func_floorf_libm+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_func_floorf_libm=? cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -40289,18 +39741,17 @@ else $as_nop float (*funcptr) (float) = floorf; float x; int -main (void) +main () { x = funcptr(x) + floorf(x); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_func_floorf_libm= fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test "$gl_cv_func_floorf_libm" = "?"; then save_LIBS="$LIBS" @@ -40314,18 +39765,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ float (*funcptr) (float) = floorf; float x; int -main (void) +main () { x = funcptr(x) + floorf(x); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_func_floorf_libm="-lm" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" fi @@ -40379,7 +39829,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_FLOORF 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FLOORF 1" >>confdefs.h @@ -40392,15 +39842,13 @@ printf "%s\n" "#define GNULIB_TEST_FLOORF 1" >>confdefs.h gl_cv_func_fopen_slash="guessing no" ;; *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fopen recognizes a trailing slash" >&5 -printf %s "checking whether fopen recognizes a trailing slash... " >&6; } -if test ${gl_cv_func_fopen_slash+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fopen recognizes a trailing slash" >&5 +$as_echo_n "checking whether fopen recognizes a trailing slash... " >&6; } +if ${gl_cv_func_fopen_slash+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*) @@ -40409,7 +39857,7 @@ then : gl_cv_func_fopen_slash="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40424,10 +39872,9 @@ int main () return result; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_fopen_slash=yes -else $as_nop +else gl_cv_func_fopen_slash=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -40437,14 +39884,14 @@ fi rm -f conftest.sl fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_slash" >&5 -printf "%s\n" "$gl_cv_func_fopen_slash" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_slash" >&5 +$as_echo "$gl_cv_func_fopen_slash" >&6; } ;; esac case "$gl_cv_func_fopen_slash" in *no) -printf "%s\n" "#define FOPEN_TRAILING_SLASH_BUG 1" >>confdefs.h +$as_echo "#define FOPEN_TRAILING_SLASH_BUG 1" >>confdefs.h REPLACE_FOPEN=1 ;; @@ -40478,21 +39925,19 @@ printf "%s\n" "#define FOPEN_TRAILING_SLASH_BUG 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_FOPEN 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FOPEN 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fopen supports the mode character 'x'" >&5 -printf %s "checking whether fopen supports the mode character 'x'... " >&6; } -if test ${gl_cv_func_fopen_mode_x+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fopen supports the mode character 'x'" >&5 +$as_echo_n "checking whether fopen supports the mode character 'x'... " >&6; } +if ${gl_cv_func_fopen_mode_x+:} false; then : + $as_echo_n "(cached) " >&6 +else rm -f conftest.x - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on glibc and musl systems. linux*-gnu* | gnu* | kfreebsd*-gnu | *-musl*) @@ -40502,7 +39947,7 @@ then : gl_cv_func_fopen_mode_x="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40524,10 +39969,9 @@ int main () return 2; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_fopen_mode_x=yes -else $as_nop +else gl_cv_func_fopen_mode_x=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -40537,17 +39981,15 @@ fi rm -f conftest.x fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_mode_x" >&5 -printf "%s\n" "$gl_cv_func_fopen_mode_x" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fopen supports the mode character 'e'" >&5 -printf %s "checking whether fopen supports the mode character 'e'... " >&6; } -if test ${gl_cv_func_fopen_mode_e+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_mode_x" >&5 +$as_echo "$gl_cv_func_fopen_mode_x" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fopen supports the mode character 'e'" >&5 +$as_echo_n "checking whether fopen supports the mode character 'e'... " >&6; } +if ${gl_cv_func_fopen_mode_e+:} false; then : + $as_echo_n "(cached) " >&6 +else echo foo > conftest.x - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on glibc and musl systems. linux*-gnu* | gnu* | kfreebsd*-gnu | *-musl*) @@ -40560,7 +40002,7 @@ then : gl_cv_func_fopen_mode_e="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40587,10 +40029,9 @@ int main () return 2; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_fopen_mode_e=yes -else $as_nop +else gl_cv_func_fopen_mode_e=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -40600,8 +40041,8 @@ fi rm -f conftest.x fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_mode_e" >&5 -printf "%s\n" "$gl_cv_func_fopen_mode_e" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_mode_e" >&5 +$as_echo "$gl_cv_func_fopen_mode_e" >&6; } REPLACE_FOPEN_FOR_FOPEN_GNU="$REPLACE_FOPEN" case "$gl_cv_func_fopen_mode_x" in *no) REPLACE_FOPEN_FOR_FOPEN_GNU=1 ;; @@ -40625,7 +40066,9 @@ printf "%s\n" "$gl_cv_func_fopen_mode_e" >&6; } fi -printf "%s\n" "#define GNULIB_FOPEN_GNU 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_FOPEN_GNU 1 +_ACEOF @@ -40643,7 +40086,7 @@ printf "%s\n" "#define GNULIB_FOPEN_GNU 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_FOPEN_GNU 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FOPEN_GNU 1" >>confdefs.h @@ -40652,27 +40095,27 @@ printf "%s\n" "#define GNULIB_TEST_FOPEN_GNU 1" >>confdefs.h - ac_fn_check_decl "$LINENO" "fpurge" "ac_cv_have_decl_fpurge" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_fpurge" = xyes -then : + ac_fn_c_check_decl "$LINENO" "fpurge" "ac_cv_have_decl_fpurge" "#include +" +if test "x$ac_cv_have_decl_fpurge" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FPURGE $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FPURGE $ac_have_decl +_ACEOF if test "x$ac_cv_func_fpurge" = xyes; then HAVE_FPURGE=1 # Detect BSD bug. Only cygwin 1.7 and musl are known to be immune. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fpurge works" >&5 -printf %s "checking whether fpurge works... " >&6; } -if test ${gl_cv_func_fpurge_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fpurge works" >&5 +$as_echo_n "checking whether fpurge works... " >&6; } +if ${gl_cv_func_fpurge_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on musl systems. *-musl*) gl_cv_func_fpurge_works="guessing yes" ;; @@ -40680,13 +40123,13 @@ then : *) gl_cv_func_fpurge_works="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { FILE *f = fopen ("conftest.txt", "w+"); if (!f) @@ -40722,10 +40165,9 @@ FILE *f = fopen ("conftest.txt", "w+"); return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_fpurge_works=yes -else $as_nop +else gl_cv_func_fpurge_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -40734,8 +40176,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fpurge_works" >&5 -printf "%s\n" "$gl_cv_func_fpurge_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fpurge_works" >&5 +$as_echo "$gl_cv_func_fpurge_works" >&6; } case "$gl_cv_func_fpurge_works" in *yes) ;; *) REPLACE_FPURGE=1 ;; @@ -40776,7 +40218,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_FPURGE 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FPURGE 1" >>confdefs.h @@ -40787,18 +40229,17 @@ printf "%s\n" "#define GNULIB_TEST_FPURGE 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5 -printf %s "checking whether free is known to preserve errno... " >&6; } -if test ${gl_cv_func_free_preserves_errno+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5 +$as_echo_n "checking whether free is known to preserve errno... " >&6; } +if ${gl_cv_func_free_preserves_errno+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { #if 2 < __GLIBC__ + (33 <= __GLIBC_MINOR__) #elif defined __OpenBSD__ @@ -40811,22 +40252,21 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_func_free_preserves_errno=yes -else $as_nop +else gl_cv_func_free_preserves_errno=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5 -printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5 +$as_echo "$gl_cv_func_free_preserves_errno" >&6; } case $gl_cv_func_free_preserves_errno in *yes) -printf "%s\n" "#define HAVE_FREE_POSIX 1" >>confdefs.h +$as_echo "#define HAVE_FREE_POSIX 1" >>confdefs.h ;; *) REPLACE_FREE=1 ;; @@ -40866,7 +40306,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h @@ -40906,7 +40346,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_FSEEK 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FSEEK 1" >>confdefs.h @@ -40918,37 +40358,35 @@ printf "%s\n" "#define GNULIB_TEST_FSEEK 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 -printf %s "checking for fseeko... " >&6; } -if test ${gl_cv_func_fseeko+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 +$as_echo_n "checking for fseeko... " >&6; } +if ${gl_cv_func_fseeko+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { fseeko (stdin, 0, 0); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_func_fseeko=yes -else $as_nop +else gl_cv_func_fseeko=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fseeko" >&5 -printf "%s\n" "$gl_cv_func_fseeko" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fseeko" >&5 +$as_echo "$gl_cv_func_fseeko" >&6; } if test $ac_cv_have_decl_fseeko = no; then @@ -40967,22 +40405,20 @@ printf "%s\n" "$gl_cv_func_fseeko" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5 -printf %s "checking whether fflush works on input streams... " >&6; } -if test ${gl_cv_func_fflush_stdin+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5 +$as_echo_n "checking whether fflush works on input streams... " >&6; } +if ${gl_cv_func_fflush_stdin+:} false; then : + $as_echo_n "(cached) " >&6 +else echo hello world > conftest.txt - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on native Windows. mingw*) gl_cv_func_fflush_stdin="guessing no" ;; *) gl_cv_func_fflush_stdin=cross ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40997,7 +40433,7 @@ else $as_nop $gl_mda_defines int -main (void) +main () { FILE *f = fopen ("conftest.txt", "r"); char buffer[10]; @@ -41040,10 +40476,9 @@ FILE *f = fopen ("conftest.txt", "r"); return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_fflush_stdin=yes -else $as_nop +else gl_cv_func_fflush_stdin=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -41053,15 +40488,17 @@ fi rm conftest.txt fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 -printf "%s\n" "$gl_cv_func_fflush_stdin" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fflush_stdin" >&5 +$as_echo "$gl_cv_func_fflush_stdin" >&6; } case "$gl_cv_func_fflush_stdin" in *yes) gl_func_fflush_stdin=1 ;; *no) gl_func_fflush_stdin=0 ;; *) gl_func_fflush_stdin='(-1)' ;; esac -printf "%s\n" "#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define FUNC_FFLUSH_STDIN $gl_func_fflush_stdin +_ACEOF case "$gl_cv_func_fflush_stdin" in @@ -41088,22 +40525,28 @@ fi if test -z "$GL_COND_OBJ_FSEEKO_TRUE"; then : - ac_fn_c_check_func "$LINENO" "_fseeki64" "ac_cv_func__fseeki64" -if test "x$ac_cv_func__fseeki64" = xyes -then : - printf "%s\n" "#define HAVE__FSEEKI64 1" >>confdefs.h + for ac_func in _fseeki64 +do : + ac_fn_c_check_func "$LINENO" "_fseeki64" "ac_cv_func__fseeki64" +if test "x$ac_cv_func__fseeki64" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE__FSEEKI64 1 +_ACEOF fi +done if test $ac_cv_func__fseeki64 = yes; then - ac_fn_check_decl "$LINENO" "_fseeki64" "ac_cv_have_decl__fseeki64" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl__fseeki64" = xyes -then : + ac_fn_c_check_decl "$LINENO" "_fseeki64" "ac_cv_have_decl__fseeki64" "$ac_includes_default" +if test "x$ac_cv_have_decl__fseeki64" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL__FSEEKI64 $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL__FSEEKI64 $ac_have_decl +_ACEOF fi @@ -41124,7 +40567,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_FSEEKO 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FSEEKO 1" >>confdefs.h @@ -41192,24 +40635,29 @@ fi -printf "%s\n" "#define GNULIB_TEST_FSTAT 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FSTAT 1" >>confdefs.h + for ac_header in sys/mount.h +do : ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default #if HAVE_SYS_PARAM_H #include #endif " -if test "x$ac_cv_header_sys_mount_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h +if test "x$ac_cv_header_sys_mount_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_MOUNT_H 1 +_ACEOF fi +done + @@ -41224,12 +40672,11 @@ fi if test $ac_fsusage_space = no; then # glibc/{Hurd,kFreeBSD}, FreeBSD >= 5.0, NetBSD >= 3.0, # OpenBSD >= 4.4, AIX, HP-UX, IRIX, Solaris, Cygwin, Interix, BeOS. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for statvfs function (SVR4)" >&5 -printf %s "checking for statvfs function (SVR4)... " >&6; } -if test ${fu_cv_sys_stat_statvfs+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statvfs function (SVR4)" >&5 +$as_echo_n "checking for statvfs function (SVR4)... " >&6; } +if ${fu_cv_sys_stat_statvfs+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -41253,36 +40700,34 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1]; #endif int -main (void) +main () { statvfs (0, &fsd); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : fu_cv_sys_stat_statvfs=yes -else $as_nop +else fu_cv_sys_stat_statvfs=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs" >&5 -printf "%s\n" "$fu_cv_sys_stat_statvfs" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs" >&5 +$as_echo "$fu_cv_sys_stat_statvfs" >&6; } if test $fu_cv_sys_stat_statvfs = yes; then ac_fsusage_space=yes # AIX >= 5.2 has statvfs64 that has a wider f_blocks field than statvfs. # glibc, HP-UX, IRIX, Solaris have statvfs64 as well, but on these systems # statvfs with large-file support is already equivalent to statvfs64. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use statvfs64" >&5 -printf %s "checking whether to use statvfs64... " >&6; } -if test ${fu_cv_sys_stat_statvfs64+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use statvfs64" >&5 +$as_echo_n "checking whether to use statvfs64... " >&6; } +if ${fu_cv_sys_stat_statvfs64+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -41294,32 +40739,31 @@ else $as_nop ? 1 : -1]; int -main (void) +main () { statvfs64 (0, &fsd); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : fu_cv_sys_stat_statvfs64=yes -else $as_nop +else fu_cv_sys_stat_statvfs64=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs64" >&5 -printf "%s\n" "$fu_cv_sys_stat_statvfs64" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs64" >&5 +$as_echo "$fu_cv_sys_stat_statvfs64" >&6; } if test $fu_cv_sys_stat_statvfs64 = yes; then -printf "%s\n" "#define STAT_STATVFS64 1" >>confdefs.h +$as_echo "#define STAT_STATVFS64 1" >>confdefs.h else -printf "%s\n" "#define STAT_STATVFS 1" >>confdefs.h +$as_echo "#define STAT_STATVFS 1" >>confdefs.h fi fi @@ -41327,16 +40771,14 @@ printf "%s\n" "#define STAT_STATVFS 1" >>confdefs.h # Check for this unconditionally so we have a # good fallback on glibc/Linux > 2.6 < 2.6.36 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.f_frsize member" >&5 -printf %s "checking for two-argument statfs with statfs.f_frsize member... " >&6; } -if test ${fu_cv_sys_stat_statfs2_frsize+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.f_frsize member" >&5 +$as_echo_n "checking for two-argument statfs with statfs.f_frsize member... " >&6; } +if ${fu_cv_sys_stat_statfs2_frsize+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : fu_cv_sys_stat_statfs2_frsize=no -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -41357,10 +40799,9 @@ else $as_nop return statfs (".", &fsd) != 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : fu_cv_sys_stat_statfs2_frsize=yes -else $as_nop +else fu_cv_sys_stat_statfs2_frsize=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -41369,27 +40810,25 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_frsize" >&5 -printf "%s\n" "$fu_cv_sys_stat_statfs2_frsize" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_frsize" >&5 +$as_echo "$fu_cv_sys_stat_statfs2_frsize" >&6; } if test $fu_cv_sys_stat_statfs2_frsize = yes; then ac_fsusage_space=yes -printf "%s\n" "#define STAT_STATFS2_FRSIZE 1" >>confdefs.h +$as_echo "#define STAT_STATFS2_FRSIZE 1" >>confdefs.h fi if test $ac_fsusage_space = no; then # DEC Alpha running OSF/1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 3-argument statfs function (DEC OSF/1)" >&5 -printf %s "checking for 3-argument statfs function (DEC OSF/1)... " >&6; } -if test ${fu_cv_sys_stat_statfs3_osf1+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3-argument statfs function (DEC OSF/1)" >&5 +$as_echo_n "checking for 3-argument statfs function (DEC OSF/1)... " >&6; } +if ${fu_cv_sys_stat_statfs3_osf1+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : fu_cv_sys_stat_statfs3_osf1=no -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -41404,10 +40843,9 @@ else $as_nop return statfs (".", &fsd, sizeof (struct statfs)) != 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : fu_cv_sys_stat_statfs3_osf1=yes -else $as_nop +else fu_cv_sys_stat_statfs3_osf1=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -41416,12 +40854,12 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs3_osf1" >&5 -printf "%s\n" "$fu_cv_sys_stat_statfs3_osf1" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs3_osf1" >&5 +$as_echo "$fu_cv_sys_stat_statfs3_osf1" >&6; } if test $fu_cv_sys_stat_statfs3_osf1 = yes; then ac_fsusage_space=yes -printf "%s\n" "#define STAT_STATFS3_OSF1 1" >>confdefs.h +$as_echo "#define STAT_STATFS3_OSF1 1" >>confdefs.h fi fi @@ -41433,16 +40871,14 @@ printf "%s\n" "#define STAT_STATFS3_OSF1 1" >>confdefs.h # (On IRIX you need to include , not only and # .) # (On Solaris, statfs has 4 arguments.) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.f_bsize member (AIX, 4.3BSD)" >&5 -printf %s "checking for two-argument statfs with statfs.f_bsize member (AIX, 4.3BSD)... " >&6; } -if test ${fu_cv_sys_stat_statfs2_bsize+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.f_bsize member (AIX, 4.3BSD)" >&5 +$as_echo_n "checking for two-argument statfs with statfs.f_bsize member (AIX, 4.3BSD)... " >&6; } +if ${fu_cv_sys_stat_statfs2_bsize+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : fu_cv_sys_stat_statfs2_bsize=no -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -41463,10 +40899,9 @@ else $as_nop return statfs (".", &fsd) != 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : fu_cv_sys_stat_statfs2_bsize=yes -else $as_nop +else fu_cv_sys_stat_statfs2_bsize=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -41475,12 +40910,12 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_bsize" >&5 -printf "%s\n" "$fu_cv_sys_stat_statfs2_bsize" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_bsize" >&5 +$as_echo "$fu_cv_sys_stat_statfs2_bsize" >&6; } if test $fu_cv_sys_stat_statfs2_bsize = yes; then ac_fsusage_space=yes -printf "%s\n" "#define STAT_STATFS2_BSIZE 1" >>confdefs.h +$as_echo "#define STAT_STATFS2_BSIZE 1" >>confdefs.h fi fi @@ -41488,16 +40923,14 @@ printf "%s\n" "#define STAT_STATFS2_BSIZE 1" >>confdefs.h if test $ac_fsusage_space = no; then # SVR3 # (Solaris already handled above.) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for four-argument statfs (SVR3)" >&5 -printf %s "checking for four-argument statfs (SVR3)... " >&6; } -if test ${fu_cv_sys_stat_statfs4+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for four-argument statfs (SVR3)" >&5 +$as_echo_n "checking for four-argument statfs (SVR3)... " >&6; } +if ${fu_cv_sys_stat_statfs4+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : fu_cv_sys_stat_statfs4=no -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -41510,10 +40943,9 @@ else $as_nop return statfs (".", &fsd, sizeof fsd, 0) != 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : fu_cv_sys_stat_statfs4=yes -else $as_nop +else fu_cv_sys_stat_statfs4=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -41522,12 +40954,12 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs4" >&5 -printf "%s\n" "$fu_cv_sys_stat_statfs4" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs4" >&5 +$as_echo "$fu_cv_sys_stat_statfs4" >&6; } if test $fu_cv_sys_stat_statfs4 = yes; then ac_fsusage_space=yes -printf "%s\n" "#define STAT_STATFS4 1" >>confdefs.h +$as_echo "#define STAT_STATFS4 1" >>confdefs.h fi fi @@ -41538,16 +40970,14 @@ printf "%s\n" "#define STAT_STATFS4 1" >>confdefs.h # (On AIX, you need to include , not only .) # (On Solaris, statfs has 4 arguments and 'struct statfs' is not declared in # .) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.f_fsize member (4.4BSD and NetBSD)" >&5 -printf %s "checking for two-argument statfs with statfs.f_fsize member (4.4BSD and NetBSD)... " >&6; } -if test ${fu_cv_sys_stat_statfs2_fsize+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.f_fsize member (4.4BSD and NetBSD)" >&5 +$as_echo_n "checking for two-argument statfs with statfs.f_fsize member (4.4BSD and NetBSD)... " >&6; } +if ${fu_cv_sys_stat_statfs2_fsize+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : fu_cv_sys_stat_statfs2_fsize=no -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -41566,10 +40996,9 @@ else $as_nop return statfs (".", &fsd) != 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : fu_cv_sys_stat_statfs2_fsize=yes -else $as_nop +else fu_cv_sys_stat_statfs2_fsize=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -41578,20 +41007,19 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_fsize" >&5 -printf "%s\n" "$fu_cv_sys_stat_statfs2_fsize" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_fsize" >&5 +$as_echo "$fu_cv_sys_stat_statfs2_fsize" >&6; } if test $fu_cv_sys_stat_statfs2_fsize = yes; then ac_fsusage_space=yes -printf "%s\n" "#define STAT_STATFS2_FSIZE 1" >>confdefs.h +$as_echo "#define STAT_STATFS2_FSIZE 1" >>confdefs.h fi fi - if test $ac_fsusage_space = yes -then : + if test $ac_fsusage_space = yes; then : gl_cv_fs_space=yes -else $as_nop +else gl_cv_fs_space=no fi @@ -41614,26 +41042,25 @@ fi if test -z "$GL_COND_OBJ_FSUSAGE_TRUE"; then : - ac_fn_c_check_header_compile "$LINENO" "sys/fs/s5param.h" "ac_cv_header_sys_fs_s5param_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_fs_s5param_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_FS_S5PARAM_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_statfs_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_STATFS_H 1" >>confdefs.h + for ac_header in sys/fs/s5param.h sys/statfs.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi +done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for statfs that truncates block counts" >&5 -printf %s "checking for statfs that truncates block counts... " >&6; } -if test ${fu_cv_sys_truncating_statfs+y} -then : - printf %s "(cached) " >&6 -else $as_nop + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs that truncates block counts" >&5 +$as_echo_n "checking for statfs that truncates block counts... " >&6; } +if ${fu_cv_sys_truncating_statfs+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -41644,7 +41071,7 @@ choke -- this is a workaround for a Sun-specific problem #include int -main (void) +main () { struct statfs t; long c = *(t.f_spare); if (c) return 0; @@ -41653,20 +41080,19 @@ struct statfs t; long c = *(t.f_spare); return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : fu_cv_sys_truncating_statfs=yes -else $as_nop +else fu_cv_sys_truncating_statfs=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_truncating_statfs" >&5 -printf "%s\n" "$fu_cv_sys_truncating_statfs" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_truncating_statfs" >&5 +$as_echo "$fu_cv_sys_truncating_statfs" >&6; } if test $fu_cv_sys_truncating_statfs = yes; then -printf "%s\n" "#define STATFS_TRUNCATES_BLOCK_COUNTS 1" >>confdefs.h +$as_echo "#define STATFS_TRUNCATES_BLOCK_COUNTS 1" >>confdefs.h fi @@ -41709,7 +41135,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_FTELL 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FTELL 1" >>confdefs.h @@ -41726,36 +41152,34 @@ printf "%s\n" "#define GNULIB_TEST_FTELL 1" >>confdefs.h HAVE_DECL_FTELLO=0 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ftello" >&5 -printf %s "checking for ftello... " >&6; } -if test ${gl_cv_func_ftello+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ftello" >&5 +$as_echo_n "checking for ftello... " >&6; } +if ${gl_cv_func_ftello+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { ftello (stdin); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_func_ftello=yes -else $as_nop +else gl_cv_func_ftello=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello" >&5 -printf "%s\n" "$gl_cv_func_ftello" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello" >&5 +$as_echo "$gl_cv_func_ftello" >&6; } if test $gl_cv_func_ftello = no; then HAVE_FTELLO=0 else @@ -41767,12 +41191,11 @@ printf "%s\n" "$gl_cv_func_ftello" >&6; } fi if test $REPLACE_FTELLO = 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ftello works" >&5 -printf %s "checking whether ftello works... " >&6; } -if test ${gl_cv_func_ftello_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ftello works" >&5 +$as_echo_n "checking whether ftello works... " >&6; } +if ${gl_cv_func_ftello_works+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on Solaris. @@ -41782,10 +41205,9 @@ else $as_nop # Guess yes otherwise. *) gl_cv_func_ftello_works="guessing yes" ;; esac - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -41847,10 +41269,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_ftello_works=yes -else $as_nop +else gl_cv_func_ftello_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -41859,14 +41280,14 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello_works" >&5 -printf "%s\n" "$gl_cv_func_ftello_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ftello_works" >&5 +$as_echo "$gl_cv_func_ftello_works" >&6; } case "$gl_cv_func_ftello_works" in *yes) ;; *) REPLACE_FTELLO=1 -printf "%s\n" "#define FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE 1" >>confdefs.h +$as_echo "#define FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE 1" >>confdefs.h ;; esac @@ -41876,7 +41297,7 @@ printf "%s\n" "#define FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE 1" >>con if test $gl_ftello_broken_after_ungetc = yes; then REPLACE_FTELLO=1 -printf "%s\n" "#define FTELLO_BROKEN_AFTER_UNGETC 1" >>confdefs.h +$as_echo "#define FTELLO_BROKEN_AFTER_UNGETC 1" >>confdefs.h fi fi @@ -41899,12 +41320,16 @@ fi if test -z "$GL_COND_OBJ_FTELLO_TRUE"; then : - ac_fn_c_check_func "$LINENO" "_ftelli64" "ac_cv_func__ftelli64" -if test "x$ac_cv_func__ftelli64" = xyes -then : - printf "%s\n" "#define HAVE__FTELLI64 1" >>confdefs.h + for ac_func in _ftelli64 +do : + ac_fn_c_check_func "$LINENO" "_ftelli64" "ac_cv_func__ftelli64" +if test "x$ac_cv_func__ftelli64" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE__FTELLI64 1 +_ACEOF fi +done @@ -41924,7 +41349,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_FTELLO 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FTELLO 1" >>confdefs.h @@ -41932,12 +41357,11 @@ printf "%s\n" "#define GNULIB_TEST_FTELLO 1" >>confdefs.h GETADDRINFO_LIB= gai_saved_LIBS="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5 -printf %s "checking for library containing getaddrinfo... " >&6; } -if test ${ac_cv_search_getaddrinfo+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5 +$as_echo_n "checking for library containing getaddrinfo... " >&6; } +if ${ac_cv_search_getaddrinfo+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -41945,48 +41369,46 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char getaddrinfo (); int -main (void) +main () { return getaddrinfo (); ; return 0; } _ACEOF -for ac_lib in '' socket network net -do +for ac_lib in '' socket network net; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_getaddrinfo=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_getaddrinfo+y} -then : + if ${ac_cv_search_getaddrinfo+:} false; then : break fi done -if test ${ac_cv_search_getaddrinfo+y} -then : +if ${ac_cv_search_getaddrinfo+:} false; then : -else $as_nop +else ac_cv_search_getaddrinfo=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5 -printf "%s\n" "$ac_cv_search_getaddrinfo" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5 +$as_echo "$ac_cv_search_getaddrinfo" >&6; } ac_res=$ac_cv_search_getaddrinfo -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" if test "$ac_cv_search_getaddrinfo" != "none required"; then GETADDRINFO_LIB="$ac_cv_search_getaddrinfo" @@ -41996,12 +41418,11 @@ fi LIBS="$gai_saved_LIBS $GETADDRINFO_LIB" HAVE_GETADDRINFO=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 -printf %s "checking for getaddrinfo... " >&6; } -if test ${gl_cv_func_getaddrinfo+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 +$as_echo_n "checking for getaddrinfo... " >&6; } +if ${gl_cv_func_getaddrinfo+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42016,31 +41437,29 @@ else $as_nop #include int -main (void) +main () { getaddrinfo("", "", NULL, NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_func_getaddrinfo=yes -else $as_nop +else gl_cv_func_getaddrinfo=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getaddrinfo" >&5 -printf "%s\n" "$gl_cv_func_getaddrinfo" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getaddrinfo" >&5 +$as_echo "$gl_cv_func_getaddrinfo" >&6; } if test $gl_cv_func_getaddrinfo = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in ws2tcpip.h and -lws2_32" >&5 -printf %s "checking for getaddrinfo in ws2tcpip.h and -lws2_32... " >&6; } -if test ${gl_cv_w32_getaddrinfo+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in ws2tcpip.h and -lws2_32" >&5 +$as_echo_n "checking for getaddrinfo in ws2tcpip.h and -lws2_32... " >&6; } +if ${gl_cv_w32_getaddrinfo+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_w32_getaddrinfo=no am_save_LIBS="$LIBS" @@ -42054,33 +41473,31 @@ else $as_nop #include int -main (void) +main () { getaddrinfo(NULL, NULL, NULL, NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_w32_getaddrinfo=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_getaddrinfo" >&5 -printf "%s\n" "$gl_cv_w32_getaddrinfo" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_getaddrinfo" >&5 +$as_echo "$gl_cv_w32_getaddrinfo" >&6; } if test "$gl_cv_w32_getaddrinfo" = "yes"; then GETADDRINFO_LIB="-lws2_32" LIBS="$gai_saved_LIBS $GETADDRINFO_LIB" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo with POSIX signature" >&5 -printf %s "checking for getaddrinfo with POSIX signature... " >&6; } -if test ${gl_cv_func_getaddrinfo_posix_signature+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo with POSIX signature" >&5 +$as_echo_n "checking for getaddrinfo with POSIX signature... " >&6; } +if ${gl_cv_func_getaddrinfo_posix_signature+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42102,17 +41519,16 @@ extern int getaddrinfo (const char *, const char *, const struct addrinfo *, struct addrinfo **); _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_func_getaddrinfo_posix_signature=yes -else $as_nop +else gl_cv_func_getaddrinfo_posix_signature=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getaddrinfo_posix_signature" >&5 -printf "%s\n" "$gl_cv_func_getaddrinfo_posix_signature" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getaddrinfo_posix_signature" >&5 +$as_echo "$gl_cv_func_getaddrinfo_posix_signature" >&6; } if test $gl_cv_func_getaddrinfo_posix_signature = no; then REPLACE_GETADDRINFO=1 fi @@ -42121,13 +41537,15 @@ printf "%s\n" "$gl_cv_func_getaddrinfo_posix_signature" >&6; } fi fi -printf "%s\n" "#define HAVE_GETADDRINFO $HAVE_GETADDRINFO" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_GETADDRINFO $HAVE_GETADDRINFO +_ACEOF # We can't use AC_REPLACE_FUNCS here because gai_strerror may be an # inline function declared in ws2tcpip.h, so we need to get that # header included somehow. - ac_fn_check_decl "$LINENO" "gai_strerror" "ac_cv_have_decl_gai_strerror" " + ac_fn_c_check_decl "$LINENO" "gai_strerror" "ac_cv_have_decl_gai_strerror" " #include #ifdef HAVE_SYS_SOCKET_H #include @@ -42140,17 +41558,19 @@ printf "%s\n" "#define HAVE_GETADDRINFO $HAVE_GETADDRINFO" >>confdefs.h #endif #include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_gai_strerror" = xyes -then : +" +if test "x$ac_cv_have_decl_gai_strerror" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GAI_STRERROR $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GAI_STRERROR $ac_have_decl +_ACEOF if test $ac_cv_have_decl_gai_strerror = yes; then - ac_fn_check_decl "$LINENO" "gai_strerrorA" "ac_cv_have_decl_gai_strerrorA" " + ac_fn_c_check_decl "$LINENO" "gai_strerrorA" "ac_cv_have_decl_gai_strerrorA" " #include #ifdef HAVE_SYS_SOCKET_H #include @@ -42163,21 +41583,22 @@ printf "%s\n" "#define HAVE_DECL_GAI_STRERROR $ac_have_decl" >>confdefs.h #endif #include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_gai_strerrorA" = xyes -then : +" +if test "x$ac_cv_have_decl_gai_strerrorA" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GAI_STRERRORA $ac_have_decl" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gai_strerror with POSIX signature" >&5 -printf %s "checking for gai_strerror with POSIX signature... " >&6; } -if test ${gl_cv_func_gai_strerror_posix_signature+y} -then : - printf %s "(cached) " >&6 -else $as_nop +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GAI_STRERRORA $ac_have_decl +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror with POSIX signature" >&5 +$as_echo_n "checking for gai_strerror with POSIX signature... " >&6; } +if ${gl_cv_func_gai_strerror_posix_signature+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42199,16 +41620,15 @@ extern #endif const char *gai_strerror(int); _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_func_gai_strerror_posix_signature=yes -else $as_nop +else gl_cv_func_gai_strerror_posix_signature=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gai_strerror_posix_signature" >&5 -printf "%s\n" "$gl_cv_func_gai_strerror_posix_signature" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gai_strerror_posix_signature" >&5 +$as_echo "$gl_cv_func_gai_strerror_posix_signature" >&6; } if test $gl_cv_func_gai_strerror_posix_signature = no; then REPLACE_GAI_STRERROR=1 fi @@ -42228,10 +41648,11 @@ printf "%s\n" "$gl_cv_func_gai_strerror_posix_signature" >&6; } #include " -if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes -then : +if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_SA_LEN 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_SOCKADDR_SA_LEN 1 +_ACEOF fi @@ -42239,7 +41660,7 @@ fi - ac_fn_check_decl "$LINENO" "getaddrinfo" "ac_cv_have_decl_getaddrinfo" " + ac_fn_c_check_decl "$LINENO" "getaddrinfo" "ac_cv_have_decl_getaddrinfo" " /* sys/types.h is not needed according to POSIX, but the sys/socket.h in i386-unknown-freebsd4.10 and powerpc-apple-darwin5.5 required it. */ @@ -42254,15 +41675,17 @@ fi #include #endif -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getaddrinfo" = xyes -then : +" +if test "x$ac_cv_have_decl_getaddrinfo" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GETADDRINFO $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "freeaddrinfo" "ac_cv_have_decl_freeaddrinfo" " + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETADDRINFO $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "freeaddrinfo" "ac_cv_have_decl_freeaddrinfo" " /* sys/types.h is not needed according to POSIX, but the sys/socket.h in i386-unknown-freebsd4.10 and powerpc-apple-darwin5.5 required it. */ @@ -42277,15 +41700,17 @@ ac_fn_check_decl "$LINENO" "freeaddrinfo" "ac_cv_have_decl_freeaddrinfo" " #include #endif -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_freeaddrinfo" = xyes -then : +" +if test "x$ac_cv_have_decl_freeaddrinfo" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_FREEADDRINFO $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "getnameinfo" "ac_cv_have_decl_getnameinfo" " + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FREEADDRINFO $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "getnameinfo" "ac_cv_have_decl_getnameinfo" " /* sys/types.h is not needed according to POSIX, but the sys/socket.h in i386-unknown-freebsd4.10 and powerpc-apple-darwin5.5 required it. */ @@ -42300,14 +41725,16 @@ ac_fn_check_decl "$LINENO" "getnameinfo" "ac_cv_have_decl_getnameinfo" " #include #endif -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getnameinfo" = xyes -then : +" +if test "x$ac_cv_have_decl_getnameinfo" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GETNAMEINFO $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETNAMEINFO $ac_have_decl +_ACEOF if test $ac_cv_have_decl_getaddrinfo = no; then HAVE_DECL_GETADDRINFO=0 @@ -42335,10 +41762,11 @@ printf "%s\n" "#define HAVE_DECL_GETNAMEINFO $ac_have_decl" >>confdefs.h #endif " -if test "x$ac_cv_type_struct_addrinfo" = xyes -then : +if test "x$ac_cv_type_struct_addrinfo" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_ADDRINFO 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_ADDRINFO 1 +_ACEOF fi @@ -42408,7 +41836,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_GETADDRINFO 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETADDRINFO 1" >>confdefs.h @@ -42423,19 +41851,17 @@ printf "%s\n" "#define GNULIB_TEST_GETADDRINFO 1" >>confdefs.h if test $ac_cv_func_getdelim = yes; then HAVE_GETDELIM=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5 -printf %s "checking for working getdelim function... " >&6; } -if test ${gl_cv_func_working_getdelim+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5 +$as_echo_n "checking for working getdelim function... " >&6; } +if ${gl_cv_func_working_getdelim+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in darwin*) gl_cv_func_working_getdelim=no ;; *) echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42448,20 +41874,19 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1 -then : + $EGREP "Lucky GNU user" >/dev/null 2>&1; then : gl_cv_func_working_getdelim="guessing yes" -else $as_nop +else case "$host_os" in *-musl*) gl_cv_func_working_getdelim="guessing yes" ;; *) gl_cv_func_working_getdelim="$gl_cross_guess_normal" ;; esac fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42497,10 +41922,9 @@ else $as_nop } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_working_getdelim=yes -else $as_nop +else gl_cv_func_working_getdelim=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -42511,8 +41935,8 @@ fi esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5 -printf "%s\n" "$gl_cv_func_working_getdelim" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5 +$as_echo "$gl_cv_func_working_getdelim" >&6; } case "$gl_cv_func_working_getdelim" in *yes) ;; *) REPLACE_GETDELIM=1 ;; @@ -42542,27 +41966,28 @@ fi if test -z "$GL_COND_OBJ_GETDELIM_TRUE"; then : - ac_fn_c_check_func "$LINENO" "flockfile" "ac_cv_func_flockfile" -if test "x$ac_cv_func_flockfile" = xyes -then : - printf "%s\n" "#define HAVE_FLOCKFILE 1" >>confdefs.h + for ac_func in flockfile funlockfile +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_func "$LINENO" "funlockfile" "ac_cv_func_funlockfile" -if test "x$ac_cv_func_funlockfile" = xyes -then : - printf "%s\n" "#define HAVE_FUNLOCKFILE 1" >>confdefs.h +done -fi - - ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getc_unlocked" = xyes -then : + ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl +_ACEOF @@ -42582,7 +42007,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h @@ -42593,24 +42018,22 @@ printf "%s\n" "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h if test $ac_cv_func_getdtablesize = yes && test $ac_cv_have_decl_getdtablesize = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5 -printf %s "checking whether getdtablesize works... " >&6; } -if test ${gl_cv_func_getdtablesize_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5 +$as_echo_n "checking whether getdtablesize works... " >&6; } +if ${gl_cv_func_getdtablesize_works+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in vms*) gl_cv_func_getdtablesize_works="no (limitation)" ;; *) - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows gl_cv_func_getdtablesize_works="guessing no" ;; *) gl_cv_func_getdtablesize_works="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42621,7 +42044,7 @@ $gl_mda_defines int -main (void) +main () { int size = getdtablesize(); if (dup2 (0, getdtablesize()) != -1) @@ -42633,10 +42056,9 @@ int size = getdtablesize(); return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_getdtablesize_works=yes -else $as_nop +else gl_cv_func_getdtablesize_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -42647,8 +42069,8 @@ fi esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5 -printf "%s\n" "$gl_cv_func_getdtablesize_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5 +$as_echo "$gl_cv_func_getdtablesize_works" >&6; } case "$gl_cv_func_getdtablesize_works" in *yes | "no (limitation)") ;; *) REPLACE_GETDTABLESIZE=1 ;; @@ -42691,7 +42113,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h @@ -42702,13 +42124,18 @@ printf "%s\n" "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h if test $ac_cv_header_sys_socket_h != yes; then - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes -then : - printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h + for ac_header in winsock2.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" +if test "x$ac_cv_header_winsock2_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINSOCK2_H 1 +_ACEOF fi +done + fi if test "$ac_cv_header_winsock2_h" = yes; then HAVE_WINSOCK2_H=1 @@ -42721,22 +42148,21 @@ fi GETHOSTNAME_LIB= - for ac_func in gethostname do : ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname" -if test "x$ac_cv_func_gethostname" = xyes -then : - printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h +if test "x$ac_cv_func_gethostname" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETHOSTNAME 1 +_ACEOF -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostname in winsock2.h and -lws2_32" >&5 -printf %s "checking for gethostname in winsock2.h and -lws2_32... " >&6; } -if test ${gl_cv_w32_gethostname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in winsock2.h and -lws2_32" >&5 +$as_echo_n "checking for gethostname in winsock2.h and -lws2_32... " >&6; } +if ${gl_cv_w32_gethostname+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_w32_gethostname=no gl_save_LIBS="$LIBS" LIBS="$LIBS -lws2_32" @@ -42749,33 +42175,32 @@ else $as_nop #include int -main (void) +main () { gethostname(NULL, 0); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_w32_gethostname=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$gl_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_gethostname" >&5 -printf "%s\n" "$gl_cv_w32_gethostname" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_gethostname" >&5 +$as_echo "$gl_cv_w32_gethostname" >&6; } if test "$gl_cv_w32_gethostname" = "yes"; then GETHOSTNAME_LIB="-lws2_32" fi fi - done + if test "$ac_cv_func_gethostname" = no; then HAVE_GETHOSTNAME=0 fi @@ -42784,12 +42209,11 @@ done - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for HOST_NAME_MAX" >&5 -printf %s "checking for HOST_NAME_MAX... " >&6; } -if test ${gl_cv_decl_HOST_NAME_MAX+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HOST_NAME_MAX" >&5 +$as_echo_n "checking for HOST_NAME_MAX... " >&6; } +if ${gl_cv_decl_HOST_NAME_MAX+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_decl_HOST_NAME_MAX= cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -42802,11 +42226,10 @@ lucky _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "lucky" >/dev/null 2>&1 -then : + $EGREP "lucky" >/dev/null 2>&1; then : gl_cv_decl_HOST_NAME_MAX=yes fi -rm -rf conftest* +rm -f conftest* if test -z "$gl_cv_decl_HOST_NAME_MAX"; then if test "$gl_cv_w32_gethostname" = yes; then @@ -42823,10 +42246,9 @@ rm -rf conftest* #if HAVE_NETDB_H # include #endif -" -then : +"; then : -else $as_nop +else gl_cv_decl_HOST_NAME_MAX=256 fi @@ -42835,11 +42257,13 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_HOST_NAME_MAX" >&5 -printf "%s\n" "$gl_cv_decl_HOST_NAME_MAX" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_HOST_NAME_MAX" >&5 +$as_echo "$gl_cv_decl_HOST_NAME_MAX" >&6; } if test "$gl_cv_decl_HOST_NAME_MAX" != yes; then -printf "%s\n" "#define HOST_NAME_MAX $gl_cv_decl_HOST_NAME_MAX" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HOST_NAME_MAX $gl_cv_decl_HOST_NAME_MAX +_ACEOF fi @@ -42862,12 +42286,16 @@ fi if test "$gl_cv_w32_gethostname" != "yes"; then - ac_fn_c_check_func "$LINENO" "uname" "ac_cv_func_uname" -if test "x$ac_cv_func_uname" = xyes -then : - printf "%s\n" "#define HAVE_UNAME 1" >>confdefs.h + for ac_func in uname +do : + ac_fn_c_check_func "$LINENO" "uname" "ac_cv_func_uname" +if test "x$ac_cv_func_uname" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UNAME 1 +_ACEOF fi +done fi @@ -42888,7 +42316,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_GETHOSTNAME 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETHOSTNAME 1" >>confdefs.h @@ -42901,23 +42329,20 @@ printf "%s\n" "#define GNULIB_TEST_GETHOSTNAME 1" >>confdefs.h gl_getline_needs_run_time_check=no ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline" -if test "x$ac_cv_func_getline" = xyes -then : +if test "x$ac_cv_func_getline" = xyes; then : gl_getline_needs_run_time_check=yes -else $as_nop +else am_cv_func_working_getline=no fi if test $gl_getline_needs_run_time_check = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working getline function" >&5 -printf %s "checking for working getline function... " >&6; } -if test ${am_cv_func_working_getline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getline function" >&5 +$as_echo_n "checking for working getline function... " >&6; } +if ${am_cv_func_working_getline+:} false; then : + $as_echo_n "(cached) " >&6 +else echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42930,20 +42355,19 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1 -then : + $EGREP "Lucky GNU user" >/dev/null 2>&1; then : am_cv_func_working_getline="guessing yes" -else $as_nop +else case "$host_os" in *-musl*) am_cv_func_working_getline="guessing yes" ;; *) am_cv_func_working_getline="$gl_cross_guess_normal" ;; esac fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42979,10 +42403,9 @@ else $as_nop } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : am_cv_func_working_getline=yes -else $as_nop +else am_cv_func_working_getline=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -42991,8 +42414,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_working_getline" >&5 -printf "%s\n" "$am_cv_func_working_getline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_working_getline" >&5 +$as_echo "$am_cv_func_working_getline" >&6; } fi if test $ac_cv_have_decl_getline = no; then @@ -43042,7 +42465,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_GETLINE 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETLINE 1" >>confdefs.h @@ -43058,10 +42481,9 @@ gl_save_LIBS=$LIBS # NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7. HAVE_GETLOADAVG=1 ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg" -if test "x$ac_cv_func_getloadavg" = xyes -then : +if test "x$ac_cv_func_getloadavg" = xyes; then : -else $as_nop +else gl_func_getloadavg_done=no # Some systems with -lutil have (and need) -lkvm as well, some do not. @@ -43070,12 +42492,11 @@ else $as_nop # For kstat on solaris, we need to test for libelf and libkvm to force the # definition of SVR4 below. if test $gl_func_getloadavg_done = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for elf_begin in -lelf" >&5 -printf %s "checking for elf_begin in -lelf... " >&6; } -if test ${ac_cv_lib_elf_elf_begin+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_begin in -lelf" >&5 +$as_echo_n "checking for elf_begin in -lelf... " >&6; } +if ${ac_cv_lib_elf_elf_begin+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lelf $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -43084,38 +42505,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char elf_begin (); int -main (void) +main () { return elf_begin (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_elf_elf_begin=yes -else $as_nop +else ac_cv_lib_elf_elf_begin=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_elf_begin" >&5 -printf "%s\n" "$ac_cv_lib_elf_elf_begin" >&6; } -if test "x$ac_cv_lib_elf_elf_begin" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_elf_begin" >&5 +$as_echo "$ac_cv_lib_elf_elf_begin" >&6; } +if test "x$ac_cv_lib_elf_elf_begin" = xyes; then : LIBS="-lelf $LIBS" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5 -printf %s "checking for kvm_open in -lkvm... " >&6; } -if test ${ac_cv_lib_kvm_kvm_open+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5 +$as_echo_n "checking for kvm_open in -lkvm... " >&6; } +if ${ac_cv_lib_kvm_kvm_open+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lkvm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -43124,39 +42545,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char kvm_open (); int -main (void) +main () { return kvm_open (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_kvm_kvm_open=yes -else $as_nop +else ac_cv_lib_kvm_kvm_open=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_open" >&5 -printf "%s\n" "$ac_cv_lib_kvm_kvm_open" >&6; } -if test "x$ac_cv_lib_kvm_kvm_open" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_open" >&5 +$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; } +if test "x$ac_cv_lib_kvm_kvm_open" = xyes; then : LIBS="-lkvm $LIBS" fi # Check for the 4.4BSD definition of getloadavg. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lutil" >&5 -printf %s "checking for getloadavg in -lutil... " >&6; } -if test ${ac_cv_lib_util_getloadavg+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lutil" >&5 +$as_echo_n "checking for getloadavg in -lutil... " >&6; } +if ${ac_cv_lib_util_getloadavg+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -43165,29 +42586,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char getloadavg (); int -main (void) +main () { return getloadavg (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_util_getloadavg=yes -else $as_nop +else ac_cv_lib_util_getloadavg=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_getloadavg" >&5 -printf "%s\n" "$ac_cv_lib_util_getloadavg" >&6; } -if test "x$ac_cv_lib_util_getloadavg" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_getloadavg" >&5 +$as_echo "$ac_cv_lib_util_getloadavg" >&6; } +if test "x$ac_cv_lib_util_getloadavg" = xyes; then : LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes fi @@ -43200,12 +42622,11 @@ fi if test $cross_compiling != yes; then LIBS="-L/usr/local/lib $LIBS" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lgetloadavg" >&5 -printf %s "checking for getloadavg in -lgetloadavg... " >&6; } -if test ${ac_cv_lib_getloadavg_getloadavg+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lgetloadavg" >&5 +$as_echo_n "checking for getloadavg in -lgetloadavg... " >&6; } +if ${ac_cv_lib_getloadavg_getloadavg+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lgetloadavg $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -43214,31 +42635,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char getloadavg (); int -main (void) +main () { return getloadavg (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_getloadavg_getloadavg=yes -else $as_nop +else ac_cv_lib_getloadavg_getloadavg=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_getloadavg_getloadavg" >&5 -printf "%s\n" "$ac_cv_lib_getloadavg_getloadavg" >&6; } -if test "x$ac_cv_lib_getloadavg_getloadavg" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_getloadavg_getloadavg" >&5 +$as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; } +if test "x$ac_cv_lib_getloadavg_getloadavg" = xyes; then : LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes -else $as_nop +else LIBS=$gl_getloadavg_LIBS fi @@ -43249,12 +42671,11 @@ fi HAVE_GETLOADAVG=0 # Solaris has libkstat which does not require root. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5 -printf %s "checking for kstat_open in -lkstat... " >&6; } -if test ${ac_cv_lib_kstat_kstat_open+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5 +$as_echo_n "checking for kstat_open in -lkstat... " >&6; } +if ${ac_cv_lib_kstat_kstat_open+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lkstat $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -43263,30 +42684,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char kstat_open (); int -main (void) +main () { return kstat_open (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_kstat_kstat_open=yes -else $as_nop +else ac_cv_lib_kstat_kstat_open=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5 -printf "%s\n" "$ac_cv_lib_kstat_kstat_open" >&6; } -if test "x$ac_cv_lib_kstat_kstat_open" = xyes -then : - printf "%s\n" "#define HAVE_LIBKSTAT 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5 +$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } +if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBKSTAT 1 +_ACEOF LIBS="-lkstat $LIBS" @@ -43296,12 +42720,11 @@ fi # AIX has libperfstat which does not require root if test $gl_func_getloadavg_done = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for perfstat_cpu_total in -lperfstat" >&5 -printf %s "checking for perfstat_cpu_total in -lperfstat... " >&6; } -if test ${ac_cv_lib_perfstat_perfstat_cpu_total+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perfstat_cpu_total in -lperfstat" >&5 +$as_echo_n "checking for perfstat_cpu_total in -lperfstat... " >&6; } +if ${ac_cv_lib_perfstat_perfstat_cpu_total+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lperfstat $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -43310,30 +42733,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char perfstat_cpu_total (); int -main (void) +main () { return perfstat_cpu_total (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_perfstat_perfstat_cpu_total=yes -else $as_nop +else ac_cv_lib_perfstat_perfstat_cpu_total=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_perfstat_perfstat_cpu_total" >&5 -printf "%s\n" "$ac_cv_lib_perfstat_perfstat_cpu_total" >&6; } -if test "x$ac_cv_lib_perfstat_perfstat_cpu_total" = xyes -then : - printf "%s\n" "#define HAVE_LIBPERFSTAT 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_perfstat_perfstat_cpu_total" >&5 +$as_echo "$ac_cv_lib_perfstat_perfstat_cpu_total" >&6; } +if test "x$ac_cv_lib_perfstat_perfstat_cpu_total" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPERFSTAT 1 +_ACEOF LIBS="-lperfstat $LIBS" @@ -43343,19 +42769,17 @@ fi fi if test $gl_func_getloadavg_done = no; then - ac_fn_c_check_header_compile "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_dg_sys_info_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_dg_sys_info_h" = xyes; then : gl_func_getloadavg_done=yes -printf "%s\n" "#define DGUX 1" >>confdefs.h +$as_echo "#define DGUX 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dg_sys_info in -ldgc" >&5 -printf %s "checking for dg_sys_info in -ldgc... " >&6; } -if test ${ac_cv_lib_dgc_dg_sys_info+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dg_sys_info in -ldgc" >&5 +$as_echo_n "checking for dg_sys_info in -ldgc... " >&6; } +if ${ac_cv_lib_dgc_dg_sys_info+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldgc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -43364,30 +42788,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dg_sys_info (); int -main (void) +main () { return dg_sys_info (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dgc_dg_sys_info=yes -else $as_nop +else ac_cv_lib_dgc_dg_sys_info=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgc_dg_sys_info" >&5 -printf "%s\n" "$ac_cv_lib_dgc_dg_sys_info" >&6; } -if test "x$ac_cv_lib_dgc_dg_sys_info" = xyes -then : - printf "%s\n" "#define HAVE_LIBDGC 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgc_dg_sys_info" >&5 +$as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; } +if test "x$ac_cv_lib_dgc_dg_sys_info" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDGC 1 +_ACEOF LIBS="-ldgc $LIBS" @@ -43395,6 +42822,7 @@ fi fi + fi fi fi @@ -43410,34 +42838,39 @@ LIBS=$gl_save_LIBS # Test whether the system declares getloadavg. Solaris has the function # but declares it in , not . -ac_fn_c_check_header_compile "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_loadavg_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_LOADAVG_H 1" >>confdefs.h +for ac_header in sys/loadavg.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_loadavg_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_LOADAVG_H 1 +_ACEOF fi +done + if test $ac_cv_header_sys_loadavg_h = yes; then HAVE_SYS_LOADAVG_H=1 else HAVE_SYS_LOADAVG_H=0 fi -ac_fn_check_decl "$LINENO" "getloadavg" "ac_cv_have_decl_getloadavg" "#if HAVE_SYS_LOADAVG_H +ac_fn_c_check_decl "$LINENO" "getloadavg" "ac_cv_have_decl_getloadavg" "#if HAVE_SYS_LOADAVG_H /* OpenIndiana has a bug: must be included before . */ # include # include #endif #include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getloadavg" = xyes -then : +" +if test "x$ac_cv_have_decl_getloadavg" = xyes; then : -else $as_nop +else HAVE_DECL_GETLOADAVG=0 fi + if test $HAVE_GETLOADAVG = 0; then GL_COND_OBJ_GETLOADAVG_TRUE= GL_COND_OBJ_GETLOADAVG_FALSE='#' @@ -43460,17 +42893,17 @@ fi # On HPUX9, an unprivileged user can get load averages this way. if test $gl_func_getloadavg_done = no; then - for ac_func in pstat_getdynamic do : ac_fn_c_check_func "$LINENO" "pstat_getdynamic" "ac_cv_func_pstat_getdynamic" -if test "x$ac_cv_func_pstat_getdynamic" = xyes -then : - printf "%s\n" "#define HAVE_PSTAT_GETDYNAMIC 1" >>confdefs.h +if test "x$ac_cv_func_pstat_getdynamic" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PSTAT_GETDYNAMIC 1 +_ACEOF gl_func_getloadavg_done=yes fi - done + fi # We cannot check for , because Solaris 2 does not use dwarf (it @@ -43480,57 +42913,64 @@ if test $gl_func_getloadavg_done = no && test "$ac_cv_lib_elf_elf_begin" = yes \ && test "$ac_cv_lib_kvm_kvm_open" = yes; then gl_func_getloadavg_done=yes -printf "%s\n" "#define SVR4 1" >>confdefs.h +$as_echo "#define SVR4 1" >>confdefs.h fi if test $gl_func_getloadavg_done = no; then - ac_fn_c_check_header_compile "$LINENO" "inq_stats/cpustats.h" "ac_cv_header_inq_stats_cpustats_h" "$ac_includes_default" -if test "x$ac_cv_header_inq_stats_cpustats_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "inq_stats/cpustats.h" "ac_cv_header_inq_stats_cpustats_h" "$ac_includes_default" +if test "x$ac_cv_header_inq_stats_cpustats_h" = xyes; then : gl_func_getloadavg_done=yes -printf "%s\n" "#define UMAX 1" >>confdefs.h +$as_echo "#define UMAX 1" >>confdefs.h -printf "%s\n" "#define UMAX4_3 1" >>confdefs.h +$as_echo "#define UMAX4_3 1" >>confdefs.h fi + fi if test $gl_func_getloadavg_done = no; then - ac_fn_c_check_header_compile "$LINENO" "sys/cpustats.h" "ac_cv_header_sys_cpustats_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_cpustats_h" = xyes -then : - gl_func_getloadavg_done=yes; printf "%s\n" "#define UMAX 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "sys/cpustats.h" "ac_cv_header_sys_cpustats_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_cpustats_h" = xyes; then : + gl_func_getloadavg_done=yes; $as_echo "#define UMAX 1" >>confdefs.h fi + fi if test $gl_func_getloadavg_done = no; then - ac_fn_c_check_header_compile "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default" -if test "x$ac_cv_header_mach_mach_h" = xyes -then : - printf "%s\n" "#define HAVE_MACH_MACH_H 1" >>confdefs.h - -fi - -fi - - for ac_header in nlist.h + for ac_header in mach/mach.h do : - ac_fn_c_check_header_compile "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default" -if test "x$ac_cv_header_nlist_h" = xyes -then : - printf "%s\n" "#define HAVE_NLIST_H 1" >>confdefs.h + ac_fn_c_check_header_mongrel "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default" +if test "x$ac_cv_header_mach_mach_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MACH_MACH_H 1 +_ACEOF + +fi + +done + +fi + +for ac_header in nlist.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default" +if test "x$ac_cv_header_nlist_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NLIST_H 1 +_ACEOF ac_fn_c_check_member "$LINENO" "struct nlist" "n_un.n_name" "ac_cv_member_struct_nlist_n_un_n_name" "#include " -if test "x$ac_cv_member_struct_nlist_n_un_n_name" = xyes -then : +if test "x$ac_cv_member_struct_nlist_n_un_n_name" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_NLIST_N_UN_N_NAME 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_NLIST_N_UN_N_NAME 1 +_ACEOF fi @@ -43539,7 +42979,7 @@ fi /* end confdefs.h. */ #include int -main (void) +main () { struct nlist x; #ifdef HAVE_STRUCT_NLIST_N_UN_N_NAME @@ -43551,19 +42991,19 @@ struct nlist x; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : -printf "%s\n" "#define N_NAME_POINTER 1" >>confdefs.h +$as_echo "#define N_NAME_POINTER 1" >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi done + fi @@ -43580,7 +43020,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_GETLOADAVG 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETLOADAVG 1" >>confdefs.h @@ -43611,7 +43051,7 @@ printf "%s\n" "#define GNULIB_TEST_GETLOADAVG 1" >>confdefs.h -printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h +$as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h GL_GENERATE_GETOPT_H=true GL_GENERATE_GETOPT_CDEFS_H=true @@ -43725,7 +43165,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_GETOPT_POSIX 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETOPT_POSIX 1" >>confdefs.h @@ -43733,45 +43173,48 @@ printf "%s\n" "#define GNULIB_TEST_GETOPT_POSIX 1" >>confdefs.h ac_found=0 - ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_program_invocation_name" = xyes -then : + ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include +" +if test "x$ac_cv_have_decl_program_invocation_name" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h -if test $ac_have_decl = 1 -then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : ac_found=1 fi - ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes -then : + ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include +" +if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h -if test $ac_have_decl = 1 -then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : ac_found=1 fi - ac_fn_check_decl "$LINENO" "__argv" "ac_cv_have_decl___argv" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl___argv" = xyes -then : + ac_fn_c_check_decl "$LINENO" "__argv" "ac_cv_have_decl___argv" "#include +" +if test "x$ac_cv_have_decl___argv" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h -if test $ac_have_decl = 1 -then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL___ARGV $ac_have_decl +_ACEOF +if test $ac_have_decl = 1; then : ac_found=1 fi @@ -43780,19 +43223,18 @@ fi if test $ac_found = 0; then # On OpenBSD 5.1, using the global __progname variable appears to be # the only way to implement getprogname. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5 -printf %s "checking whether __progname is defined in default libraries... " >&6; } -if test ${gl_cv_var___progname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5 +$as_echo_n "checking whether __progname is defined in default libraries... " >&6; } +if ${gl_cv_var___progname+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_var___progname= cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern char *__progname; int -main (void) +main () { return *__progname; @@ -43800,21 +43242,20 @@ return *__progname; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_var___progname=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5 -printf "%s\n" "$gl_cv_var___progname" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5 +$as_echo "$gl_cv_var___progname" >&6; } if test "$gl_cv_var___progname" = yes; then -printf "%s\n" "#define HAVE_VAR___PROGNAME 1" >>confdefs.h +$as_echo "#define HAVE_VAR___PROGNAME 1" >>confdefs.h fi fi @@ -43828,12 +43269,11 @@ printf "%s\n" "#define HAVE_VAR___PROGNAME 1" >>confdefs.h HOSTENT_LIB= gl_saved_libs="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 -printf %s "checking for library containing gethostbyname... " >&6; } -if test ${ac_cv_search_gethostbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 +$as_echo_n "checking for library containing gethostbyname... " >&6; } +if ${ac_cv_search_gethostbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -43841,48 +43281,46 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char gethostbyname (); int -main (void) +main () { return gethostbyname (); ; return 0; } _ACEOF -for ac_lib in '' nsl network net -do +for ac_lib in '' nsl network net; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_gethostbyname=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_gethostbyname+y} -then : + if ${ac_cv_search_gethostbyname+:} false; then : break fi done -if test ${ac_cv_search_gethostbyname+y} -then : +if ${ac_cv_search_gethostbyname+:} false; then : -else $as_nop +else ac_cv_search_gethostbyname=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 -printf "%s\n" "$ac_cv_search_gethostbyname" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 +$as_echo "$ac_cv_search_gethostbyname" >&6; } ac_res=$ac_cv_search_gethostbyname -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" if test "$ac_cv_search_gethostbyname" != "none required"; then HOSTENT_LIB="$ac_cv_search_gethostbyname" @@ -43891,22 +43329,21 @@ fi LIBS="$gl_saved_libs" if test -z "$HOSTENT_LIB"; then - - for ac_func in gethostbyname + for ac_func in gethostbyname do : ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = xyes -then : - printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h +if test "x$ac_cv_func_gethostbyname" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETHOSTBYNAME 1 +_ACEOF -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in winsock2.h and -lws2_32" >&5 -printf %s "checking for gethostbyname in winsock2.h and -lws2_32... " >&6; } -if test ${gl_cv_w32_gethostbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in winsock2.h and -lws2_32" >&5 +$as_echo_n "checking for gethostbyname in winsock2.h and -lws2_32... " >&6; } +if ${gl_cv_w32_gethostbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_w32_gethostbyname=no gl_save_LIBS="$LIBS" LIBS="$LIBS -lws2_32" @@ -43919,31 +43356,30 @@ else $as_nop #include int -main (void) +main () { gethostbyname(NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_w32_gethostbyname=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$gl_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_gethostbyname" >&5 -printf "%s\n" "$gl_cv_w32_gethostbyname" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_gethostbyname" >&5 +$as_echo "$gl_cv_w32_gethostbyname" >&6; } if test "$gl_cv_w32_gethostbyname" = "yes"; then HOSTENT_LIB="-lws2_32" fi fi - done + fi @@ -43967,13 +43403,18 @@ done if test $ac_cv_header_sys_socket_h != yes; then - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes -then : - printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h + for ac_header in winsock2.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" +if test "x$ac_cv_header_winsock2_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINSOCK2_H 1 +_ACEOF fi +done + fi if test "$ac_cv_header_winsock2_h" = yes; then HAVE_WINSOCK2_H=1 @@ -43986,15 +43427,17 @@ fi if test $HAVE_WINSOCK2_H = 1; then REPLACE_INET_NTOP=1 - ac_fn_check_decl "$LINENO" "inet_ntop" "ac_cv_have_decl_inet_ntop" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_inet_ntop" = xyes -then : + ac_fn_c_check_decl "$LINENO" "inet_ntop" "ac_cv_have_decl_inet_ntop" "#include +" +if test "x$ac_cv_have_decl_inet_ntop" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_INET_NTOP $ac_have_decl +_ACEOF if test $ac_cv_have_decl_inet_ntop = yes; then INET_NTOP_LIB="-lws2_32" @@ -44003,12 +43446,11 @@ printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h fi else gl_save_LIBS=$LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 -printf %s "checking for library containing inet_ntop... " >&6; } -if test ${ac_cv_search_inet_ntop+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 +$as_echo_n "checking for library containing inet_ntop... " >&6; } +if ${ac_cv_search_inet_ntop+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -44016,57 +43458,59 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char inet_ntop (); int -main (void) +main () { return inet_ntop (); ; return 0; } _ACEOF -for ac_lib in '' nsl resolv network -do +for ac_lib in '' nsl resolv network; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_inet_ntop=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_inet_ntop+y} -then : + if ${ac_cv_search_inet_ntop+:} false; then : break fi done -if test ${ac_cv_search_inet_ntop+y} -then : +if ${ac_cv_search_inet_ntop+:} false; then : -else $as_nop +else ac_cv_search_inet_ntop=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5 -printf "%s\n" "$ac_cv_search_inet_ntop" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5 +$as_echo "$ac_cv_search_inet_ntop" >&6; } ac_res=$ac_cv_search_inet_ntop -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop +else + for ac_func in inet_ntop +do : ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" -if test "x$ac_cv_func_inet_ntop" = xyes -then : - printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h +if test "x$ac_cv_func_inet_ntop" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_INET_NTOP 1 +_ACEOF fi +done if test $ac_cv_func_inet_ntop = no; then HAVE_INET_NTOP=0 @@ -44082,19 +43526,21 @@ fi fi - ac_fn_check_decl "$LINENO" "inet_ntop" "ac_cv_have_decl_inet_ntop" "#include + ac_fn_c_check_decl "$LINENO" "inet_ntop" "ac_cv_have_decl_inet_ntop" "#include #if HAVE_NETDB_H # include #endif -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_inet_ntop" = xyes -then : +" +if test "x$ac_cv_have_decl_inet_ntop" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_INET_NTOP $ac_have_decl +_ACEOF if test $ac_cv_have_decl_inet_ntop = no; then HAVE_DECL_INET_NTOP=0 @@ -44153,37 +43599,35 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5 -printf %s "checking whether the compiler supports the __inline keyword... " >&6; } -if test ${gl_cv_c___inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5 +$as_echo_n "checking whether the compiler supports the __inline keyword... " >&6; } +if ${gl_cv_c___inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ typedef int foo_t; static __inline foo_t foo (void) { return 0; } int -main (void) +main () { return foo (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_c___inline=yes -else $as_nop +else gl_cv_c___inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5 -printf "%s\n" "$gl_cv_c___inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5 +$as_echo "$gl_cv_c___inline" >&6; } if test $gl_cv_c___inline = yes; then -printf "%s\n" "#define HAVE___INLINE 1" >>confdefs.h +$as_echo "#define HAVE___INLINE 1" >>confdefs.h fi @@ -44260,10 +43704,11 @@ fi ac_fn_c_check_member "$LINENO" "struct lconv" "decimal_point" "ac_cv_member_struct_lconv_decimal_point" "#include " -if test "x$ac_cv_member_struct_lconv_decimal_point" = xyes -then : +if test "x$ac_cv_member_struct_lconv_decimal_point" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_LCONV_DECIMAL_POINT 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_LCONV_DECIMAL_POINT 1 +_ACEOF fi @@ -44286,7 +43731,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h @@ -44298,27 +43743,24 @@ printf "%s\n" "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h has_rwlock=false ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include " -if test "x$ac_cv_type_pthread_rwlock_t" = xyes -then : +if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then : has_rwlock=true -printf "%s\n" "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h +$as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h fi if $has_rwlock; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthread_rwlock_rdlock prefers a writer to a reader" >&5 -printf %s "checking whether pthread_rwlock_rdlock prefers a writer to a reader... " >&6; } -if test ${gl_cv_pthread_rwlock_rdlock_prefer_writer+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_rwlock_rdlock prefers a writer to a reader" >&5 +$as_echo_n "checking whether pthread_rwlock_rdlock prefers a writer to a reader... " >&6; } +if ${gl_cv_pthread_rwlock_rdlock_prefer_writer+:} false; then : + $as_echo_n "(cached) " >&6 +else save_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on glibc systems. *-gnu* | gnu*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; @@ -44338,7 +43780,7 @@ then : *) gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -44454,10 +43896,9 @@ main () } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_pthread_rwlock_rdlock_prefer_writer=yes -else $as_nop +else gl_cv_pthread_rwlock_rdlock_prefer_writer=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -44467,12 +43908,12 @@ fi LIBS="$save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pthread_rwlock_rdlock_prefer_writer" >&5 -printf "%s\n" "$gl_cv_pthread_rwlock_rdlock_prefer_writer" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pthread_rwlock_rdlock_prefer_writer" >&5 +$as_echo "$gl_cv_pthread_rwlock_rdlock_prefer_writer" >&6; } case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in *yes) -printf "%s\n" "#define HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER 1" >>confdefs.h +$as_echo "#define HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER 1" >>confdefs.h ;; esac @@ -44484,7 +43925,7 @@ printf "%s\n" "#define HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER 1" >>confdefs.h #include int -main (void) +main () { #if __FreeBSD__ == 4 @@ -44501,19 +43942,20 @@ return !x; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -printf "%s\n" "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h +$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi : -printf "%s\n" "#define GNULIB_LOCK 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_LOCK 1 +_ACEOF @@ -44522,12 +43964,11 @@ printf "%s\n" "#define GNULIB_LOCK 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lseek detects pipes" >&5 -printf %s "checking whether lseek detects pipes... " >&6; } -if test ${gl_cv_func_lseek_pipe+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lseek detects pipes" >&5 +$as_echo_n "checking whether lseek detects pipes... " >&6; } +if ${gl_cv_func_lseek_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in mingw*) gl_cv_func_lseek_pipe=no @@ -44549,7 +43990,7 @@ else $as_nop $gl_mda_defines int -main (void) +main () { /* Exit with success only if stdin is seekable. */ @@ -44559,8 +44000,7 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : if test -s conftest$ac_exeext \ && ./conftest$ac_exeext < conftest.$ac_ext \ && test 1 = "`echo hi \ @@ -44570,10 +44010,10 @@ then : gl_cv_func_lseek_pipe=no fi -else $as_nop +else gl_cv_func_lseek_pipe=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -44584,24 +44024,23 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ Choke me. #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_func_lseek_pipe=yes -else $as_nop +else gl_cv_func_lseek_pipe=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi ;; esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lseek_pipe" >&5 -printf "%s\n" "$gl_cv_func_lseek_pipe" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lseek_pipe" >&5 +$as_echo "$gl_cv_func_lseek_pipe" >&6; } if test "$gl_cv_func_lseek_pipe" = no; then REPLACE_LSEEK=1 -printf "%s\n" "#define LSEEK_PIPE_BROKEN 1" >>confdefs.h +$as_echo "#define LSEEK_PIPE_BROKEN 1" >>confdefs.h fi @@ -44644,7 +44083,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_LSEEK 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_LSEEK 1" >>confdefs.h @@ -44654,14 +44093,12 @@ printf "%s\n" "#define GNULIB_TEST_LSEEK 1" >>confdefs.h REPLACE_MALLOC_FOR_MALLOC_GNU="$REPLACE_MALLOC_FOR_MALLOC_POSIX" if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5 -printf %s "checking whether malloc (0) returns nonnull... " >&6; } -if test ${ac_cv_func_malloc_0_nonnull+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5 +$as_echo_n "checking whether malloc (0) returns nonnull... " >&6; } +if ${ac_cv_func_malloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ @@ -44672,13 +44109,13 @@ then : *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { void *p = malloc (0); int result = !p; @@ -44689,10 +44126,9 @@ void *p = malloc (0); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_malloc_0_nonnull=yes -else $as_nop +else ac_cv_func_malloc_0_nonnull=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -44701,8 +44137,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 -printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } case $ac_cv_func_malloc_0_nonnull in #( *yes) : ;; #( @@ -44739,7 +44175,7 @@ esac -printf "%s\n" "#define GNULIB_TEST_MALLOC_GNU 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_MALLOC_GNU 1" >>confdefs.h @@ -44771,7 +44207,7 @@ printf "%s\n" "#define GNULIB_TEST_MALLOC_GNU 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h @@ -44807,12 +44243,11 @@ printf "%s\n" "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5 -printf %s "checking whether mbrtowc handles incomplete characters... " >&6; } -if test ${gl_cv_func_mbrtowc_incomplete_state+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5 +$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; } +if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on AIX and OSF/1. @@ -44821,10 +44256,9 @@ else $as_nop *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;; esac if test $LOCALE_JA != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -44847,10 +44281,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_incomplete_state=yes -else $as_nop +else gl_cv_func_mbrtowc_incomplete_state=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -44859,10 +44292,9 @@ fi else if test $LOCALE_FR_UTF8 != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -44885,10 +44317,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_incomplete_state=yes -else $as_nop +else gl_cv_func_mbrtowc_incomplete_state=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -44899,18 +44330,17 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_incomplete_state" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5 +$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5 -printf %s "checking whether mbrtowc works as well as mbtowc... " >&6; } -if test ${gl_cv_func_mbrtowc_sanitycheck+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5 +$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; } +if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on Solaris 8. @@ -44919,10 +44349,9 @@ else $as_nop *) gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;; esac if test $LOCALE_ZH_CN != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -44949,10 +44378,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_sanitycheck=yes -else $as_nop +else gl_cv_func_mbrtowc_sanitycheck=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -44962,8 +44390,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5 +$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; } REPLACE_MBSTATE_T=0 case "$gl_cv_func_mbrtowc_incomplete_state" in @@ -44982,17 +44410,19 @@ printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; } if test $ac_cv_func_mbrtowc = no; then HAVE_MBRTOWC=0 - ac_fn_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" " + ac_fn_c_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" " #include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_mbrtowc" = xyes -then : +" +if test "x$ac_cv_have_decl_mbrtowc" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_MBRTOWC $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_MBRTOWC $ac_have_decl +_ACEOF if test $ac_cv_have_decl_mbrtowc = yes; then REPLACE_MBRTOWC=1 @@ -45004,12 +44434,11 @@ printf "%s\n" "#define HAVE_DECL_MBRTOWC $ac_have_decl" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL pwc argument" >&5 -printf %s "checking whether mbrtowc handles a NULL pwc argument... " >&6; } -if test ${gl_cv_func_mbrtowc_null_arg1+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL pwc argument" >&5 +$as_echo_n "checking whether mbrtowc handles a NULL pwc argument... " >&6; } +if ${gl_cv_func_mbrtowc_null_arg1+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on Solaris. @@ -45018,10 +44447,9 @@ else $as_nop *) gl_cv_func_mbrtowc_null_arg1="guessing yes" ;; esac if test $LOCALE_FR_UTF8 != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45058,10 +44486,9 @@ int main () return result; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_null_arg1=yes -else $as_nop +else gl_cv_func_mbrtowc_null_arg1=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -45071,18 +44498,17 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg1" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_null_arg1" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg1" >&5 +$as_echo "$gl_cv_func_mbrtowc_null_arg1" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5 -printf %s "checking whether mbrtowc handles a NULL string argument... " >&6; } -if test ${gl_cv_func_mbrtowc_null_arg2+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5 +$as_echo_n "checking whether mbrtowc handles a NULL string argument... " >&6; } +if ${gl_cv_func_mbrtowc_null_arg2+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on OSF/1. @@ -45091,10 +44517,9 @@ else $as_nop *) gl_cv_func_mbrtowc_null_arg2="guessing yes" ;; esac if test $LOCALE_FR_UTF8 != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45119,10 +44544,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_null_arg2=yes -else $as_nop +else gl_cv_func_mbrtowc_null_arg2=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -45132,20 +44556,19 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_null_arg2" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5 +$as_echo "$gl_cv_func_mbrtowc_null_arg2" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5 -printf %s "checking whether mbrtowc has a correct return value... " >&6; } -if test ${gl_cv_func_mbrtowc_retval+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5 +$as_echo_n "checking whether mbrtowc has a correct return value... " >&6; } +if ${gl_cv_func_mbrtowc_retval+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on HP-UX, Solaris, native Windows. @@ -45155,10 +44578,9 @@ else $as_nop esac if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \ || { case "$host_os" in mingw*) true;; *) false;; esac; }; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45250,10 +44672,9 @@ int main () return (found_some_locale ? result : 77); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_retval=yes -else $as_nop +else if test $? != 77; then gl_cv_func_mbrtowc_retval=no fi @@ -45266,18 +44687,17 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_retval" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_retval" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_retval" >&5 +$as_echo "$gl_cv_func_mbrtowc_retval" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5 -printf %s "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; } -if test ${gl_cv_func_mbrtowc_nul_retval+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5 +$as_echo_n "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; } +if ${gl_cv_func_mbrtowc_nul_retval+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on Solaris 8 and 9. @@ -45286,10 +44706,9 @@ else $as_nop *) gl_cv_func_mbrtowc_nul_retval="guessing yes" ;; esac if test $LOCALE_ZH_CN != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45311,10 +44730,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_nul_retval=yes -else $as_nop +else gl_cv_func_mbrtowc_nul_retval=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -45324,17 +44742,16 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_nul_retval" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5 +$as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc stores incomplete characters" >&5 -printf %s "checking whether mbrtowc stores incomplete characters... " >&6; } -if test ${gl_cv_func_mbrtowc_stores_incomplete+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc stores incomplete characters" >&5 +$as_echo_n "checking whether mbrtowc stores incomplete characters... " >&6; } +if ${gl_cv_func_mbrtowc_stores_incomplete+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess yes on native Windows. @@ -45343,10 +44760,9 @@ else $as_nop esac case "$host_os" in mingw*) - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45399,10 +44815,9 @@ int main () return result; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_stores_incomplete=no -else $as_nop +else gl_cv_func_mbrtowc_stores_incomplete=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -45413,10 +44828,9 @@ fi *) if test $LOCALE_FR_UTF8 != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45438,10 +44852,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_stores_incomplete=no -else $as_nop +else gl_cv_func_mbrtowc_stores_incomplete=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -45453,17 +44866,16 @@ fi esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_stores_incomplete" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_stores_incomplete" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_stores_incomplete" >&5 +$as_echo "$gl_cv_func_mbrtowc_stores_incomplete" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5 -printf %s "checking whether mbrtowc works on empty input... " >&6; } -if test ${gl_cv_func_mbrtowc_empty_input+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5 +$as_echo_n "checking whether mbrtowc works on empty input... " >&6; } +if ${gl_cv_func_mbrtowc_empty_input+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on AIX and glibc systems. @@ -45472,10 +44884,9 @@ else $as_nop mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; esac - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45488,10 +44899,9 @@ else $as_nop return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_empty_input=yes -else $as_nop +else gl_cv_func_mbrtowc_empty_input=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -45500,27 +44910,25 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_empty_input" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5 +$as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5 -printf %s "checking whether the C locale is free of encoding errors... " >&6; } -if test ${gl_cv_func_mbrtowc_C_locale_sans_EILSEQ+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5 +$as_echo_n "checking whether the C locale is free of encoding errors... " >&6; } +if ${gl_cv_func_mbrtowc_C_locale_sans_EILSEQ+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on native Windows. mingw*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -45528,7 +44936,7 @@ else $as_nop #include int -main (void) +main () { int i; @@ -45550,10 +44958,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes -else $as_nop +else gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -45562,13 +44969,13 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&5 +$as_echo "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&6; } case "$gl_cv_func_mbrtowc_null_arg1" in *yes) ;; *) -printf "%s\n" "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h +$as_echo "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h REPLACE_MBRTOWC=1 ;; @@ -45576,7 +44983,7 @@ printf "%s\n" "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h case "$gl_cv_func_mbrtowc_null_arg2" in *yes) ;; *) -printf "%s\n" "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h +$as_echo "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h REPLACE_MBRTOWC=1 ;; @@ -45584,7 +44991,7 @@ printf "%s\n" "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h case "$gl_cv_func_mbrtowc_retval" in *yes) ;; *) -printf "%s\n" "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h +$as_echo "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h REPLACE_MBRTOWC=1 ;; @@ -45592,7 +44999,7 @@ printf "%s\n" "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h case "$gl_cv_func_mbrtowc_nul_retval" in *yes) ;; *) -printf "%s\n" "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h +$as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h REPLACE_MBRTOWC=1 ;; @@ -45600,7 +45007,7 @@ printf "%s\n" "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h case "$gl_cv_func_mbrtowc_stores_incomplete" in *no) ;; *) -printf "%s\n" "#define MBRTOWC_STORES_INCOMPLETE_BUG 1" >>confdefs.h +$as_echo "#define MBRTOWC_STORES_INCOMPLETE_BUG 1" >>confdefs.h REPLACE_MBRTOWC=1 ;; @@ -45608,7 +45015,7 @@ printf "%s\n" "#define MBRTOWC_STORES_INCOMPLETE_BUG 1" >>confdefs.h case "$gl_cv_func_mbrtowc_empty_input" in *yes) ;; *) -printf "%s\n" "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h +$as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h REPLACE_MBRTOWC=1 ;; @@ -45616,7 +45023,7 @@ printf "%s\n" "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h case "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" in *yes) ;; *) -printf "%s\n" "#define MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h +$as_echo "#define MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h REPLACE_MBRTOWC=1 ;; @@ -45629,12 +45036,11 @@ printf "%s\n" "#define MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 -printf %s "checking whether imported symbols can be declared weak... " >&6; } -if test ${gl_cv_have_weak+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 +$as_echo_n "checking whether imported symbols can be declared weak... " >&6; } +if ${gl_cv_have_weak+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in cygwin*) gl_cv_have_weak="guessing no" @@ -45646,22 +45052,20 @@ else $as_nop extern void xyzzy (); #pragma weak xyzzy int -main (void) +main () { xyzzy(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_have_weak=maybe fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test $gl_cv_have_weak = maybe; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __ELF__ @@ -45670,16 +45074,15 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Extensible Linking Format" >/dev/null 2>&1 -then : + $EGREP "Extensible Linking Format" >/dev/null 2>&1; then : gl_cv_have_weak="guessing yes" -else $as_nop +else gl_cv_have_weak="guessing no" fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45690,10 +45093,9 @@ int main () return (fputs == NULL); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_have_weak=yes -else $as_nop +else gl_cv_have_weak=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -45729,12 +45131,12 @@ EOF esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 -printf "%s\n" "$gl_cv_have_weak" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 +$as_echo "$gl_cv_have_weak" >&6; } case "$gl_cv_have_weak" in *yes) -printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h +$as_echo "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h ;; esac @@ -45793,43 +45195,40 @@ fi CFLAG_VISIBILITY= HAVE_VISIBILITY=0 if test -n "$GCC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 -printf %s "checking whether the -Werror option is usable... " >&6; } -if test ${gl_cv_cc_vis_werror+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 +$as_echo_n "checking whether the -Werror option is usable... " >&6; } +if ${gl_cv_cc_vis_werror+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_cc_vis_werror=yes -else $as_nop +else gl_cv_cc_vis_werror=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gl_save_CFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 -printf "%s\n" "$gl_cv_cc_vis_werror" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 -printf %s "checking for simple visibility declarations... " >&6; } -if test ${gl_cv_cc_visibility+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 +$as_echo "$gl_cv_cc_vis_werror" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 +$as_echo_n "checking for simple visibility declarations... " >&6; } +if ${gl_cv_cc_visibility+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" if test $gl_cv_cc_vis_werror = yes; then @@ -45849,25 +45248,24 @@ extern __attribute__((__visibility__("hidden"))) int hiddenvar; void dummyfunc (void) {} int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_cc_visibility=yes -else $as_nop +else gl_cv_cc_visibility=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gl_save_CFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 -printf "%s\n" "$gl_cv_cc_visibility" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 +$as_echo "$gl_cv_cc_visibility" >&6; } if test $gl_cv_cc_visibility = yes; then CFLAG_VISIBILITY="-fvisibility=hidden" HAVE_VISIBILITY=1 @@ -45876,7 +45274,9 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; } -printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_VISIBILITY $HAVE_VISIBILITY +_ACEOF @@ -45907,7 +45307,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h @@ -45932,12 +45332,11 @@ printf "%s\n" "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5 -printf %s "checking whether mbrtowc handles incomplete characters... " >&6; } -if test ${gl_cv_func_mbrtowc_incomplete_state+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5 +$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; } +if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on AIX and OSF/1. @@ -45946,10 +45345,9 @@ else $as_nop *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;; esac if test $LOCALE_JA != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45972,10 +45370,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_incomplete_state=yes -else $as_nop +else gl_cv_func_mbrtowc_incomplete_state=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -45984,10 +45381,9 @@ fi else if test $LOCALE_FR_UTF8 != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46010,10 +45406,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_incomplete_state=yes -else $as_nop +else gl_cv_func_mbrtowc_incomplete_state=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -46024,18 +45419,17 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_incomplete_state" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5 +$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5 -printf %s "checking whether mbrtowc works as well as mbtowc... " >&6; } -if test ${gl_cv_func_mbrtowc_sanitycheck+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5 +$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; } +if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on Solaris 8. @@ -46044,10 +45438,9 @@ else $as_nop *) gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;; esac if test $LOCALE_ZH_CN != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46074,10 +45467,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_sanitycheck=yes -else $as_nop +else gl_cv_func_mbrtowc_sanitycheck=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -46087,8 +45479,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5 +$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; } REPLACE_MBSTATE_T=0 case "$gl_cv_func_mbrtowc_incomplete_state" in @@ -46107,17 +45499,19 @@ printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; } if test $ac_cv_func_mbsinit = no; then HAVE_MBSINIT=0 - ac_fn_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" " + ac_fn_c_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" " #include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_mbsinit" = xyes -then : +" +if test "x$ac_cv_have_decl_mbsinit" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_MBSINIT $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_MBSINIT $ac_have_decl +_ACEOF if test $ac_cv_have_decl_mbsinit = yes; then REPLACE_MBSINIT=1 @@ -46173,19 +45567,23 @@ fi -printf "%s\n" "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h + for ac_func in mbtowc +do : ac_fn_c_check_func "$LINENO" "mbtowc" "ac_cv_func_mbtowc" -if test "x$ac_cv_func_mbtowc" = xyes -then : - printf "%s\n" "#define HAVE_MBTOWC 1" >>confdefs.h +if test "x$ac_cv_func_mbtowc" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MBTOWC 1 +_ACEOF fi +done if test $ac_cv_func_mbtowc = no; then HAVE_MBTOWC=0 @@ -46231,7 +45629,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h @@ -46253,13 +45651,18 @@ fi if test -z "$GL_COND_OBJ_MEMCHR_TRUE"; then : - ac_fn_c_check_header_compile "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default" -if test "x$ac_cv_header_bp_sym_h" = xyes -then : - printf "%s\n" "#define HAVE_BP_SYM_H 1" >>confdefs.h + for ac_header in bp-sym.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default" +if test "x$ac_cv_header_bp_sym_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BP_SYM_H 1 +_ACEOF fi +done + fi @@ -46283,7 +45686,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h @@ -46299,14 +45702,14 @@ printf "%s\n" "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h if test "$gl_cv_func_working_mktime" != yes; then REPLACE_MKTIME=1 -printf "%s\n" "#define NEED_MKTIME_WORKING 1" >>confdefs.h +$as_echo "#define NEED_MKTIME_WORKING 1" >>confdefs.h fi case "$host_os" in mingw*) REPLACE_MKTIME=1 -printf "%s\n" "#define NEED_MKTIME_WINDOWS 1" >>confdefs.h +$as_echo "#define NEED_MKTIME_WINDOWS 1" >>confdefs.h ;; esac @@ -46339,7 +45742,7 @@ printf "%s\n" "#define NEED_MKTIME_WINDOWS 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_MKTIME 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_MKTIME 1" >>confdefs.h @@ -46348,16 +45751,15 @@ printf "%s\n" "#define GNULIB_TEST_MKTIME 1" >>confdefs.h WANT_MKTIME_INTERNAL=0 ac_fn_c_check_func "$LINENO" "__mktime_internal" "ac_cv_func___mktime_internal" -if test "x$ac_cv_func___mktime_internal" = xyes -then : +if test "x$ac_cv_func___mktime_internal" = xyes; then : -printf "%s\n" "#define mktime_internal __mktime_internal" >>confdefs.h +$as_echo "#define mktime_internal __mktime_internal" >>confdefs.h -else $as_nop +else WANT_MKTIME_INTERNAL=1 -printf "%s\n" "#define NEED_MKTIME_INTERNAL 1" >>confdefs.h +$as_echo "#define NEED_MKTIME_INTERNAL 1" >>confdefs.h fi @@ -46378,51 +45780,65 @@ fi fi + for ac_func in listmntent +do : ac_fn_c_check_func "$LINENO" "listmntent" "ac_cv_func_listmntent" -if test "x$ac_cv_func_listmntent" = xyes -then : - printf "%s\n" "#define HAVE_LISTMNTENT 1" >>confdefs.h +if test "x$ac_cv_func_listmntent" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LISTMNTENT 1 +_ACEOF fi +done # We must include grp.h before ucred.h on OSF V4.0, since ucred.h uses # NGROUPS (as the array dimension for a struct member) without a definition. + for ac_header in sys/ucred.h +do : ac_fn_c_check_header_compile "$LINENO" "sys/ucred.h" "ac_cv_header_sys_ucred_h" "#include " -if test "x$ac_cv_header_sys_ucred_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_UCRED_H 1" >>confdefs.h +if test "x$ac_cv_header_sys_ucred_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_UCRED_H 1 +_ACEOF fi +done + + for ac_header in sys/mount.h +do : ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default #if HAVE_SYS_PARAM_H #include #endif " -if test "x$ac_cv_header_sys_mount_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h +if test "x$ac_cv_header_sys_mount_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_MOUNT_H 1 +_ACEOF fi +done - ac_fn_c_check_header_compile "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default" -if test "x$ac_cv_header_mntent_h" = xyes -then : - printf "%s\n" "#define HAVE_MNTENT_H 1" >>confdefs.h + + for ac_header in mntent.h sys/fs_types.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_header_compile "$LINENO" "sys/fs_types.h" "ac_cv_header_sys_fs_types_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_fs_types_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_FS_TYPES_H 1" >>confdefs.h -fi +done getfsstat_includes="\ $ac_includes_default @@ -46442,10 +45858,11 @@ $ac_includes_default " ac_fn_c_check_member "$LINENO" "struct fsstat" "f_fstypename" "ac_cv_member_struct_fsstat_f_fstypename" "$getfsstat_includes " -if test "x$ac_cv_member_struct_fsstat_f_fstypename" = xyes -then : +if test "x$ac_cv_member_struct_fsstat_f_fstypename" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_FSSTAT_F_FSTYPENAME 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_FSSTAT_F_FSTYPENAME 1 +_ACEOF fi @@ -46459,12 +45876,11 @@ fi # getmntent is in the standard C library on most systems, but in -lgen on # Unixware. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getmntent" >&5 -printf %s "checking for library containing getmntent... " >&6; } -if test ${ac_cv_search_getmntent+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getmntent" >&5 +$as_echo_n "checking for library containing getmntent... " >&6; } +if ${ac_cv_search_getmntent+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46472,87 +45888,87 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char getmntent (); int -main (void) +main () { return getmntent (); ; return 0; } _ACEOF -for ac_lib in '' gen -do +for ac_lib in '' gen; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_getmntent=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_getmntent+y} -then : + if ${ac_cv_search_getmntent+:} false; then : break fi done -if test ${ac_cv_search_getmntent+y} -then : +if ${ac_cv_search_getmntent+:} false; then : -else $as_nop +else ac_cv_search_getmntent=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getmntent" >&5 -printf "%s\n" "$ac_cv_search_getmntent" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getmntent" >&5 +$as_echo "$ac_cv_search_getmntent" >&6; } ac_res=$ac_cv_search_getmntent -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi + for ac_func in getmntent +do : ac_fn_c_check_func "$LINENO" "getmntent" "ac_cv_func_getmntent" -if test "x$ac_cv_func_getmntent" = xyes -then : - printf "%s\n" "#define HAVE_GETMNTENT 1" >>confdefs.h +if test "x$ac_cv_func_getmntent" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETMNTENT 1 +_ACEOF fi +done if test -z "$ac_list_mounted_fs"; then # AIX. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mntctl function and struct vmount" >&5 -printf %s "checking for mntctl function and struct vmount... " >&6; } -if test ${fu_cv_sys_mounted_vmount+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mntctl function and struct vmount" >&5 +$as_echo_n "checking for mntctl function and struct vmount... " >&6; } +if ${fu_cv_sys_mounted_vmount+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : fu_cv_sys_mounted_vmount=yes -else $as_nop +else fu_cv_sys_mounted_vmount=no fi rm -f conftest.err conftest.i conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_vmount" >&5 -printf "%s\n" "$fu_cv_sys_mounted_vmount" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_vmount" >&5 +$as_echo "$fu_cv_sys_mounted_vmount" >&6; } if test $fu_cv_sys_mounted_vmount = yes; then ac_list_mounted_fs=found -printf "%s\n" "#define MOUNTED_VMOUNT 1" >>confdefs.h +$as_echo "#define MOUNTED_VMOUNT 1" >>confdefs.h fi fi @@ -46564,12 +45980,11 @@ printf "%s\n" "#define MOUNTED_VMOUNT 1" >>confdefs.h if test -z "$ac_list_mounted_fs"; then # glibc, HP-UX, IRIX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for one-argument getmntent function" >&5 -printf %s "checking for one-argument getmntent function... " >&6; } -if test ${fu_cv_sys_mounted_getmntent1+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for one-argument getmntent function" >&5 +$as_echo_n "checking for one-argument getmntent function... " >&6; } +if ${fu_cv_sys_mounted_getmntent1+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46590,7 +46005,7 @@ else $as_nop #endif int -main (void) +main () { struct mntent *mnt = 0; char *table = MOUNTED; if (sizeof mnt && sizeof table) return 0; @@ -46599,73 +46014,63 @@ struct mntent *mnt = 0; char *table = MOUNTED; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : fu_cv_sys_mounted_getmntent1=yes -else $as_nop +else fu_cv_sys_mounted_getmntent1=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntent1" >&5 -printf "%s\n" "$fu_cv_sys_mounted_getmntent1" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntent1" >&5 +$as_echo "$fu_cv_sys_mounted_getmntent1" >&6; } if test $fu_cv_sys_mounted_getmntent1 = yes; then ac_list_mounted_fs=found -printf "%s\n" "#define MOUNTED_GETMNTENT1 1" >>confdefs.h +$as_echo "#define MOUNTED_GETMNTENT1 1" >>confdefs.h - ac_fn_c_check_func "$LINENO" "setmntent" "ac_cv_func_setmntent" -if test "x$ac_cv_func_setmntent" = xyes -then : - printf "%s\n" "#define HAVE_SETMNTENT 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "endmntent" "ac_cv_func_endmntent" -if test "x$ac_cv_func_endmntent" = xyes -then : - printf "%s\n" "#define HAVE_ENDMNTENT 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "hasmntopt" "ac_cv_func_hasmntopt" -if test "x$ac_cv_func_hasmntopt" = xyes -then : - printf "%s\n" "#define HAVE_HASMNTOPT 1" >>confdefs.h + for ac_func in setmntent endmntent hasmntopt +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi +done fi fi if test -z "$ac_list_mounted_fs"; then # Solaris >= 8. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getextmntent function" >&5 -printf %s "checking for getextmntent function... " >&6; } -if test ${fu_cv_sys_mounted_getextmntent+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getextmntent function" >&5 +$as_echo_n "checking for getextmntent function... " >&6; } +if ${fu_cv_sys_mounted_getextmntent+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "getextmntent" >/dev/null 2>&1 -then : + $EGREP "getextmntent" >/dev/null 2>&1; then : fu_cv_sys_mounted_getextmntent=yes -else $as_nop +else fu_cv_sys_mounted_getextmntent=no fi -rm -rf conftest* +rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getextmntent" >&5 -printf "%s\n" "$fu_cv_sys_mounted_getextmntent" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getextmntent" >&5 +$as_echo "$fu_cv_sys_mounted_getextmntent" >&6; } if test $fu_cv_sys_mounted_getextmntent = yes; then ac_list_mounted_fs=found -printf "%s\n" "#define MOUNTED_GETEXTMNTENT 1" >>confdefs.h +$as_echo "#define MOUNTED_GETEXTMNTENT 1" >>confdefs.h fi fi @@ -46673,41 +46078,43 @@ printf "%s\n" "#define MOUNTED_GETEXTMNTENT 1" >>confdefs.h if test -z "$ac_list_mounted_fs"; then # Solaris < 8, also (obsolete) SVR4. # Solaris >= 8 has the two-argument getmntent but is already handled above. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for two-argument getmntent function" >&5 -printf %s "checking for two-argument getmntent function... " >&6; } -if test ${fu_cv_sys_mounted_getmntent2+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument getmntent function" >&5 +$as_echo_n "checking for two-argument getmntent function... " >&6; } +if ${fu_cv_sys_mounted_getmntent2+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "getmntent" >/dev/null 2>&1 -then : + $EGREP "getmntent" >/dev/null 2>&1; then : fu_cv_sys_mounted_getmntent2=yes -else $as_nop +else fu_cv_sys_mounted_getmntent2=no fi -rm -rf conftest* +rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntent2" >&5 -printf "%s\n" "$fu_cv_sys_mounted_getmntent2" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntent2" >&5 +$as_echo "$fu_cv_sys_mounted_getmntent2" >&6; } if test $fu_cv_sys_mounted_getmntent2 = yes; then ac_list_mounted_fs=found -printf "%s\n" "#define MOUNTED_GETMNTENT2 1" >>confdefs.h +$as_echo "#define MOUNTED_GETMNTENT2 1" >>confdefs.h - ac_fn_c_check_func "$LINENO" "hasmntopt" "ac_cv_func_hasmntopt" -if test "x$ac_cv_func_hasmntopt" = xyes -then : - printf "%s\n" "#define HAVE_HASMNTOPT 1" >>confdefs.h + for ac_func in hasmntopt +do : + ac_fn_c_check_func "$LINENO" "hasmntopt" "ac_cv_func_hasmntopt" +if test "x$ac_cv_func_hasmntopt" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_HASMNTOPT 1 +_ACEOF fi +done fi fi @@ -46718,12 +46125,11 @@ fi # OSF/1, also (obsolete) Apple Darwin 1.3. # powerpc-apple-darwin1.3.7 needs sys/param.h sys/ucred.h sys/fs_types.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getfsstat function" >&5 -printf %s "checking for getfsstat function... " >&6; } -if test ${fu_cv_sys_mounted_getfsstat+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getfsstat function" >&5 +$as_echo_n "checking for getfsstat function... " >&6; } +if ${fu_cv_sys_mounted_getfsstat+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46736,7 +46142,7 @@ else $as_nop $getfsstat_includes int -main (void) +main () { struct statfs *stats; int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); @@ -46746,34 +46152,32 @@ struct statfs *stats; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : fu_cv_sys_mounted_getfsstat=yes -else $as_nop +else fu_cv_sys_mounted_getfsstat=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getfsstat" >&5 -printf "%s\n" "$fu_cv_sys_mounted_getfsstat" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getfsstat" >&5 +$as_echo "$fu_cv_sys_mounted_getfsstat" >&6; } if test $fu_cv_sys_mounted_getfsstat = yes; then ac_list_mounted_fs=found -printf "%s\n" "#define MOUNTED_GETFSSTAT 1" >>confdefs.h +$as_echo "#define MOUNTED_GETFSSTAT 1" >>confdefs.h fi fi if test -z "$ac_list_mounted_fs"; then # (obsolete) SVR3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FIXME existence of three headers" >&5 -printf %s "checking for FIXME existence of three headers... " >&6; } -if test ${fu_cv_sys_mounted_fread_fstyp+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FIXME existence of three headers" >&5 +$as_echo_n "checking for FIXME existence of three headers... " >&6; } +if ${fu_cv_sys_mounted_fread_fstyp+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46782,21 +46186,20 @@ else $as_nop #include _ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : +if ac_fn_c_try_cpp "$LINENO"; then : fu_cv_sys_mounted_fread_fstyp=yes -else $as_nop +else fu_cv_sys_mounted_fread_fstyp=no fi rm -f conftest.err conftest.i conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_fread_fstyp" >&5 -printf "%s\n" "$fu_cv_sys_mounted_fread_fstyp" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_fread_fstyp" >&5 +$as_echo "$fu_cv_sys_mounted_fread_fstyp" >&6; } if test $fu_cv_sys_mounted_fread_fstyp = yes; then ac_list_mounted_fs=found -printf "%s\n" "#define MOUNTED_FREAD_FSTYP 1" >>confdefs.h +$as_echo "#define MOUNTED_FREAD_FSTYP 1" >>confdefs.h fi fi @@ -46807,12 +46210,11 @@ printf "%s\n" "#define MOUNTED_FREAD_FSTYP 1" >>confdefs.h # We cannot use AC_CHECK_FUNCS([getmntinfo]) here, because at the linker # level the function is sometimes called getmntinfo64 or getmntinfo$INODE64 # on Mac OS X, __getmntinfo13 on NetBSD and Minix, _F64_getmntinfo on OSF/1. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getmntinfo function" >&5 -printf %s "checking for getmntinfo function... " >&6; } -if test ${fu_cv_sys_mounted_getmntinfo+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getmntinfo function" >&5 +$as_echo_n "checking for getmntinfo function... " >&6; } +if ${fu_cv_sys_mounted_getmntinfo+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46829,7 +46231,7 @@ else $as_nop #include int -main (void) +main () { int count = getmntinfo (NULL, MNT_WAIT); @@ -46837,25 +46239,23 @@ int count = getmntinfo (NULL, MNT_WAIT); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : fu_cv_sys_mounted_getmntinfo=yes -else $as_nop +else fu_cv_sys_mounted_getmntinfo=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntinfo" >&5 -printf "%s\n" "$fu_cv_sys_mounted_getmntinfo" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntinfo" >&5 +$as_echo "$fu_cv_sys_mounted_getmntinfo" >&6; } if test $fu_cv_sys_mounted_getmntinfo = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getmntinfo returns statvfs structures" >&5 -printf %s "checking whether getmntinfo returns statvfs structures... " >&6; } -if test ${fu_cv_sys_mounted_getmntinfo2+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getmntinfo returns statvfs structures" >&5 +$as_echo_n "checking whether getmntinfo returns statvfs structures... " >&6; } +if ${fu_cv_sys_mounted_getmntinfo2+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46876,35 +46276,34 @@ extern int getmntinfo (struct statfs **, int); int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : fu_cv_sys_mounted_getmntinfo2=no -else $as_nop +else fu_cv_sys_mounted_getmntinfo2=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntinfo2" >&5 -printf "%s\n" "$fu_cv_sys_mounted_getmntinfo2" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_getmntinfo2" >&5 +$as_echo "$fu_cv_sys_mounted_getmntinfo2" >&6; } if test $fu_cv_sys_mounted_getmntinfo2 = no; then # Mac OS X, FreeBSD, OpenBSD, also (obsolete) 4.4BSD. ac_list_mounted_fs=found -printf "%s\n" "#define MOUNTED_GETMNTINFO 1" >>confdefs.h +$as_echo "#define MOUNTED_GETMNTINFO 1" >>confdefs.h else # NetBSD, Minix. ac_list_mounted_fs=found -printf "%s\n" "#define MOUNTED_GETMNTINFO2 1" >>confdefs.h +$as_echo "#define MOUNTED_GETMNTINFO2 1" >>confdefs.h fi fi @@ -46912,32 +46311,35 @@ printf "%s\n" "#define MOUNTED_GETMNTINFO2 1" >>confdefs.h if test -z "$ac_list_mounted_fs"; then # Haiku, also (obsolete) BeOS. - ac_fn_c_check_func "$LINENO" "next_dev" "ac_cv_func_next_dev" -if test "x$ac_cv_func_next_dev" = xyes -then : - printf "%s\n" "#define HAVE_NEXT_DEV 1" >>confdefs.h + for ac_func in next_dev fs_stat_dev +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_func "$LINENO" "fs_stat_dev" "ac_cv_func_fs_stat_dev" -if test "x$ac_cv_func_fs_stat_dev" = xyes -then : - printf "%s\n" "#define HAVE_FS_STAT_DEV 1" >>confdefs.h +done + + for ac_header in fs_info.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "fs_info.h" "ac_cv_header_fs_info_h" "$ac_includes_default" +if test "x$ac_cv_header_fs_info_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FS_INFO_H 1 +_ACEOF fi - ac_fn_c_check_header_compile "$LINENO" "fs_info.h" "ac_cv_header_fs_info_h" "$ac_includes_default" -if test "x$ac_cv_header_fs_info_h" = xyes -then : - printf "%s\n" "#define HAVE_FS_INFO_H 1" >>confdefs.h +done -fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BEOS mounted file system support functions" >&5 -printf %s "checking for BEOS mounted file system support functions... " >&6; } -if test ${fu_cv_sys_mounted_fs_stat_dev+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BEOS mounted file system support functions" >&5 +$as_echo_n "checking for BEOS mounted file system support functions... " >&6; } +if ${fu_cv_sys_mounted_fs_stat_dev+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_fs_info_h = yes \ && test $ac_cv_func_next_dev = yes \ && test $ac_cv_func_fs_stat_dev = yes; then @@ -46947,12 +46349,12 @@ else $as_nop fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_fs_stat_dev" >&5 -printf "%s\n" "$fu_cv_sys_mounted_fs_stat_dev" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_mounted_fs_stat_dev" >&5 +$as_echo "$fu_cv_sys_mounted_fs_stat_dev" >&6; } if test $fu_cv_sys_mounted_fs_stat_dev = yes; then ac_list_mounted_fs=found -printf "%s\n" "#define MOUNTED_FS_STAT_DEV 1" >>confdefs.h +$as_echo "#define MOUNTED_FS_STAT_DEV 1" >>confdefs.h fi fi @@ -46962,17 +46364,21 @@ printf "%s\n" "#define MOUNTED_FS_STAT_DEV 1" >>confdefs.h # the code is really interix specific, so make sure, we're on it. case "$host" in *-interix*) - ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs" -if test "x$ac_cv_func_statvfs" = xyes -then : - printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h + for ac_func in statvfs +do : + ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs" +if test "x$ac_cv_func_statvfs" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STATVFS 1 +_ACEOF fi +done if test $ac_cv_func_statvfs = yes; then ac_list_mounted_fs=found -printf "%s\n" "#define MOUNTED_INTERIX_STATVFS 1" >>confdefs.h +$as_echo "#define MOUNTED_INTERIX_STATVFS 1" >>confdefs.h fi ;; @@ -47008,31 +46414,36 @@ fi if test -z "$GL_COND_OBJ_MOUNTLIST_TRUE"; then : - ac_fn_c_check_header_compile "$LINENO" "sys/mntent.h" "ac_cv_header_sys_mntent_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_mntent_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_MNTENT_H 1" >>confdefs.h + for ac_header in sys/mntent.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/mntent.h" "ac_cv_header_sys_mntent_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mntent_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_MNTENT_H 1 +_ACEOF fi +done -ac_fn_c_check_header_compile "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_mkdev_h" = xyes -then : -printf "%s\n" "#define MAJOR_IN_MKDEV 1" >>confdefs.h +ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : + +$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h fi + if test $ac_cv_header_sys_mkdev_h = no; then - ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_sysmacros_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : -printf "%s\n" "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h +$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h fi + fi ac_fn_c_check_member "$LINENO" "struct statfs" "f_fstypename" "ac_cv_member_struct_statfs_f_fstypename" " @@ -47041,10 +46452,11 @@ fi #include " -if test "x$ac_cv_member_struct_statfs_f_fstypename" = xyes -then : +if test "x$ac_cv_member_struct_statfs_f_fstypename" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_STATFS_F_FSTYPENAME 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STATFS_F_FSTYPENAME 1 +_ACEOF fi @@ -47085,7 +46497,9 @@ fi -printf "%s\n" "#define GNULIB_MSVC_NOTHROW 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_MSVC_NOTHROW 1 +_ACEOF @@ -47097,46 +46511,49 @@ printf "%s\n" "#define GNULIB_MSVC_NOTHROW 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether is self-contained" >&5 -printf %s "checking whether is self-contained... " >&6; } -if test ${gl_cv_header_netinet_in_h_selfcontained+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether is self-contained" >&5 +$as_echo_n "checking whether is self-contained... " >&6; } +if ${gl_cv_header_netinet_in_h_selfcontained+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_netinet_in_h_selfcontained=yes -else $as_nop +else gl_cv_header_netinet_in_h_selfcontained=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_netinet_in_h_selfcontained" >&5 -printf "%s\n" "$gl_cv_header_netinet_in_h_selfcontained" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_netinet_in_h_selfcontained" >&5 +$as_echo "$gl_cv_header_netinet_in_h_selfcontained" >&6; } if test $gl_cv_header_netinet_in_h_selfcontained = yes; then GL_GENERATE_NETINET_IN_H=false else GL_GENERATE_NETINET_IN_H=true - ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" -if test "x$ac_cv_header_netinet_in_h" = xyes -then : - printf "%s\n" "#define HAVE_NETINET_IN_H 1" >>confdefs.h + for ac_header in netinet/in.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" +if test "x$ac_cv_header_netinet_in_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NETINET_IN_H 1 +_ACEOF fi +done + @@ -47149,12 +46566,11 @@ fi if test $gl_cv_have_include_next = yes; then gl_cv_next_netinet_in_h='<'netinet/in.h'>' else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_netinet_in_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_netinet_in_h+:} false; then : + $as_echo_n "(cached) " >&6 +else if test $ac_cv_header_netinet_in_h = yes; then @@ -47199,8 +46615,8 @@ _ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_netinet_in_h" >&5 -printf "%s\n" "$gl_cv_next_netinet_in_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_netinet_in_h" >&5 +$as_echo "$gl_cv_next_netinet_in_h" >&6; } fi NEXT_NETINET_IN_H=$gl_cv_next_netinet_in_h @@ -47267,14 +46683,12 @@ fi if test $ac_cv_func_nl_langinfo = yes; then # On Irix 6.5, YESEXPR is defined, but nl_langinfo(YESEXPR) is broken. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether YESEXPR works" >&5 -printf %s "checking whether YESEXPR works... " >&6; } -if test ${gl_cv_func_nl_langinfo_yesexpr_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether YESEXPR works" >&5 +$as_echo_n "checking whether YESEXPR works... " >&6; } +if ${gl_cv_func_nl_langinfo_yesexpr_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on irix systems. @@ -47283,13 +46697,13 @@ then : *) gl_cv_func_nl_langinfo_yesexpr_works="guessing yes";; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { return !*nl_langinfo(YESEXPR); @@ -47297,10 +46711,9 @@ return !*nl_langinfo(YESEXPR); return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_nl_langinfo_yesexpr_works=yes -else $as_nop +else gl_cv_func_nl_langinfo_yesexpr_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -47309,14 +46722,16 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_nl_langinfo_yesexpr_works" >&5 -printf "%s\n" "$gl_cv_func_nl_langinfo_yesexpr_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_nl_langinfo_yesexpr_works" >&5 +$as_echo "$gl_cv_func_nl_langinfo_yesexpr_works" >&6; } case $gl_cv_func_nl_langinfo_yesexpr_works in *yes) FUNC_NL_LANGINFO_YESEXPR_WORKS=1 ;; *) FUNC_NL_LANGINFO_YESEXPR_WORKS=0 ;; esac -printf "%s\n" "#define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_WORKS" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_WORKS +_ACEOF # On Solaris 10 and Solaris 11.3, nl_langinfo is not multithread-safe. case "$host_os" in @@ -47324,7 +46739,9 @@ printf "%s\n" "#define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_ *) NL_LANGINFO_MTSAFE=1 ;; esac -printf "%s\n" "#define NL_LANGINFO_MTSAFE $NL_LANGINFO_MTSAFE" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define NL_LANGINFO_MTSAFE $NL_LANGINFO_MTSAFE +_ACEOF if test $HAVE_LANGINFO_CODESET = 1 \ && test $HAVE_LANGINFO_T_FMT_AMPM = 1 \ @@ -47336,7 +46753,7 @@ printf "%s\n" "#define NL_LANGINFO_MTSAFE $NL_LANGINFO_MTSAFE" >>confdefs.h else REPLACE_NL_LANGINFO=1 -printf "%s\n" "#define REPLACE_NL_LANGINFO 1" >>confdefs.h +$as_echo "#define REPLACE_NL_LANGINFO 1" >>confdefs.h fi else @@ -47384,43 +46801,40 @@ fi CFLAG_VISIBILITY= HAVE_VISIBILITY=0 if test -n "$GCC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 -printf %s "checking whether the -Werror option is usable... " >&6; } -if test ${gl_cv_cc_vis_werror+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 +$as_echo_n "checking whether the -Werror option is usable... " >&6; } +if ${gl_cv_cc_vis_werror+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_cc_vis_werror=yes -else $as_nop +else gl_cv_cc_vis_werror=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gl_save_CFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 -printf "%s\n" "$gl_cv_cc_vis_werror" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 -printf %s "checking for simple visibility declarations... " >&6; } -if test ${gl_cv_cc_visibility+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 +$as_echo "$gl_cv_cc_vis_werror" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 +$as_echo_n "checking for simple visibility declarations... " >&6; } +if ${gl_cv_cc_visibility+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" if test $gl_cv_cc_vis_werror = yes; then @@ -47440,25 +46854,24 @@ extern __attribute__((__visibility__("hidden"))) int hiddenvar; void dummyfunc (void) {} int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_cc_visibility=yes -else $as_nop +else gl_cv_cc_visibility=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gl_save_CFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 -printf "%s\n" "$gl_cv_cc_visibility" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 +$as_echo "$gl_cv_cc_visibility" >&6; } if test $gl_cv_cc_visibility = yes; then CFLAG_VISIBILITY="-fvisibility=hidden" HAVE_VISIBILITY=1 @@ -47467,7 +46880,9 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; } -printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_VISIBILITY $HAVE_VISIBILITY +_ACEOF @@ -47487,7 +46902,7 @@ printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h @@ -47505,19 +46920,17 @@ printf "%s\n" "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5 -printf %s "checking whether open recognizes a trailing slash... " >&6; } -if test ${gl_cv_func_open_slash+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5 +$as_echo_n "checking whether open recognizes a trailing slash... " >&6; } +if ${gl_cv_func_open_slash+:} false; then : + $as_echo_n "(cached) " >&6 +else # Assume that if we have lstat, we can also check symlinks. if test $ac_cv_func_lstat = yes; then touch conftest.tmp ln -s conftest.tmp conftest.lnk fi - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*) @@ -47526,7 +46939,7 @@ then : gl_cv_func_open_slash="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -47550,10 +46963,9 @@ int main () return result; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_open_slash=yes -else $as_nop +else gl_cv_func_open_slash=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -47563,12 +46975,12 @@ fi rm -f conftest.sl conftest.tmp conftest.lnk fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5 -printf "%s\n" "$gl_cv_func_open_slash" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5 +$as_echo "$gl_cv_func_open_slash" >&6; } case "$gl_cv_func_open_slash" in *no) -printf "%s\n" "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h +$as_echo "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h ;; esac @@ -47620,7 +47032,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_OPEN 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_OPEN 1" >>confdefs.h @@ -47632,14 +47044,12 @@ printf "%s\n" "#define GNULIB_TEST_OPEN 1" >>confdefs.h if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether realloc (0, 0) returns nonnull" >&5 -printf %s "checking whether realloc (0, 0) returns nonnull... " >&6; } -if test ${ac_cv_func_realloc_0_nonnull+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether realloc (0, 0) returns nonnull" >&5 +$as_echo_n "checking whether realloc (0, 0) returns nonnull... " >&6; } +if ${ac_cv_func_realloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ @@ -47650,13 +47060,13 @@ then : *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { void *p = realloc (0, 0); int result = !p; @@ -47667,10 +47077,9 @@ void *p = realloc (0, 0); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_realloc_0_nonnull=yes -else $as_nop +else ac_cv_func_realloc_0_nonnull=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -47679,8 +47088,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 -printf "%s\n" "$ac_cv_func_realloc_0_nonnull" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } case $ac_cv_func_realloc_0_nonnull in #( *yes) : ;; #( @@ -47717,7 +47126,7 @@ esac -printf "%s\n" "#define GNULIB_TEST_REALLOC_GNU 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_REALLOC_GNU 1" >>confdefs.h @@ -47755,7 +47164,7 @@ printf "%s\n" "#define GNULIB_TEST_REALLOC_GNU 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h @@ -47764,12 +47173,16 @@ printf "%s\n" "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h + for ac_func in reallocarray +do : ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" -if test "x$ac_cv_func_reallocarray" = xyes -then : - printf "%s\n" "#define HAVE_REALLOCARRAY 1" >>confdefs.h +if test "x$ac_cv_func_reallocarray" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_REALLOCARRAY 1 +_ACEOF fi +done if test "$ac_cv_func_reallocarray" = no; then HAVE_REALLOCARRAY=0 @@ -47798,7 +47211,9 @@ fi fi -printf "%s\n" "#define GNULIB_REALLOCARRAY 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_REALLOCARRAY 1 +_ACEOF @@ -47816,15 +47231,14 @@ printf "%s\n" "#define GNULIB_REALLOCARRAY 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_REALLOCARRAY 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_REALLOCARRAY 1" >>confdefs.h # Check whether --with-included-regex was given. -if test ${with_included_regex+y} -then : +if test "${with_included_regex+set}" = set; then : withval=$with_included_regex; fi @@ -47839,14 +47253,12 @@ fi # regex.c. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working re_compile_pattern" >&5 -printf %s "checking for working re_compile_pattern... " >&6; } -if test ${gl_cv_func_re_compile_pattern_working+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working re_compile_pattern" >&5 +$as_echo_n "checking for working re_compile_pattern... " >&6; } +if ${gl_cv_func_re_compile_pattern_working+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on native Windows. mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;; @@ -47854,7 +47266,7 @@ then : *) gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -47878,7 +47290,7 @@ else $as_nop #endif int -main (void) +main () { int result = 0; static struct re_pattern_buffer regex; @@ -48154,10 +47566,9 @@ int result = 0; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_re_compile_pattern_working=yes -else $as_nop +else gl_cv_func_re_compile_pattern_working=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -48166,8 +47577,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_re_compile_pattern_working" >&5 -printf "%s\n" "$gl_cv_func_re_compile_pattern_working" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_re_compile_pattern_working" >&5 +$as_echo "$gl_cv_func_re_compile_pattern_working" >&6; } case "$gl_cv_func_re_compile_pattern_working" in #( *yes) ac_use_included_regex=no;; #( *no) ac_use_included_regex=yes;; @@ -48179,55 +47590,55 @@ printf "%s\n" "$gl_cv_func_re_compile_pattern_working" >&6; } if test $ac_use_included_regex = yes; then -printf "%s\n" "#define _REGEX_INCLUDE_LIMITS_H 1" >>confdefs.h +$as_echo "#define _REGEX_INCLUDE_LIMITS_H 1" >>confdefs.h -printf "%s\n" "#define _REGEX_LARGE_OFFSETS 1" >>confdefs.h +$as_echo "#define _REGEX_LARGE_OFFSETS 1" >>confdefs.h -printf "%s\n" "#define re_syntax_options rpl_re_syntax_options" >>confdefs.h +$as_echo "#define re_syntax_options rpl_re_syntax_options" >>confdefs.h -printf "%s\n" "#define re_set_syntax rpl_re_set_syntax" >>confdefs.h +$as_echo "#define re_set_syntax rpl_re_set_syntax" >>confdefs.h -printf "%s\n" "#define re_compile_pattern rpl_re_compile_pattern" >>confdefs.h +$as_echo "#define re_compile_pattern rpl_re_compile_pattern" >>confdefs.h -printf "%s\n" "#define re_compile_fastmap rpl_re_compile_fastmap" >>confdefs.h +$as_echo "#define re_compile_fastmap rpl_re_compile_fastmap" >>confdefs.h -printf "%s\n" "#define re_search rpl_re_search" >>confdefs.h +$as_echo "#define re_search rpl_re_search" >>confdefs.h -printf "%s\n" "#define re_search_2 rpl_re_search_2" >>confdefs.h +$as_echo "#define re_search_2 rpl_re_search_2" >>confdefs.h -printf "%s\n" "#define re_match rpl_re_match" >>confdefs.h +$as_echo "#define re_match rpl_re_match" >>confdefs.h -printf "%s\n" "#define re_match_2 rpl_re_match_2" >>confdefs.h +$as_echo "#define re_match_2 rpl_re_match_2" >>confdefs.h -printf "%s\n" "#define re_set_registers rpl_re_set_registers" >>confdefs.h +$as_echo "#define re_set_registers rpl_re_set_registers" >>confdefs.h -printf "%s\n" "#define re_comp rpl_re_comp" >>confdefs.h +$as_echo "#define re_comp rpl_re_comp" >>confdefs.h -printf "%s\n" "#define re_exec rpl_re_exec" >>confdefs.h +$as_echo "#define re_exec rpl_re_exec" >>confdefs.h -printf "%s\n" "#define regcomp rpl_regcomp" >>confdefs.h +$as_echo "#define regcomp rpl_regcomp" >>confdefs.h -printf "%s\n" "#define regexec rpl_regexec" >>confdefs.h +$as_echo "#define regexec rpl_regexec" >>confdefs.h -printf "%s\n" "#define regerror rpl_regerror" >>confdefs.h +$as_echo "#define regerror rpl_regerror" >>confdefs.h -printf "%s\n" "#define regfree rpl_regfree" >>confdefs.h +$as_echo "#define regfree rpl_regfree" >>confdefs.h fi @@ -48253,23 +47664,30 @@ fi - ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = xyes -then : - printf "%s\n" "#define HAVE_LIBINTL_H 1" >>confdefs.h + for ac_header in libintl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBINTL_H 1 +_ACEOF fi +done - ac_fn_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_isblank" = xyes -then : + + ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include +" +if test "x$ac_cv_have_decl_isblank" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_ISBLANK $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ISBLANK $ac_have_decl +_ACEOF @@ -48277,12 +47695,11 @@ fi SERVENT_LIB= gl_saved_libs="$LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getservbyname" >&5 -printf %s "checking for library containing getservbyname... " >&6; } -if test ${ac_cv_search_getservbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getservbyname" >&5 +$as_echo_n "checking for library containing getservbyname... " >&6; } +if ${ac_cv_search_getservbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -48290,48 +47707,46 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char getservbyname (); int -main (void) +main () { return getservbyname (); ; return 0; } _ACEOF -for ac_lib in '' socket network net -do +for ac_lib in '' socket network net; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_getservbyname=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_getservbyname+y} -then : + if ${ac_cv_search_getservbyname+:} false; then : break fi done -if test ${ac_cv_search_getservbyname+y} -then : +if ${ac_cv_search_getservbyname+:} false; then : -else $as_nop +else ac_cv_search_getservbyname=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getservbyname" >&5 -printf "%s\n" "$ac_cv_search_getservbyname" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getservbyname" >&5 +$as_echo "$ac_cv_search_getservbyname" >&6; } ac_res=$ac_cv_search_getservbyname -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" if test "$ac_cv_search_getservbyname" != "none required"; then SERVENT_LIB="$ac_cv_search_getservbyname" @@ -48340,22 +47755,21 @@ fi LIBS="$gl_saved_libs" if test -z "$SERVENT_LIB"; then - - for ac_func in getservbyname + for ac_func in getservbyname do : ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname" -if test "x$ac_cv_func_getservbyname" = xyes -then : - printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h +if test "x$ac_cv_func_getservbyname" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETSERVBYNAME 1 +_ACEOF -else $as_nop +else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getservbyname in winsock2.h and -lws2_32" >&5 -printf %s "checking for getservbyname in winsock2.h and -lws2_32... " >&6; } -if test ${gl_cv_w32_getservbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getservbyname in winsock2.h and -lws2_32" >&5 +$as_echo_n "checking for getservbyname in winsock2.h and -lws2_32... " >&6; } +if ${gl_cv_w32_getservbyname+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_w32_getservbyname=no gl_save_LIBS="$LIBS" LIBS="$LIBS -lws2_32" @@ -48368,31 +47782,30 @@ else $as_nop #include int -main (void) +main () { getservbyname(NULL,NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_w32_getservbyname=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$gl_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_getservbyname" >&5 -printf "%s\n" "$gl_cv_w32_getservbyname" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_w32_getservbyname" >&5 +$as_echo "$gl_cv_w32_getservbyname" >&6; } if test "$gl_cv_w32_getservbyname" = "yes"; then SERVENT_LIB="-lws2_32" fi fi - done + fi @@ -48401,14 +47814,12 @@ done if test $ac_cv_func_setenv = no; then HAVE_SETENV=0 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setenv validates arguments" >&5 -printf %s "checking whether setenv validates arguments... " >&6; } -if test ${gl_cv_func_setenv_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setenv validates arguments" >&5 +$as_echo_n "checking whether setenv validates arguments... " >&6; } +if ${gl_cv_func_setenv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;; @@ -48418,7 +47829,7 @@ then : *) gl_cv_func_setenv_works="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -48427,7 +47838,7 @@ else $as_nop #include int -main (void) +main () { int result = 0; @@ -48449,10 +47860,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_setenv_works=yes -else $as_nop +else gl_cv_func_setenv_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -48460,8 +47870,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setenv_works" >&5 -printf "%s\n" "$gl_cv_func_setenv_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setenv_works" >&5 +$as_echo "$gl_cv_func_setenv_works" >&6; } case "$gl_cv_func_setenv_works" in *yes) ;; *) @@ -48499,7 +47909,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_SETENV 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_SETENV 1" >>confdefs.h @@ -48508,12 +47918,11 @@ printf "%s\n" "#define GNULIB_TEST_SETENV 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5 -printf %s "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >&6; } -if test ${gl_cv_func_setlocale_null_all_mtsafe+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5 +$as_echo_n "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >&6; } +if ${gl_cv_func_setlocale_null_all_mtsafe+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin. *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku* | cygwin*) @@ -48527,8 +47936,8 @@ else $as_nop esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5 -printf "%s\n" "$gl_cv_func_setlocale_null_all_mtsafe" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5 +$as_echo "$gl_cv_func_setlocale_null_all_mtsafe" >&6; } case "$host_os" in mingw*) ;; *) @@ -48542,15 +47951,16 @@ printf "%s\n" "$gl_cv_func_setlocale_null_all_mtsafe" >&6; } *) SETLOCALE_NULL_ALL_MTSAFE=0 ;; esac -printf "%s\n" "#define SETLOCALE_NULL_ALL_MTSAFE $SETLOCALE_NULL_ALL_MTSAFE" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SETLOCALE_NULL_ALL_MTSAFE $SETLOCALE_NULL_ALL_MTSAFE +_ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setlocale (category, NULL) is multithread-safe" >&5 -printf %s "checking whether setlocale (category, NULL) is multithread-safe... " >&6; } -if test ${gl_cv_func_setlocale_null_one_mtsafe+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setlocale (category, NULL) is multithread-safe" >&5 +$as_echo_n "checking whether setlocale (category, NULL) is multithread-safe... " >&6; } +if ${gl_cv_func_setlocale_null_one_mtsafe+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on OpenBSD, AIX. openbsd* | aix*) @@ -48564,8 +47974,8 @@ else $as_nop esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5 -printf "%s\n" "$gl_cv_func_setlocale_null_one_mtsafe" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5 +$as_echo "$gl_cv_func_setlocale_null_one_mtsafe" >&6; } case "$host_os" in mingw*) ;; *) @@ -48579,7 +47989,9 @@ printf "%s\n" "$gl_cv_func_setlocale_null_one_mtsafe" >&6; } *) SETLOCALE_NULL_ONE_MTSAFE=0 ;; esac -printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE +_ACEOF if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then @@ -48588,12 +48000,11 @@ printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>c *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 -printf %s "checking whether imported symbols can be declared weak... " >&6; } -if test ${gl_cv_have_weak+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 +$as_echo_n "checking whether imported symbols can be declared weak... " >&6; } +if ${gl_cv_have_weak+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in cygwin*) gl_cv_have_weak="guessing no" @@ -48605,22 +48016,20 @@ else $as_nop extern void xyzzy (); #pragma weak xyzzy int -main (void) +main () { xyzzy(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_have_weak=maybe fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test $gl_cv_have_weak = maybe; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __ELF__ @@ -48629,16 +48038,15 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Extensible Linking Format" >/dev/null 2>&1 -then : + $EGREP "Extensible Linking Format" >/dev/null 2>&1; then : gl_cv_have_weak="guessing yes" -else $as_nop +else gl_cv_have_weak="guessing no" fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -48649,10 +48057,9 @@ int main () return (fputs == NULL); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_have_weak=yes -else $as_nop +else gl_cv_have_weak=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -48688,12 +48095,12 @@ EOF esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 -printf "%s\n" "$gl_cv_have_weak" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 +$as_echo "$gl_cv_have_weak" >&6; } case "$gl_cv_have_weak" in *yes) -printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h +$as_echo "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h ;; esac @@ -48731,43 +48138,40 @@ fi CFLAG_VISIBILITY= HAVE_VISIBILITY=0 if test -n "$GCC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 -printf %s "checking whether the -Werror option is usable... " >&6; } -if test ${gl_cv_cc_vis_werror+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 +$as_echo_n "checking whether the -Werror option is usable... " >&6; } +if ${gl_cv_cc_vis_werror+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_cc_vis_werror=yes -else $as_nop +else gl_cv_cc_vis_werror=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gl_save_CFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 -printf "%s\n" "$gl_cv_cc_vis_werror" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 -printf %s "checking for simple visibility declarations... " >&6; } -if test ${gl_cv_cc_visibility+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 +$as_echo "$gl_cv_cc_vis_werror" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 +$as_echo_n "checking for simple visibility declarations... " >&6; } +if ${gl_cv_cc_visibility+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" if test $gl_cv_cc_vis_werror = yes; then @@ -48787,25 +48191,24 @@ extern __attribute__((__visibility__("hidden"))) int hiddenvar; void dummyfunc (void) {} int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_cc_visibility=yes -else $as_nop +else gl_cv_cc_visibility=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gl_save_CFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 -printf "%s\n" "$gl_cv_cc_visibility" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 +$as_echo "$gl_cv_cc_visibility" >&6; } if test $gl_cv_cc_visibility = yes; then CFLAG_VISIBILITY="-fvisibility=hidden" HAVE_VISIBILITY=1 @@ -48814,7 +48217,9 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; } -printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_VISIBILITY $HAVE_VISIBILITY +_ACEOF @@ -48835,24 +48240,28 @@ fi -printf "%s\n" "#define GNULIB_TEST_SETLOCALE_NULL 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_SETLOCALE_NULL 1" >>confdefs.h - ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" -if test "x$ac_cv_header_stdint_h" = xyes -then : - printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h + for ac_header in stdint.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDINT_H 1 +_ACEOF fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5 -printf %s "checking for SIZE_MAX... " >&6; } -if test ${gl_cv_size_max+y} -then : - printf %s "(cached) " >&6 -else $as_nop +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5 +$as_echo_n "checking for SIZE_MAX... " >&6; } +if ${gl_cv_size_max+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_cv_size_max=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -48868,25 +48277,22 @@ Found it _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Found it" >/dev/null 2>&1 -then : + $EGREP "Found it" >/dev/null 2>&1; then : gl_cv_size_max=yes fi -rm -rf conftest* +rm -f conftest* if test $gl_cv_size_max != yes; then if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) * CHAR_BIT - 1" "size_t_bits_minus_1" "#include -#include " -then : +#include "; then : -else $as_nop +else size_t_bits_minus_1= fi - if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint" "#include " -then : + if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint" "#include "; then : -else $as_nop +else fits_in_uint= fi @@ -48899,18 +48305,17 @@ fi extern unsigned long foo; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : fits_in_uint=0 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $fits_in_uint = 1; then gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" @@ -48923,11 +48328,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5 -printf "%s\n" "$gl_cv_size_max" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5 +$as_echo "$gl_cv_size_max" >&6; } if test "$gl_cv_size_max" != yes; then -printf "%s\n" "#define SIZE_MAX $gl_cv_size_max" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define SIZE_MAX $gl_cv_size_max +_ACEOF fi @@ -48935,26 +48342,28 @@ printf "%s\n" "#define SIZE_MAX $gl_cv_size_max" >>confdefs.h gl_cv_func_snprintf_usable=no + for ac_func in snprintf +do : ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" -if test "x$ac_cv_func_snprintf" = xyes -then : - printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h +if test "x$ac_cv_func_snprintf" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SNPRINTF 1 +_ACEOF fi +done if test $ac_cv_func_snprintf = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5 -printf %s "checking whether snprintf respects a size of 1... " >&6; } -if test ${gl_cv_func_snprintf_size1+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5 +$as_echo_n "checking whether snprintf respects a size of 1... " >&6; } +if ${gl_cv_func_snprintf_size1+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on Android. linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;; @@ -48963,7 +48372,7 @@ then : *) gl_cv_func_snprintf_size1="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -48989,10 +48398,9 @@ int main() return buf[1] != 'E'; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_snprintf_size1=yes -else $as_nop +else gl_cv_func_snprintf_size1=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -49001,8 +48409,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5 -printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5 +$as_echo "$gl_cv_func_snprintf_size1" >&6; } case "$gl_cv_func_snprintf_size1" in *yes) @@ -49011,15 +48419,13 @@ printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; } *yes) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5 -printf %s "checking whether printf supports POSIX/XSI format strings with positions... " >&6; } -if test ${gl_cv_func_printf_positions+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5 +$as_echo_n "checking whether printf supports POSIX/XSI format strings with positions... " >&6; } +if ${gl_cv_func_printf_positions+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*) @@ -49032,7 +48438,7 @@ then : *) gl_cv_func_printf_positions="guessing yes";; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -49048,10 +48454,9 @@ int main () return (strcmp (buf, "55 33") != 0); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_printf_positions=yes -else $as_nop +else gl_cv_func_printf_positions=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -49060,8 +48465,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5 -printf "%s\n" "$gl_cv_func_printf_positions" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5 +$as_echo "$gl_cv_func_printf_positions" >&6; } case "$gl_cv_func_printf_positions" in *yes) @@ -49117,13 +48522,15 @@ printf "%s\n" "$gl_cv_func_printf_positions" >&6; } -printf "%s\n" "#define GNULIB_TEST_SNPRINTF 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_SNPRINTF 1" >>confdefs.h -printf "%s\n" "#define GNULIB_SNPRINTF 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_SNPRINTF 1 +_ACEOF @@ -49140,16 +48547,14 @@ printf "%s\n" "#define GNULIB_SNPRINTF 1" >>confdefs.h #endif " -if test "x$ac_cv_type_socklen_t" = xyes -then : +if test "x$ac_cv_type_socklen_t" = xyes; then : -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5 -printf %s "checking for socklen_t equivalent... " >&6; } -if test ${gl_cv_socklen_t_equiv+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5 +$as_echo_n "checking for socklen_t equivalent... " >&6; } +if ${gl_cv_socklen_t_equiv+:} false; then : + $as_echo_n "(cached) " >&6 +else # Systems have either "struct sockaddr *" or # "void *" as the second argument to getpeername gl_cv_socklen_t_equiv= @@ -49162,7 +48567,7 @@ else $as_nop int getpeername (int, $arg2 *, $t *); int -main (void) +main () { $t len; getpeername (0, 0, &len); @@ -49170,11 +48575,10 @@ $t len; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_socklen_t_equiv="$t" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test "$gl_cv_socklen_t_equiv" != "" && break done test "$gl_cv_socklen_t_equiv" != "" && break @@ -49184,25 +48588,26 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5 -printf "%s\n" "$gl_cv_socklen_t_equiv" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5 +$as_echo "$gl_cv_socklen_t_equiv" >&6; } -printf "%s\n" "#define socklen_t $gl_cv_socklen_t_equiv" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define socklen_t $gl_cv_socklen_t_equiv +_ACEOF fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5 -printf %s "checking for ssize_t... " >&6; } -if test ${gt_cv_ssize_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5 +$as_echo_n "checking for ssize_t... " >&6; } +if ${gt_cv_ssize_t+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { int x = sizeof (ssize_t *) + sizeof (ssize_t); return !x; @@ -49210,19 +48615,18 @@ int x = sizeof (ssize_t *) + sizeof (ssize_t); return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gt_cv_ssize_t=yes -else $as_nop +else gt_cv_ssize_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5 -printf "%s\n" "$gt_cv_ssize_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5 +$as_echo "$gt_cv_ssize_t" >&6; } if test $gt_cv_ssize_t = no; then -printf "%s\n" "#define ssize_t int" >>confdefs.h +$as_echo "#define ssize_t int" >>confdefs.h fi @@ -49235,19 +48639,17 @@ printf "%s\n" "#define ssize_t int" >>confdefs.h REPLACE_STAT=1 ;; *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5 -printf %s "checking whether stat handles trailing slashes on files... " >&6; } -if test ${gl_cv_func_stat_file_slash+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5 +$as_echo_n "checking whether stat handles trailing slashes on files... " >&6; } +if ${gl_cv_func_stat_file_slash+:} false; then : + $as_echo_n "(cached) " >&6 +else touch conftest.tmp # Assume that if we have lstat, we can also check symlinks. if test $ac_cv_func_lstat = yes; then ln -s conftest.tmp conftest.lnk fi - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;; @@ -49257,13 +48659,13 @@ then : *) gl_cv_func_stat_file_slash="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { int result = 0; struct stat st; @@ -49279,10 +48681,9 @@ int result = 0; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_stat_file_slash=yes -else $as_nop +else gl_cv_func_stat_file_slash=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -49291,13 +48692,13 @@ fi rm -f conftest.tmp conftest.lnk fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5 -printf "%s\n" "$gl_cv_func_stat_file_slash" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5 +$as_echo "$gl_cv_func_stat_file_slash" >&6; } case $gl_cv_func_stat_file_slash in *no) REPLACE_STAT=1 -printf "%s\n" "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h +$as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h ;; esac case $host_os in @@ -49359,7 +48760,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_STAT 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_STAT 1" >>confdefs.h @@ -49370,17 +48771,17 @@ printf "%s\n" "#define GNULIB_TEST_STAT 1" >>confdefs.h ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.tv_nsec" "ac_cv_member_struct_stat_st_atim_tv_nsec" "#include #include " -if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes -then : +if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1 +_ACEOF -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5 -printf %s "checking whether struct stat.st_atim is of type struct timespec... " >&6; } -if test ${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5 +$as_echo_n "checking whether struct stat.st_atim is of type struct timespec... " >&6; } +if ${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -49394,7 +48795,7 @@ else $as_nop struct stat st; int -main (void) +main () { st.st_atim = ts; @@ -49403,49 +48804,51 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes -else $as_nop +else ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5 -printf "%s\n" "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5 +$as_echo "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; } if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then -printf "%s\n" "#define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h +$as_echo "#define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h fi -else $as_nop +else ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "#include #include " -if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes -then : +if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1 +_ACEOF -else $as_nop +else ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "#include #include " -if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes -then : +if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1 +_ACEOF -else $as_nop +else ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" "#include #include " -if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes -then : +if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1 +_ACEOF fi @@ -49463,30 +48866,33 @@ fi ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec.tv_nsec" "ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" "#include #include " -if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = xyes -then : +if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1 +_ACEOF -else $as_nop +else ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "#include #include " -if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes -then : +if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1 +_ACEOF -else $as_nop +else ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim.tv_nsec" "ac_cv_member_struct_stat_st_birthtim_tv_nsec" "#include #include " -if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes -then : +if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes; then : -printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1 +_ACEOF fi @@ -49497,12 +48903,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alignas and alignof" >&5 -printf %s "checking for alignas and alignof... " >&6; } -if test ${gl_cv_header_working_stdalign_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alignas and alignof" >&5 +$as_echo_n "checking for alignas and alignof... " >&6; } +if ${gl_cv_header_working_stdalign_h+:} false; then : + $as_echo_n "(cached) " >&6 +else gl_save_CFLAGS=$CFLAGS for gl_working in "yes, keywords" "yes, macros"; do case $gl_working in #( @@ -49548,27 +48953,26 @@ esac #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_header_working_stdalign_h=$gl_working -else $as_nop +else gl_cv_header_working_stdalign_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$gl_save_CFLAGS test "$gl_cv_header_working_stdalign_h" != no && break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5 -printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5 +$as_echo "$gl_cv_header_working_stdalign_h" >&6; } GL_GENERATE_STDALIGN_H=false case $gl_cv_header_working_stdalign_h in #( @@ -49576,7 +48980,7 @@ printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; } GL_GENERATE_STDALIGN_H=true ;; #( yes*keyword*) : -printf "%s\n" "#define HAVE_C_ALIGNASOF 1" >>confdefs.h +$as_echo "#define HAVE_C_ALIGNASOF 1" >>confdefs.h ;; #( *) : ;; @@ -49620,12 +49024,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bool, true, false" >&5 -printf %s "checking for bool, true, false... " >&6; } -if test ${gl_cv_c_bool+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bool, true, false" >&5 +$as_echo_n "checking for bool, true, false... " >&6; } +if ${gl_cv_c_bool+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -49635,19 +49038,18 @@ else $as_nop extern bool b; bool b = true == false; _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_c_bool=yes -else $as_nop +else gl_cv_c_bool=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_bool" >&5 -printf "%s\n" "$gl_cv_c_bool" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_bool" >&5 +$as_echo "$gl_cv_c_bool" >&6; } if test "$gl_cv_c_bool" = yes; then -printf "%s\n" "#define HAVE_C_BOOL 1" >>confdefs.h +$as_echo "#define HAVE_C_BOOL 1" >>confdefs.h fi @@ -49849,13 +49251,15 @@ fi -printf "%s\n" "#define GNULIB_TEST_FSCANF 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FSCANF 1" >>confdefs.h -printf "%s\n" "#define GNULIB_FSCANF 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_FSCANF 1 +_ACEOF @@ -49873,13 +49277,15 @@ printf "%s\n" "#define GNULIB_FSCANF 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_SCANF 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_SCANF 1" >>confdefs.h -printf "%s\n" "#define GNULIB_SCANF 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_SCANF 1 +_ACEOF @@ -49897,7 +49303,7 @@ printf "%s\n" "#define GNULIB_SCANF 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_FGETC 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FGETC 1" >>confdefs.h @@ -49916,7 +49322,7 @@ printf "%s\n" "#define GNULIB_TEST_FGETC 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_GETC 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETC 1" >>confdefs.h @@ -49935,7 +49341,7 @@ printf "%s\n" "#define GNULIB_TEST_GETC 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_GETCHAR 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETCHAR 1" >>confdefs.h @@ -49954,7 +49360,7 @@ printf "%s\n" "#define GNULIB_TEST_GETCHAR 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_FGETS 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FGETS 1" >>confdefs.h @@ -49973,7 +49379,7 @@ printf "%s\n" "#define GNULIB_TEST_FGETS 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_FREAD 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FREAD 1" >>confdefs.h @@ -49992,7 +49398,7 @@ printf "%s\n" "#define GNULIB_TEST_FREAD 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_FPRINTF 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FPRINTF 1" >>confdefs.h @@ -50011,7 +49417,7 @@ printf "%s\n" "#define GNULIB_TEST_FPRINTF 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_PRINTF 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_PRINTF 1" >>confdefs.h @@ -50030,7 +49436,7 @@ printf "%s\n" "#define GNULIB_TEST_PRINTF 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_VFPRINTF 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_VFPRINTF 1" >>confdefs.h @@ -50049,7 +49455,7 @@ printf "%s\n" "#define GNULIB_TEST_VFPRINTF 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_VPRINTF 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_VPRINTF 1" >>confdefs.h @@ -50068,7 +49474,7 @@ printf "%s\n" "#define GNULIB_TEST_VPRINTF 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_FPUTC 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FPUTC 1" >>confdefs.h @@ -50087,7 +49493,7 @@ printf "%s\n" "#define GNULIB_TEST_FPUTC 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_PUTC 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_PUTC 1" >>confdefs.h @@ -50106,7 +49512,7 @@ printf "%s\n" "#define GNULIB_TEST_PUTC 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_PUTCHAR 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_PUTCHAR 1" >>confdefs.h @@ -50125,7 +49531,7 @@ printf "%s\n" "#define GNULIB_TEST_PUTCHAR 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_FPUTS 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FPUTS 1" >>confdefs.h @@ -50144,7 +49550,7 @@ printf "%s\n" "#define GNULIB_TEST_FPUTS 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_PUTS 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_PUTS 1" >>confdefs.h @@ -50163,7 +49569,7 @@ printf "%s\n" "#define GNULIB_TEST_PUTS 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_FWRITE 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_FWRITE 1" >>confdefs.h @@ -50177,12 +49583,16 @@ printf "%s\n" "#define GNULIB_TEST_FWRITE 1" >>confdefs.h + for ac_func in strcasecmp +do : ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" -if test "x$ac_cv_func_strcasecmp" = xyes -then : - printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h +if test "x$ac_cv_func_strcasecmp" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRCASECMP 1 +_ACEOF fi +done if test $ac_cv_func_strcasecmp = no; then HAVE_STRCASECMP=0 @@ -50190,26 +49600,32 @@ fi + for ac_func in strncasecmp +do : ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" -if test "x$ac_cv_func_strncasecmp" = xyes -then : - printf "%s\n" "#define HAVE_STRNCASECMP 1" >>confdefs.h +if test "x$ac_cv_func_strncasecmp" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRNCASECMP 1 +_ACEOF fi +done if test $ac_cv_func_strncasecmp = yes; then HAVE_STRNCASECMP=1 else HAVE_STRNCASECMP=0 fi - ac_fn_check_decl "$LINENO" "strncasecmp" "ac_cv_have_decl_strncasecmp" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_strncasecmp" = xyes -then : + ac_fn_c_check_decl "$LINENO" "strncasecmp" "ac_cv_have_decl_strncasecmp" "$ac_includes_default" +if test "x$ac_cv_have_decl_strncasecmp" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_STRNCASECMP $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRNCASECMP $ac_have_decl +_ACEOF if test $ac_cv_have_decl_strncasecmp = no; then HAVE_DECL_STRNCASECMP=0 @@ -50261,14 +49677,12 @@ fi if test $HAVE_STRCASESTR = 1 && test $REPLACE_STRCASESTR = 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strcasestr works in linear time" >&5 -printf %s "checking whether strcasestr works in linear time... " >&6; } -if test ${gl_cv_func_strcasestr_linear+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strcasestr works in linear time" >&5 +$as_echo_n "checking whether strcasestr works in linear time... " >&6; } +if ${gl_cv_func_strcasestr_linear+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -50288,16 +49702,15 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 -then : + $EGREP "Lucky user" >/dev/null 2>&1; then : gl_cv_func_strcasestr_linear="guessing yes" -else $as_nop +else gl_cv_func_strcasestr_linear="$gl_cross_guess_normal" fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -50308,7 +49721,7 @@ else $as_nop static void quit (int sig) { _exit (sig + 128); } int -main (void) +main () { int result = 0; @@ -50340,10 +49753,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_strcasestr_linear=yes -else $as_nop +else gl_cv_func_strcasestr_linear=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -50352,8 +49764,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strcasestr_linear" >&5 -printf "%s\n" "$gl_cv_func_strcasestr_linear" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strcasestr_linear" >&5 +$as_echo "$gl_cv_func_strcasestr_linear" >&6; } case "$gl_cv_func_strcasestr_linear" in *yes) ;; *) @@ -50383,12 +49795,16 @@ printf "%s\n" "$gl_cv_func_strcasestr_linear" >&6; } + for ac_func in strcasestr +do : ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr" -if test "x$ac_cv_func_strcasestr" = xyes -then : - printf "%s\n" "#define HAVE_STRCASESTR 1" >>confdefs.h +if test "x$ac_cv_func_strcasestr" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRCASESTR 1 +_ACEOF fi +done if test $ac_cv_func_strcasestr = no; then HAVE_STRCASESTR=0 @@ -50396,14 +49812,12 @@ fi if test $REPLACE_MEMCHR = 1; then REPLACE_STRCASESTR=1 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strcasestr works" >&5 -printf %s "checking whether strcasestr works... " >&6; } -if test ${gl_cv_func_strcasestr_works_always+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strcasestr works" >&5 +$as_echo_n "checking whether strcasestr works... " >&6; } +if ${gl_cv_func_strcasestr_works_always+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -50425,16 +49839,15 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 -then : + $EGREP "Lucky user" >/dev/null 2>&1; then : gl_cv_func_strcasestr_works_always="guessing yes" -else $as_nop +else gl_cv_func_strcasestr_works_always="$gl_cross_guess_normal" fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -50450,7 +49863,7 @@ else $as_nop #define NEEDLE P P P P P int -main (void) +main () { return !!strcasestr (HAYSTACK, NEEDLE); @@ -50458,10 +49871,9 @@ return !!strcasestr (HAYSTACK, NEEDLE); return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_strcasestr_works_always=yes -else $as_nop +else gl_cv_func_strcasestr_works_always=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -50470,8 +49882,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strcasestr_works_always" >&5 -printf "%s\n" "$gl_cv_func_strcasestr_works_always" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strcasestr_works_always" >&5 +$as_echo "$gl_cv_func_strcasestr_works_always" >&6; } case "$gl_cv_func_strcasestr_works_always" in *yes) ;; *) @@ -50516,7 +49928,7 @@ printf "%s\n" "$gl_cv_func_strcasestr_works_always" >&6; } -printf "%s\n" "#define GNULIB_TEST_STRCASESTR 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_STRCASESTR 1" >>confdefs.h @@ -50526,14 +49938,12 @@ printf "%s\n" "#define GNULIB_TEST_STRCASESTR 1" >>confdefs.h if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5 -printf %s "checking for working strerror function... " >&6; } -if test ${gl_cv_func_working_strerror+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5 +$as_echo_n "checking for working strerror function... " >&6; } +if ${gl_cv_func_working_strerror+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; @@ -50543,23 +49953,22 @@ then : *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { if (!*strerror (-2)) return 1; ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_working_strerror=yes -else $as_nop +else gl_cv_func_working_strerror=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -50568,8 +49977,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5 -printf "%s\n" "$gl_cv_func_working_strerror" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5 +$as_echo "$gl_cv_func_working_strerror" >&6; } case "$gl_cv_func_working_strerror" in *yes) ;; *) @@ -50597,7 +50006,9 @@ fi -printf "%s\n" "#define GNULIB_STRERROR 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_STRERROR 1 +_ACEOF @@ -50620,7 +50031,7 @@ printf "%s\n" "#define GNULIB_STRERROR 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_STRERROR 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_STRERROR 1" >>confdefs.h @@ -50647,13 +50058,18 @@ fi if test $ac_cv_header_sys_socket_h != yes; then - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes -then : - printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h + for ac_header in winsock2.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" +if test "x$ac_cv_header_winsock2_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINSOCK2_H 1 +_ACEOF fi +done + fi if test "$ac_cv_header_winsock2_h" = yes; then HAVE_WINSOCK2_H=1 @@ -50691,12 +50107,16 @@ fi + for ac_func in strsep +do : ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep" -if test "x$ac_cv_func_strsep" = xyes -then : - printf "%s\n" "#define HAVE_STRSEP 1" >>confdefs.h +if test "x$ac_cv_func_strsep" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRSEP 1 +_ACEOF fi +done if test $ac_cv_func_strsep = no; then HAVE_STRSEP=0 @@ -50741,7 +50161,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_STRSEP 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_STRSEP 1" >>confdefs.h @@ -50751,14 +50171,12 @@ printf "%s\n" "#define GNULIB_TEST_STRSEP 1" >>confdefs.h if test $REPLACE_MEMCHR = 1; then REPLACE_STRSTR=1 else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strstr works" >&5 -printf %s "checking whether strstr works... " >&6; } -if test ${gl_cv_func_strstr_works_always+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strstr works" >&5 +$as_echo_n "checking whether strstr works... " >&6; } +if ${gl_cv_func_strstr_works_always+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -50780,16 +50198,15 @@ then : _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky user" >/dev/null 2>&1 -then : + $EGREP "Lucky user" >/dev/null 2>&1; then : gl_cv_func_strstr_works_always="guessing yes" -else $as_nop +else gl_cv_func_strstr_works_always="$gl_cross_guess_normal" fi -rm -rf conftest* +rm -f conftest* -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -50805,7 +50222,7 @@ else $as_nop #define NEEDLE P P P P P int -main (void) +main () { return !!strstr (HAYSTACK, NEEDLE); @@ -50813,10 +50230,9 @@ return !!strstr (HAYSTACK, NEEDLE); return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_strstr_works_always=yes -else $as_nop +else gl_cv_func_strstr_works_always=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -50825,8 +50241,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strstr_works_always" >&5 -printf "%s\n" "$gl_cv_func_strstr_works_always" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strstr_works_always" >&5 +$as_echo "$gl_cv_func_strstr_works_always" >&6; } case "$gl_cv_func_strstr_works_always" in *yes) ;; *) @@ -50867,7 +50283,7 @@ printf "%s\n" "$gl_cv_func_strstr_works_always" >&6; } -printf "%s\n" "#define GNULIB_TEST_STRSTR 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_STRSTR 1" >>confdefs.h @@ -50913,7 +50329,7 @@ printf "%s\n" "#define GNULIB_TEST_STRSTR 1" >>confdefs.h - ac_fn_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "/* mingw's provides the functions asctime_r, ctime_r, + ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "/* mingw's provides the functions asctime_r, ctime_r, gmtime_r, localtime_r only if or has been included before. */ #if defined __MINGW32__ @@ -50921,14 +50337,16 @@ printf "%s\n" "#define GNULIB_TEST_STRSTR 1" >>confdefs.h #endif #include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_localtime_r" = xyes -then : +" +if test "x$ac_cv_have_decl_localtime_r" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_LOCALTIME_R $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_LOCALTIME_R $ac_have_decl +_ACEOF if test $ac_cv_have_decl_localtime_r = no; then HAVE_DECL_LOCALTIME_R=0 @@ -50937,12 +50355,11 @@ printf "%s\n" "#define HAVE_DECL_LOCALTIME_R $ac_have_decl" >>confdefs.h if test $ac_cv_func_localtime_r = yes; then HAVE_LOCALTIME_R=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether localtime_r is compatible with its POSIX signature" >&5 -printf %s "checking whether localtime_r is compatible with its POSIX signature... " >&6; } -if test ${gl_cv_time_r_posix+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime_r is compatible with its POSIX signature" >&5 +$as_echo_n "checking whether localtime_r is compatible with its POSIX signature... " >&6; } +if ${gl_cv_time_r_posix+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* mingw's provides the functions asctime_r, ctime_r, @@ -50954,7 +50371,7 @@ else $as_nop #include int -main (void) +main () { /* We don't need to append 'restrict's to the argument types, even though the POSIX signature has the 'restrict's, @@ -50969,17 +50386,16 @@ main (void) } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_time_r_posix=yes -else $as_nop +else gl_cv_time_r_posix=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_r_posix" >&5 -printf "%s\n" "$gl_cv_time_r_posix" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_r_posix" >&5 +$as_echo "$gl_cv_time_r_posix" >&6; } if test $gl_cv_time_r_posix = yes; then REPLACE_LOCALTIME_R=0 else @@ -50987,12 +50403,11 @@ printf "%s\n" "$gl_cv_time_r_posix" >&6; } fi else HAVE_LOCALTIME_R=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether localtime_r exists as an inline function" >&5 -printf %s "checking whether localtime_r exists as an inline function... " >&6; } -if test ${gl_cv_func_localtime_r_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime_r exists as an inline function" >&5 +$as_echo_n "checking whether localtime_r exists as an inline function... " >&6; } +if ${gl_cv_func_localtime_r_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* mingw's provides the functions asctime_r, ctime_r, @@ -51004,7 +50419,7 @@ else $as_nop #include int -main (void) +main () { time_t a; struct tm r; @@ -51015,18 +50430,17 @@ time_t a; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_func_localtime_r_inline=yes -else $as_nop +else gl_cv_func_localtime_r_inline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_localtime_r_inline" >&5 -printf "%s\n" "$gl_cv_func_localtime_r_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_localtime_r_inline" >&5 +$as_echo "$gl_cv_func_localtime_r_inline" >&6; } if test $gl_cv_func_localtime_r_inline = yes; then REPLACE_LOCALTIME_R=1 fi @@ -51068,7 +50482,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_TIME_R 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_TIME_R 1" >>confdefs.h @@ -51122,7 +50536,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_TIMEGM 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_TIMEGM 1" >>confdefs.h @@ -51156,23 +50570,26 @@ printf "%s\n" "#define GNULIB_TEST_TIMEGM 1" >>confdefs.h if test $ac_cv_have_decl_unsetenv = no; then HAVE_DECL_UNSETENV=0 fi + for ac_func in unsetenv +do : ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv" -if test "x$ac_cv_func_unsetenv" = xyes -then : - printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h +if test "x$ac_cv_func_unsetenv" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UNSETENV 1 +_ACEOF fi +done if test $ac_cv_func_unsetenv = no; then HAVE_UNSETENV=0 else HAVE_UNSETENV=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unsetenv() return type" >&5 -printf %s "checking for unsetenv() return type... " >&6; } -if test ${gt_cv_func_unsetenv_ret+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsetenv() return type" >&5 +$as_echo_n "checking for unsetenv() return type... " >&6; } +if ${gt_cv_func_unsetenv_ret+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -51186,38 +50603,35 @@ extern int unsetenv (const char *name); int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : gt_cv_func_unsetenv_ret='int' -else $as_nop +else gt_cv_func_unsetenv_ret='void' fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_unsetenv_ret" >&5 -printf "%s\n" "$gt_cv_func_unsetenv_ret" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_unsetenv_ret" >&5 +$as_echo "$gt_cv_func_unsetenv_ret" >&6; } if test $gt_cv_func_unsetenv_ret = 'void'; then -printf "%s\n" "#define VOID_UNSETENV 1" >>confdefs.h +$as_echo "#define VOID_UNSETENV 1" >>confdefs.h REPLACE_UNSETENV=1 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether unsetenv obeys POSIX" >&5 -printf %s "checking whether unsetenv obeys POSIX... " >&6; } -if test ${gl_cv_func_unsetenv_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether unsetenv obeys POSIX" >&5 +$as_echo_n "checking whether unsetenv obeys POSIX... " >&6; } +if ${gl_cv_func_unsetenv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on glibc systems. *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;; @@ -51225,7 +50639,7 @@ then : *) gl_cv_func_unsetenv_works="$gl_cross_guess_normal" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -51237,7 +50651,7 @@ else $as_nop $gl_mda_defines int -main (void) +main () { char entry1[] = "a=1"; @@ -51260,10 +50674,9 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_unsetenv_works=yes -else $as_nop +else gl_cv_func_unsetenv_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -51272,8 +50685,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unsetenv_works" >&5 -printf "%s\n" "$gl_cv_func_unsetenv_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unsetenv_works" >&5 +$as_echo "$gl_cv_func_unsetenv_works" >&6; } case "$gl_cv_func_unsetenv_works" in *yes) ;; *) @@ -51319,89 +50732,86 @@ fi -printf "%s\n" "#define GNULIB_TEST_UNSETENV 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_UNSETENV 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5 -printf %s "checking for variable-length arrays... " >&6; } -if test ${ac_cv_c_vararrays+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5 +$as_echo_n "checking for variable-length arrays... " >&6; } +if ${ac_cv_c_vararrays+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC_NO_VLA__ - defined - #endif + defined + #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "defined" >/dev/null 2>&1 -then : + $EGREP "defined" >/dev/null 2>&1; then : ac_cv_c_vararrays='no: __STDC_NO_VLA__ is defined' -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Test for VLA support. This test is partly inspired - from examples in the C standard. Use at least two VLA - functions to detect the GCC 3.4.3 bug described in: - https://lists.gnu.org/archive/html/bug-gnulib/2014-08/msg00014.html - */ - #ifdef __STDC_NO_VLA__ - syntax error; - #else - extern int n; - int B[100]; - int fvla (int m, int C[m][m]); + from examples in the C standard. Use at least two VLA + functions to detect the GCC 3.4.3 bug described in: + https://lists.gnu.org/archive/html/bug-gnulib/2014-08/msg00014.html + */ + #ifdef __STDC_NO_VLA__ + syntax error; + #else + extern int n; + int B[100]; + int fvla (int m, int C[m][m]); - int - simple (int count, int all[static count]) - { - return all[count - 1]; - } + int + simple (int count, int all[static count]) + { + return all[count - 1]; + } - int - fvla (int m, int C[m][m]) - { - typedef int VLA[m][m]; - VLA x; - int D[m]; - static int (*q)[m] = &B; - int (*s)[n] = q; - return C && &x[0][0] == &D[0] && &D[0] == s[0]; - } - #endif + int + fvla (int m, int C[m][m]) + { + typedef int VLA[m][m]; + VLA x; + int D[m]; + static int (*q)[m] = &B; + int (*s)[n] = q; + return C && &x[0][0] == &D[0] && &D[0] == s[0]; + } + #endif int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_vararrays=yes -else $as_nop +else ac_cv_c_vararrays=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -rf conftest* +rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5 -printf "%s\n" "$ac_cv_c_vararrays" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5 +$as_echo "$ac_cv_c_vararrays" >&6; } if test "$ac_cv_c_vararrays" = yes; then -printf "%s\n" "#define HAVE_C_VARARRAYS 1" >>confdefs.h +$as_echo "#define HAVE_C_VARARRAYS 1" >>confdefs.h elif test "$ac_cv_c_vararrays" = no; then -printf "%s\n" "#define __STDC_NO_VLA__ 1" >>confdefs.h +$as_echo "#define __STDC_NO_VLA__ 1" >>confdefs.h fi @@ -51453,7 +50863,7 @@ printf "%s\n" "#define __STDC_NO_VLA__ 1" >>confdefs.h if test $ac_cv_func_vasnprintf = yes; then -printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h +$as_echo "#define REPLACE_VASNPRINTF 1" >>confdefs.h fi @@ -51466,12 +50876,11 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" -if test "x$ac_cv_type_ptrdiff_t" = xyes -then : +if test "x$ac_cv_type_ptrdiff_t" = xyes; then : -else $as_nop +else -printf "%s\n" "#define ptrdiff_t long" >>confdefs.h +$as_echo "#define ptrdiff_t long" >>confdefs.h fi @@ -51485,12 +50894,16 @@ fi fi + for ac_func in vasprintf +do : ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf" -if test "x$ac_cv_func_vasprintf" = xyes -then : - printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h +if test "x$ac_cv_func_vasprintf" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VASPRINTF 1 +_ACEOF fi +done if test $ac_cv_func_vasprintf = no; then @@ -51545,7 +50958,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_VASPRINTF 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_VASPRINTF 1" >>confdefs.h @@ -51560,26 +50973,28 @@ printf "%s\n" "#define GNULIB_TEST_VASPRINTF 1" >>confdefs.h gl_cv_func_vsnprintf_usable=no + for ac_func in vsnprintf +do : ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" -if test "x$ac_cv_func_vsnprintf" = xyes -then : - printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h +if test "x$ac_cv_func_vsnprintf" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VSNPRINTF 1 +_ACEOF fi +done if test $ac_cv_func_vsnprintf = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5 -printf %s "checking whether snprintf respects a size of 1... " >&6; } -if test ${gl_cv_func_snprintf_size1+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5 +$as_echo_n "checking whether snprintf respects a size of 1... " >&6; } +if ${gl_cv_func_snprintf_size1+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on Android. linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;; @@ -51588,7 +51003,7 @@ then : *) gl_cv_func_snprintf_size1="guessing yes" ;; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -51614,10 +51029,9 @@ int main() return buf[1] != 'E'; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_snprintf_size1=yes -else $as_nop +else gl_cv_func_snprintf_size1=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -51626,8 +51040,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5 -printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5 +$as_echo "$gl_cv_func_snprintf_size1" >&6; } case "$gl_cv_func_snprintf_size1" in *yes) @@ -51636,15 +51050,13 @@ printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; } *yes) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5 -printf %s "checking whether printf supports POSIX/XSI format strings with positions... " >&6; } -if test ${gl_cv_func_printf_positions+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5 +$as_echo_n "checking whether printf supports POSIX/XSI format strings with positions... " >&6; } +if ${gl_cv_func_printf_positions+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : case "$host_os" in netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*) @@ -51657,7 +51069,7 @@ then : *) gl_cv_func_printf_positions="guessing yes";; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -51673,10 +51085,9 @@ int main () return (strcmp (buf, "55 33") != 0); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_printf_positions=yes -else $as_nop +else gl_cv_func_printf_positions=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -51685,8 +51096,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5 -printf "%s\n" "$gl_cv_func_printf_positions" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5 +$as_echo "$gl_cv_func_printf_positions" >&6; } case "$gl_cv_func_printf_positions" in *yes) @@ -51742,7 +51153,7 @@ printf "%s\n" "$gl_cv_func_printf_positions" >&6; } -printf "%s\n" "#define GNULIB_TEST_VSNPRINTF 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_VSNPRINTF 1" >>confdefs.h @@ -51778,12 +51189,11 @@ printf "%s\n" "#define GNULIB_TEST_VSNPRINTF 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5 -printf %s "checking whether mbrtowc handles incomplete characters... " >&6; } -if test ${gl_cv_func_mbrtowc_incomplete_state+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5 +$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; } +if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on AIX and OSF/1. @@ -51792,10 +51202,9 @@ else $as_nop *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;; esac if test $LOCALE_JA != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -51818,10 +51227,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_incomplete_state=yes -else $as_nop +else gl_cv_func_mbrtowc_incomplete_state=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -51830,10 +51238,9 @@ fi else if test $LOCALE_FR_UTF8 != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -51856,10 +51263,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_incomplete_state=yes -else $as_nop +else gl_cv_func_mbrtowc_incomplete_state=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -51870,18 +51276,17 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_incomplete_state" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5 +$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5 -printf %s "checking whether mbrtowc works as well as mbtowc... " >&6; } -if test ${gl_cv_func_mbrtowc_sanitycheck+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5 +$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; } +if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on Solaris 8. @@ -51890,10 +51295,9 @@ else $as_nop *) gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;; esac if test $LOCALE_ZH_CN != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -51920,10 +51324,9 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_mbrtowc_sanitycheck=yes -else $as_nop +else gl_cv_func_mbrtowc_sanitycheck=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -51933,8 +51336,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5 -printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5 +$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; } REPLACE_MBSTATE_T=0 case "$gl_cv_func_mbrtowc_incomplete_state" in @@ -51953,17 +51356,19 @@ printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; } if test $ac_cv_func_wcrtomb = no; then HAVE_WCRTOMB=0 - ac_fn_check_decl "$LINENO" "wcrtomb" "ac_cv_have_decl_wcrtomb" " + ac_fn_c_check_decl "$LINENO" "wcrtomb" "ac_cv_have_decl_wcrtomb" " #include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_wcrtomb" = xyes -then : +" +if test "x$ac_cv_have_decl_wcrtomb" = xyes; then : ac_have_decl=1 -else $as_nop +else ac_have_decl=0 fi -printf "%s\n" "#define HAVE_DECL_WCRTOMB $ac_have_decl" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_WCRTOMB $ac_have_decl +_ACEOF if test $ac_cv_have_decl_wcrtomb = yes; then REPLACE_WCRTOMB=1 @@ -51975,14 +51380,12 @@ printf "%s\n" "#define HAVE_DECL_WCRTOMB $ac_have_decl" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb works in the C locale" >&5 -printf %s "checking whether wcrtomb works in the C locale... " >&6; } -if test ${gl_cv_func_wcrtomb_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb works in the C locale" >&5 +$as_echo_n "checking whether wcrtomb works in the C locale... " >&6; } +if ${gl_cv_func_wcrtomb_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : case "$host_os" in # Guess no on Android. linux*-android*) gl_cv_func_wcrtomb_works="guessing no";; @@ -51990,7 +51393,7 @@ then : *) gl_cv_func_wcrtomb_works="guessing yes";; esac -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -52008,10 +51411,9 @@ int main () return !(count == 1 && out[0] == 'a'); } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_wcrtomb_works=yes -else $as_nop +else gl_cv_func_wcrtomb_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -52020,23 +51422,22 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_works" >&5 -printf "%s\n" "$gl_cv_func_wcrtomb_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_works" >&5 +$as_echo "$gl_cv_func_wcrtomb_works" >&6; } case "$gl_cv_func_wcrtomb_works" in *yes) ;; *) -printf "%s\n" "#define WCRTOMB_C_LOCALE_BUG 1" >>confdefs.h +$as_echo "#define WCRTOMB_C_LOCALE_BUG 1" >>confdefs.h REPLACE_WCRTOMB=1 ;; esac fi if test $REPLACE_WCRTOMB = 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb return value is correct" >&5 -printf %s "checking whether wcrtomb return value is correct... " >&6; } -if test ${gl_cv_func_wcrtomb_retval+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb return value is correct" >&5 +$as_echo_n "checking whether wcrtomb return value is correct... " >&6; } +if ${gl_cv_func_wcrtomb_retval+:} false; then : + $as_echo_n "(cached) " >&6 +else case "$host_os" in # Guess no on AIX 4, OSF/1, Solaris, native Windows. @@ -52045,10 +51446,9 @@ else $as_nop *) gl_cv_func_wcrtomb_retval="guessing yes" ;; esac if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then - if test "$cross_compiling" = yes -then : + if test "$cross_compiling" = yes; then : : -else $as_nop +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -52088,10 +51488,9 @@ int main () return result; } _ACEOF -if ac_fn_c_try_run "$LINENO" -then : +if ac_fn_c_try_run "$LINENO"; then : gl_cv_func_wcrtomb_retval=yes -else $as_nop +else gl_cv_func_wcrtomb_retval=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -52101,12 +51500,12 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_retval" >&5 -printf "%s\n" "$gl_cv_func_wcrtomb_retval" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_retval" >&5 +$as_echo "$gl_cv_func_wcrtomb_retval" >&6; } case "$gl_cv_func_wcrtomb_retval" in *yes) ;; *) -printf "%s\n" "#define WCRTOMB_RETVAL_BUG 1" >>confdefs.h +$as_echo "#define WCRTOMB_RETVAL_BUG 1" >>confdefs.h REPLACE_WCRTOMB=1 ;; esac @@ -52154,7 +51553,7 @@ fi -printf "%s\n" "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h @@ -52228,23 +51627,32 @@ fi : -printf "%s\n" "#define GNULIB_XALLOC 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_XALLOC 1 +_ACEOF -printf "%s\n" "#define GNULIB_XALLOC_DIE 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_XALLOC_DIE 1 +_ACEOF - ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" -if test "x$ac_cv_header_stdint_h" = xyes -then : - printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h + for ac_header in stdint.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDINT_H 1 +_ACEOF fi +done + # End of code from modules @@ -52299,7 +51707,7 @@ if test "$ac_cv_uname_s" = 'SunOS' -a \( "x$ac_cv_prog_ac_ct_AR" = "x" -o "$ac_c as_fn_error $? "No ar found for Solaris - is /usr/ccs/bin in PATH?" "$LINENO" 5 fi -ac_config_files="$ac_config_files Makefile tap/Makefile lib/Makefile plugins/Makefile lib/tests/Makefile plugins-root/Makefile plugins-scripts/Makefile plugins-scripts/utils.pm plugins-scripts/utils.sh test.pl pkg/solaris/pkginfo" +ac_config_files="$ac_config_files Makefile tap/Makefile lib/Makefile plugins/Makefile lib/tests/Makefile plugins-root/Makefile plugins-scripts/Makefile plugins-scripts/utils.pm plugins-scripts/utils.sh test.pl pkg/solaris/pkginfo po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -52328,8 +51736,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -52359,15 +51767,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -52381,8 +51789,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;} fi fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -52399,7 +51807,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -52410,14 +51818,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -printf %s "checking that generated files are newer than configure... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 -printf "%s\n" "done" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -52439,14 +51847,12 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi # Check whether --enable-year2038 was given. -if test ${enable_year2038+y} -then : +if test "${enable_year2038+set}" = set; then : enableval=$enable_year2038; fi # Check whether --enable-largefile was given. -if test ${enable_largefile+y} -then : +if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; fi @@ -52535,8 +51941,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -52559,16 +51965,14 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -52578,46 +51982,46 @@ esac fi - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -52626,6 +52030,13 @@ if ${PATH_SEPARATOR+false} :; then fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -52634,12 +52045,8 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -52651,10 +52058,30 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -52667,14 +52094,13 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -52701,20 +52127,18 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset - # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : eval 'as_fn_append () { eval $1+=\$2 }' -else $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -52726,13 +52150,12 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -52763,7 +52186,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -52785,10 +52208,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -52802,12 +52221,6 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -52849,7 +52262,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -52858,7 +52271,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -52920,8 +52333,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by monitoring-plugins $as_me 2.4.0, which was -generated by GNU Autoconf 2.71. Invocation command line was +This file was extended by monitoring-plugins $as_me 2.3.5, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -52983,16 +52396,14 @@ $config_commands Report bugs to the package provider." _ACEOF -ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` -ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config='$ac_cs_config_escaped' +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -monitoring-plugins config.status 2.4.0 -configured by $0, generated by GNU Autoconf 2.71, +monitoring-plugins config.status 2.3.5 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -53032,15 +52443,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - printf "%s\n" "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - printf "%s\n" "$ac_cs_config"; exit ;; + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -53048,7 +52459,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -53057,7 +52468,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - printf "%s\n" "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -53085,7 +52496,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -53099,7 +52510,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - printf "%s\n" "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF @@ -53417,6 +52828,7 @@ do "plugins-scripts/utils.sh") CONFIG_FILES="$CONFIG_FILES plugins-scripts/utils.sh" ;; "test.pl") CONFIG_FILES="$CONFIG_FILES test.pl" ;; "pkg/solaris/pkginfo") CONFIG_FILES="$CONFIG_FILES pkg/solaris/pkginfo" ;; + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -53428,9 +52840,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files - test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers - test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -53766,7 +53178,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -53774,17 +53186,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -printf "%s\n" "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`printf "%s\n" "$configure_input" | + ac_sed_conf_input=`$as_echo "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -53801,7 +53213,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -53825,9 +53237,9 @@ printf "%s\n" X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -53889,8 +53301,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -53934,9 +53346,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -53952,20 +53364,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -53985,7 +53397,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$_am_arg" | +$as_echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -54005,8 +53417,8 @@ printf "%s\n" X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -printf "%s\n" "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -54032,7 +53444,7 @@ esac for am_mf do # Strip MF so we end up with the name of the file. - am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'` + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile which includes # dependency-tracking related rules and includes. # Grep'ing the whole file directly is not great: AIX grep has a line @@ -54044,7 +53456,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$am_mf" : 'X\(//\)[^/]' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$am_mf" | +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -54066,7 +53478,7 @@ printf "%s\n" X"$am_mf" | $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$am_mf" | +$as_echo X/"$am_mf" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -54091,8 +53503,8 @@ printf "%s\n" X/"$am_mf" | (exit $ac_status); } || am_rc=$? done if test $am_rc -ne 0; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments for automatic dependency tracking. If GNU make was not used, consider re-running the configure script with MAKE=\"gmake\" (or whatever is @@ -54564,7 +53976,6 @@ _LT_EOF esac - ltmain="$ac_aux_dir/ltmain.sh" @@ -54729,8 +54140,8 @@ else fi if test x"$_lt_function_replace_fail" = x":"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -printf "%s\n" "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} fi @@ -54822,9 +54233,7 @@ fi # presentlang can be used as a fallback for messages # which are not translated in the desiredlang catalog). case "$desiredlang" in - "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*) - useit=yes - ;; + "$presentlang"*) useit=yes;; esac done if test $useit = yes; then @@ -54886,8 +54295,8 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi @@ -54909,4 +54318,3 @@ echo " --with-trusted-path: $with_trusted_path" echo " --enable-libtap: $enable_libtap" echo " --with-libcurl: $with_libcurl" echo " --with-uriparser: $with_uriparser" - diff --git a/configure.ac b/configure.ac index 10ef688..7eed920 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.64) -AC_INIT(monitoring-plugins,2.4.0) +AC_INIT(monitoring-plugins,2.3.5) AC_CONFIG_SRCDIR(NPTest.pm) AC_CONFIG_FILES([gl/Makefile]) AC_CONFIG_AUX_DIR(build-aux) @@ -1923,6 +1923,7 @@ AC_OUTPUT( plugins-scripts/utils.sh test.pl pkg/solaris/pkginfo + po/Makefile.in ) diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml deleted file mode 100644 index 45a5cf6..0000000 --- a/debian/.gitlab-ci.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml - -variables: - RELEASE: 'unstable' - SALSA_CI_DISABLE_APTLY: 0 - SALSA_CI_DISABLE_AUTOPKGTEST: 0 - SALSA_CI_DISABLE_BLHC: 1 - SALSA_CI_DISABLE_LINTIAN: 0 - SALSA_CI_DISABLE_PIUPARTS: 0 - SALSA_CI_DISABLE_REPROTEST: 0 - SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 0 - SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 0 - SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1 diff --git a/debian/NEWS b/debian/NEWS deleted file mode 100644 index f46109a..0000000 --- a/debian/NEWS +++ /dev/null @@ -1,114 +0,0 @@ -monitoring-plugins (2.4.0-3) unstable; urgency=medium - - The check_http plugin was deprecated. Please migrate the check command - definitions over to the drop-in replacement check_curl. It should be - sufficient to replace check_http with check_curl in your command definitions. - The check_curl plugin was moved to the monitoring-plugins-basic package for - a smoother migration path. For making things easy, update-alternatives can - be used to change the check_http alternative. This can be done with the - command: update-alternatives --config check_http - - -- Jan Wagner Mon, 21 Apr 2025 11:00:59 +0200 - -monitoring-plugins (2.1.2-3) unstable; urgency=medium - - We switched again over to another radius library. This time radcli - to fix #822337. This makes it again necessary to migrate your radius - credentials from /etc/radiusclient/servers to /etc/radcli/servers - in case you are using check_radius. - Please install the new dependencies in this case if you don't install - Recommends by default. Those dependencies can be found in - /usr/share/doc/monitoring-plugins-standard/README.Debian.plugins. - - -- Jan Wagner Wed, 02 Nov 2016 23:59:10 +0100 - -monitoring-plugins (2.0-1) unstable; urgency=medium - - This software project was renamed by upstream. For more information - see https://www.monitoring-plugins.org/news/new-project-name.html. - - We renamed the package(s) also, but we kept the directories - /etc/nagios-plugins/ and /usr/lib/nagios/plugins for now, cause - many other packages rely on them. Maybe we have to change that later. - - We decided to set capabilities(7) for check_icmp and check_dhcp, when - possible. This means libcap2-bin needs to be installed and the - kernel (in our case this is linux) needs to support that. This - makes it possible to avoid suid bit set for those plugins. - - We even switched over to freeradius-client to fix #721621. This makes - it necessary to migrate you radius credentials from - /etc/radiusclient-ng/servers to /etc/radiusclient/servers in case you - are using check_radius. - - check_snmp is now evaluating negative values properly, but it might be - returning CRITICALs where it used to return OK and was ignored, if a - negative value turns out to actually be a valid value. - If negative values are valid, this can be worked around, by adding "~:" - to the warning/critical threshold : 100 -> ~:100 - - -- Jan Wagner Mon, 23 Jun 2014 08:34:45 +0200 - -nagios-plugins (1.4.15-6) unstable; urgency=low - - Created a nagios-plugins-common package which ships files possibly needed - also by other plugin packages and should installed as dependency - - Removed check_bgpstate and check_linux_raid, which are shiped in upstream - contrib/ and are not maintained there anymore. If you need a replacement - for check_linux_raid, have a look into check_raid from - nagios-plugins-contrib package. - - -- Jan Wagner Tue, 15 May 2012 13:41:33 +0200 - -nagios-plugins (1.4.15-4) unstable; urgency=low - - Moved linked libraries against nagios-plugins-standard from Depends to - Recommends and mention them in - /usr/share/doc/nagios-plugins-standard/README.Debian.plugins. - - -- Jan Wagner Sun, 13 Feb 2011 22:51:54 +0100 - -nagios-plugins (1.4.14-2) unstable; urgency=low - - Moved check_mailq to nagios-plugins-standard, because it requires the mailq - binary and it is shipped with postfix, exim, sendmail and qmail, which is - the plugin is intended to check. - - -- Jan Wagner Thu, 11 Mar 2010 13:24:23 +0100 - -nagios-plugins (1.4.14-1) unstable; urgency=low - - If your are using check_linux_raid.pl or check_bgpstate (respectively the - check_snmp_bgpstate), they will be removed sometime in the future, as - upstream will remove they shortly ... so be prepared! - - The qstat package is not a dependency any more but recommanded. As Recommands - installed by default these days, there shouldn't much users effected. If you - have turned off the installation of recommanded packages and you are using - check_quake, please install the qstat package again. - - For all non linux archs, we depend on inetutils-ping, since now. As actually - inetutils-ping doesn't support a deadlines option (see #565137), it will be - likely, that you will get plugin timeouts from check_ping. As iputils-ping - is not an option here, due it's not available, you have to deal with that. - The suggestion would be in this case, to migrate over to check_icmp. - - -- Jan Wagner Sun, 20 Dec 2009 20:01:07 +0100 - -nagios-plugins (1.4.12-1) unstable; urgency=low - - Removed default port of check_radius definition in favor of the ability to - specify it as 4th argument. - - -- Jan Wagner Fri, 06 Jun 2008 12:25:59 +0200 - -nagios-plugins (1.4.5-3) unstable; urgency=low - - ifstatus.cfg has changed. Now you have to provide a community in the first - argument ($ARG1$). Description and IfIndex moved to second argument ($ARG2$). - - E.g.: use "check_ifstatus!public" instead of "check_ifstatus" as - check_command! - - -- Jan Wagner Thu, 11 Jan 2007 14:56:47 +0100 diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index b1eaa35..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,95 +0,0 @@ -================================================================================ -monitoring-plugins for Debian -================================================================================ - -below is a collection of various bits of information that might be -helpful to users of monitoring-plugins in debian. - -================================================================================ -plugins and dependencies -================================================================================ - -some plugins require additional libraries and programs. to prevent you from -having to install dozens of further packages that you don't actually need, -there is no strict dependency on some of them. -see /usr/share/doc/monitoring-plugins-standard/README.Debian.plugins for details. - -================================================================================ -how to use plugins -================================================================================ - -- you can invoke the plugins with "--help" to get help how to use the plugins -- a short usage can be usually obtained by just running the check without - arguments -- if you need more information, how to use plugins, have a look at: - http://www.monitoring-plugins.org/doc/faq/index.html - -================================================================================ -predefined / shipped check commands -================================================================================ - -we are shipping predefined checks, to make users life easier. at the first look, -this seems really nice. providing checks for every special case (see check_http) -may end up in a unsupportable state of our package. -for example one check is testing a service on a special port, where we provide -a check command. after some time, this service changes its port after some time, -cause the developers of this software decided for any reason to do so. changing -the port in the existing check will break installations, which are using the -service with the old behavior. new users will getting confused of not using the -correct port for their shiny service. -cause of this conflict, we try to provide flexible checks, which may look -complicated at first, but giving the user more power. - -a good example for using such a general approach is check_nt / check_nscp. some -3rd party sources (guessing they can traced back to one) are suggesting using -two args in some way like: - -define command { -command_name check_nt -command_line $USER1$/check_nt -H $HOSTADDRESS$ -p 12489 -v $ARG1$ $ARG2$ -} - -beside specifying not the port, we are not using "$ARG2$", cause all arguments -of "$ARG2$" can just be used in "$ARG1$" without any problem. -this gives you the possibility to use every check in your service definition, -without the problem about changes in your environment. you can easily change -your service definition as soon your environment changes without breaking the -command definition. - -================================================================================ -different plugin packages and how to avoid installing massive dependencies -================================================================================ - -if you're frustrated by all the crap being brought in by monitoring-plugins (for -example if you're installing nrpe or nsca on a remote host), try the -monitoring-plugins-basic package. - -================================================================================ -plugins needing root privilege or capabilities(7) set -================================================================================ - -the check_dhcp, check_icmp and maybe others plugins require root privileges or -capabilities(7) to run, because of the low-level packet mangling that they -perform. but, in the interest of the "safe default", these plugins will not -be installed with the suid bit set. -if setcap is able set the necessary capabilities, you are fine. if the setcap -binary is not installed or not able to set the capabilities, you need to -either set the capabilities (eg. cap_net_raw+ep) for your own or provide root -privileges. You could go the lazy way and install libcap2-bin and run the -following afterwards: - -# /var/lib/dpkg/info/monitoring-plugins-basic.postinst configure - -there are two recommended ways about providing root priviles to your plugins -on your system: - -- set the suid bit with dpkg-statoverride: - -# dpkg-statoverride --update --add root nagios 4750 $plugin - -where $plugin is the specific plugin you want to grant such privileges. - -- use sudo to grant the permissions and modify your plugin config - -of these two, the first is recommended because it's the simplest and -has the same effect as the second. diff --git a/debian/README.Debian.plugins.in b/debian/README.Debian.plugins.in deleted file mode 100644 index 6b69c76..0000000 --- a/debian/README.Debian.plugins.in +++ /dev/null @@ -1,61 +0,0 @@ -monitoring-plugins on Debian -============================ - -Some plugins require additional libraries and programs. To prevent you from -having to install dozens of further packages that you don't actually need, -there is no strict dependency on some of them. Rather, they are listed as -recommendations and suggests. - -apt-get(8) and aptitude(8) will install recommended packages automatically by -default. If you did not disable this feature you will have everything in place -to operate all plugins when installing the "monitoring-plugins-standard" -package, beside the packages listed as suggests. -Else you have to install missing dependencies manually (see the section "Plugin -dependencies" below). - -Plugin dependencies: --------------------- - -check_bgpstate: - * libnet-snmp-perl - * whois - -check_breeze: - * snmp - -check_disk_smb: - * smbclient - -check_dns: - * dnsutils - -check_fping: - * fping - -check_game: - * qstat - -check_ifoperstatus: - * libnet-snmp-perl - -check_ifstatus: - * libnet-snmp-perl - -check_mailq: - * sendmail binary of qmail or one of the following packages - - postfix - - sendmail-bin - - exim4-daemon-heavy - - exim4-daemon-light - * sudo - -check_oracle: - * procps - -check_rpc: - * rpcbind - -check_wave: - * snmp - -@PLUGIN_DEPS@ diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index fabfff5..0000000 --- a/debian/README.source +++ /dev/null @@ -1,24 +0,0 @@ -We use dpatch for patch handling inside our package(s). Please see -/usr/share/doc/dpatch/README.source.gz (if you have installed dpatch) for -documentation about dpatch. - -Since Version 1.5.0 we are repackaging the upstream tarball to stop providing: - - * perlmods/ - -Therefor you should use the script debian/bin/repack.sh: - - repack.sh - - This can also be automatically done with 'uscan --force-download' - -Creating a sufficiant tarball from latest git snapshot: - -* Install 'autoconf automake' beside the build-depends -* Following RELEASING[1] you need - - cd /tmp/monitoringlug - - tools/setup - - ./configure - - make dist - -[1] https://github.com/monitoring-plugins/monitoring-plugins/blob/master/doc/RELEASING diff --git a/debian/bin/gen_plugin_deps.pl b/debian/bin/gen_plugin_deps.pl deleted file mode 100644 index 1280074..0000000 --- a/debian/bin/gen_plugin_deps.pl +++ /dev/null @@ -1,106 +0,0 @@ -#! /usr/bin/perl -# -# collectd - gen_plugin_deps.pl -# Copyright (C) 2007 Sebastian Harl -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# Author: -# Sebastian Harl - -use strict; -use warnings; - -# actual not needed -my $extra_deps = { -# sensors => [ 'lm-sensors' ], -}; - -my $infile = "debian/README.Debian.plugins.in"; -my $outfile = "debian/README.Debian.plugins"; - -my ($ifile, $ofile); - -if (! open($ifile, "<", $infile)) { - print STDERR "Could not open file '$infile': $!\n"; - exit 1; -} - -if (! open($ofile, ">", $outfile)) { - print STDERR "Could not open file '$outfile': $!\n"; - exit 1; -} - -while (my $line = <$ifile>) { - if ($line !~ m/^\@PLUGIN_DEPS\@\n$/) { - print $ofile $line; - } - else { - print_plugin_deps($ofile); - } -} - -close($ofile); -close($ifile); - -sub print_plugin_deps -{ - my $fh = shift; - my $pdir = undef; - my $i = 0; - - my $plugindir = "debian/monitoring-plugins-standard/usr/lib/nagios/plugins/"; - - if (! opendir($pdir, $plugindir)) { - print STDERR "Could not open directory '$plugindir': $!\n"; - exit 1; - } - - foreach my $dirent (sort readdir($pdir)) { -# if ($dirent !~ m/^(\w+).so$/) { - if ($dirent !~ m/^check_(\w+)$/) { - next; - } - - my $name = $1; - my $deps = `dpkg-shlibdeps -O $plugindir/$dirent`; - - chomp $deps; - - $deps =~ s/^shlibs:Depends=//; - - my @deps = grep !m/^libc6\b/, split m/, /, $deps; - - if (scalar @deps) { - if (0 < $i) { - print $fh "\n"; - } - - ++$i; - - print $fh "check_$name:\n"; - - if (defined $extra_deps->{$name}) { - unshift @deps, @{$extra_deps->{$name}}; - } - - foreach my $dep (@deps) { - print $fh " * $dep\n"; - } - } - } -} - -# vim: set tw=78 sw=4 ts=4 noexpandtab : - diff --git a/debian/bin/repack.sh b/debian/bin/repack.sh deleted file mode 100755 index cc3b78f..0000000 --- a/debian/bin/repack.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# Borrowed from Raphael Geissert's Debian PHP repack script. - -set -e - -if [ ! -f "$3" ] && [ ! -f "$1" ]; then - echo "This script must be run via uscan or by manually specifying the tarball" >&2 - exit 1 -fi - -tarball= - -[ -f "$3" ] && tarball="$3" -[ -z "$tarball" -a -f "$1" ] && tarball="$1" - -tarball="$(readlink -f "$tarball")" - -tdir="$(mktemp -d)" -trap '[ ! -d "$tdir" ] || rm -r "$tdir"' EXIT - -tar -xzf $tarball -C $tdir -cp -a "$tarball" "$tarball.orig" -distdir="$(basename $(ls -d $tdir/*))" -srcdir="$tdir/$distdir" - -#echo "Adjusting $srcdir/configure" -sed -i 's/perlmods\/Makefile\ //' $srcdir/configure -sed -i '/perlmods\/Makefile/d' $srcdir/configure -#echo "Adjusting $srcdir/configure.in" -[ -f $srcdir/configure.in ] && sed -i '/perlmods\/Makefile/d' $srcdir/configure.in -#echo "Adjusting $srcdir/configure.am" -[ -f $srcdir/configure.ac ] && sed -i '/perlmods\/Makefile/d' $srcdir/configure.ac -#echo "Adjusting $srcdir/Makefile*" -sed -i 's/perlmods\ //' $srcdir/Makefile* -#echo "Removing $srcdir/perlmods/ -rm -rf $srcdir/perlmods/ - -tar -cof "${tarball%.*}" -C $tdir/ $distdir -gzip -f9 "${tarball%.*}" diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 4119fa2..0000000 --- a/debian/changelog +++ /dev/null @@ -1,1823 +0,0 @@ -monitoring-plugins (2.4.0-4) UNRELEASED; urgency=medium - - * - - -- Jan Wagner Tue, 22 Apr 2025 16:31:05 +0200 - -monitoring-plugins (2.4.0-3) unstable; urgency=medium - - * Upload to unstable - - -- Jan Wagner Tue, 22 Apr 2025 16:25:21 +0200 - -monitoring-plugins (2.4.0-3~exp1) experimental; urgency=medium - - * [7e8c776] Adding d/p/24_check_http_deprecation from upstream - * [baad659] Add d/monitoring-plugins-basic.alternatives - * [6bb8580] Adjust debian/rules for check_http rename - * [ddaa81f] check_curl: move to monitoring-plugins-basic package - * [b724e41] d/NEWS: Add information about check_http deprecation - - -- Jan Wagner Mon, 21 Apr 2025 16:29:02 +0200 - -monitoring-plugins (2.4.0-2) unstable; urgency=medium - - [ Bas Couwenberg ] - * [2d414bd] Bump Standards-Version to 4.7.0, no changes. - - [ Jan Wagner ] - * [672d37c] Adding d/p/10_check_curl_fix_redirects from upstream - * [15760ad] Adding d/p/11_check_curl_raise_ssl_issue from upstream - * [a6b1db0] Adding d/p/12_check_curl_add_docu from upstream - * [8b17915] Adding d/p/13_check_mysql_fix_variables from upstream - * [01e11f9] Adding d/p/14_check_curl_remove_experimental_state from upstream - * [1b018b3] Adding d/p/15_check_curl_fix_regex from upstream - * [9c49b6f] Adding d/p/16_check_curl_openssl_error from upstream - * [f3e1279] Adding d/p/17_check_fping_dontfrag_random from upstream - - [ Bas Couwenberg ] - * [3c5882d] Add check_curl to monitoring-plugins-standard description. - - [ Jan Wagner ] - * [043d328] Adding d/p/18_check_curl_fix_TLS_notes from upstream - * [bf60013] Adding d/p/19_check_curl_cookie_handling from upstream - - [ Bas Couwenberg ] - * [9cb7fae] Bump Standards-Version to 4.7.2, no changes. - * [af69fcf] Fix old FSF address in copyright file. - - [ Jan Wagner ] - * [38aec8e] Adding d/p/20_check_icmp_fix_rtmin from upstream - * [e817fec] Adding d/p/21_check_http_state_regex from upstream - * [45f91e2] Adding d/p/22_check_by_ssh_missing_options from upstream - * [b6a58eb] Adding d/p/23_sslutils_fix_error_message from upstream - * [3a5f250] debian/NEWS: Fix spelling error - * [55f87b7] Changing check_httpname to the intended check_http_hostname - definition (Closes: #1099028) - * [2f5d025] Adding d/p/04_lmstat_path (Closes: #1053687) - - -- Jan Wagner Sun, 20 Apr 2025 21:09:27 +0200 - -monitoring-plugins (2.4.0-1) unstable; urgency=medium - - * [600e193] New upstream version 2.4.0 - (Closes: #928752) - - -- Jan Wagner Tue, 23 Jul 2024 20:28:15 +0000 - -monitoring-plugins (2.3.5-1) unstable; urgency=medium - - [ Jan Wagner ] - * [a20810f] Adding d/p/36_check_smtp_adding_proxy_header from upstream - * [0250eb9] Adding d/p/37_check_smtp_Adding_SNI from upstream - * [1381a20] Remove left over d/p/31_checl_mailq_separate_submission_queue - - [ Bas Couwenberg ] - * [7c86d65] Explicitly enable test-build-twice job. - - [ Jan Wagner ] - * [de72f6f] New upstream version 2.3.4 - * [5956793] New upstream version 2.3.5 - * [f07f4db] Drop patches integrated by upstream - - -- Jan Wagner Wed, 18 Oct 2023 12:04:05 +0200 - -monitoring-plugins (2.3.3-6) unstable; urgency=medium - - * [e1f9786] Adding d/p/14_check_curl_fix_SSL_with_multiple_IPs from upstream - * [534d0c8] Adding d/p/30_check_radius_radcli_1.3.1_support from upstream - * [bd72df2] Adding d/p/31_checl_mailq_separate_submission_queue from upstream - * [567890c] Adding d/p/32_check_disk_add_ignore_missing from upstream - (Closes: #516097) - * [47b7589] Adding d/p/15_check_swap_remove_includes from upstream - * [6f89be8] Adding d/p/33_check_procs_exclude-process from upstream - * [983507a] Adding d/p/34_check_curl_fix_compare_warning from upstream - * [9225592] Adding d/p/17_fix_exit_codes from upstream - * [3a0d875] Adding d/p/18_check_mysql_fix_typo from upstream - * [17688c7] Adding d/p/19_check_nwstat_fix_typo from upstream - * [e0cfe77] Adding d/p/20_chech_nt_fix_encoding from upstream - * [3da2163] Adding d/p/21_check_pgsql_extra_output from upstream - * [7cbe4b6] Adding d/p/22_check_disk_avoid_mount from upstream - * [01be8ce] d/p/series: Fix typo - * [85d9e03] Adding d/p/23_check_mysql_fix_error_handling from upstream - * [555d643] CI: Disable BLHC job - * [85a271e] Adding d/p/24_check_disk_fix_SI_units from upstream - * [02c716f] d/p/31_check_mailq_separate_submission_queue: Fix filename - - -- Jan Wagner Mon, 12 Jun 2023 21:46:29 +0200 - -monitoring-plugins (2.3.3-5) unstable; urgency=medium - - * [6fb8e25] Adding d/p/14_check_curl_fix_SSL_with_multiple_IPs from upstream - * [eab1e1d] Adding d/p/15_check_swap_remove_includes from upstream - * [3ede347] Adding d/p/16_check_snmp_disable_multiplier_when_unused from upstream - - -- Jan Wagner Thu, 30 Mar 2023 08:51:53 +0000 - -monitoring-plugins (2.3.3-4) unstable; urgency=medium - - * [953ee52] Adding d/p/13_check_icmp_improvements from upstream - - -- Jan Wagner Tue, 07 Mar 2023 13:29:35 +0000 - -monitoring-plugins (2.3.3-3) unstable; urgency=medium - - * [15d0c56] Adding d/p/12_check_curl_improvements from upstream - - -- Jan Wagner Fri, 24 Feb 2023 12:55:11 +0000 - -monitoring-plugins (2.3.3-2) unstable; urgency=high - - * [01c9312] Adding d/p/10_check_http_chunked_wo_actual_content from upstream - * [c1f3ca7] Adding d/p/11_fallback_for_gnutls from upstream - - -- Jan Wagner Fri, 10 Feb 2023 10:16:38 +0000 - -monitoring-plugins (2.3.3-1) unstable; urgency=medium - - * [e7bdd1c] New upstream version 2.3.3 - * [c31ba97] Drop patches applied upstream - - -- Jan Wagner Thu, 02 Feb 2023 09:36:44 +0000 - -monitoring-plugins (2.3.2-3) unstable; urgency=high - - * [62a3be0] Adding d/p/31_check_http_fix_memory_alloc_error_chunk_decod from - upstream (Closes: #1029934) - - -- Jan Wagner Tue, 31 Jan 2023 13:13:58 +0000 - -monitoring-plugins (2.3.2-2) unstable; urgency=medium - - [ Bas Couwenberg ] - * [32fba01] Bump Standards-Version to 4.6.1, no changes. - - [ Jan Wagner ] - * [5a11a70] Adding upstream patches fixing (u)int64_t on 32-bit machines - (Closes: #1023280) - * [2a90f45] Adding github actions - * [7d0e34a] Use testing, since unstable has large transition ongoing - * [0543e43] only removing github stuff - * [1e0e230] Adding d/patches/16_check_pgsql_dbname_too_strict - (Closes: ##982847) - * [b61a8ea] Update d/patch/13_check_http_fix_superflous_crlf - * [73bd381] Adding d/p/17_check_curl_detect_ipv6 - - [ Bas Couwenberg ] - * [d6b03fd] Add Rules-Requires-Root to control file. - - [ Jan Wagner ] - * [08ddb1e] d/control: Drop 'pkg-' from Vcs-Headers - * [76475e9] Adding d/p/18_check_icmp_help from upstream - * [f625b1e] Adding d/p/19_check_disk_fs_usage from upstream - * [f9e79de] Adding d/p/20_check_apt_unknown_escape_sequence - * [f95110e] Adding d/p/21_check_http_faster_with_large_files from upstream - * [d4c9e0b] Adding d/p/22_check_curl_faster_with_large_files from upstream - * [c662b29] Adding gitlab CI - * [95eeed8] Adding d/p/24_check_apt_usage from upstream - * [298c20a] Bump debhelper from old 12 to 13. - * [ab165de] Update standards version to 4.6.2, no changes needed. - * [f064e9b] Adding d/p/23_check_http_chunked_encoding from upstream - * [f503139] d/README.Debian: Fix typo - * [ccc552b] Adding d/p/25_spell_fixes from upstream - * [405406d] d/rules: Set DH_VERBOSE=1 - * [ff160b6] Adding d/p/26_check_mailq_fix_nullmailer_regex from upstream - (Closes: #1019406) - * [e99bd7b] Adding d/p/27_check_snmp_add_multiplier - * [73742e9] Adding d/p/28_check_snmp_fix_regex_matches from upstream - * [4f70a9d] Adding d/p/29_check_log_polish from upstream - * [4f7eea1] Adding d/p/30_check_disk_clarify_usage_possibilites from upstream - - -- Jan Wagner Mon, 23 Jan 2023 14:40:09 +0000 - -monitoring-plugins (2.3.2-1) unstable; urgency=medium - - * [1fe8724] d/control: remove deprecated libradiusclient-ng-dev from build-deps - * [9e92541] d/rules: Fix debhelper compat 12 by using '-a' instead '-s' - * [eb27aa7] Adding d/p/13_check_http_fix_superflous_crlf (Closes: #913142) - * [6cf0b31] Remove constraints unnecessary since buster - * [21323d2] New upstream version 2.3.2 (Closes: #800345, #997849) - * [91105f7] Drop patches integrated upstream - - -- Jan Wagner Fri, 21 Oct 2022 11:41:42 +0200 - -monitoring-plugins (2.3.1-1) unstable; urgency=medium - - * Upload to unstable - - -- Jan Wagner Thu, 22 Apr 2021 12:41:33 +0200 - -monitoring-plugins (2.3.1-1~exp2) experimental; urgency=medium - - * [eb7432c] Adding d/p/10_check_curl_header fixing HTTP_ heqders - * [363955f] Adding d/p/03_epn disable epn in check_disk_smb - - -- Jan Wagner Tue, 13 Apr 2021 13:05:28 +0200 - -monitoring-plugins (2.3.1-1~exp1) experimental; urgency=medium - - * [09f4277] New upstream version 2.3.1 (Closes: #982847, #886888, #950921) - - -- Jan Wagner Sun, 11 Apr 2021 12:21:37 +0100 - -monitoring-plugins (2.3-1) unstable; urgency=medium - - * Upload to unstable - - -- Jan Wagner Wed, 06 Jan 2021 22:10:18 +0100 - -monitoring-plugins (2.3-1~exp1) experimental; urgency=medium - - * [3031044] New upstream version 2.3 - * [61ef2d7] Droping all patches commited upstream and beeing obsolete with 2.3 - * [66c44c4] d/control: adding new build-deps fir check_curl - * [59b52dd] d/rules: Adding check_curl to std_plugins - * [5e59ca1] Adding check_curl check commands - * [6cbfc78] check_uptime: Don't ship for now, check_uptime also exist in - nagios-plugins-contrib - - -- Jan Wagner Mon, 14 Dec 2020 14:51:49 +0100 - -monitoring-plugins (2.2-7) unstable; urgency=medium - - [ Bas Couwenberg ] - * [643c792] Drop icinga from Suggests. - - [ Christopher Huhn ] - * [ab5d5b97] Fix OID for snmp_users check - - [ Debian Janitor ] - * Trim trailing whitespace. - * Wrap long lines in changelog entries: 1.4-1. - * Bump debhelper from deprecated 5 to 10. (Closes: #965726) - * Set upstream metadata fields: Bug-Database, Bug-Submit, Name (from - ./configure), Repository, Repository-Browse. - * Rely on pre-initialized dpkg-architecture variables. - * Fix day-of-week for changelog entry 1.5-2. - * Update standards version to 4.5.0, no changes needed. - - [ Bas Couwenberg ] - * [122d9b7] Bump watch file version to 4. - - [ Jan Wagner ] - * [e44da07] Adding CI - * [7065705] Removing .travis.yml - * [23a92bf] Remove debugging in ci workflow - - [ Bas Couwenberg ] - * [3c97246] Update gbp.conf to use --source-only-changes by default. - * [ed92830] Update gbp.conf for deprecated section. - * [4890f23] Drop obsolete symlinks for icinga 1.x. - * [6086187] Drop obsolete autotools-dev build dependency. - * [1407082] Don't set CFLAGS from noopt. - * [94db0e3] Drop obsolete ORed build dependency. - * [4ddc077] Bump Standards-Version to 4.5.1, no changes. - - [ Jan Wagner ] - * [bb8ed44] d/s/option: drop travis and add github ignore - * [52473e9] Rename debian/NEWS.Debian to debian/NEWS to make lintian happy - * [45b13cf] debian/monitoring-plugins-common.docs: Fixing NEWS filename - * [6ffbf14] Adding d/p/16_check_mailq_options from upstream (Closes: #954961) - - -- Jan Wagner Tue, 08 Dec 2020 19:45:04 +0100 - -monitoring-plugins (2.2-6) unstable; urgency=medium - - * [697d611] travis-ci: Remove trusty from definition - * [7b5d419] d/rules: Explicitly call ping with -4 and -6 on linux arch - (Closes: #863981) - - -- Jan Wagner Tue, 16 Apr 2019 19:14:10 +0200 - -monitoring-plugins (2.2-5) unstable; urgency=medium - - [ Bas Couwenberg ] - * [890cd8c] Bump Standards-Version to 4.1.5, no changes. - * [59073f6] Bump Standards-Version to 4.2.0, no changes. - * [e07a06c] Bump Standards-Version to 4.2.1, no changes. - - [ Jan Wagner ] - * [40b9004] travis-ci: Use xenial image - * [56443b1] d/control: Add Provides for 'old' nagios-plugins - - [ Bas Couwenberg ] - * [c70710f] Apply path by Andreas Henriksson to fix usrmerge issue. - (closes: #914092) - * [377eec3] Bump Standards-Version to 4.3.0, no changes. - - [ Jan Wagner ] - * [73f2273] Add d/p/14_mariad to fix FTBFS with MariaDB 10.3. - (Closes: #919375) - * [4f75b28] Add d/p/15_check_smtp_initialize to fix check_smtp with custom - commands and SSL - * [61315ee] d/rules: Configure with sudo (Closes: 905318) - * [d8a134e] d/control: Add sudo to Recommends - * [1fe1cd2] Symlink /usr/lib/nagios/plugins/utils.* to /usr/lib/icinga/ - (Closes: #879084, #907484) - - -- Jan Wagner Sun, 20 Jan 2019 19:40:25 +0100 - -monitoring-plugins (2.2-4) unstable; urgency=medium - - * [97cb3c4] Drop symlinks to removed LEGAL file. (Closes: #856676) - * [878ceb9] Using absolut paths when using ucf, debconf 1.5.62 changed it's - behaviour (Closes: #867256) - * [22de139] d/control: Update VCS-headers - * [b024e21] d/control: Priority extra is deprecated, using optional - * [9095923] d/control: Drop old nagios-plugins* transitional packages - (Closes: #878769) - * [6956bcc] d/control: Bump Standards-Version to 4.1.4.0, no changes needed - * [d634e5a] d/functions: Fixing ucf register function - - -- Jan Wagner Sun, 13 May 2018 14:04:35 +0200 - -monitoring-plugins (2.2-3) unstable; urgency=medium - - * [760496b] d/control: Drop useless libssl1.0-dev build depend alternative - * [e5adc23] Update d/p/10_spell_fixes - * [094efe4] Adding d/p/12_check_apt_only_crit and - d/p/13_check_apt_list_packages - * [e4d7fd6] travis-ci: Reduce complexity - - -- Jan Wagner Thu, 19 Jan 2017 08:14:21 +0100 - -monitoring-plugins (2.2-2) unstable; urgency=medium - - * [627d88a] d/control: Explicit build-dep on libssl-dev or libssl1.0-dev - (Closes: #847612) - - -- Jan Wagner Sun, 11 Dec 2016 16:17:18 +0100 - -monitoring-plugins (2.2-1) unstable; urgency=medium - - - * [6f99654] Adding OpenSSL support by d/p/21_openssl11 (Closes: #844031), - still build against openssl 1.0 - * [3978de2] travis-ci: Add my own trusty ppa for newer lintian - * [fc1e752] travis-ci: use distribution trusty - * [0bf4153] travis-ci: Use include build matrix - * [c845af0] New upstream version 2.2 - * [79b42f5] Drop patches integrated upstream - * [be431d8] Don't ship removed LEGAL file anymore - * [38c2cff] Apply d/p/10_spell_fixes - * [abb379d] d/control: Remove nagios3 from Suggests (Closes: #846874) - * [2857592] d/control: Add icinga2 as suggests alternative - * [7fe2363] d/control: Update Vcs-Browser URL to HTTPS - * [670b052] d/control: Update VCS-URLs to https and cgit - * [ed0d010] Apply d/p/11_check_dhcp_MSG_PEAK - * [4e87f4c] d/control: Remove explicit dependency on libssl-dev - - -- Jan Wagner Thu, 08 Dec 2016 15:13:41 +0100 - -monitoring-plugins (2.1.2-3) unstable; urgency=medium - - * [8bab78d] d/control: Replacing build-dep libmysqlclient-dev with - default-libmysqlclient-dev - * [c40925b] d/control: Bump Standards-Version to 3.9.8, no changes needed - * [2499442] travis-ci: Do not autoremove packages - * [c272a5f] travis-ci: Add trusty-backports - * [c15dfcc] Remove dangling links for removed examples (Closes: #824599) - * [767714f] d/control: Build-depend on libssl1.0-dev - * [775a4db] d/control: Add libssl-dev (<< 1.1.0) as Build-depend alternative - for backporting - * [0ee6998] travis-ci: Make use of travis.d.n - * [a4b8d68] travis-ci: Adding jessie repo - * [7a42fe2] travis-ci: Also fetching all tags - * [a3c46e3] travis-ci: Using httpredir.debian.org as mirror - * [51e0ade] travis-ci: Builds on testing are allowed to fail - * [11ce4ed] d/control: Add libmysqlclient-dev as Build-depend alternative for - backporting - * [cccb5e2] travis-ci: Add stable to travis env - * [c614108] d/control: Adding libradcli-dev as first radius build-dep - (Closes: #822337) - * [1b1c5e9] Adding d/p/20_check_radius_radcli to add support for radcli - (Closes: #822337) - * [bbb8528] d/NEWS.Debian: Add a note about dependencies for check_radius - * [438149a] Adjust check_radius command definition to use the correct - radiusclient config file - - -- Jan Wagner Fri, 18 Nov 2016 12:22:37 +0100 - -monitoring-plugins (2.1.2-2) unstable; urgency=medium - - [ Jan Wagner ] - * [6bcfb6c] Remove check_bgpstate and check_linux_raid from package - description (LP: #1473229) - * [93b217d] travis-ci: Adding required arguments for trusty - * [af23094] travis-ci: Droping backports - * [3fd4e78] travis-ci: automatically install dependencies - - [ Klaus Ethgen ] - * [52ead1a] Fix /proc check on systems that have hardened system - (Closes: #803154) - - [ Robie Basak ] - * [db38432] Drop fping and qstat from Recommends to Suggests - * [877f48a] Drop $(DEPSUBSTVARS) from dh_gencontrol call - - [ Jan Wagner ] - * [8401f27] Use dh_prep instead of dh_clean -k - * [093d9a4] Drop hardening-wrapper, use dpkg-buildflags instead - - -- Jan Wagner Mon, 16 Nov 2015 20:06:31 +0100 - -monitoring-plugins (2.1.2-1) unstable; urgency=medium - - * [710c8df] Imported Upstream version 2.1.2 - - -- Jan Wagner Fri, 16 Oct 2015 15:00:57 +0200 - -monitoring-plugins (2.1.1+git20151012-1) unstable; urgency=medium - - * [b8377a8] travis-ci: don't install build-deps manual - * [3fda51b] travis-ci: build package with dpkg-buildpackage - * [e6de6c2] travis-ci: cosmetical changes - * [1314f7b] Drop libmysqlclient16-dev and libmysqlclient15-dev as build-dep - alternatives (Closes: #790468) - * [f412e4a] Convert the package to source format 3.0 (quilt) - * [25a6df7] debian/copyright: Deleting empty last line - * [96ed330] debian/control: reformating with warp-and-sort - * [1353afa] Reformating with warp-and-sort the rest of debian/ - * [5dbc8cb] travis-ci: grab actual used upstream version - * [608ba75] Add patches/10_sslutils_checksslv3 from upstream maint branch - * [8e98d7f] Add patches/11_check_dhcp_parsing_option from upstream maint - branch - * [0d48744] Add patches/12_check_ups_perf_data_hresholds from upstream maint - branch - * [fad70ed] Add patches/13_check_snmp_timeout from upstream maint branch - * [a9d2a52] Add patches/14_sslutils_superfluous_parenthesis from upstream - maint branch - * [f69aba4] Add patches/15_check_smtp_expect from upstream master branch - * [0c7f9bf] Add patches/16_check_smtp_quit from upstream master branch - * [5d8b296] Add patches/17_check_smtp_forcetls_on_cert from upstream master - branch - * [494a834] Imported Upstream version 2.1.1+git20151012 (Closes: #784319) - * [9e076d8] Droping patches imported from upstream maint branch - * [605543c] Update version - - -- Jan Wagner Mon, 12 Oct 2015 16:12:30 +0200 - -monitoring-plugins (2.1.1-1) unstable; urgency=high - - * [61401f6] Imported Upstream version 2.1.1 - * [ace55d6] Droping all patches taken from upstream 'maint' branch - - 10_check_apt_fix_memset.dpatch - - 10_check_ntp_null_termination.dpatch - - 10_check_real_null_termination.dpatch - - 10_check_tcp_fix_help_escape.dpatch - - 11_check_ntp_revert_n-p_coverty_fix.dpatch - - 12_check_ntp_null_termination_jitter.dpatch - - -- Jan Wagner Tue, 02 Dec 2014 05:42:05 +0100 - -monitoring-plugins (2.1-3) unstable; urgency=high - - * [fecca17] Applying more patches from upstream 'maint' branch fixing the - check_ntp fix and a small escape in check_tcp - - 10_check_tcp_fix_help_escape.dpatch - - 11_check_ntp_revert_n-p_coverty_fix.dpatch - - 12_check_ntp_null_termination_jitter.dpatch - * [92d5f60] Fixing dpatch macro - - 10_check_ntp_null_termination.dpatch - - 10_check_real_null_termination.dpatch - - -- Jan Wagner Mon, 01 Dec 2014 21:29:16 +0100 - -monitoring-plugins (2.1-2) unstable; urgency=high - - * [d4bbd4c] Applying patches from upstream 'maint' branch - fixing grave coding errors - - 10_check_apt_fix_memset.dpatch - - 10_check_ntp_null_termination.dpatch - - 10_check_real_null_termination.dpatch - - -- Jan Wagner Sat, 29 Nov 2014 11:12:58 +0100 - -monitoring-plugins (2.1-1) unstable; urgency=medium - - * [060ec72] Imported Upstream version 2.1 (Closes: #758662) - * [5255a96] Add icinga2 as another Suggests option - * [88b130b] Add --disable-maintainer-mode to configure, for not running - autotools foo - * [8f70394] Bump Standards-Version to 3.9.6, no changes needed - - -- Jan Wagner Wed, 15 Oct 2014 23:26:24 +0200 - -monitoring-plugins (2.0-2) unstable; urgency=medium - - * [1a9106e] debian/control: Fixing and generalizing descriptions - * [3f5ec75] Updating debian/changelog - * [ec235b0] travis-ci: use libfreeradius-client-dev as build-dep - * [b2a2999] check_oracle: Fix --tns bad string matching - - Adding 10_check_oracle_tns_bad_string.dpatch - - -- Jan Wagner Mon, 11 Aug 2014 15:22:59 +0200 - -monitoring-plugins (2.0-1) unstable; urgency=medium - - * [0841b5c] Imported Upstream version 2.0 - (Closes: #496307, #489974, #489974, #738042) - * [49be365] Starting transition toward monitoring-plugins with debian/control - * [a90fffd] Fix install path in dependency helper - * [b6aca40] Fixing our debian/README.source to recent state - * [cca2985] Fix documentation path in nt.cfg - * [243da0a] Fix URL in the watch file - * [ffc2ec8] Rename all debian nagios-plugins* to monitoring-plugins* - (Closes: #736331) - * [9f353b3] Fix package name in README.Debian* files - * [fb6d01c] Fixing pathes in debian/rules and maintainers scripts - * [03eb8d0] Document our move due renamed upstream - * [5070f23] Droping patches applied upstream - - 11_check_http_arguments.dpatch - - 12_check_ssh_read_socket.dpatch - * [ff3a690] Fix spelling error in debian/NEWS.Debian - * [e754328] Fixing dependency relation - * [fcf0c24] Updating standards version to 3.9.5 (no changes needed) - * [72f1e74] Fix watch file to match further and actual releases - * [85dfaeb] Repack upstream tarball on download - * [ab4c50f] Update README.source - * [5ae316e] Fixing repack.sh script - * [0ef43fe] Add 03_configure.in_remove_perlmods.dpatch - * [9b07715] Drop 13_check_proc_parent_process.dpatch - - Included upstream - * [a3145c9] Adjust repack.sh to latest upstream - * [ce560c9] Add travis config - * [b207889] Remove 03_configure.in_remove_perlmods.dpatch - * [4e50939] travis-ci: Add lintian checks after build - * [6fbf537] travis-ci: Remove gawk from buildenv - * [5965a35] Include correct bug report for latest close (just cosmetic change) - * [9939d1f] Breaks and Replaces against next upstream release - * [1d11720] Don't use Pre-Depends - * [4580974] check_fping: define fping6 command on compile time - (Closes: #751866), many thanks Nicolas Deefayet for bringing this up - * [7cb5f53] check_http: droping expect string from check_squid - (Closes: #742363), thanks Andreas B. Mundt - * [803b3e3] Add libfreeradius-client-dev as first build-dep option - (Closes: #721621) - * [c3dd2ca] Fixing typo in changelog - * [4e2ccd5] NEWS.Debian: Adjust version, next stable release will be 2.0 - * [1742518] Use canonical VCS-URIs - * [d4ad20c] Set -e in the body of the maintainers script - * [a6611b1] check_icmp/check_dhcp: Implementing setcap - * [90090cb] check_dhcp: Set proper capabilities - * [a75bd42] README.Debian: Lazy documentation how to set capabilities - * [6b6e127] NEWS.Debian: Adding some more details - * [7f2013f] NEWS.Debian: Fix wording - * [e7c0c6f] Adjust Break and Replace version in debian/control - * [aeed4b2] Adjust VCS-Headers to new package name - * [e789ea3] NEWS.Debian: Add a hint about negative values of check_snmp - * [b798a92] debian/bin/repack.sh: Fixing substitution - * [73fc1e6] travis-ci: droping m-p branch workaround - * [9083aa4] debian/bin/repack.sh: adjust for configure.ac - * [1b7ece7] debian/copyright: syncing license notice from upstream README - * [8d8e2d4] debian/copyright: Add missing gl/m4/*.m4 - - -- Jan Wagner Fri, 11 Jul 2014 23:40:41 +0200 - -nagios-plugins (1.5-3) unstable; urgency=medium - - * [38d8f67] Fixing latest changelog timestamp - * [7091aae] check_ssh: Drop 12_check_ssh_read_socket.dpatch - (Closes: #734811, #739254), this seems to make more touble in the wild as - fixing #739254, Thanks Jim Barber - - -- Jan Wagner Mon, 17 Feb 2014 12:42:06 +0100 - -nagios-plugins (1.5-2) unstable; urgency=medium - - * Update Licensing text from upstream README - * Switch over to packaging ti git-buildpackage - * [1a95a53] Update Vcs-headers - * [e0ee45e] Use check_ldap instead of check_ldaps for the check_ldaps* - command definitions - * [9bc7a29] Add 11_check_http_arguments.dpatch to fix argument processing - of check_http - * [219a55a] Add 12_check_ssh_read_socket.dpatch to fix socket read failure - (Closes: #734811) - * [0cc66f5] Fix typo in package description (Closes: #734513), thanks - Pascal De Vuyst - * [ec51a84] Just missed a typo to fix in debian/control - * [de62798] Changing upstream URLs to monitoring-plugins.org - * [1a03f82] Fix URL in the watch file - * [201bd0e] Adding 13_check_proc_parent_process.dpatch (Closes: 626913), - Thanks Anton Lofgren - * [e5fc80f] Build again against libradiusclient-ng-dev, this Reopens: #721621 - - libfreeradius-client-dev is actually not supported by upstream - - check_radius - - -- Jan Wagner Sun, 02 Feb 2014 22:11:48 +0100 - -nagios-plugins (1.5-1) unstable; urgency=medium - - * New upstream release - - -- Jan Wagner Wed, 02 Oct 2013 20:03:31 +0200 - -nagios-plugins (1.4.16+git20130926-1) unstable; urgency=medium - - * New upstream git snapshot (d4c5730464) - - check_http: Die on SSL initialization errors - - several updates to the upstream README - - -- Jan Wagner Fri, 27 Sep 2013 16:45:44 +0200 - -nagios-plugins (1.4.16+git20130919-1) unstable; urgency=medium - - * New upstream git snapshot (6f0366c8b8) - - check_pgsql: Don't exit UNKNOWN instead of OK (Closes: #723738) - - check_dhcp: fix mac address and interface number detection on solaris - - check_disk: get_fs_usage hasn't been run if using groups - - check_disk_smb: verify path to smbclient - - check_tcp: use receive timeout for checks that expect response - - check_load: add alternative uptime syntaxcheck_udp: try nc.traditional too - - check_udp: unified nc syntax - - check_fping: some fping versions set loss to 0% by mistake - - -- Jan Wagner Fri, 20 Sep 2013 11:40:38 +0200 - -nagios-plugins (1.4.16+git20130912-1) unstable; urgency=medium - - * New upstream git snapshot (4933146e00) (Closes: #722576) - - check_snmp: add timeout handler befor running snmpget - - check_tcp: only test ipv6 if ping6 works - - tests: sort cached settings before save - - tests: make sure tests don't hang - - check_tcp: Fix checks without --expect string - - check_tcp: Properly deal will partial recv(3)s - - Improve interface of np_expect_match() function - - -- Jan Wagner Fri, 13 Sep 2013 00:24:22 +0200 - -nagios-plugins (1.4.16+git20130911-1) unstable; urgency=medium - - * New upstream git snapshot (ca9ce71576) - - Don't mark SSL_METHOD variable as "const" - - Move global variables from .h to .c files - - Fix GCC's -Wimplicit-function-declaration warnings - - Fix GCC's -Wuninitialized warnings - - -- Jan Wagner Wed, 11 Sep 2013 13:02:31 +0200 - -nagios-plugins (1.4.16+git20130910-1) unstable; urgency=medium - - * New upstream git snapshot (cfb50add53) - - check_tcp: Don't close connection too early - - check_http: s/--proxy_authorization/--proxy-authorization/ - - check_snmp: Initialize size_t value to 0, not NULL - - Update bundled libtool files - - check_icmp: Minor whitespace/indentation fixes - - check_icmp: Support "--help" and "--version" - - -- Jan Wagner Tue, 10 Sep 2013 14:01:39 +0200 - -nagios-plugins (1.4.16+git20130902-1) unstable; urgency=medium - - * New upstream git snapshot (5789548373) (Closes: #522812) - - Adjust debian/copyright - * Droped the following upstream integrated patches - - 05_fix_gets_undefined_in_iso_c11.dpatch - - 10_check_apt_perfdata.dpatch - - 11_check_nt_npe.dpatch - - 12_check_smtp_double_threshold.dpatch - * Fix removing empty /usr/include - * Add new check_dbi into nagios-plugins-standard - * Remove whois from Recommands, as check_bgpstate is removed - * Cleanup debian/rules from unused stuff - * Provide information about repackaging - - Extend debian/README.source - - Add debian/bin/repack.sh - * Updating standards version to 3.9.4 (no changes needed) - * Add libfreeradius-client-dev to build-deps and remove libradiusclient-ng-dev - (Closes: #721621) - * Remove traces of contrib/ from debian/copyright - * Remove command.cfg from examples in nagios-plugins-common, it was removed - upstream - - -- Jan Wagner Tue, 03 Sep 2013 15:13:11 +0200 - -nagios-plugins (1.4.16-3) unstable; urgency=medium - - * Fixed check_squid* command definitions - * Add double threshold to check_smtp (LP: #318703) - - 12_check_smtp_double_threshold.dpatch - * Remove the additional argument from check_ssh and check_proc - (Closes: #717229, 720580) - - -- Jan Wagner Fri, 23 Aug 2013 22:10:13 +0200 - -nagios-plugins (1.4.16-2) unstable; urgency=low - - * Add versioned dependency to inetutils-ping (Closes: #680416), thanks to - Robert Millan - * Move nagios-plugins-contrib from Recommends to Suggests - * Define the path for rpcinfo to /usr/sbin and recommend rpcbind - - LP: #1086151 - - Closes: #713839, thanks to Russell Sim - * Enable Extra-Opts by adding --enable-extra-opts to configure flags - (Closes: #698119) - * Fix FTBFS: do not assume that gets is defined - - LP: #1097848 - - Closes: #701406 - * Add performance data to check_apt: 10_check_apt_perfdata.dpatch - (Closes: #708343) - * Fixing NULL pointer dereference in check_nt (Closes: #714281), thanks to - Vaclav Ovsik - * Add additional arguments to command definitions in (Closes: #709297): - - dhcp.cfg - - dns.cfg - - ftp.cfg - - http.cfg - - mail.cfg - - mysql.cfg - - news.cfg - - ntp.cfg - - pgsql.cfg - - procs.cfg - - ssh.cfg - - tcp_udp.cfg - - telnet.cfg - - -- Jan Wagner Wed, 10 Jul 2013 15:08:23 +0200 - -nagios-plugins (1.4.16-1) unstable; urgency=low - - * New upstream release - - Drop 00_fix_release_version.dpatch - * Droped the following upstream integrated patches - - 03_check_disk_smb_perfdata.dpatch - - 10_check_dhcp_Fix-handling-of-pad-options.dpatch - - 11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch - * Updated debian/copyright - - -- Jan Wagner Wed, 27 Jun 2012 23:06:52 +0200 - -nagios-plugins (1.4.16~pre1-1) unstable; urgency=medium - - * New upstream snapshot (Closes: #662638, #514588) - * Droped the following upstream integrated patches - - 10_check_disk_smb_spaces.dpatch - - 11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch - - 12_check_snmp_1.4.15_regression.dpatch - - 13_check_smtp_greeting.dpatch - - 14_check_icmp_multiple_ips.dpatch - - 15_check_sensors_fault.dpatch - - 16_check_raduis_fix_format-security.dpatch - - 17_check_tcp_fix_duplicate_cert_message.dpatch - - 17_check_smtp_fix_duplicate_cert_message.dpatch - - 18_check_snmp_labels.dpatch - - 19_check_http_help.dpatch - * Added the following upstream patches - - 10_check_dhcp_Fix-handling-of-pad-options.dpatch - - 11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch - * Add 00_fix_release_version.dpatch to fix release version - * Bump Standards-Version to 3.9.3, no changes needed - - -- Jan Wagner Thu, 14 Jun 2012 10:39:44 +0200 - -nagios-plugins (1.4.15-7) unstable; urgency=low - - * Recommand nagios-plugins-contrib via nagios-plugins, drop - nagios-plugins-common which gets installed by nagios-plugins-basic - anyways - * Add Replaces: nagios-plugins-basic to nagios-plugins-common - (Closes: #673891), thanks to Christoph Anton Mitterer - - -- Jan Wagner Tue, 22 May 2012 20:00:03 +0200 - -nagios-plugins (1.4.15-6) unstable; urgency=low - - * Add nagios-plugins-common package which ships files possibly needed also by - other plugin packages - * Removed check_bgpstate and check_linux_raid from package - - Deleted 01_subst.in.dpatch and 05_check_linux_raid_fix_striped.dpatch - - Remove check_snmp_bgpstate command definition - * Recommand nagios-plugins-common via nagios-plugins - * Add icinga as recommand as alternative for nagios3 - * Add '-w %d' as ping argument for check_ping on non-linux plattforms, as - inetutils-ping is now supporting this, thanks Guillem Jover for bringing - this up (Closes: #655023) - * Adding 17_check_smtp_fix_duplicate_cert_message.dpatch and - 17_check_tcp_fix_duplicate_cert_message.dpatch (Closes: #654682), to fix - duplicate messages when certificate errors occures, thanks Sebastian Harl - for reporting - * Add build-arch and build-indep targets to debian/rules - * Add 03_check_disk_smb_perfdata.dpatch to add perfdata to check_disk_smb - (Closes: #654259), thanks to G. Leimua - * Add 18_check_snmp_labels.dpatch to fix multiple labels in check_snmp - (Closes: #647020), thanks to Oskar Liljeblad - * Updating Vcs-Browser field - * Add 19_check_http_help.dpatch to clarify that check_http won't verify - certificates (Closes: #644627), thanks to Michael Renner - * Add check_jabber and check_jabber_4 command definitions - * Add check_mysql_slave command definition - - -- Jan Wagner Fri, 18 May 2012 11:41:17 +0200 - -nagios-plugins (1.4.15-5) unstable; urgency=low - - * Enable hardening options (Closes: #542728) - * Bump Standards-Version to 3.9.2, no changes needed - * Updating package description (Closes: #640070), thanks to Christoph Anton - Mitterer - - Listing the checks of each package - - Hint added, that nagios-plugins-basic needs more packages (recommands) - * Adding 16_check_raduis_fix_format-security.dpatch to fix error in - check_radius when compiling with -Werror=format-security (hardening), - thanks Thomas Guyot-Sionnesti - LP: #837085 - * Adding 15_check_sensors_fault.dpatch to detect sensors in FAULT state, - thank Holger Weiss (Closes: #615133) - * Remove empty /usr/include from nagios-plugins-basic, thanks Ferenc Wagner - (Closes: #630711) - - -- Jan Wagner Wed, 07 Sep 2011 12:23:56 +0200 - -nagios-plugins (1.4.15-4) unstable; urgency=low - - * Add 13_check_smtp_greeting.dpatch (Closes: #611914), thanks Daniel Piddock - for spotting and Holger Weiss for providing a fix - - Abort immediately if we don't receive a server greeting or if the - greeting doesn't contain the "--expect"ed string (by default: "220") - instead of blindly sending the EHLO/HELO line. - * Add 14_check_icmp_multiple_ips.dpatch (Closes: #623702), thanks Max Kosmach - for spotting and Sebastian Harl for providing a fix - - When specifying a host-name on the command line, each of its IPs is added - to the host table (and each one is pinged). So, the buffer has to be large - enough to hold all of the respective host objects. (argc - 1) only fits - hosts with a single IP. - * Move libraries linked at compile time against checks of - nagios-plugins-standard from Depends to Recommends (Closes: #569028) - - Add slightly modified bin/gen_plugin_deps.pl from collectd source package - - Add linked libraries via bin/gen_plugin_deps.pl into - /usr/share/doc/nagios-plugins-standard/README.Debian.plugins - - Build-Depend on perl - - Create customized substvars for nagios-plugins-standard via - dpkg-shlibdeps in debian/rules - - Remove temporary files via clean target in debian/rules - - Add hint to NEWS.Debian - - -- Jan Wagner Wed, 18 May 2011 16:31:35 +0200 - -nagios-plugins (1.4.15-3) unstable; urgency=low - - * Add 10_check_disk_smb_spaces.dpatch from upstream svn (Closes: #601699), - thanks to Adam Buchbinder - * Add 11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch from upstream svn - (Closes: #601696), thanks to Adam Buchbinder - * Fix broken symlink of README.Debian.plugins (Closes: #603414), thanks - Bernd Zeimetz - * Add patche provided by upstream to fix regressions with check_snmp - introduced in 1.4.15 (Closes: #607736) - - 12_check_snmp_1.4.15_regression.dpatch - - -- Jan Wagner Wed, 22 Dec 2010 00:43:02 +0100 - -nagios-plugins (1.4.15-2) unstable; urgency=low - - [ Alexander Wirt ] - * Call ps with two "w" to ensure unlimited width of ps output - (Closes: #596372) - - [ Jan Wagner ] - * Add 05_check_linux_raid_fix_striped.dpatch to fix bad output from - check_linux_raid with RAID0 and linear volumes, thanks to Thomas - Guyot-Sionnest (Closes: #579049) - LP: #621380 - * Bump Standards-Version to 3.9.1, no changes needed - - -- Jan Wagner Thu, 23 Sep 2010 09:24:39 +0200 - -nagios-plugins (1.4.15-1) unstable; urgency=low - - * New upstream release (Closes: #588273, #522631) - * Droped the following upstream integrated patches - - 03_check_smtp_help.dpatch - - 06_checkircd.dpatch - - 18_check_game_cmdline.dpatch - - 22_check_smb_hostaddress.dpatch - - 32_check_ldap_pointer.dpatch - - 33_fix_emb_check_disk_smb.dpatch - - 34_fix_smbclient_check_disk_smb.dpatch - - 35_check_http_date.dpatch - - 36_check_ldap_empty_base.dpatch - - 37_check_radius_nas-ip-address.dpatch - - 39_check_ircd_fix_epn.dpatch - - 40_check_http_proxy_auth.dpatch - - 41_check_ping_detect_args.dpatch - - 42_check_linux_raid_fix_r10.dpatch - - 42_check_linux_raid_fix_rebuild.dpatch - - 43_check_http_large_pages_mleak.dpatch - - 44_check_snmp_perfdata.dpatch - - 45_check_http_sni_optional.dpatch - * Rename 13_subst.in_again.dpatch to 01_subst.in.dpatch - * Fix ssh_disk and make ssh_disk* better readable, thanks - Paul Slootman (Closes: #582272) - - -- Jan Wagner Sat, 31 Jul 2010 10:34:04 +0200 - -nagios-plugins (1.4.14-5) unstable; urgency=low - - * Adding links to Debian and Upstream bugreports into most of the patches - * Dropping patches not needed anymore, thanks Holger Weiss for assisting: - - 14_check_log_paths.dpatch: paths are fine now - - 26_implicit-basename.dpatch: no 'implicitly convertion' found in buildlog - without the patch - - 27_check_radius_segfault.dpatch: check_radius.c:161 initializes "data" to - 0 using memset(3) and problem not longer reproducable on amd64 without - the patch - * Drop 13_subst.in_again.dpatch and move 38_fix_libexec.dpatch to - 13_subst.in_again.dpatch - * Fix 34_fix_smbclient_check_disk_smb.dpatch and drop - 23_check_smb_password.dpatch, thanks Holger Weiss for notification - * Update 39_check_ircd_fix_epn.dpatch with fix from upstream, thanks - Holger Weiss - * Add 03_check_smtp_help.dpatch to add the help output of "-F" to check_smtp, - thanks to Josip Rodin (Closes: #578374) - - -- Jan Wagner Sat, 08 May 2010 22:11:17 +0200 - -nagios-plugins (1.4.14-4) unstable; urgency=low - - * Remove libmysqlclient12-dev from Build-Deps, as it's obsolete - * Restructure shipped documentation - - Move all common stuff info nagios-plugins-basic - - Provide package specific documentation with the packages - - Provide symlinks from other packages - * Remove debian/TODO cause it't totally outdated - * Add 44_check_snmp_perfdata.dpatch to fix regression related perfdata - * Add 45_check_http_sni_optional.dpatch to fix regression related ssl/sni - checks - - -- Jan Wagner Thu, 08 Apr 2010 23:16:59 +0200 - -nagios-plugins (1.4.14-3) unstable; urgency=low - - * Remove Sean and Guido from the Uploaders list, thanks for your work - * Move postfix | sendmail-bin | exim4-daemon-heavy | exim4-daemon-light - to Suggests, thanks to Glennie Vignarajah (CLoses: #574591) - * Install NEWS.Debian and README.Debian* to the appropriate packages - * Add 42_check_linux_raid_fix_rebuild.dpatch to return Warning when - rebuilding volume, thanks to Christoph Martin (CLoses: #574612) - - -- Jan Wagner Wed, 24 Mar 2010 20:05:13 +0100 - -nagios-plugins (1.4.14-2) unstable; urgency=low - - * Cosmetic change to last changelog entry - * Add some hints to NEWS.Debian about the use on non-linux archs - * Bump Standards-Version to 3.8.4, no changes needed - * Add 1.0 to debian/source/format - * Add 43_check_http_large_pages_mleak.dpatch, taken from upstream, which - fixes memory leaks on large files - * Add trailing trunk/ at Vcs-Svn-field - * Remove radiusclient1 from Dependencies, as check_radius seems not need it - * Move check_mailq to nagios-plugins-standard, cause it depends - postfix|sendmail|exim4 or qmail - - Add "postfix | sendmail-bin | exim4-daemon-heavy | exim4-daemon-light" to - Recommends of nagios-plugins-standard - * Move remaining Depends binaries of nagios-plugins-standard to Recommends, - keeping Depends we have used at linking (for now) - - -- Jan Wagner Mon, 15 Mar 2010 22:41:29 +0100 - -nagios-plugins (1.4.14-1) unstable; urgency=low - - * New upstream release - * Added libmysqlclient16-dev to build-deps and moved libmysqlclient-dev to - the first position (Closes: #538487) - * Configure ps to use also etime with check_proc, thanks to - Justin T Pryzby (Closes: #540107) - * Removing vsz.cfg, check_vsz isn't available anymore and check_proc can be - used, thanks to Keith (Closes: #542700) - * Updating standards version to 3.8.3 - - Add README.source - * Droped unused patches from debian/patches - * Add 39_check_ircd_fix_epn.dpatch to fix epn, thanks to Hendrik Jaeger and - Alexander Wirt (Closes: #545940) - * Remove coreutils from build-depends, it's essential - * Raise compat level to 5 - * Update 06_checkircd.dpatch, which got fixed upstream - * Add 40_check_http_proxy_auth.dpatch to make check_http able to check proxy - authorization - * Update copyright, thanks to Robert Millan (Closes: #548303) - * Depend on inetutils-ping on kfreebsd and hurd, thanks to Petr Salinger - (Closes: #555532) - - Use '-n -c %d %s' as ping argument on archs where inetutils-ping is used - - Add 41_check_ping_detect_args.dpatch, thanks to Thomas Guyot-Sionnest - * Add hint to NEWS.Debian, that check_linux_raid.pl and check_bgpstate will - be removed in the next future - * Add 42_check_linux_raid_fix_r10.dpatch, which fixes RAID Levels with more - than one digit, thanks to Matija Nalis (Closes: #534604) - * Move qstat from Depends to Recommends, since its just used for check_game - and that seems not really essential, leaving note in NEWS file, thanks to - Steve Lane (Closes: #561770) - * Add 02_check_icmp_links.dpatch to provide check_host and check_rta_multi, - thanks to Justin T Pryzby for reporting (Closes: #563090) - * Fix check-switch-alive* check commands by adding "-H" at the appropriate - place - * Add lintian fixes - - Add ${misc:Depends} to nagios-plugins dependencies - - Fix two spelling errors in README.Debian - - -- Jan Wagner Sat, 23 Jan 2010 01:07:49 +0100 - -nagios-plugins (1.4.13+git200906171200-1) unstable; urgency=low - - * new upstream - - check_http doesn't enforce port (Closes: #494835) - - check_http --onredirect=sticky follows using the same IP address - (Closes: #502529) - - Fixed buffer overflow in check_ntp/check_ntp_peer (Closes: #528686) - - Fixed check_mrtg returning UNKNOWN instead of OK (Closes: #335871) - - Fixed check_by_ssh interpretation of quotes in -C parameter - (Closes: #425312) - - Fixed coredump from check_nt when drive not found (Closes: #521097) - - Removed -n option in check_smtp's help and usage output (Closes: #525307) - - Fixed check_icmp --help output for warn and critical thresholds - (Closes: #530553) - - Fix potential buffer overflow in check_snmp - enforce MAX_OIDS limit - (Closes: #460405) - * adjusted the following patches for new upstream - - 13_subst.in_again.dpatch - - 37_check_radius_nas-ip-address.dpatch - * removed the following patches from 00list cause they where integrated - - 39_check_dig_options.dpatch - - 40_check_http_status_line.dpatch - - 41_check_http_fix_http_header.dpatch - - 42_check_ups_logoutfix.dpatch - - 43_check_ntp_segfaults.dpatch - - 50_misc_typos.dpatch - * add trailing $ to check_httpname, thanks Daniel Pocock (Closes: #524629) - * add informations into README.Debian how to use plugins (Closes: #525168) - * add check_nscp which uses the default port of NSClient++ (Closes: #528262) - * providing some explanation about predefined check commands in README.Debian - * pointing to README.Debian in nt.cfg - * add 'make install-root' to debian/rules to get suid plugins installed again - * bump standards version to 3.8.2 (no changes needed) - - -- Jan Wagner Mon, 06 Jul 2009 20:21:42 +0200 - -nagios-plugins (1.4.12-5) unstable; urgency=low - - * add missing auth pair parameter to check_https_auth_hostname* command - definitions - * changing check_cups command to use host headers anymore, since cups changed - it's behavior in etch, thanks Maximilian Gass (Closes: #505610) - * add -e to all preconfigured check commands using check_disk, to only display - effected partitions, when warning or critical, thanks to - Filip Van Raemdonck and Jacob L. Anawalt (Closes: #395389) - * add 42_check_ups_logoutfix.dpatch to fix logout problem with check_ups - (Closes: #387001) - - -- Jan Wagner Fri, 30 Jan 2009 22:50:35 +0100 - -nagios-plugins (1.4.12-4) unstable; urgency=low - - * add server_port back to 41_check_http_fix_http_header.dpatch, - patch was incomplete - * add warning and critical threshold to check_disk_smb_user command - definition - * fix check_http?_hostname* command definitions - * adjust 'check_ssh_4' command definition, it needs the v4 argument at first, - thanks Julien Ozog (Closes: #500774). - - -- Jan Wagner Sun, 24 Aug 2008 07:40:12 +0200 - -nagios-plugins (1.4.12-3) unstable; urgency=low - - * rename 40_check_http_status_line.patch to 40_check_http_status_line.dpatch - and make it able to apply - * add 40_check_http_status_line.dpatch to 00list to really fix #486932 - * add 41_check_http_fix_http_header.dpatch to support virtual servers - (Closes: #494835) - - -- Jan Wagner Sat, 23 Aug 2008 17:20:34 +0200 - -nagios-plugins (1.4.12-2) unstable; urgency=low - - * add 40_check_http_status_line.dpatch to add content of the status_line - into the check_http output (Closes: #486932) - * clean patches from reject files left from dpatch-edit-patch - * fix 34_fix_smbclient_check_disk_smb.dpatch, thanks Stephane Chazelas - for helping out here (Closes: #488820) - - -- Jan Wagner Fri, 04 Jul 2008 16:53:07 +0200 - -nagios-plugins (1.4.12-1) unstable; urgency=low - - [ Jan Wagner ] - * new upstream - - check_http supports now an IPv6 as value for parameter -H - (Closes: #457336) - - Enhanced check_smtp to actually print invalid response text - (Closes: #467493) - * removed the following patches, cause fixed upstream - - 28_check_pgsql_include_for_8.3.dpatch - - 29_check_ntp_fixsefault_deprecate.dpatch - - 30_fix_check_ntp_options.dpatch - - 31_check_disk_local_option.dpatch - * adjust 50_misc_typos.dpatch to apply new upstream - * remove unneeded debhelper scripts from rules - * remove senseless comments from patches - * add missing descriptions to patches - * add missing command definition for check_ldaps, thanks Michael Renner - for reporting it (Closes: #407310) - * remove sarge handholding for configfiles migration - * add nagios3 to Suggests and remove nagios2, nagios and nagios-text - (Closes: #479292) - * adjust year in copyright - * include list of files which are GPL3 into copyright - * build depend on libradiusclient-ng-dev instead of libradius1-dev (for more - informations see REQUIREMENTS) - * add 33_fix_emb_check_disk_smb.dpatch which fixes processing via embedded - perl of check_disk_smb, thanks Stephane Chazelas - for providing it (Closes: #478906) - * add 34_fix_smbclient_check_disk_smb.dpatch which fixes usage of smbclient, - thanks Stephane Chazelas for providing it and - adding ' around arguments in plugin configs - (Closes: #478942) - * add 35_check_http_date.dpatch which fixes date parsing of check_http, - thanks Hilko Bengen for providing it (Closes: #460097) - * add 36_check_ldap_empty_base.dpatch which allows empty ldap base, thanks - to Stephane Chazelas for providing it - (Closes: #479984) - * add 37_check_radius_nas-ip-address.dpatch to add support for nas-ip to - check_radius, thanks Josip Rodin for - providing it (Closes: #482947) - * provide new checks for check_http which makes use of "-H '$HOSTNAME'" - (Closes: #423461) - * fixed check_radius command definition and removed static port in favor of - ability to provide it as 4th argument, since it was broken and unusable - anyways, thanks Josip Rodin for profiding a - fix (Closes: #482942) - * mention the check_radius breakerage in NEWS.Debian - * add check_linux_raid into package (Closes: #461999) and add - 38_fix_libexec.dpatch to fix libexec path - * Updating standards version to 3.8.0, no changes needed - * add 39_check_dig_options.dpatch which provides fix for no check for - mandatory parameter -l, thanks Matthias Eble - for providing a fix - (Closes: #479013) - - [ Alexander Wirt ] - * Call smbclient with -N (supress password prompt) if no password is - supplied. Thanks to Josip Rodin for the patch (Closes: #425129) - * Add myself to uploaders - - -- Jan Wagner Tue, 17 Jun 2008 23:18:32 +0200 - -nagios-plugins (1.4.11-2) unstable; urgency=low - - * Remove Build-depends on libsnmp*-dev since it's not needed anymore - (Closes: #429778) - * fix check_disk --local by adding 31_check_disk_local_option.dpatch - (Closes: #405537) - * define LDAP_DEPRECATED in check_ldap.c to make use of old API by adding - 32_check_ldap_pointer.dpatch (Closes: #463322) - * add more authors from upstreams AUTHORS to changelog - * include a more explicit copyright notice to copyright to make lintian - happy - * include OpenSSL exception from upstream README into copyright - * make use of dh_* -i for binary-indep and dh_* -s for binary-arch - (Closes: #468467) - * remove some unneeded and commented debhelper scripts in binary-arch - * remove postgresql-dev from build-depends, thanks Lior Kaplan - for reminding (Closes: #429977) - - -- Jan Wagner Thu, 06 Mar 2008 22:07:31 +0100 - -nagios-plugins (1.4.11-1) unstable; urgency=low - - [ Jan Wagner ] - * new upstream release - * drop CVE-2007-5623.dpatch since it's included upstream - * fix Vcs- fields fields - * use $HOSTADDRESS$ instead of $HOSTNAME$ in dns.cfg (closes: #405244). - * add typo fix for check_mailq into 50_misc_typos.dpatch (closes: #435525). - * add 28_check_pgsql_include_for_8.3.dpatch to get check_pgsql working - together with libpq-dev (closes: #462509). - * add 29_check_ntp_fixsefault_deprecate.dpatch to fix segfaults for - check_ntp and check_ntp_time - * add 30_fix_check_ntp_options.dpatch to fix options help for check_ntp_peer - and check_ntp_time - * migrate ntp.cfg to new check_ntp_peer - - -- Sean Finney Sat, 26 Jan 2008 15:04:00 +0100 - -nagios-plugins (1.4.10-1) unstable; urgency=low - - [ Jan Wagner ] - * new upstream - - fixes CVE-2007-5198 (closes: #445475, #447639), thanks Steffen Joeris - and Nico Golde for NMU. - - fix for negate which may break existing commands: - stop evaluating command line options through shell twice - enforce a full path for the command to run - * add interface check with exclude to ifstatus.cfg - * add ssh check with possibility of port specification to ssh.cfg - * included fix for watch file provided by Raphael Geissert, thanks (closes: - #449671). - * include fix for several typos provided by Luca Falavigna, thanks (closes: - #453012). - * merge changes from and ack NMU. Thanks Nico Golde (closes: #448372). - * Don't ignore errors from make clean - * Bump standards version to 3.7.3 - * added Vcs- fields and Homepage into source header's field - * modify 00list so 06_checkircd.dpatch can get patched in - * removed libsnmp5-dev as depency option and turned around order of - libsnmp9-dev and libsnmp-dev, since only libsnmp-dev is in unstable and - libsnmp9-dev in stable - - -- Sean Finney Fri, 07 Dec 2007 00:55:42 +0100 - -nagios-plugins (1.4.8-2.2) unstable; urgency=high - - * Non-maintainer upload by testing-security team. - * Fix remote DoS which can be triggered by a remote attacker - via crafted snmpget replies (CVE-2007-5623) (Closes: #448372). - * Modifying CVE-2007-5198 patch since it is incomplete (Closes: #447639). - - -- Nico Golde Sun, 28 Oct 2007 16:15:54 +0100 - -nagios-plugins (1.4.8-2.1) unstable; urgency=high - - * Non-maintainer upload by the testing-security team - * Include CVS patch to fix buffer overflow in redir function in - check_http.c, which was caused by parsing HTTP redirect strings - using sscanf (Closes: #445475) - Fixes: CVE-2007-5198 - * Include fix for off-by-one error and a NULL pointer, which leads - to a segfault - - -- Steffen Joeris Sun, 14 Oct 2007 10:36:01 +0000 - -nagios-plugins (1.4.8-2) unstable; urgency=low - - * fix typo in upstream configure script which caused some plugins - to disappear (closes: #425758). thanks to Bernhard Schmidt for - catching it. - - -- sean finney Mon, 28 May 2007 19:39:24 +0200 - -nagios-plugins (1.4.8-1) unstable; urgency=low - - New upstream release. - - [jan wagner] - * add explicit IPv4 checks to disk.cfg, ftp.cfg, http.cfg, ldap.cfg, - mail.cfg, news.cfg, ping.cfg, pgsql.cfg, snmp.cfg, ssh.cfg, - tcp_udp.cfg and telnet.cfg - * add check_bgpstate script from contrib to nagios-plugins-standard - * add whois to Suggests of nagios-plugins-standard - * fixed static community string for check_snmp_bgpstate in snmp.cfg - (closes: #403892). - * remove static community string in ifstatus.cfg - * add check_mysql_database to mysql.cfg - * add check_cups to http.cfg - - [sean finney] - * the Architecture should be "all" for the empty nagios-plugins - metapackage (closes: #422083). - * merge changes from and ack NMU. Thanks to Michael Tautschnig - (closes: #420954). - * modify the Suggests to prefer nagios2 to nagios-text. - * remove the following patches, which have been included upstream: - - 28_check_tcp.expect_reporting.dpatch - - 29_check_tcp.check_jabber-returns-warning.dpatch - * update debian/rules to reflect that config.{sub,guess} have changed - location in the upstream tarball. - - -- sean finney Sun, 20 May 2007 20:29:13 +0200 - -nagios-plugins (1.4.5-2.1) unstable; urgency=low - - * Non-maintainer upload - * nagios-plugins-standard must have a versioned depends on - nagios-plugins-basic (Closes: #420954) - - -- Michael Tautschnig Fri, 18 May 2007 22:44:59 +0200 - -nagios-plugins (1.4.5-2) unstable; urgency=medium - - * fix for spurious conffile-type prompts from ucf, thanks to - Stephen Gran for catching this (closes: #400595). - - -- sean finney Wed, 06 Dec 2006 22:38:38 +0100 - -nagios-plugins (1.4.5-1) unstable; urgency=low - - * new upstream (bugfix only) release. the following patches - have been obsoleted: - - 27_is_hostname.dpatch - * fix for segfaulting check_radius plugin, thanks to Yasper - Casper for finding it (closes: #399532, #379788). - patch: 27_check_radius_segfault.dpatch - * regarding the fix for check_ups in the previous patch: both - the bug number and the attribution were incorrect. thanks are - due to Robbert Kouprie (closes: #398780). - - -- sean finney Mon, 20 Nov 2006 20:31:23 +0100 - -nagios-plugins (1.4.4-2) unstable; urgency=low - - * fix for implicit definition of basename function, thanks to - dann frazier for finding it (closes: #396814). - patch: 26_implicit-basename.dpatch - * aparently the check_ups fix caused problems as well as solved them. - until we ge a real fix for the problem i'm reverting the patch. - thanks to Michael Bussmann (closes: #398767). - * add '-' to allowable characters in is_hostname. thanks again to - Michael Bussmann (closes: #398767). - patch: 27_is_hostname.dpatch - - -- sean finney Fri, 17 Nov 2006 09:37:17 +0100 - -nagios-plugins (1.4.4-1) unstable; urgency=low - - [sean finney] - * new upstream release. actually, we've been basing previous versions - on cvs snapshots so the changes aren't that big. - * upstream includes fix for warn/crit handling in check_tcp based plugins - such as check_simap (closes: #351847). - * dpkg's conffile handling can't deal with migrating config files - from nagios-plugins to nagios-plugins-foo, so we're now managing - all the config files via ucf (closes: #339971). - * remove some unneeded build-deps, and bump Standards-Version - * fix for multiple expect strings in check_tcp.c. thanks to Ralph Rößner - for finding this (closes: #395176). - - -- sean finney Wed, 01 Nov 2006 22:57:16 +0100 - -nagios-plugins (1.4.3.0cvs.20060707-3) unstable; urgency=high - - [sean finney] - * to make backporting easier, change the build dep on libpq-dev - to libpq-dev | postgresql-dev. thanks to Jan Wagner for the - suggestion. - * fix for check_ldaps showing up in two packages (closes: #373926). - thanks to Jan for being persistant in pointing this out. - * that last one is rc, hence high urgency. - - -- sean finney Fri, 04 Aug 2006 08:57:33 -0700 - -nagios-plugins (1.4.3.0cvs.20060707-2) unstable; urgency=low - - [sean finney] - * whoops, new plugin check_mysql_query accidentally made the last - version's nagios-plugins-basic package depend on libmysqlclient15off. - - -- sean finney Sun, 09 Jul 2006 18:51:41 +0200 - -nagios-plugins (1.4.3.0cvs.20060707-1) unstable; urgency=low - - [sean finney] - * new release based on latest upstream CVS HEAD, as backporting some - of the changes would involve either massive patches to the autofoo - generated files (Makefile/Configure etc) or by changing the packages - to autogenerate the autofoo stuff as part of the build process, - neither of which i like. - * anyway, the goodies: - - upstream incorporated fix for F'ing TBFS due to the broken .la files - installed in the libradius-dev package - - new check_apt plugin to check that a host is up to date wrt the debian - package management system (run with --help for more information) - Closes: #317763. - - new check_ntp plugin written in C, which performs much faster and more - reliably than the perl plugin, and does everything natively - (sending/recieving the packets itself instead of parsing the output - of ntpdate/ntpq). Closes: #351257, #360549, #360774. - - as a result, we no longer need to depend on any of the NTP stuff. - * modified debian/control to reflect new lack of dependency on ntp - * modified debian/rules to keep check_ntp in the -basic package, as - there's no reason to keep it in standard now. - * finally incorporate martin pitt's request about transitioning to - the new postgres build system. Closes: #377201. - - [marc haber] - * make package build fail if /proc is not mounted, before I end up - filing that bug a fourth time. Closes: #344389, #354215 - - -- sean finney Sun, 04 Jun 2006 00:57:17 +0200 - -nagios-plugins (1.4.3-1) unstable; urgency=low - - * new upstream release. - - [sean finney] - * the following dpatches have been incorporated upstream and thus removed: - - 11_check_ups.c_perfdata_fix.dpatch - - 12_check_mysql.c_mysql_options.dpatch - - 15_check_mrtg_wtf_conditionals.dpatch - - 16_check_smtp_protocolfix.dpatch - - 17_check_smb_freespace.dpatch - - 19_check_disk_subdirs.dpatch - - 20_check_ntp_lessbeastlyregex.dpatch - - 21_de.po_fixes.dpatch - - 24_check_procs_localefix.dpatch - * the following dpatches have been modified to still apply against upstream - - 10_config.h_debiandefaults.dpatch - - 14_check_log_paths.dpatch - - 18_check_game_cmdline.dpatch - * removed the transitional (pre-sarge) fileutils dependency - (closes: #368718), thanks to Stefan Huehner for pointing this out. - * upstream now uses libtool, but the shipped libtool is out of date and - has problems building against radiusclient1-dev (which might not be - our fault, but...). so, for the time being we're shipping an updated - version of ltmain.sh in the diff (build depending on the newest version - of libtool is subobtimal for backporting). - * add --disable-rpath to configure options... arg, and i had to apply - another patch to ./configure to keep a -R from sneaking in and - deactivating it. - * upstream ./configure fails to automagically detect mysql installation now, - so modify debian/rules accordingly. - * modify debian/control to be more explicit about build-dependencies to - make life easier for backporting. - - -- sean finney Sat, 27 May 2006 20:03:31 +0200 - -nagios-plugins (1.4.2-7) unstable; urgency=medium - - [sean finney] - * update build dependencies to build against libmysqlclient15-dev. - fixes (now) rc bug, urgency bumped (closes: #343785). - * properly set LC_NUMERIC in check_procs. fix also committed for - next upstream release. thanks to Hadmut Danisch for - catching this (closes: #353201). - - -- sean finney Sat, 18 Feb 2006 13:56:25 +0100 - -nagios-plugins (1.4.2-6) unstable; urgency=low - - [sean finney] - * 10_config.h_debiandefaults.dpatch now also hardcodes nslookup, - removing the need for a couple more build-dependencies (dnsutils, - bind9-host | host). this also has the added benefit that the - build process doesn't require a working dns setup :) - * moved check_dig to -standard, as that's where check_dns (and - more importantly its configs and dependencies) are. - * moved check_ping to -basic. even though it means another - dependency in -basic, maintainer consensus is that it's - critical enough of a plugin that it should go in. - * split config for check_fping into fping.cfg. - - [marc haber] - * migrate package from CVS to svn - * add 23_check_axis.dpatch, making the package suiteable to - debian/-only layout - * convert to debian/-only layout - * add build-dependency on autotools-dev, add code to automatically - link in current config.guess, config.sub - - -- sean finney Mon, 23 Jan 2006 23:24:21 +0100 - -nagios-plugins (1.4.2-5) unstable; urgency=low - - * Sean Finney - - add documentation to README.Debian about the plugins needing setuid - root, why we don't install them setuid root by default, and some - recommended methods for dealing with this (closes: #289879). - - add documentation to README.Debian about the new package split. - - config.h_debiandefaults.dpatch now modifies common.h instead of - config.h.in, because the latter would sometimes cause build hosts - to spontaneously regenerate the file, overwriting our changes. - since all the plugins include common.h too... (closes: #336639). - - include some patches from "F.A.G. Luteijn" : - * dhcp.cfg (with notes added by me about needing setuid) - * disk.cfg (check_all_disks) - * disk-smb.cfg (seperated check_disk_smb commands) - * http.cfg (check_https_auth) - * check_disk_smb: allow checking disk usage via host addresses. - (closes: #310780). - - -- sean finney Mon, 31 Oct 2005 22:35:16 +0100 - -nagios-plugins (1.4.2-4) unstable; urgency=low - - * Sean Finney: - - only depend on ntp, not ntp | ntp-simple. hopefully this should - allow nagios-plugins to co-exist with openntpd et al. - - now building against libmysqlclient14-dev. - - updated Standards-Version to 3.6.2 - - nagios-plugins is now separated into 3 separate packages: - nagios-plugins, nagios-plugins-basic, and nagios-plugins-standard. - this should provide folks with a "basic" set of plugins as an - alternative to those who don't want to bring in so many dependencies - (specifically, users of nsca and nagios-nrpe-server). the original - package will depend on both of the new packages, for backwards - compatibility. the list of what-goes-where may change in future - updates, but nagios-plugins will always bring in everything. - contact me if you have specific preferences on how the layout should - be done (closes: #303996, #264194, #255438). - - another fix to check_mrtg, seems like the WARN and CRIT states - were working just fine, but there was no way for things to - be OK. whoops. thanks to uno takeshi for looking into this. - (closes: #335871). - - updated FSF address, couple other cosmetic lintian-related fixes. - - -- sean finney Wed, 26 Oct 2005 23:17:41 +0200 - -nagios-plugins (1.4.2-3) unstable; urgency=low - - * Sean Finney: - - include fix from Modesto Alexandre to correct paths in check_log - (closes: #296600). - - looks like upstream's check_mrtg has been broken for a while now. - now including a fix that i'll eventually move upstream. - (closes: #309673). - - include a fix to check_smtp to make it speak proper ehlo before - issueing a starttls command, and also check that the server - actually supports it before blindly continuing. thanks to - Jeroen van Wolffelaar for taking the time to point out the - details (closes: #285554). - - in the process of the above, also figured out how to get - check_smtp to play nicely with gnutls-based servers. - - check_disk once again will match non-mountpoint directories to - the closest parent mountpoint (closes: #296278). - - include jeroen's "less beastly" check_ntp sys.peer regex. - - fix for braindead command-line option parsing for freespace - in check_disk_smb (closes: #300701). - - updated the usage function in check_game to reflect changed - cmdline options (closes: #307905). - - upstream is now shipping an non-broken ipv6-capable check_ping, - with PING6_COMMAND properly set in config.h (closes: #309255). - - upstream check_mysql can now check slave status (closes: #278864). - - -- sean finney Tue, 11 Oct 2005 10:14:18 +0200 - -nagios-plugins (1.4.2-2) unstable; urgency=low - - * Sean Finney: - - ack, the perl plugins broke on the last upload, because "use lib" - wasn't being properly substituted in. fixed. (closes: #332667). - - include upstream fix for check_ups temperature perfdata. thanks - to Chris AtLee for originally reporting this (closes: #316534). - - stop mucking around with config.sub/config.guess in debian/rules. - - last update in the changelog was missing a colon on the following: - (closes: #312228, #306244, #308458, #327212, #316882). - - have check_mysql read in defaults from my.cnf (closes: #278817). - - -- sean finney Fri, 07 Oct 2005 22:19:09 +0200 - -nagios-plugins (1.4.2-1) unstable; urgency=low - - * New upstream release. - * Sean Finney: - - now managing nagios-plugins as part of the pkg-nagios alioth project. - - updated Maintainer field - - updated build-dependencies to build against libsnmp9-dev - - removed build-dependencies on exim4 | mail-transport-agent, ssh, fping, - qstat, smbclient, and ntp stuff. instead they are all have their - paths hardcoded into the build-process via dpatch file - 10_config.h_debiandefaults.dpatch (closes: #312333, #297708). - - added config option for ssmtp - - upstream is now accidentally deleting the check_ldaps plugin - during the build-process. whoops. - - removed unneccesary dpatch 09_pssyntax, massaged 08_subst.dpatch - into shape with new upstream version. - - added check_mysql_cmdlinecred to allow parsing of credentials on - the cmdline (closes: #314913). - - looks like the issue with check_load was previously resolved by - guido (closes: #305351). - - nagios and nagios-plugins no longer need to use update-nagios, as nagios - can natively scan /etc/nagios-plugins/config now: - (closes: #325893, #321939). - - i believe check_ldap's config is now correct (closes: #305720). - - removed references to check_nmap, which is generally superceded - by check_tcp. it still exists in the contrib directory of the - source, which may at some point be put in /usr/share/doc for those - who really want it (closes: #319997). - - include de.po patch from jens seidel (closes: #313960). - - upstream fix: all of the plugins should now be properly setting - locales, so problems like commas for decimal seperators should no - longer break plugins for people in certain locales: - (closes #312228, #306244, #308458, #327212, #316882). - - upstream fix: check_ntp now supports zero offset (closes: #276794). - - upstream fix: divide by zero check for check_swap (closes: #328603). - - -- sean finney Thu, 06 Oct 2005 05:02:36 -0400 - -nagios-plugins (1.4-6) unstable; urgency=low - - * Build-Depend on the *correct* libmysqlclient-dev - - -- Guido Trotter Sun, 8 May 2005 08:12:20 -0700 - -nagios-plugins (1.4-5) unstable; urgency=low - - * Fix Build-Dependencies for sarge as per - http://lists.debian.org/debian-release/2005/05/msg00442.html and following - - -- Guido Trotter Sat, 7 May 2005 18:19:32 -0700 - -nagios-plugins (1.4-4) unstable; urgency=medium - - * The "Upload after it's too late" release - * Make nagios-plugins depend on iputils-ping only (closes: #296295) - * Urgency medium because it fixes an important bug reported by lots - of people, and it doesn't change anything else - * This version should be the one sarge ships with, hopefully! - - -- Guido Trotter Tue, 3 May 2005 17:04:39 -0700 - -nagios-plugins (1.4-3) unstable; urgency=medium - - * Add back empty imap.cfg (closes: #296249) - * Remove --with-ping-command from configure (closes: #296295) - * Fix load.cfg (closes: #296254) - * Urgency medium because it fixes a segfault in check_ping - * Build depend on mail-transport-agent (mailq path) (closes: #297708) - - -- Guido Trotter Mon, 7 Mar 2005 04:31:49 +0000 - -nagios-plugins (1.4-2) unstable; urgency=low - - * Add information about update-nagios needed after re-configuration - (Shouldn't nagios document this? anyway...) (closes: #291224) - * Use --ssl in check_https (closes: #295917) - * Fix ps syntax (closes: #296003) - - -- Guido Trotter Sat, 19 Feb 2005 20:22:16 +0000 - -nagios-plugins (1.4-1) unstable; urgency=low - - * The "I'm still around" release - * New upstream version (closes: #294224) - * Remove useless patches: - 01_ldap21bind - 04_checkswap - 03_hostwithnumbers - 05_checkbreeze - 07_checkbyssh (apparently it wasn't considered a bug upstream) - * Fix argument number in check_ldap (closes: #281700) (Thanks Joerg) - * Fix hostname placeholder in mysql.cfg (closes: #281701) - * Don't list check_imap twice (closes: #280702) - * Add check_https command (closes: #292124) - * Add check_dig command (closes: #281020) - * Add check_breeze command (closes: #281019) - * Add dummy commands (closes: #281018) - * Add check_mailq_ commands for all supported mtas (closes: #281016, - #282015) - * Add check_spop and check_simap commands (closes: #280700) - * Add check_nt command (closes: #294299) - * Fix check_load command (closes: #294298) - * Fix a reference to @libexec@ in snmp.cfg (closes: #276520) - - -- Guido Trotter Fri, 18 Feb 2005 07:50:28 +0000 - -nagios-plugins (1.3.1.0-12) unstable; urgency=low - - * Sorry for the multiple uploads trying to fix the problem... - Unfortunately I don't have any !i386 handy. :( - * This time #275803 should really be dealt with! - - -- Guido Trotter Wed, 13 Oct 2004 13:59:58 -0700 - -nagios-plugins (1.3.1.0-11) unstable; urgency=high - - * Hack subst.in to really solve the incorrect "use lib" on arches !i386 - forcing the correct (debian) path in (closes: #275803) - * urgency set to high because it solves an RC bug in sarge - - -- Guido Trotter Wed, 13 Oct 2004 08:23:53 -0700 - -nagios-plugins (1.3.1.0-10) unstable; urgency=low - - * The "Better late than never" release - * Include Tom Laermans mysql.cfg in pluginsconfig (closes: #267747) - * Include Tom Laermans imap.cfg in pluginsconfig (closes: #267953) - * Fix snmp_load typo (thanks to Raoul Borenius) (closes: #270276) - * Fix snmp_load typo (thanks to Raoul Borenius) (closes: #270276) - * Build-depend on mawk to try fixing #275803 (was that the culprit?) - - -- Guido Trotter Tue, 12 Oct 2004 20:44:51 -0700 - -nagios-plugins (1.3.1.0-9) unstable; urgency=high - - * Update debian/watch file - * Fix check_breeze (thanks to Peter Palfrader for noticing it was broken) - (closes: #265207) - * Add to 04_checkswap two patches from Sean Finney plus one from me - (to avoid it returning STATE_CRITICAL when no swap is configured) - (closes: #265152, #265154) - * Also import: - - Sven Velt patch for check_ircd (closes: #259720) - - Cyril Bouthors patch for check_by_ssh (closes: #257793) - * Urgency high so nagios and nagios-plugins stop running one after - the other to enter testing - * Sorry, the package splitting is still delayed for after sarge - - -- Guido Trotter Thu, 12 Aug 2004 16:13:35 +0200 - -nagios-plugins (1.3.1.0-8) unstable; urgency=low - - * Import a backport of check_swap from upstream CVS done by - "The Fungi" to make swap checking 2.6 - compatible (closes: #261151) - * Postpone package splitting, so this version can go in sarge - with nagios before we have to wait a bit in the NEW queue - - -- Guido Trotter Sun, 25 Jul 2004 11:34:01 +0200 - -nagios-plugins (1.3.1.0-7) unstable; urgency=low - - * Add 03_hostwithnumbers.dpatch written by me to correct the behaviour - of is_hostname() in utils.c about host components beginning with a - number (closes: #253620). Thanks to Andreas Edler who spotted - the problem. - - -- Guido Trotter Tue, 15 Jun 2004 15:37:48 +0200 - -nagios-plugins (1.3.1.0-6) unstable; urgency=low - - * Conflict with the current version of nagios (closes: #245607) - - -- Guido Trotter Sat, 24 Apr 2004 12:01:59 +0200 - -nagios-plugins (1.3.1.0-5) unstable; urgency=low - - * Move plugin configuration to /etc/nagios-plugins/config - * For the time beeing symlink from the original directory - - This should help nagios closing #241807 - - -- Guido Trotter Fri, 23 Apr 2004 09:06:51 +0200 - -nagios-plugins (1.3.1.0-4) unstable; urgency=low - - * Fix not considered args and broken example in check_disk (closes: #241833) - - -- Guido Trotter Mon, 5 Apr 2004 10:34:37 +0200 - -nagios-plugins (1.3.1.0-3) unstable; urgency=low - - * Take parameters for basic check_ping (closes: #238670) - * Add ssh.cfg and ldap.cfg (closes: #236781) - - -- Guido Trotter Sat, 3 Apr 2004 18:03:38 +0200 - -nagios-plugins (1.3.1.0-2) unstable; urgency=low - - * Recommend nagios-text | nagios - * Remove notify.cfg from distributed config files (closes: #234951) - - -- Guido Trotter Thu, 26 Feb 2004 22:41:56 +0100 - -nagios-plugins (1.3.1.0-1) unstable; urgency=low - - * The "lintian clean it" release - * Upstream version is 1.3.1, i've incremented the version number a bit in - order to upload a new source without the CVS directories, and so let - lintian not complain... - - -- Guido Trotter Tue, 24 Feb 2004 19:37:09 +0100 - -nagios-plugins (1.3.1-6) unstable; urgency=low - - * Depend only on ntp-simple instead of ntp (closes: #233267) - * Also in build-dependency use ntp-simple rather than ntp - - -- Guido Trotter Tue, 17 Feb 2004 21:03:58 +0100 - -nagios-plugins (1.3.1-5) unstable; urgency=low - - * Adapt the choosen ping command to the fact that configure - doesn't set PING_PACKETS_FIRST when PING_COMMAND is passed - from the command line (closes: #233010) - - -- Guido Trotter Mon, 16 Feb 2004 13:19:20 +0100 - -nagios-plugins (1.3.1-4) unstable; urgency=low - - * Pass --with-ping-command to configure, and relax the dependency on ping. - * Export a sane $PATH and pass it to configure (closes: #232498) - * Give full path of libexec dir to configure (closes: #232436) - * Remove empty dirs from debian/dirs - * Ship command configuration in /usr/share/nagios/pluginconfig - These files are generated passing the upstream command.cfg to - nagios' convertcfg, and then splitted up manually removing - definitions already shipped with nagios. Thanks to Nate Allen - who found out the solution. (closes: #232300) - - -- Guido Trotter Sat, 14 Feb 2004 13:20:55 +0100 - -nagios-plugins (1.3.1-3) unstable; urgency=low - - * Remove dependency on non-existent package "dqs" - * Pass --with-df-command="/bin/df -Pk" to configure, since compiling - on the autobuilders doesn't detect that (why?) - * Build-depend also on libkrb5-dev - - -- Guido Trotter Wed, 11 Feb 2004 17:03:23 +0100 - -nagios-plugins (1.3.1-2) unstable; urgency=low - - * Add some missing build dependencies that prevented nagios-plugins - from compiling - - -- Guido Trotter Wed, 11 Feb 2004 12:41:13 +0100 - -nagios-plugins (1.3.1-1) unstable; urgency=low - - * Initial Release (closes: #208218) - * I prefer having all the plugins in a single package: the installation size - is not so terrible - - -- Guido Trotter Sun, 1 Feb 2004 10:32:04 +0100 diff --git a/debian/control b/debian/control deleted file mode 100644 index fb2c3c5..0000000 --- a/debian/control +++ /dev/null @@ -1,116 +0,0 @@ -Source: monitoring-plugins -Section: net -Priority: optional -Maintainer: Debian Nagios Maintainer Group -Uploaders: Jan Wagner -Build-Depends: debhelper-compat (= 13), - libcurl4-openssl-dev | libcurl4-nss-dev | libcurl4-gnutls-dev, - libdbi-dev, - libradcli-dev | libfreeradius-client-dev, - libkrb5-dev, - libldap2-dev, - default-libmysqlclient-dev, - libnet-snmp-perl, - libpq-dev, - libssl-dev, - libsystemd0, - libsystemd-dev, - liburiparser-dev, - mawk | awk, - perl, - procps -Standards-Version: 4.7.2 -Vcs-Browser: https://salsa.debian.org/nagios-team/monitoring-plugins -Vcs-Git: https://salsa.debian.org/nagios-team/monitoring-plugins.git -Homepage: https://www.monitoring-plugins.org -Rules-Requires-Root: binary-targets - -Package: monitoring-plugins -Architecture: all -Depends: monitoring-plugins-basic, monitoring-plugins-standard, ${misc:Depends} -Suggests: icinga2, nagios-plugins-contrib -Provides: nagios-plugins -Description: Plugins for nagios compatible monitoring systems (metapackage) - Plugins for nagios compatible monitoring systems like Naemon and Icinga. - . - This metapackage will install the entire suite of plugins for nagios - compatible monitoring systems. - If you are installing monitoring plugins on a remote "satellite" server - (using nagios-nrpe-server or nsca), you may be interested in the - monitoring-plugins-basic package. - -Package: monitoring-plugins-common -Architecture: any -Depends: ucf, ${misc:Depends}, ${shlibs:Depends} -Suggests: icinga2 -Description: Common files for plugins for nagios compatible monitoring - Common files for plugins for nagios compatible monitoring systems like Naemon - and Icinga. - . - This package contains common files which maybe needed for plugins. - -Package: monitoring-plugins-basic -Architecture: any -Depends: inetutils-ping [kfreebsd-any hurd-any], - iputils-ping [linux-any], - monitoring-plugins-common, - procps, - ucf, - ${misc:Depends}, - ${shlibs:Depends} -Recommends: libcap2-bin [linux-any] -Suggests: icinga2 -Breaks: monitoring-plugins-standard (<< 2.4.0-3~) -Replaces: monitoring-plugins-standard (<< 2.4.0-3~) -Provides: nagios-plugins-basic -Description: Plugins for nagios compatible monitoring systems (basic) - Plugins for nagios compatible monitoring systems like Naemon and Icinga. It - contains the following plugins: - . - check_apt, check_by_ssh, check_clamd, check_cluster, - check_curl, check_dhcp, check_disk, check_dummy, - check_file_age, check_ftp, check_host, check_http, - check_icmp, check_ide_smart, check_imap, check_ircd, - check_jabber, check_load, check_log, check_mrtg, - check_mrtgtraf, check_nagios, check_nntp, check_nntps, - check_nt, check_ntp, check_ntp_peer, check_ntp_time, - check_nwstat, check_overcr, check_ping, check_pop, - check_procs, check_real, check_rta_multi, check_sensors, - check_simap, check_smtp, check_spop, check_ssh, - check_ssmtp, check_swap, check_tcp, check_time, check_udp, - check_ups, check_users - . - This package provides a basic set of plugins with minimal external - dependencies. It is not likely to be useful by itself unless you are - using a remote "satellite" system (using nagios-nrpe-server, check_by_ssh or - nsca, for example). - -Package: monitoring-plugins-standard -Architecture: any -Depends: monitoring-plugins-basic, ucf, ${misc:Depends}, ${shlibs:Depends} -Recommends: bind9-host | host, - dnsutils, - libnet-snmp-perl, - rpcbind, - smbclient, - snmp, - sudo, - ${shlibs:Recommends} -Suggests: fping, - icinga2, - postfix | sendmail-bin | exim4-daemon-heavy | exim4-daemon-light, - qstat -Provides: nagios-plugins-standard -Description: Plugins for nagios compatible monitoring systems (standard) - Plugins for nagios compatible monitoring systems like Naemon and Icinga. It - contains the following plugins: - . - check_breeze, check_dbi, check_dig, check_disk_smb, check_dns, - check_flexlm, check_fping, check_game, check_hpjd, check_ifoperstatus, - check_ifstatus, check_ldap, check_ldaps, check_mailq, check_mysql, - check_mysql_query, check_oracle, check_pgsql, check_radius, check_rpc, - check_snmp, check_wave - . - This package provides the suite of plugins that are most likely to be - useful on a central monitoring host. Some scripts need more packages installed - to work, which is implemented as recommends. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 844fb6b..0000000 --- a/debian/copyright +++ /dev/null @@ -1,287 +0,0 @@ -This package was debianized by Guido Trotter on -Sun, 1 Feb 2004 10:05:51 +0100. - -It was downloaded from https://www.monitoring-plugins.org/ - -Upstream Authors: Felipe Gustavo de Almeida - Ian Cass - Robert Dale - Karl DeBisschop - Ragnar Hojland Espinosa - Ethan Galstad - Bo Kersey - Pedro Leite - Richard Mayhew - Remi Paulmier - Didi Rieder - Tom Shields - Sean Finney - Jeremy T Bouse - Peter Bray - Gavin Carr - Matthias Eble - Subhendu Ghosh - Thomas Guyot-Sionnest - Stanley Hopcroft - Matthew Kent - Harper Mann - Benoit Mortier - Sven Nierlein - Nathan Vonnahme - Ton Voon - Holger Weiss - Michael Wirtgen - -Copyright: - -Copyright (C) 1985, 2013 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - -From upstream README: - - You can redistribute and/or modify this software under the terms of the GNU - General Public License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version; with the - additional exemption that compiling, linking, and/or using OpenSSL is - allowed. - - This software is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - -Files with different Licenses: - - build-aux/config.guess - build-aux/config.sub - build-aux/ltmain.sh - plugins-scripts/check_mailq.pl - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . - - gl/alloca.in.h - gl/as* - gl/base64* - gl/basename.c - gl/cloexec.c - gl/config.charset - gl/creat-safer.c - gl/c-strtod.c - gl/d* - gl/e* - gl/fcntl* - gl/fd-safer.c - gl/float.* - gl/float - gl/floorf.c - gl/fsusage* - gl/full* - gl/gai_strerror.c - gl/getaddrinfo* - gl/gethostname.c - gl/getloadavg.c - gl/getopt* - gl/gettext.h - gl/inet_ntop* - gl/intprops.h - gl/localcharset* - gl/malloc.c - gl/math.in.h - gl/mountlist* - gl/netinet_in.in.h - gl/printf-* - gl/ref-* - gl/safe-* - gl/size_max.h - gl/snprintf.c - gl/stdbool.in.h - gl/stdint.in.h - gl/stdio.in.h - gl/stdlib.in.h - gl/strerror.c - gl/string.in.h - gl/stripslash.c - gl/strndup.c - gl/strnlen.c - gl/sys_socket.in.h - gl/unistd.in.h - gl/v* - gl/wchar.in.h - gl/wctype.in.h - gl/xalloc.h - gl/xalloc-die.c - gl/xmalloc.c - gl/xsize.h - gl/xstrndup* - gl/xsize.h - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program; if not, see - . - - gl/reg* - gl/mktime.c - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public - License along with the GNU C Library; if not, see - . - - Makefile.in - gl/Makefile.in - gl/m4/*.m4 - lib/Makefile.in - lib/tests/Makefile.in - plugins/Makefile.in - plugins-root/Makefile.in - plugins-scripts/Makefile.in - tap/Makefile.in - - This Makefile.in 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 program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY, to the extent permitted by law; without - even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. - - aclocal.m4 - - 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. - - gl/m4/00gnulib.m4 - gl/m4/a*.m4 - gl/m4/b*.m4 - gl/m4/c*.m4 - gl/m4/d*.m4 - gl/m4/e*.m4 - gl/m4/f*.m4 - gl/m4/getaddrinfo.m4 - gl/m4/gethostname.m4 - gl/m4/getloadavg.m4 - gl/m4/getopt.m4 - gl/m4/gettext.m4 - gl/m4/glibc21.m4 - gl/m4/gnulib-common.m4 - gl/m4/h*.m4 - gl/m4/i*.m4 - gl/m4/l*.m4 - gl/m4/m*.m4 - gl/m4/n*.m4 - gl/m4/off_t.m4 - gl/m4/p*.m4 - gl/m4/r*.m4 - gl/m4/s*.m4 - gl/m4/t*.m4 - gl/m4/u*.m4 - gl/m4/v*.m4 - gl/m4/w*.m4 - gl/m4/x*.m4 - m4/np_mysqlclient.m4 - - 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. - - build-aux/install-sh - - Copyright (C) 1994 X Consortium - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- - TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall not - be used in advertising or otherwise to promote the sale, use or other deal- - ings in this Software without prior written authorization from the X Consor- - tium. - - FSF changes to this file are in the public domain. - - tap/tap.* - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 9abe0cb..0000000 --- a/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -etc/nagios-plugins/config diff --git a/debian/functions b/debian/functions deleted file mode 100644 index a902e12..0000000 --- a/debian/functions +++ /dev/null @@ -1,14 +0,0 @@ -# functions for use by nagios plugins maintainer scripts - -npconfdir=/etc/nagios-plugins/config - -# we now register all n-p config files via ucf. -register_cfgs(){ - # do this in a subshell so we don't screw up cwd - ( - for file in ${templdir}/*cfg; do - ucf ${templdir}/$(basename $file) ${npconfdir}/$(basename $file) - done - ); -} - diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index b5fd342..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,3 +0,0 @@ -[buildpackage] -postbuild = lintian --info --display-info --display-experimental --pedantic --show-overrides $GBP_CHANGES_FILE -pbuilder-options = --source-only-changes diff --git a/debian/monitoring-plugins-basic.alternatives b/debian/monitoring-plugins-basic.alternatives deleted file mode 100644 index 699f51e..0000000 --- a/debian/monitoring-plugins-basic.alternatives +++ /dev/null @@ -1,12 +0,0 @@ -Name: check_http -Link: /usr/lib/nagios/plugins/check_http -Status: auto -Best: /usr/lib/nagios/plugins/check_http.deprecated -Value: /usr/lib/nagios/plugins/check_http.deprecated -Alternative: /usr/lib/nagios/plugins/check_http.deprecated -Priority: 50 - -Name: check_http -Link: /usr/lib/nagios/plugins/check_http -Alternative: /usr/lib/nagios/plugins/check_curl -Priority: -100 diff --git a/debian/monitoring-plugins-basic.dirs b/debian/monitoring-plugins-basic.dirs deleted file mode 100644 index 7059e15..0000000 --- a/debian/monitoring-plugins-basic.dirs +++ /dev/null @@ -1,3 +0,0 @@ -etc/nagios-plugins/config -usr/lib/nagios/plugins -usr/share/monitoring-plugins/templates-basic diff --git a/debian/monitoring-plugins-basic.links b/debian/monitoring-plugins-basic.links deleted file mode 100644 index 3124589..0000000 --- a/debian/monitoring-plugins-basic.links +++ /dev/null @@ -1,7 +0,0 @@ -usr/share/doc/monitoring-plugins-common/NEWS.Debian.gz usr/share/doc/monitoring-plugins-basic/NEWS.Debian.gz -usr/share/doc/monitoring-plugins-common/NEWS.gz usr/share/doc/monitoring-plugins-basic/NEWS.gz -usr/share/doc/monitoring-plugins-common/README usr/share/doc/monitoring-plugins-basic/README -usr/share/doc/monitoring-plugins-common/README.Debian.gz usr/share/doc/monitoring-plugins-basic/README.Debian.gz -usr/share/doc/monitoring-plugins-common/REQUIREMENTS usr/share/doc/monitoring-plugins-basic/REQUIREMENTS -usr/share/doc/monitoring-plugins-common/SUPPORT usr/share/doc/monitoring-plugins-basic/SUPPORT -usr/share/doc/monitoring-plugins-common/changelog.gz usr/share/doc/monitoring-plugins-basic/changelog.gz diff --git a/debian/monitoring-plugins-basic.postinst b/debian/monitoring-plugins-basic.postinst deleted file mode 100644 index 1a143a9..0000000 --- a/debian/monitoring-plugins-basic.postinst +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -set -e - -templdir=/usr/share/monitoring-plugins/templates-basic -. /usr/share/monitoring-plugins/dpkg/functions -plugindir=/usr/lib/nagios/plugins/ - -if [ "$1" = "configure" ]; then - register_cfgs $2 - - # If we have setcap is installed, try setting cap_net_raw+ep, - # which allows us to make our binaries working without the - # setuid bit - if command -v setcap > /dev/null; then - if setcap "cap_net_raw+ep" ${plugindir}/check_icmp "cap_net_bind_service=+ep cap_net_raw=+ep" ${plugindir}/check_dhcp; then - echo "Setcap for check_icmp and check_dhcp worked!" - else - echo "Setcap for check_icmp and check_dhcp failed." >&2 - echo "Please refer README.Debian.gz for using plugins needing" >&2 - echo "higher privileges!" >&2 - fi - else - echo "Setcap is not installed, please refer README.Debian.gz for using" >&2 - echo "plugins needing higher privileges!" >&2 - fi -fi - -#DEBHELPER# diff --git a/debian/monitoring-plugins-basic.postrm.in b/debian/monitoring-plugins-basic.postrm.in deleted file mode 100644 index b65cc9d..0000000 --- a/debian/monitoring-plugins-basic.postrm.in +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -e - -BASIC_PLUGINS="@BASIC_PLUGINS@" - -if [ "$1" = "purge" ]; then - if which ucf >/dev/null 2>&1; then - have_ucf="yes" - fi - for f in $BASIC_PLUGINS; do - rm -f /etc/nagios-plugins/config/${f}.cfg - if [ "$have_ucf" = "yes" ]; then - ucf --purge /etc/nagios-plugins/config/${f}.cfg - fi - done -fi - -#DEBHELPER# diff --git a/debian/monitoring-plugins-common.dirs b/debian/monitoring-plugins-common.dirs deleted file mode 100644 index b073cdc..0000000 --- a/debian/monitoring-plugins-common.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/nagios/plugins diff --git a/debian/monitoring-plugins-common.docs b/debian/monitoring-plugins-common.docs deleted file mode 100644 index 24029e9..0000000 --- a/debian/monitoring-plugins-common.docs +++ /dev/null @@ -1,7 +0,0 @@ -FAQ -NEWS -README -REQUIREMENTS -SUPPORT -debian/NEWS -debian/README.Debian diff --git a/debian/monitoring-plugins-common.examples b/debian/monitoring-plugins-common.examples deleted file mode 100644 index 8b13789..0000000 --- a/debian/monitoring-plugins-common.examples +++ /dev/null @@ -1 +0,0 @@ - diff --git a/debian/monitoring-plugins-standard.dirs b/debian/monitoring-plugins-standard.dirs deleted file mode 100644 index 064660b..0000000 --- a/debian/monitoring-plugins-standard.dirs +++ /dev/null @@ -1,3 +0,0 @@ -etc/nagios-plugins/config -usr/lib/nagios/plugins -usr/share/monitoring-plugins/templates-standard diff --git a/debian/monitoring-plugins-standard.docs b/debian/monitoring-plugins-standard.docs deleted file mode 100644 index 27af518..0000000 --- a/debian/monitoring-plugins-standard.docs +++ /dev/null @@ -1 +0,0 @@ -debian/README.Debian.plugins diff --git a/debian/monitoring-plugins-standard.links b/debian/monitoring-plugins-standard.links deleted file mode 100644 index aeb5ae4..0000000 --- a/debian/monitoring-plugins-standard.links +++ /dev/null @@ -1,8 +0,0 @@ -usr/share/doc/monitoring-plugins-common/FAQ usr/share/doc/monitoring-plugins-standard/FAQ -usr/share/doc/monitoring-plugins-common/NEWS.Debian.gz usr/share/doc/monitoring-plugins-standard/NEWS.Debian.gz -usr/share/doc/monitoring-plugins-common/NEWS.gz usr/share/doc/monitoring-plugins-standard/NEWS.gz -usr/share/doc/monitoring-plugins-common/README usr/share/doc/monitoring-plugins-standard/README -usr/share/doc/monitoring-plugins-common/README.Debian.gz usr/share/doc/monitoring-plugins-standard/README.Debian.gz -usr/share/doc/monitoring-plugins-common/REQUIREMENTS usr/share/doc/monitoring-plugins-standard/REQUIREMENTS -usr/share/doc/monitoring-plugins-common/SUPPORT usr/share/doc/monitoring-plugins-standard/SUPPORT -usr/share/doc/monitoring-plugins-common/changelog.gz usr/share/doc/monitoring-plugins-standard/changelog.gz diff --git a/debian/monitoring-plugins-standard.postinst b/debian/monitoring-plugins-standard.postinst deleted file mode 100644 index d4dd594..0000000 --- a/debian/monitoring-plugins-standard.postinst +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/monitoring-plugins/dpkg/functions -templdir=/usr/share/monitoring-plugins/templates-standard - -if [ "$1" = "configure" ]; then - register_cfgs $2 -fi - -#DEBHELPER# diff --git a/debian/monitoring-plugins-standard.postrm.in b/debian/monitoring-plugins-standard.postrm.in deleted file mode 100644 index a7ae07b..0000000 --- a/debian/monitoring-plugins-standard.postrm.in +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -e - -STD_PLUGINS="@STD_PLUGINS@" - -if [ "$1" = "purge" ]; then - if which ucf >/dev/null 2>&1; then - have_ucf="yes" - fi - for f in $STD_PLUGINS; do - rm -f /etc/nagios-plugins/config/${f}.cfg - if [ "$have_ucf" = "yes" ]; then - ucf --purge /etc/nagios-plugins/config/${f}.cfg - fi - done -fi - -#DEBHELPER# diff --git a/debian/monitoring-plugins.links b/debian/monitoring-plugins.links deleted file mode 100644 index 3914a50..0000000 --- a/debian/monitoring-plugins.links +++ /dev/null @@ -1,9 +0,0 @@ -usr/share/doc/monitoring-plugins-common/FAQ usr/share/doc/monitoring-plugins/FAQ -usr/share/doc/monitoring-plugins-common/NEWS.Debian.gz usr/share/doc/monitoring-plugins/NEWS.Debian.gz -usr/share/doc/monitoring-plugins-common/NEWS.gz usr/share/doc/monitoring-plugins/NEWS.gz -usr/share/doc/monitoring-plugins-common/README usr/share/doc/monitoring-plugins/README -usr/share/doc/monitoring-plugins-common/README.Debian.gz usr/share/doc/monitoring-plugins/README.Debian.gz -usr/share/doc/monitoring-plugins-common/REQUIREMENTS usr/share/doc/monitoring-plugins/REQUIREMENTS -usr/share/doc/monitoring-plugins-common/SUPPORT usr/share/doc/monitoring-plugins/SUPPORT -usr/share/doc/monitoring-plugins-common/changelog.gz usr/share/doc/monitoring-plugins/changelog.gz -usr/share/doc/monitoring-plugins-standard/README.Debian.plugins usr/share/doc/monitoring-plugins/README.Debian.plugins diff --git a/debian/patches/02_check_icmp_links b/debian/patches/02_check_icmp_links deleted file mode 100644 index 591683c..0000000 --- a/debian/patches/02_check_icmp_links +++ /dev/null @@ -1,30 +0,0 @@ -## 02_check_icmp_links by Jan Wagner -## -## DP: Create symlinks for check_icmp to provide default values for some situations - -diff -urNad nagios-plugins-1.4.14~/plugins-root/Makefile.am nagios-plugins-1.4.14/plugins-root/Makefile.am ---- nagios-plugins-1.4.14~/plugins-root/Makefile.am 2008-11-30 22:23:18.000000000 +0100 -+++ nagios-plugins-1.4.14/plugins-root/Makefile.am 2010-01-10 20:39:03.000000000 +0100 -@@ -71,7 +71,8 @@ - else \ - echo "WARNING: insufficient access; not installing setuid plugins"; \ - echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \ -- fi -+ fi ; \ -+ if [ -x $(DESTDIR)$(libexecdir)/check_icmp ] ; then rm -f $(DESTDIR)$(libexecdir)/check_host $(DESTDIR)$(libexecdir)/check_rta_multi ; ln -s check_icmp $(DESTDIR)$(libexecdir)/check_host ; ln -s check_icmp $(DESTDIR)$(libexecdir)/check_rta_multi ; fi - - # /* Author Coreutils team sub-citation */ - -diff -urNad nagios-plugins-1.4.14~/plugins-root/Makefile.in nagios-plugins-1.4.14/plugins-root/Makefile.in ---- nagios-plugins-1.4.14~/plugins-root/Makefile.in 2009-09-16 10:37:59.000000000 +0200 -+++ nagios-plugins-1.4.14/plugins-root/Makefile.in 2010-01-10 20:39:13.000000000 +0100 -@@ -1162,7 +1162,8 @@ - else \ - echo "WARNING: insufficient access; not installing setuid plugins"; \ - echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \ -- fi -+ fi ; \ -+ if [ -x $(DESTDIR)$(libexecdir)/check_icmp ] ; then rm -f $(DESTDIR)$(libexecdir)/check_host $(DESTDIR)$(libexecdir)/check_rta_multi ; ln -s check_icmp $(DESTDIR)$(libexecdir)/check_host ; ln -s check_icmp $(DESTDIR)$(libexecdir)/check_rta_multi ; fi - - clean-local: - rm -f NP-VERSION-FILE diff --git a/debian/patches/03_epn b/debian/patches/03_epn deleted file mode 100644 index 5ee4062..0000000 --- a/debian/patches/03_epn +++ /dev/null @@ -1,8 +0,0 @@ ---- a/plugins-scripts/check_disk_smb.pl -+++ b/plugins-scripts/check_disk_smb.pl -@@ -1,4 +1,5 @@ - #!@PERL@ -w -+# nagios: -epn - # - # - # check_disk.pl [warn] [critical] [port] diff --git a/debian/patches/04_lmstat_path b/debian/patches/04_lmstat_path deleted file mode 100644 index 89b1d23..0000000 --- a/debian/patches/04_lmstat_path +++ /dev/null @@ -1,11 +0,0 @@ ---- a/plugins-scripts/utils.pm.in -+++ b/plugins-scripts/utils.pm.in -@@ -19,7 +19,7 @@ - ## updated by autoconf - $PATH_TO_SUDO = "@PATH_TO_SUDO@"; - $PATH_TO_RPCINFO = "@PATH_TO_RPCINFO@" ; --$PATH_TO_LMSTAT = "@PATH_TO_LMSTAT@" ; -+$PATH_TO_LMSTAT = "/usr/local/bin/lmstat" ; - $PATH_TO_SMBCLIENT = "@PATH_TO_SMBCLIENT@" ; - $PATH_TO_MAILQ = "@PATH_TO_MAILQ@"; - $PATH_TO_QMAIL_QSTAT = "@PATH_TO_QMAIL_QSTAT@"; diff --git a/debian/patches/10_check_curl_fix_redirects b/debian/patches/10_check_curl_fix_redirects deleted file mode 100644 index 03321f4..0000000 --- a/debian/patches/10_check_curl_fix_redirects +++ /dev/null @@ -1,164 +0,0 @@ -From 17549189ae6864203a48a2b2488db35a9e020e0e Mon Sep 17 00:00:00 2001 -From: Sven Nierlein -Date: Mon, 29 Jul 2024 20:53:32 +0200 -Subject: [PATCH] check_curl: fix relative redirects on non-standard port - -Having a webserver respond with a relative redirect as for ex. in `Location: /path/to.html` -check_curl would use the wrong standard http/https port instead -of crafting the absolute url using the given scheme/hostname and port. - -Adding a new test case for this for check_http and check_curl. check_http did -it correct already, so no fix necessary there. - -before: - - %>./check_curl -H 127.0.0.1 -p 50493 -f follow -u /redirect_rel -s redirected -vvv - **** HEADER **** - HTTP/1.1 302 Found - ... - Location: /redirect2 - - ... - * Seen redirect location /redirect2 - ** scheme: (null) - ** host: (null) - ** port: (null) - ** path: /redirect2 - Redirection to http://127.0.0.1:80/redirect2 - -fixed: - - %>./check_curl -H 127.0.0.1 -p 50493 -f follow -u /redirect_rel -s redirected -vvv - **** HEADER **** - HTTP/1.1 302 Found - ... - Location: /redirect2 - - ... - * Seen redirect location /redirect2 - ** scheme: (null) - ** host: (null) - ** port: (null) - ** path: /redirect2 - Redirection to http://127.0.0.1:50493/redirect2 - -Signed-off-by: Sven Nierlein ---- - plugins/check_curl.c | 15 ++++++++++----- - plugins/tests/check_curl.t | 14 +++++++++++--- - plugins/tests/check_http.t | 12 +++++++++++- - 3 files changed, 32 insertions(+), 9 deletions(-) - -diff --git a/plugins/check_curl.c b/plugins/check_curl.c -index c54be5e4f..01e2770e3 100644 ---- a/plugins/check_curl.c -+++ b/plugins/check_curl.c -@@ -1285,10 +1285,12 @@ redir (curlhelp_write_curlbuf* header_buf) - } - } - -- if (!uri_strcmp (uri.scheme, "https")) -- use_ssl = true; -- else -- use_ssl = false; -+ if (uri.scheme.first) { -+ if (!uri_strcmp (uri.scheme, "https")) -+ use_ssl = true; -+ else -+ use_ssl = false; -+ } - - /* we do a sloppy test here only, because uriparser would have failed - * above, if the port would be invalid, we just check for MAX_PORT -@@ -1306,10 +1308,13 @@ redir (curlhelp_write_curlbuf* header_buf) - MAX_PORT, location, display_html ? "" : ""); - - /* by RFC 7231 relative URLs in Location should be taken relative to -- * the original URL, so wy try to form a new absolute URL here -+ * the original URL, so we try to form a new absolute URL here - */ - if (!uri.scheme.first && !uri.hostText.first) { - new_host = strdup (host_name ? host_name : server_address); -+ new_port = server_port; -+ if(use_ssl) -+ uri_string (uri.scheme, "https", DEFAULT_BUFFER_SIZE); - } else { - new_host = strdup (uri_string (uri.hostText, buf, DEFAULT_BUFFER_SIZE)); - } -diff --git a/plugins/tests/check_curl.t b/plugins/tests/check_curl.t -index 3c9148308..eaa9f5183 100755 ---- a/plugins/tests/check_curl.t -+++ b/plugins/tests/check_curl.t -@@ -21,7 +21,7 @@ use FindBin qw($Bin); - - $ENV{'LC_TIME'} = "C"; - --my $common_tests = 73; -+my $common_tests = 75; - my $ssl_only_tests = 8; - # Check that all dependent modules are available - eval "use HTTP::Daemon 6.01;"; -@@ -178,6 +178,11 @@ sub run_server { - $c->send_basic_header; - $c->send_crlf; - $c->send_response(HTTP::Response->new( 200, 'OK', undef, 'redirected' )); -+ } elsif ($r->url->path eq "/redirect_rel") { -+ $c->send_basic_header(302); -+ $c->send_header("Location", "/redirect2" ); -+ $c->send_crlf; -+ $c->send_response('moved to /redirect2'); - } elsif ($r->url->path eq "/redir_timeout") { - $c->send_redirect( "/timeout" ); - } elsif ($r->url->path eq "/timeout") { -@@ -471,9 +476,12 @@ sub run_common_tests { - is( $result->return_code, 0, $cmd); - like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output ); - -- # These tests may block -- print "ALRM\n"; -+ $cmd = "$command -f follow -u /redirect_rel -s redirected"; -+ $result = NPTest->testCmd( $cmd ); -+ is( $result->return_code, 0, $cmd); -+ like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output ); - -+ # These tests may block - # stickyport - on full urlS port is set back to 80 otherwise - $cmd = "$command -f stickyport -u /redir_external -t 5 -s redirected"; - eval { -diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t -index 6078b2745..6eaf85b29 100755 ---- a/plugins/tests/check_http.t -+++ b/plugins/tests/check_http.t -@@ -13,7 +13,7 @@ use IO::Socket::INET; - - $ENV{'LC_TIME'} = "C"; - --my $common_tests = 71; -+my $common_tests = 73; - my $virtual_port_tests = 8; - my $ssl_only_tests = 12; - my $chunked_encoding_special_tests = 1; -@@ -199,6 +199,11 @@ sub run_server { - $c->send_basic_header; - $c->send_crlf; - $c->send_response(HTTP::Response->new( 200, 'OK', undef, 'redirected' )); -+ } elsif ($r->url->path eq "/redirect_rel") { -+ $c->send_basic_header(302); -+ $c->send_header("Location", "/redirect2" ); -+ $c->send_crlf; -+ $c->send_response('moved to /redirect2'); - } elsif ($r->url->path eq "/redir_timeout") { - $c->send_redirect( "/timeout" ); - } elsif ($r->url->path eq "/timeout") { -@@ -515,6 +520,11 @@ sub run_common_tests { - is( $result->return_code, 0, $cmd); - like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output ); - -+ $cmd = "$command -f follow -u /redirect_rel -s redirected"; -+ $result = NPTest->testCmd( $cmd ); -+ is( $result->return_code, 0, $cmd); -+ like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output ); -+ - # These tests may block - print "ALRM\n"; - diff --git a/debian/patches/11_check_curl_raise_ssl_issue b/debian/patches/11_check_curl_raise_ssl_issue deleted file mode 100644 index 9c8fd8f..0000000 --- a/debian/patches/11_check_curl_raise_ssl_issue +++ /dev/null @@ -1,87 +0,0 @@ -From ca40cf81fb94cf57a82df938ed2aa2843691be3a Mon Sep 17 00:00:00 2001 -From: Yannick Martin -Date: Fri, 9 Aug 2024 12:14:28 +0200 -Subject: [PATCH] check_curl: raise SSL issue when --continue-after-certificate - is used - -This change aims to raise the worst status between the SSL check and the HTTP check. - -before: -check_curl -H www.google.fr -S --continue-after-certificate --certificate 4000,4000 ; echo $? -CRITICAL - Certificate '*.google.fr' expires in 74 day(s) (Tue 22 Oct 2024 12:53:52 PM GMT +0000). -HTTP OK: HTTP/2 200 - 22807 bytes in 0.076 second response time |time=0.075516s;;;0.000000;10.000000 size=22807B;;;0; -0 - -after: -/usr/lib/nagios/ovh/check_curl -H www.google.fr -S --continue-after-certificate --certificate 4000,4000 ; echo $? -CRITICAL - Certificate '*.google.fr' expires in 74 day(s) (Tue 22 Oct 2024 12:53:52 PM GMT +0000). -HTTP OK: HTTP/2 200 - 22840 bytes in 0.090 second response time |time=0.090463s;;;0.000000;10.000000 size=22840B;;;0; -2 ---- - plugins/check_curl.c | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -diff --git a/plugins/check_curl.c b/plugins/check_curl.c -index 01e2770e3..4522e6c9f 100644 ---- a/plugins/check_curl.c -+++ b/plugins/check_curl.c -@@ -468,6 +468,7 @@ int - check_http (void) - { - int result = STATE_OK; -+ int result_ssl = STATE_OK; - int page_len = 0; - int i; - char *force_host_header = NULL; -@@ -852,9 +853,9 @@ check_http (void) - /* check certificate with OpenSSL functions, curl has been built against OpenSSL - * and we actually have OpenSSL in the monitoring tools - */ -- result = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit); -+ result_ssl = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit); - if (!continue_after_check_cert) { -- return result; -+ return result_ssl; - } - #else /* USE_OPENSSL */ - die (STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates - OpenSSL callback used and not linked against OpenSSL\n"); -@@ -898,17 +899,17 @@ check_http (void) - die (STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg); - } - BIO_free (cert_BIO); -- result = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit); -+ result_ssl = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit); - if (!continue_after_check_cert) { -- return result; -+ return result_ssl; - } - #else /* USE_OPENSSL */ - /* We assume we don't have OpenSSL and np_net_ssl_check_certificate at our disposal, - * so we use the libcurl CURLINFO data - */ -- result = net_noopenssl_check_certificate(&cert_ptr, days_till_exp_warn, days_till_exp_crit); -+ result_ssl = net_noopenssl_check_certificate(&cert_ptr, days_till_exp_warn, days_till_exp_crit); - if (!continue_after_check_cert) { -- return result; -+ return result_ssl; - } - #endif /* USE_OPENSSL */ - } else { -@@ -1176,7 +1177,7 @@ check_http (void) - } - - /* TODO: separate _() msg and status code: die (result, "HTTP %s: %s\n", state_text(result), msg); */ -- die (result, "HTTP %s: %s %d %s%s%s - %d bytes in %.3f second response time %s|%s\n%s%s", -+ die (max_state_alt(result, result_ssl), "HTTP %s: %s %d %s%s%s - %d bytes in %.3f second response time %s|%s\n%s%s", - state_text(result), string_statuscode (status_line.http_major, status_line.http_minor), - status_line.http_code, status_line.msg, - strlen(msg) > 0 ? " - " : "", -@@ -1186,7 +1187,7 @@ check_http (void) - (show_body ? body_buf.buf : ""), - (show_body ? "\n" : "") ); - -- return result; -+ return max_state_alt(result, result_ssl); - } - - int diff --git a/debian/patches/12_check_curl_add_docu b/debian/patches/12_check_curl_add_docu deleted file mode 100644 index 4716906..0000000 --- a/debian/patches/12_check_curl_add_docu +++ /dev/null @@ -1,42 +0,0 @@ -From 9cdf2aec7fa3277237c078fc9da32f40d0292299 Mon Sep 17 00:00:00 2001 -From: Alvar Penning -Date: Fri, 16 Aug 2024 10:38:02 +0200 -Subject: [PATCH] check_curl: Documentation for --certificate, --cookie-jar - -From the mere help output for -C / --certificate, I was confused about -what its two integer parameters do. Unfortunately, I also missed out on -the explaining examples later. Since I like to have basic documentation -for each flag, I tried to make the arguments as short as possible. - -The other fix was one hyphen too many for the --cookie-jar option. ---- - plugins/check_curl.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/plugins/check_curl.c b/plugins/check_curl.c -index 4522e6c9f..e9c15e648 100644 ---- a/plugins/check_curl.c -+++ b/plugins/check_curl.c -@@ -2008,8 +2008,11 @@ print_help (void) - printf (" %s\n", _("Note: SNI is not supported in libcurl before 7.18.1")); - #endif - printf (" %s\n", "-C, --certificate=INTEGER[,INTEGER]"); -- printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443")); -- printf (" %s\n", _("(when this option is used the URL is not checked by default. You can use")); -+ printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443.")); -+ printf (" %s\n", _("A STATE_WARNING is returned if the certificate has a validity less than the")); -+ printf (" %s\n", _("first agument's value. If there is a second argument and the certificate's")); -+ printf (" %s\n", _("validity is less than its value, a STATE_CRITICAL is returned.")); -+ printf (" %s\n", _("(When this option is used the URL is not checked by default. You can use")); - printf (" %s\n", _(" --continue-after-certificate to override this behavior)")); - printf (" %s\n", "--continue-after-certificate"); - printf (" %s\n", _("Allows the HTTP check to continue after performing the certificate check.")); -@@ -2092,7 +2095,7 @@ print_help (void) - printf (" %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING).")); - printf(" %s\n", "--haproxy-protocol"); - printf(" %s\n", _("Send HAProxy proxy protocol v1 header (CURLOPT_HAPROXYPROTOCOL).")); -- printf (" %s\n", "---cookie-jar=FILE"); -+ printf (" %s\n", "--cookie-jar=FILE"); - printf (" %s\n", _("Store cookies in the cookie jar and send them out when requested.")); - printf ("\n"); - diff --git a/debian/patches/13_check_mysql_fix_variables b/debian/patches/13_check_mysql_fix_variables deleted file mode 100644 index 2f85e77..0000000 --- a/debian/patches/13_check_mysql_fix_variables +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c -index 6a7daf11a..15ec04c04 100644 ---- a/plugins/check_mysql.c -+++ b/plugins/check_mysql.c -@@ -59,8 +59,8 @@ bool ssl = false; - char *opt_file = NULL; - char *opt_group = NULL; - unsigned int db_port = MYSQL_PORT; --int check_slave = 0, warn_sec = 0, crit_sec = 0; --int ignore_auth = 0; -+bool check_slave = false; -+bool ignore_auth = false; - int verbose = 0; - - static double warning_time = 0; -@@ -456,10 +456,10 @@ process_arguments (int argc, char **argv) - db_port = atoi (optarg); - break; - case 'S': -- check_slave = 1; /* check-slave */ -+ check_slave = true; /* check-slave */ - break; - case 'n': -- ignore_auth = 1; /* ignore-auth */ -+ ignore_auth = true; /* ignore-auth */ - break; - case 'w': - warning = optarg; diff --git a/debian/patches/14_check_curl_remove_experimental_state b/debian/patches/14_check_curl_remove_experimental_state deleted file mode 100644 index 62862fb..0000000 --- a/debian/patches/14_check_curl_remove_experimental_state +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/check_curl.c b/plugins/check_curl.c -index e9c15e648..e25d7a79a 100644 ---- a/plugins/check_curl.c -+++ b/plugins/check_curl.c -@@ -2190,8 +2190,6 @@ print_usage (void) - printf ("%s\n", _("In the first form, make an HTTP request.")); - printf ("%s\n\n", _("In the second form, connect to the server and check the TLS certificate.")); - #endif -- printf ("%s\n", _("WARNING: check_curl is experimental. Please use")); -- printf ("%s\n\n", _("check_http if you need a stable version.")); - } - - void diff --git a/debian/patches/15_check_curl_fix_regex b/debian/patches/15_check_curl_fix_regex deleted file mode 100644 index fdfce45..0000000 --- a/debian/patches/15_check_curl_fix_regex +++ /dev/null @@ -1,82 +0,0 @@ -From 46efe803cf8e7b769ca112afc158b76510b01e46 Mon Sep 17 00:00:00 2001 -From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> -Date: Mon, 19 Aug 2024 15:23:41 +0200 -Subject: [PATCH 1/3] check_curl: Fix help for state regex option - -The help output of `check-curl` contained a typo, -the real option is `state-regex` and not `regex-state` as -the help suggests. -Also added the two possible options to avoid confusion. ---- - plugins/check_curl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/check_curl.c b/plugins/check_curl.c -index e9c15e648..bf46b2261 100644 ---- a/plugins/check_curl.c -+++ b/plugins/check_curl.c -@@ -2061,8 +2061,8 @@ print_help (void) - printf (" %s\n", "--invert-regex"); - printf (" %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)")); - printf (" %s\n", _("can be changed with --state--regex)")); -- printf (" %s\n", "--regex-state=STATE"); -- printf (" %s\n", _("Return STATE if regex is found, OK if not\n")); -+ printf (" %s\n", "--state-regex=STATE"); -+ printf (" %s\n", _("Return STATE if regex is found, OK if not\nSTATE can be one of \"critical\",\"warning\"")); - printf (" %s\n", "-a, --authorization=AUTH_PAIR"); - printf (" %s\n", _("Username:password on sites with basic authentication")); - printf (" %s\n", "-b, --proxy-authorization=AUTH_PAIR"); - -From b6c72064a53da8b173b7406a0a535922dc0cc1b3 Mon Sep 17 00:00:00 2001 -From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> -Date: Mon, 19 Aug 2024 15:26:52 +0200 -Subject: [PATCH 2/3] check_curl: Parse state-regex option ignoring case - -Previously the --state-regex option accepted only "critical" and -"warning" as values. -This commit changes the strcmp there to strcasecmp to be more tolerant -regarding the input. ---- - plugins/check_curl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/check_curl.c b/plugins/check_curl.c -index bf46b2261..38c971093 100644 ---- a/plugins/check_curl.c -+++ b/plugins/check_curl.c -@@ -1775,9 +1775,9 @@ process_arguments (int argc, char **argv) - invert_regex = true; - break; - case STATE_REGEX: -- if (!strcmp (optarg, "critical")) -+ if (!strcasecmp (optarg, "critical")) - state_regex = STATE_CRITICAL; -- else if (!strcmp (optarg, "warning")) -+ else if (!strcasecmp (optarg, "warning")) - state_regex = STATE_WARNING; - else usage2 (_("Invalid state-regex option"), optarg); - break; - -From af097aa3642174a2111f0bbcbc8236fff0901e17 Mon Sep 17 00:00:00 2001 -From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> -Date: Mon, 19 Aug 2024 15:33:17 +0200 -Subject: [PATCH 3/3] check_curl: change help for --state-regex again to fix - formatting - ---- - plugins/check_curl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/check_curl.c b/plugins/check_curl.c -index 38c971093..214ba74f9 100644 ---- a/plugins/check_curl.c -+++ b/plugins/check_curl.c -@@ -2062,7 +2062,7 @@ print_help (void) - printf (" %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)")); - printf (" %s\n", _("can be changed with --state--regex)")); - printf (" %s\n", "--state-regex=STATE"); -- printf (" %s\n", _("Return STATE if regex is found, OK if not\nSTATE can be one of \"critical\",\"warning\"")); -+ printf (" %s\n", _("Return STATE if regex is found, OK if not. STATE can be one of \"critical\",\"warning\"")); - printf (" %s\n", "-a, --authorization=AUTH_PAIR"); - printf (" %s\n", _("Username:password on sites with basic authentication")); - printf (" %s\n", "-b, --proxy-authorization=AUTH_PAIR"); diff --git a/debian/patches/16_check_curl_openssl_error b/debian/patches/16_check_curl_openssl_error deleted file mode 100644 index 9b91761..0000000 --- a/debian/patches/16_check_curl_openssl_error +++ /dev/null @@ -1,115 +0,0 @@ -From 528e92c180148703ee2cb90d7291f4edbfc270d4 Mon Sep 17 00:00:00 2001 -From: Sven Nierlein -Date: Wed, 9 Oct 2024 09:50:39 +0200 -Subject: [PATCH] fix check_curl: OpenSSL SSL_read: error:0A000126:SSL - routines::unexpected eof while reading, errno 0 - -using check_curl on a probably embedded device responding as 'Server: GoAhead-Webs' - - %> check_curl -H ... -S -vvv - - > GET / HTTP/1.1 - Host: ... - User-Agent: check_curl/v2.4.0 (monitoring-plugins 2.4.0, libcurl/7.76.1 OpenSSL/3.0.7 zlib/1.2.11 brotli/1.0.9 libidn2/2.3.0 libpsl/0.21.1 (+libidn2/2.3.0) libssh/0.10.4/openssl/zlib nghttp2/1.43.0) - Accept: */* - Connection: close - - * Mark bundle as not supporting multiuse - * HTTP 1.0, assume close after body - < HTTP/1.0 302 Redirect - < Server: GoAhead-Webs - < Date: Tue Mar 26 17:57:16 2019 - < Cache-Control: no-cache, no-store, must-revalidate,private - < Pragma: no-cache - < Expires: 0 - < Content-Type: text/html - < X-Frame-Options: sameorigin - < X-XSS-Protection: 1; mode=block - < X-Content-Type-Options: nosniff - < Location: https://... - < - * OpenSSL SSL_read: error:0A000126:SSL routines::unexpected eof while reading, errno 0 - * Closing connection 0 - -reading the discussion on https://github.com/openssl/openssl/discussions/22690 suggest to set the option SSL_OP_IGNORE_UNEXPECTED_EOF -which makes check_curl behave like check_http at this point. -Since this is a rather new flag, fencing it in ifdefs. -And since there can only be one ssl ctx function, we need to move both tasks into one function. ---- - plugins/check_curl.c | 29 ++++++++++++++++++++++------- - 1 file changed, 22 insertions(+), 7 deletions(-) - -diff --git a/plugins/check_curl.c b/plugins/check_curl.c -index 7f45b5a79..d3bddacd2 100644 ---- a/plugins/check_curl.c -+++ b/plugins/check_curl.c -@@ -214,6 +214,7 @@ char *client_privkey = NULL; - char *ca_cert = NULL; - bool verify_peer_and_host = false; - bool is_openssl_callback = false; -+bool add_sslctx_verify_fun = false; - #if defined(HAVE_SSL) && defined(USE_OPENSSL) - X509 *cert = NULL; - #endif /* defined(HAVE_SSL) && defined(USE_OPENSSL) */ -@@ -299,7 +300,7 @@ main (int argc, char **argv) - - int verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx) - { -- (void) preverify_ok; -+ (void) preverify_ok; - /* TODO: we get all certificates of the chain, so which ones - * should we test? - * TODO: is the last certificate always the server certificate? -@@ -324,9 +325,18 @@ int verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx) - - CURLcode sslctxfun(CURL *curl, SSL_CTX *sslctx, void *parm) - { -- (void) curl; // ignore unused parameter -- (void) parm; // ignore unused parameter -- SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, verify_callback); -+ (void) curl; // ignore unused parameter -+ (void) parm; // ignore unused parameter -+ if(add_sslctx_verify_fun) { -+ SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, verify_callback); -+ } -+ -+ // workaround for issue: -+ // OpenSSL SSL_read: error:0A000126:SSL routines::unexpected eof while reading, errno 0 -+ // see discussion https://github.com/openssl/openssl/discussions/22690 -+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF -+ SSL_CTX_set_options(sslctx, SSL_OP_IGNORE_UNEXPECTED_EOF); -+#endif - - return CURLE_OK; - } -@@ -678,9 +688,8 @@ check_http (void) - * OpenSSL-style libraries only!) */ - #ifdef USE_OPENSSL - /* libcurl and monitoring plugins built with OpenSSL, good */ -- handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION"); -+ add_sslctx_verify_fun = true; - is_openssl_callback = true; --#else /* USE_OPENSSL */ - #endif /* USE_OPENSSL */ - /* libcurl is built with OpenSSL, monitoring plugins, so falling - * back to manually extracting certificate information */ -@@ -713,12 +722,18 @@ check_http (void) - #else /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */ - /* old libcurl, our only hope is OpenSSL, otherwise we are out of luck */ - if (ssl_library == CURLHELP_SSL_LIBRARY_OPENSSL || ssl_library == CURLHELP_SSL_LIBRARY_LIBRESSL) -- handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION"); -+ add_sslctx_verify_fun = true; - else - die (STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (no CURLOPT_SSL_CTX_FUNCTION, no OpenSSL library or libcurl too old and has no CURLOPT_CERTINFO)\n"); - #endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */ - } - -+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 10, 6) /* required for CURLOPT_SSL_CTX_FUNCTION */ -+ // ssl ctx function is not available with all ssl backends -+ if (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, NULL) != CURLE_UNKNOWN_OPTION) -+ handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION"); -+#endif -+ - #endif /* LIBCURL_FEATURE_SSL */ - - /* set default or user-given user agent identification */ diff --git a/debian/patches/17_check_fping_dontfrag_random b/debian/patches/17_check_fping_dontfrag_random deleted file mode 100644 index e62a548..0000000 --- a/debian/patches/17_check_fping_dontfrag_random +++ /dev/null @@ -1,83 +0,0 @@ -From 88d991773b6d8ac416ad2931ea8debc949555c7a Mon Sep 17 00:00:00 2001 -From: William -Date: Wed, 6 Nov 2024 14:00:23 +1000 -Subject: [PATCH] Add dontfrag/random for fping - -Support the dont fragment and randomise packet data options for check_fping ---- - plugins/check_fping.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - ---- a/plugins/check_fping.c -+++ b/plugins/check_fping.c -@@ -7,7 +7,7 @@ - * - * Description: - * --* This file contains the check_disk plugin -+* This file contains the check_fping plugin - * - * This plugin will use the fping command to ping the specified host for a - * fast check -@@ -60,6 +60,8 @@ - int target_timeout = 0; - int packet_interval = 0; - bool verbose = false; -+bool dontfrag = false; -+bool randomize_packet_data = false; - int cpl; - int wpl; - double crta; -@@ -105,6 +107,10 @@ - xasprintf(&option_string, "%s-S %s ", option_string, sourceip); - if (sourceif) - xasprintf(&option_string, "%s-I %s ", option_string, sourceif); -+ if (dontfrag) -+ xasprintf(&option_string, "%s-M ", option_string); -+ if (randomize_packet_data) -+ xasprintf(&option_string, "%s-R ", option_string); - - #ifdef PATH_TO_FPING6 - if (address_family != AF_INET && is_inet6_addr(server)) -@@ -303,6 +309,8 @@ - {"help", no_argument, 0, 'h'}, - {"use-ipv4", no_argument, 0, '4'}, - {"use-ipv6", no_argument, 0, '6'}, -+ {"dontfrag", no_argument, 0, 'M'}, -+ {"random", no_argument, 0, 'R'}, - {0, 0, 0, 0} - }; - -@@ -320,7 +328,7 @@ - } - - while (1) { -- c = getopt_long (argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:46", longopts, &option); -+ c = getopt_long (argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:M:R:46", longopts, &option); - - if (c == -1 || c == EOF || c == 1) - break; -@@ -415,6 +423,12 @@ - else - usage (_("Interval must be a positive integer")); - break; -+ case 'R': -+ randomize_packet_data = true; -+ break; -+ case 'M': -+ dontfrag = true; -+ break; - } - } - -@@ -506,6 +520,10 @@ - printf (" %s\n", _("name or IP Address of sourceip")); - printf (" %s\n", "-I, --sourceif=IF"); - printf (" %s\n", _("source interface name")); -+ printf(" %s\n", "-M, --dontfrag"); -+ printf(" %s\n", _("set the Don't Fragment flag")); -+ printf(" %s\n", "-R, --random"); -+ printf(" %s\n", _("random packet data (to foil link data compression)")); - printf (UT_VERBOSE); - printf ("\n"); - printf (" %s\n", _("THRESHOLD is ,%% where is the round trip average travel time (ms)")); diff --git a/debian/patches/18_check_curl_fix_TLS_notes b/debian/patches/18_check_curl_fix_TLS_notes deleted file mode 100644 index 5de8b45..0000000 --- a/debian/patches/18_check_curl_fix_TLS_notes +++ /dev/null @@ -1,21 +0,0 @@ -From 8de299308c52d083b893a87e6924405b652f1f7b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lorenz=20K=C3=A4stle?= - <12514511+RincewindsHat@users.noreply.github.com> -Date: Wed, 27 Nov 2024 14:22:02 +0100 -Subject: [PATCH] check_curl: update TLS notification notes - ---- - plugins/check_curl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/plugins/check_curl.c -+++ b/plugins/check_curl.c -@@ -2013,7 +2013,7 @@ - printf (" %s\n", _("Connect via SSL. Port defaults to 443. VERSION is optional, and prevents")); - printf (" %s\n", _("auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1,")); - printf (" %s\n", _("1.2 = TLSv1.2, 1.3 = TLSv1.3). With a '+' suffix, newer versions are also accepted.")); -- printf (" %s\n", _("Note: SSLv2 and SSLv3 are deprecated and are usually disabled in libcurl")); -+ printf (" %s\n", _("Note: SSLv2, SSLv3, TLSv1.0 and TLSv1.1 are deprecated and are usually disabled in libcurl")); - printf (" %s\n", "--sni"); - printf (" %s\n", _("Enable SSL/TLS hostname extension support (SNI)")); - #if LIBCURL_VERSION_NUM >= 0x071801 diff --git a/debian/patches/19_check_curl_cookie_handling b/debian/patches/19_check_curl_cookie_handling deleted file mode 100644 index 29f5cce..0000000 --- a/debian/patches/19_check_curl_cookie_handling +++ /dev/null @@ -1,46 +0,0 @@ -From 191d15354ba32a483fd4f8017595c7eb82ee5650 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andre=20Kl=C3=A4rner?= -Date: Fri, 29 Nov 2024 10:34:16 +0100 -Subject: [PATCH] check_curl: enable internal cookie handling - -This enables us to enable curl cookie engine by specifying an empty -filename as the cookie jar file. - -This works, since curl's CURLOPT_COOKIEFILE option allows passing an -empty string as filename, which it interprets as a request to enable the -cookie processing. But since CURLOPT_COOKIEJAR would now attempt to -write to a file named by an empty filename, it would break again (or at -least produce a warning in verbose output). - -Overall this is allows to handle checking URLs with cookie based -sessions without persisting the cookies to disk, by using the -curl-internal redirect following. ---- - plugins/check_curl.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/plugins/check_curl.c -+++ b/plugins/check_curl.c -@@ -831,8 +831,11 @@ - - /* cookie handling */ - if (cookie_jar_file != NULL) { -- handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEJAR, cookie_jar_file), "CURLOPT_COOKIEJAR"); -+ /* enable reading cookies from a file, and if the filename is an empty string, only enable the curl cookie engine */ - handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEFILE, cookie_jar_file), "CURLOPT_COOKIEFILE"); -+ /* now enable saving cookies to a file, but only if the filename is not an empty string, since writing it would fail */ -+ if (*cookie_jar_file) -+ handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_COOKIEJAR, cookie_jar_file), "CURLOPT_COOKIEJAR"); - } - - /* do the request */ -@@ -2111,6 +2114,9 @@ - printf(" %s\n", "--haproxy-protocol"); - printf(" %s\n", _("Send HAProxy proxy protocol v1 header (CURLOPT_HAPROXYPROTOCOL).")); - printf (" %s\n", "--cookie-jar=FILE"); -+ printf (" %s\n", _("Specify an empty string as FILE to enable curl's cookie engine without saving")); -+ printf (" %s\n", _("the cookies to disk. Only enabling the engine without saving to disk requires")); -+ printf (" %s\n", _("handling multiple requests internally to curl, so use it with --onredirect=curl")); - printf (" %s\n", _("Store cookies in the cookie jar and send them out when requested.")); - printf ("\n"); - diff --git a/debian/patches/20_check_icmp_fix_rtmin b/debian/patches/20_check_icmp_fix_rtmin deleted file mode 100644 index 310a93d..0000000 --- a/debian/patches/20_check_icmp_fix_rtmin +++ /dev/null @@ -1,29 +0,0 @@ -From e5f35d40556468fcdebccae847cfc19380952ca0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lorenz=20K=C3=A4stle?= - <12514511+RincewindsHat@users.noreply.github.com> -Date: Wed, 27 Nov 2024 15:29:19 +0100 -Subject: [PATCH] check_icmp: set rtmin initially - ---- - plugins-root/check_icmp.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/plugins-root/check_icmp.c -+++ b/plugins-root/check_icmp.c -@@ -64,6 +64,7 @@ - #include - #include - #include -+#include - - - /** sometimes undefined system macros (quite a few, actually) **/ -@@ -1051,7 +1052,7 @@ - icmp_recv++; - if (tdiff > (unsigned int)host->rtmax) - host->rtmax = tdiff; -- if (tdiff < (unsigned int)host->rtmin) -+ if ((host->rtmin == INFINITY) || (tdiff < (unsigned int)host->rtmin)) - host->rtmin = tdiff; - - if(debug) { diff --git a/debian/patches/21_check_http_state_regex b/debian/patches/21_check_http_state_regex deleted file mode 100644 index 993791e..0000000 --- a/debian/patches/21_check_http_state_regex +++ /dev/null @@ -1,22 +0,0 @@ -From e445a386f8ad1166b05fcdfdb5b9cde4622a8632 Mon Sep 17 00:00:00 2001 -From: Andreas Baumann -Date: Fri, 27 Dec 2024 15:32:24 +0100 -Subject: [PATCH] check_http: fix documentation for --state-regex - ---- - plugins/check_http.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/check_http.c b/plugins/check_http.c -index 97c0e39ad..baff682a7 100644 ---- a/plugins/check_http.c -+++ b/plugins/check_http.c -@@ -1805,7 +1805,7 @@ print_help (void) - printf (" %s\n", "--invert-regex"); - printf (" %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)")); - printf (" %s\n", _("can be changed with --state--regex)")); -- printf (" %s\n", "--regex-state=STATE"); -+ printf (" %s\n", "--state-regex=STATE"); - printf (" %s\n", _("Return STATE if regex is found, OK if not\n")); - - printf (" %s\n", "-a, --authorization=AUTH_PAIR"); diff --git a/debian/patches/22_check_by_ssh_missing_options b/debian/patches/22_check_by_ssh_missing_options deleted file mode 100644 index 33e2873..0000000 --- a/debian/patches/22_check_by_ssh_missing_options +++ /dev/null @@ -1,20 +0,0 @@ -From 02adcbfa896eb726c59ca647eb4cf6909c690f37 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lorenz=20K=C3=A4stle?= - <12514511+RincewindsHat@users.noreply.github.com> -Date: Mon, 24 Feb 2025 20:32:19 +0100 -Subject: [PATCH] check_by_ssh: Remove warning/critical from help - ---- - plugins/check_by_ssh.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/plugins/check_by_ssh.c -+++ b/plugins/check_by_ssh.c -@@ -454,7 +454,6 @@ - printf (" %s\n", _("Tell ssh to use this configfile [optional]")); - printf (" %s\n","-q, --quiet"); - printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]")); -- printf (UT_WARN_CRIT); - printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); - printf (" %s\n","-U, --unknown-timeout"); - printf (" %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL")); diff --git a/debian/patches/23_sslutils_fix_error_message b/debian/patches/23_sslutils_fix_error_message deleted file mode 100644 index c2e5c56..0000000 --- a/debian/patches/23_sslutils_fix_error_message +++ /dev/null @@ -1,23 +0,0 @@ -From ef3045b97eea23a4dec3197277e5ff4e5afc5c71 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andre=20Kl=C3=A4rner?= -Date: Mon, 17 Mar 2025 16:13:46 +0100 -Subject: [PATCH] change error message for missing certificate - -The old error message is quite similar to the openssl `failed to retrieve issuer certificate` and can mislead users to troubleshooting certificate stores. - -The new message should be distinct enough to make it clear to users that this is not a problem raised by the underlying SSL implementation, but a problem inside monitoring-plugins. ---- - plugins/sslutils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/plugins/sslutils.c -+++ b/plugins/sslutils.c -@@ -208,7 +208,7 @@ - time_t tm_t; - - if (!certificate) { -- printf("%s\n",_("CRITICAL - Cannot retrieve server certificate.")); -+ printf("%s\n",_("CRITICAL - No server certificate present to inspect.")); - return STATE_CRITICAL; - } - diff --git a/debian/patches/24_check_http_deprecation b/debian/patches/24_check_http_deprecation deleted file mode 100644 index 117a28c..0000000 --- a/debian/patches/24_check_http_deprecation +++ /dev/null @@ -1,30 +0,0 @@ -From 14169fe5a11b94a9f9ab44336fdb5170ee98be66 Mon Sep 17 00:00:00 2001 -From: Jan Wagner -Date: Sat, 19 Apr 2025 14:37:46 +0200 -Subject: [PATCH] check_http: Adding deprecation text - ---- - plugins/check_http.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/plugins/check_http.c b/plugins/check_http.c -index baff682a7..8e0c15ec9 100644 ---- a/plugins/check_http.c -+++ b/plugins/check_http.c -@@ -1724,6 +1724,16 @@ print_help (void) - printf ("%s\n", _("strings and regular expressions, check connection times, and report on")); - printf ("%s\n", _("certificate expiration times.")); - -+ printf ("\n"); -+ printf ("%s\n", _("ATTENTION!")); -+ printf ("\n"); -+ printf ("%s\n", _("THIS PLUGIN IS DEPRECATED. The functionality was reimplemented by the")); -+ printf ("%s\n", _("check_curl plugin, which can be used as a drop-in replacement. You should")); -+ printf ("%s\n", _("migrate your checks over to check_curl, because check_http is going to be")); -+ printf ("%s\n", _("removed sooner than later. Just replace check_http with check_curl in your")); -+ printf ("%s\n", _("check command definitions.")); -+ printf ("%s\n", _("Report issues to: https://github.com/monitoring-plugins/monitoring-plugins/issues")); -+ - printf ("\n\n"); - - print_usage (); diff --git a/debian/patches/25_check_users_sd_get_uids b/debian/patches/25_check_users_sd_get_uids deleted file mode 100644 index 9f541ed..0000000 --- a/debian/patches/25_check_users_sd_get_uids +++ /dev/null @@ -1,28 +0,0 @@ -From fb39f96ac6f72bb56d17f3e8694134dfea9186e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lorenz=20K=C3=A4stle?= - <12514511+RincewindsHat@users.noreply.github.com> -Date: Mon, 11 Aug 2025 21:49:20 +0200 -Subject: [PATCH] check_users: Use sd_get_uids instead of sd_get_session - -Previously check_users in combination with systemd used -sd_get_sessions (3) to aquire the number of users, probably -with the idea that every users opens a session. -Turns out, that a user can have multiple sessions and we only really -want to know how many users there are. - -This commit changes to sd_get_uids (3) to achieve that target. ---- - plugins/check_users.d/users.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/plugins/check_users.c -+++ b/plugins/check_users.c -@@ -92,7 +92,7 @@ - - #ifdef HAVE_LIBSYSTEMD - if (sd_booted () > 0) -- users = sd_get_sessions (NULL); -+ users = sd_get_uids(NULL); - else { - #endif - #if HAVE_WTSAPI32_H diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 612f11a..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,21 +0,0 @@ -02_check_icmp_links -03_epn -04_lmstat_path -# commited upstream -10_check_curl_fix_redirects -11_check_curl_raise_ssl_issue -12_check_curl_add_docu -13_check_mysql_fix_variables -14_check_curl_remove_experimental_state -15_check_curl_fix_regex -16_check_curl_openssl_error -17_check_fping_dontfrag_random -18_check_curl_fix_TLS_notes -19_check_curl_cookie_handling -20_check_icmp_fix_rtmin -21_check_http_state_regex -22_check_by_ssh_missing_options -23_sslutils_fix_error_message -24_check_http_deprecation -25_check_users_sd_get_uids -# feature patches diff --git a/debian/pluginconfig/apt.cfg b/debian/pluginconfig/apt.cfg deleted file mode 100644 index d3ceb7c..0000000 --- a/debian/pluginconfig/apt.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# 'check_apt' command definition -define command{ - command_name check_apt - command_line /usr/lib/nagios/plugins/check_apt - } - -# 'check_apt_distupgrade' command definition -define command{ - command_name check_apt_distupgrade - command_line /usr/lib/nagios/plugins/check_apt -d - } - diff --git a/debian/pluginconfig/breeze.cfg b/debian/pluginconfig/breeze.cfg deleted file mode 100644 index 2e89650..0000000 --- a/debian/pluginconfig/breeze.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# 'check_breeze' command definition -define command { - command_name check_breeze - command_line /usr/lib/nagios/plugins/check_breeze -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$' -} diff --git a/debian/pluginconfig/curl-http.cfg b/debian/pluginconfig/curl-http.cfg deleted file mode 100644 index d3b967b..0000000 --- a/debian/pluginconfig/curl-http.cfg +++ /dev/null @@ -1,111 +0,0 @@ -# 'check_curl_http' command definition -define command{ - command_name check_curl_http - command_line /usr/lib/nagios/plugins/check_curl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' '$ARG1$' - } - -# 'check_curl_httpname' command definition -define command{ - command_name check_curl_httpname - command_line /usr/lib/nagios/plugins/check_curl -H '$HOSTNAME$' -I '$HOSTADDRESS$' '$ARG1$' - } - -# 'check_curl_http2' command definition -define command{ - command_name check_curl_http2 - command_line /usr/lib/nagios/plugins/check_curl -H '$ARG1$' -I '$HOSTADDRESS$' -w '$ARG2$' -c '$ARG3$' '$ARG4$' - } - -# 'check_curl_squid' command definition -define command{ - command_name check_curl_squid - command_line /usr/lib/nagios/plugins/check_curl -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' - } - -# 'check_curl_https' command definition -define command{ - command_name check_curl_https - command_line /usr/lib/nagios/plugins/check_curl --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' '$ARG1$' - } - -# 'check_curl_https_httpname' command definition -define command{ - command_name check_curl_https_hostname - command_line /usr/lib/nagios/plugins/check_curl --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' '$ARG1$' - } - -# 'check_curl_https_auth' command definition -define command{ - command_name check_curl_https_auth - command_line /usr/lib/nagios/plugins/check_curl --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -a '$ARG1$' '$ARG2$' - } - -# 'check_curl_https_auth_hostname' command definition -define command{ - command_name check_curl_https_auth_hostname - command_line /usr/lib/nagios/plugins/check_curl --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' -a '$ARG1$' '$ARG2$' - } - -# 'check_curl_cups' command definition -define command{ - command_name check_curl_cups - command_line /usr/lib/nagios/plugins/check_curl -I '$HOSTADDRESS$' -p 631 '$ARG1$' - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_curl_http_4' command definition -define command{ - command_name check_curl_http_4 - command_line /usr/lib/nagios/plugins/check_curl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -4 '$ARG1$' - } - -# 'check_curl_httpname_4' command definition -define command{ - command_name check_curl_httpname_4 - command_line /usr/lib/nagios/plugins/check_curl -H '$HOSTNAME$' -I '$HOSTADDRESS$' -4 '$ARG1$' - } - -# 'check_curl_http2_4' command definition -define command{ - command_name check_curl_http2_4 - command_line /usr/lib/nagios/plugins/check_curl -H '$ARG1$' -I '$HOSTADDRESS$' -w '$ARG2$' -c '$ARG3$' -4 '$ARG4$' - } - -# 'check_curl_squid_4' command definition -define command{ - command_name check_curl_squid_4 - command_line /usr/lib/nagios/plugins/check_curl -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' -4 - } - -# 'check_curl_https_4' command definition -define command{ - command_name check_curl_https_4 - command_line /usr/lib/nagios/plugins/check_curl --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -4 '$ARG1$' - } - -# 'check_curls_https_hostname_4' command definition -define command{ - command_name check_curl_https_hostname_4 - command_line /usr/lib/nagios/plugins/check_curl --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' -4 '$ARG1$' - } - -# 'check_curl_https_auth_4' command definition -define command{ - command_name check_curl_https_auth_4 - command_line /usr/lib/nagios/plugins/check_curl --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -a '$ARG1$' -4 '$ARG2$' - } - -# 'check_curl_https_auth_hostname_4' command definition -define command{ - command_name check_curl_https_auth_hostname_4 - command_line /usr/lib/nagios/plugins/check_curl --ssl -H '$HOSTNAME' -I '$HOSTADDRESS$' -a '$ARG1$' -4 '$ARG2$' - } - -# 'check_curl_cups_4' command definition -define command{ - command_name check_curl_cups_4 - command_line /usr/lib/nagios/plugins/check_curl -I '$HOSTADDRESS$' -p 631 -4 '$ARG1$' - } diff --git a/debian/pluginconfig/dhcp.cfg b/debian/pluginconfig/dhcp.cfg deleted file mode 100644 index a6c0c02..0000000 --- a/debian/pluginconfig/dhcp.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# note: these plugins require root privilege. see README.Debian for -# more information on how it is recommended that you do this. - -# 'check_dhcp' command definition -define command{ - command_name check_dhcp - command_line /usr/lib/nagios/plugins/check_dhcp -s '$HOSTADDRESS$' '$ARG1$' - } - -# 'check_dhcp_interface' command definition -define command{ - command_name check_dhcp_interface - command_line /usr/lib/nagios/plugins/check_dhcp -s '$HOSTADDRESS$' -i '$ARG1$' '$ARG2$' - } - diff --git a/debian/pluginconfig/disk-smb.cfg b/debian/pluginconfig/disk-smb.cfg deleted file mode 100644 index d3cee35..0000000 --- a/debian/pluginconfig/disk-smb.cfg +++ /dev/null @@ -1,54 +0,0 @@ -# 'check_disk_smb' command definition -define command{ - command_name check_disk_smb - command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' - } - - -# 'check_disk_smb_workgroup' command definition -define command{ - command_name check_disk_smb_workgroup - command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' - } - - -# 'check_disk_smb_host' command definition -define command{ - command_name check_disk_smb_host - command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' - } - - -# 'check_disk_smb_workgroup_host' command definition -define command{ - command_name check_disk_smb_workgroup_host - command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' - } - - -# 'check_disk_smb_user' command definition -define command{ - command_name check_disk_smb_user - command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$' -w '$ARG5$' -c '$ARG6$' - } - - -# 'check_disk_smb_workgroup_user' command definition -define command{ - command_name check_disk_smb_workgroup_user - command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' -u '$ARG4$' -p '$ARG5$' - } - - -# 'check_disk_smb_host_user' command definition -define command{ - command_name check_disk_smb_host_user - command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$' - } - - -# 'check_disk_smb_workgroup_host_user' command definition -define command{ - command_name check_disk_smb_workgroup_host_user - command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' -u '$ARG4$' -p '$ARG5$' - } diff --git a/debian/pluginconfig/disk.cfg b/debian/pluginconfig/disk.cfg deleted file mode 100644 index 3f5fcaf..0000000 --- a/debian/pluginconfig/disk.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 'check_disk' command definition -define command{ - command_name check_disk - command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -e -p '$ARG3$' - } - -# 'check_all_disks' command definition -define command{ - command_name check_all_disks - command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -e - } - -# 'ssh_disk' command definition -define command{ - command_name ssh_disk - command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C "/usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -e -p '$ARG3$'" - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'ssh_disk_4' command definition -define command{ - command_name ssh_disk_4 - command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C "/usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -e -p '$ARG3$'" -4 - } diff --git a/debian/pluginconfig/dns.cfg b/debian/pluginconfig/dns.cfg deleted file mode 100644 index d2363bf..0000000 --- a/debian/pluginconfig/dns.cfg +++ /dev/null @@ -1,11 +0,0 @@ -# 'check_dns' command definition -define command{ - command_name check_dns - command_line /usr/lib/nagios/plugins/check_dns -H www.google.com -s '$HOSTADDRESS$' '$ARG1$' -} - -# 'check_dig' command definition -define command{ - command_name check_dig - command_line /usr/lib/nagios/plugins/check_dig -H '$HOSTADDRESS$' -l '$ARG1$' '$ARG2$' -} diff --git a/debian/pluginconfig/dummy.cfg b/debian/pluginconfig/dummy.cfg deleted file mode 100644 index bfb7ef4..0000000 --- a/debian/pluginconfig/dummy.cfg +++ /dev/null @@ -1,29 +0,0 @@ -# return-ok definition -define command { - command_name return-ok - command_line /usr/lib/nagios/plugins/check_dummy 0 -} - -# return-warning definition -define command { - command_name return-warning - command_line /usr/lib/nagios/plugins/check_dummy 1 -} - -# return-critical definition -define command { - command_name return-critical - command_line /usr/lib/nagios/plugins/check_dummy 2 -} - -# return-unknown definition -define command { - command_name return-unknown - command_line /usr/lib/nagios/plugins/check_dummy 3 -} - -# return-numeric definition -define command { - command_name return-numeric - command_line /usr/lib/nagios/plugins/check_dummy '$ARG1$' -} diff --git a/debian/pluginconfig/flexlm.cfg b/debian/pluginconfig/flexlm.cfg deleted file mode 100644 index 678f044..0000000 --- a/debian/pluginconfig/flexlm.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# 'check_flexlm' command definition -define command{ - command_name check_flexlm - command_line /usr/lib/nagios/plugins/check_flexlm -F '$ARG1$' - } - diff --git a/debian/pluginconfig/fping.cfg b/debian/pluginconfig/fping.cfg deleted file mode 100644 index bf3baf6..0000000 --- a/debian/pluginconfig/fping.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# 'check-fast-alive' command definition -define command{ - command_name check-fast-alive - command_line /usr/lib/nagios/plugins/check_fping -H '$HOSTADDRESS$' - } diff --git a/debian/pluginconfig/ftp.cfg b/debian/pluginconfig/ftp.cfg deleted file mode 100644 index 79bf2fd..0000000 --- a/debian/pluginconfig/ftp.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# 'check_ftp' command definition -define command{ - command_name check_ftp - command_line /usr/lib/nagios/plugins/check_ftp -H '$HOSTADDRESS$' '$ARG1$' - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_ftp_4' command definition -define command{ - command_name check_ftp_4 - command_line /usr/lib/nagios/plugins/check_ftp -H '$HOSTADDRESS$' -4 '$ARG1$' - } diff --git a/debian/pluginconfig/games.cfg b/debian/pluginconfig/games.cfg deleted file mode 100644 index 0ada476..0000000 --- a/debian/pluginconfig/games.cfg +++ /dev/null @@ -1,14 +0,0 @@ -# 'check_quake' command definition -define command{ - command_name check_quake - command_line /usr/lib/nagios/plugins/check_game qs '$HOSTADDRESS$' - } - - -# 'check_unreal' command definition -define command{ - command_name check_unreal - command_line /usr/lib/nagios/plugins/check_game uns '$HOSTADDRESS$' -P '$ARG1$' -p 8 - } - - diff --git a/debian/pluginconfig/hppjd.cfg b/debian/pluginconfig/hppjd.cfg deleted file mode 100644 index cb15b5b..0000000 --- a/debian/pluginconfig/hppjd.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# 'check_hpjd' command definition -define command{ - command_name check_hpjd - command_line /usr/lib/nagios/plugins/check_hpjd -H '$HOSTADDRESS$' -C public - } - diff --git a/debian/pluginconfig/http.cfg b/debian/pluginconfig/http.cfg deleted file mode 100644 index 8e67496..0000000 --- a/debian/pluginconfig/http.cfg +++ /dev/null @@ -1,111 +0,0 @@ -# 'check_http' command definition -define command{ - command_name check_http - command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' '$ARG1$' - } - -# 'check_http_hostname' command definition -define command{ - command_name check_http_hostname - command_line /usr/lib/nagios/plugins/check_http -H '$HOSTNAME$' -I '$HOSTADDRESS$' '$ARG1$' - } - -# 'check_http2' command definition -define command{ - command_name check_http2 - command_line /usr/lib/nagios/plugins/check_http -H '$ARG1$' -I '$HOSTADDRESS$' -w '$ARG2$' -c '$ARG3$' '$ARG4$' - } - -# 'check_squid' command definition -define command{ - command_name check_squid - command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' - } - -# 'check_https' command definition -define command{ - command_name check_https - command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' '$ARG1$' - } - -# 'check_https_hostname' command definition -define command{ - command_name check_https_hostname - command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' '$ARG1$' - } - -# 'check_https_auth' command definition -define command{ - command_name check_https_auth - command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -a '$ARG1$' '$ARG2$' - } - -# 'check_https_auth_hostname' command definition -define command{ - command_name check_https_auth_hostname - command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' -a '$ARG1$' '$ARG2$' - } - -# 'check_cups' command definition -define command{ - command_name check_cups - command_line /usr/lib/nagios/plugins/check_http -I '$HOSTADDRESS$' -p 631 '$ARG1$' - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_http_4' command definition -define command{ - command_name check_http_4 - command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -4 '$ARG1$' - } - -# 'check_http_hostname_4' command definition -define command{ - command_name check_http_hostname_4 - command_line /usr/lib/nagios/plugins/check_http -H '$HOSTNAME$' -I '$HOSTADDRESS$' -4 '$ARG1$' - } - -# 'check_http2_4' command definition -define command{ - command_name check_http2_4 - command_line /usr/lib/nagios/plugins/check_http -H '$ARG1$' -I '$HOSTADDRESS$' -w '$ARG2$' -c '$ARG3$' -4 '$ARG4$' - } - -# 'check_squid_4' command definition -define command{ - command_name check_squid_4 - command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' -4 - } - -# 'check_https_4' command definition -define command{ - command_name check_https_4 - command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -4 '$ARG1$' - } - -# 'check_https_hostname_4' command definition -define command{ - command_name check_https_hostname_4 - command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' -4 '$ARG1$' - } - -# 'check_https_auth_4' command definition -define command{ - command_name check_https_auth_4 - command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -a '$ARG1$' -4 '$ARG2$' - } - -# 'check_https_auth_hostname_4' command definition -define command{ - command_name check_https_auth_hostname_4 - command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME' -I '$HOSTADDRESS$' -a '$ARG1$' -4 '$ARG2$' - } - -# 'check_cups_4' command definition -define command{ - command_name check_cups_4 - command_line /usr/lib/nagios/plugins/check_http -I '$HOSTADDRESS$' -p 631 -4 '$ARG1$' - } diff --git a/debian/pluginconfig/ifstatus.cfg b/debian/pluginconfig/ifstatus.cfg deleted file mode 100644 index e3fb54a..0000000 --- a/debian/pluginconfig/ifstatus.cfg +++ /dev/null @@ -1,23 +0,0 @@ -# 'check_ifstatus' command definition -define command{ - command_name check_ifstatus - command_line /usr/lib/nagios/plugins/check_ifstatus -H '$HOSTADDRESS$' -C '$ARG1$' - } - -# 'check_ifstatus_exclude' command definition -define command{ - command_name check_ifstatus_exclude - command_line /usr/lib/nagios/plugins/check_ifstatus -H '$HOSTADDRESS$' -C '$ARG1$' -x '$ARG2$' - } - -# 'check_ifoperstatus_ifindex' command definition -define command{ - command_name check_ifoperstatus_ifindex - command_line /usr/lib/nagios/plugins/check_ifoperstatus -H '$HOSTADDRESS$' -C '$ARG1$' -k '$ARG2$' - } - -# 'check_ifoperstatus_ifdescr' command definition -define command{ - command_name check_ifoperstatus_ifdescr - command_line /usr/lib/nagios/plugins/check_ifoperstatus -H '$HOSTADDRESS$' -C '$ARG1$' -d '$ARG2$' - } diff --git a/debian/pluginconfig/jabber.cfg b/debian/pluginconfig/jabber.cfg deleted file mode 100644 index 7caa29d..0000000 --- a/debian/pluginconfig/jabber.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# 'check_jabber_4' command definition -define command{ - command_name check_jabber_4 - command_line /usr/lib/nagios/plugins/check_jabber -4 -H $HOSTADDRESS$ '$ARG1$' - } - -# 'check_jabber' command definition -define command{ - command_name check_jabber - command_line /usr/lib/nagios/plugins/check_jabber -H $HOSTADDRESS$ '$ARG1$' - } - diff --git a/debian/pluginconfig/ldap.cfg b/debian/pluginconfig/ldap.cfg deleted file mode 100644 index ae5bde3..0000000 --- a/debian/pluginconfig/ldap.cfg +++ /dev/null @@ -1,31 +0,0 @@ -# 'check_ldap' command definition -define command{ - command_name check_ldap - command_line /usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -b '$ARG1$' - } - -# 'check_ldaps' command definition -# This was using 'check_ldaps' in the past which used port 389 and starttls -# mechanism on default, keeped for backward compatibility -define command{ - command_name check_ldaps - command_line /usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -T -b '$ARG1$' - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_ldap_4' command definition -define command{ - command_name check_ldap_4 - command_line /usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -b '$ARG1$' -4 - } - -# 'check_ldaps_4' command definition -# This was using 'check_ldaps' in the past which used port 389 and starttls -# mechanism on default, keeped for backward compatibility -define command{ - command_name check_ldaps_4 - command_line /usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -T -b '$ARG1$' -4 - } diff --git a/debian/pluginconfig/load.cfg b/debian/pluginconfig/load.cfg deleted file mode 100644 index c87efde..0000000 --- a/debian/pluginconfig/load.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# 'check_load' command definition -define command{ - command_name check_load - command_line /usr/lib/nagios/plugins/check_load --warning='$ARG1$,$ARG2$,$ARG3$' --critical='$ARG4$,$ARG5$,$ARG6$' - } - diff --git a/debian/pluginconfig/mail.cfg b/debian/pluginconfig/mail.cfg deleted file mode 100644 index 1da8050..0000000 --- a/debian/pluginconfig/mail.cfg +++ /dev/null @@ -1,77 +0,0 @@ -# 'check_pop' command definition -define command { - command_name check_pop - command_line /usr/lib/nagios/plugins/check_pop -H '$HOSTADDRESS$' '$ARG1$' -} - - -# 'check_smtp' command definition -define command { - command_name check_smtp - command_line /usr/lib/nagios/plugins/check_smtp -H '$HOSTADDRESS$' '$ARG1$' -} - -# 'check_ssmtp' command definition -define command { - command_name check_ssmtp - command_line /usr/lib/nagios/plugins/check_ssmtp -H '$HOSTADDRESS$' '$ARG1$' -} - -# 'check_imap' command definition -define command { - command_name check_imap - command_line /usr/lib/nagios/plugins/check_imap -H '$HOSTADDRESS$' '$ARG1$' -} - -# 'check_spop' command definition -define command { - command_name check_spop - command_line /usr/lib/nagios/plugins/check_pop -p 995 -H '$HOSTADDRESS$' -S '$ARG1$' -} - - -# 'check_simap' command definition -define command { - command_name check_simap - command_line /usr/lib/nagios/plugins/check_imap -p 993 -H '$HOSTADDRESS$' -S '$ARG1$' -} - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_pop_4' command definition -define command { - command_name check_pop_4 - command_line /usr/lib/nagios/plugins/check_pop -H '$HOSTADDRESS$' -4 '$ARG1$' -} - -# 'check_smtp_4' command definition -define command { - command_name check_smtp_4 - command_line /usr/lib/nagios/plugins/check_smtp -H '$HOSTADDRESS$' -4 '$ARG1$' -} - -# 'check_ssmtp_4' command definition -define command { - command_name check_ssmtp_4 - command_line /usr/lib/nagios/plugins/check_ssmtp -H '$HOSTADDRESS$' -4 '$ARG1$' -} - -# 'check_imap_4' command definition -define command { - command_name check_imap_4 - command_line /usr/lib/nagios/plugins/check_imap -H '$HOSTADDRESS$' -4 '$ARG1$' -} - -# 'check_spop_4' command definition -define command { - command_name check_spop_4 - command_line /usr/lib/nagios/plugins/check_pop -p 995 -H '$HOSTADDRESS$' -S -4 '$ARG1$' -} - -# 'check_simap_4' command definition -define command { - command_name check_simap_4 - command_line /usr/lib/nagios/plugins/check_imap -p 993 -H '$HOSTADDRESS$' -S -4 '$ARG1$' -} diff --git a/debian/pluginconfig/mailq.cfg b/debian/pluginconfig/mailq.cfg deleted file mode 100644 index 9fb4486..0000000 --- a/debian/pluginconfig/mailq.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# 'check-mailq' for sendmail -define command { - command_name check_mailq_sendmail - command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M sendmail -} - -# 'check-mailq' for postfix -define command { - command_name check_mailq_postfix - command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M postfix -} - -# 'check-mailq' for exim -define command { - command_name check_mailq_exim - command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M exim -} - -# 'check-mailq' for qmail -define command { - command_name check_mailq_qmail - command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M qmail -} - diff --git a/debian/pluginconfig/mrtg.cfg b/debian/pluginconfig/mrtg.cfg deleted file mode 100644 index 9a4c626..0000000 --- a/debian/pluginconfig/mrtg.cfg +++ /dev/null @@ -1,14 +0,0 @@ -# 'check_mrtg' command definition -define command{ - command_name check_mrtg - command_line /usr/lib/nagios/plugins/check_mrtg '$ARG1$' 10 AVG '$ARG2$' '$ARG3$' '$ARG4$' '$ARG5$' '$ARG6$' - } - - -# 'traffic_average' command definition -define command{ - command_name traffic_average - command_line /usr/lib/nagios/plugins/check_mrtgtraf '$ARG1$' 10 AVG '$ARG2$' '$ARG3$' '$ARG4$' '$ARG5$' - } - - diff --git a/debian/pluginconfig/mysql.cfg b/debian/pluginconfig/mysql.cfg deleted file mode 100644 index e8c8a65..0000000 --- a/debian/pluginconfig/mysql.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# 'check_mysql' command definition -define command{ - command_name check_mysql - command_line /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$' '$ARG1$' -} - -# 'check_mysql_cmdlinecred' command definition -define command{ - command_name check_mysql_cmdlinecred - command_line /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$' -u '$ARG1$' -p '$ARG2$' '$ARG3$' -} - -# 'check_mysql_database' command definition -define command{ - command_name check_mysql_database - command_line /usr/lib/nagios/plugins/check_mysql -d '$ARG3$' -H '$HOSTADDRESS$' -u '$ARG1$' -p '$ARG2$' '$ARG3$' -} - -# 'check_mysql_slave' command definition -define command{ - command_name check_mysql_slave - command_line /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$' -u '$ARG1$' -p '$ARG2$' -S '$ARG3$' -} - diff --git a/debian/pluginconfig/netware.cfg b/debian/pluginconfig/netware.cfg deleted file mode 100644 index bc5f9d7..0000000 --- a/debian/pluginconfig/netware.cfg +++ /dev/null @@ -1,84 +0,0 @@ -# 'check_netware_logins' command definition -define command{ - command_name check_netware_logins - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOGINS" -w '$ARG1$' -c '$ARG2$' - } - - -# 'check_nwstat_conns' command definition -define command{ - command_name check_nwstat_conns - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v CONNS -w '$ARG1$' -c '$ARG2$' - } - - -# 'check_netware_1load' command definition -define command{ - command_name check_netware_1load - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD1" -w 70 -c 90 - } - - -# 'check_netware_5load' command definition -define command{ - command_name check_netware_5load - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD5" -w 70 -c 90 - } - - -# 'check_netware_15load' command definition -define command{ - command_name check_netware_15load - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD15" -w 70 -c 90 - } - - -# 'check_nwstat_vol_p' command definition -define command{ - command_name check_nwstat_vol_p - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v VPF'$ARG1$' -w '$ARG2$' -c '$ARG3$' - } - - -# 'check_nwstat_vol_k' command definition -define command{ - command_name check_nwstat_vol_k - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v VKF'$ARG1$' -w '$ARG2$' -c '$ARG3$' - } - - -# 'check_nwstat_ltch' command definition -define command{ - command_name check_nwstat_ltch - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v LTCH -w '$ARG1$' -c '$ARG2$' - } - - -# 'check_nwstat_puprb' command definition -define command{ - command_name check_nwstat_puprb - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v PUPRB -w '$ARG1$' -c '$ARG2$' - } - - -# 'check_nwstat_dsdb' command definition -define command{ - command_name check_nwstat_dsdb - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v DSDB - } - - -# 'check_netware_abend' command definition -define command{ - command_name check_netware_abend - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "ABENDS" -w 10 -c 30 - } - - -# 'check_nwstat_csprocs' command definition -define command{ - command_name check_nwstat_csprocs - command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v CSPROCS -w '$ARG1$' -c '$ARG2$' - } - - diff --git a/debian/pluginconfig/news.cfg b/debian/pluginconfig/news.cfg deleted file mode 100644 index 065b395..0000000 --- a/debian/pluginconfig/news.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# 'check_nntp' command definition -define command{ - command_name check_nntp - command_line /usr/lib/nagios/plugins/check_nntp -H '$HOSTADDRESS$' '$ARG1$' - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_nntp_4' command definition -define command{ - command_name check_nntp_4 - command_line /usr/lib/nagios/plugins/check_nntp -H '$HOSTADDRESS$' -4 '$ARG1$' - } diff --git a/debian/pluginconfig/nt.cfg b/debian/pluginconfig/nt.cfg deleted file mode 100644 index c01000c..0000000 --- a/debian/pluginconfig/nt.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# If you are confused about this command definition, cause you was -# reading other suggestions, please have a look into -# /usr/share/doc/monitoring-plugins/README.Debian - -# 'check_nt' command definition -define command { - command_name check_nt - command_line /usr/lib/nagios/plugins/check_nt -H '$HOSTADDRESS$' -v '$ARG1$' -} - -# 'check_nscp' command definition -define command { - command_name check_nscp - command_line /usr/lib/nagios/plugins/check_nt -H '$HOSTADDRESS$' -p 12489 -v '$ARG1$' -} diff --git a/debian/pluginconfig/ntp.cfg b/debian/pluginconfig/ntp.cfg deleted file mode 100644 index 8668718..0000000 --- a/debian/pluginconfig/ntp.cfg +++ /dev/null @@ -1,17 +0,0 @@ -# 'check_ntp' command definition -define command{ - command_name check_ntp - command_line /usr/lib/nagios/plugins/check_ntp_peer -H '$HOSTADDRESS$' '$ARG1$' - } - -# 'check_ntp_ntpq' command definition -define command{ - command_name check_ntp_ntpq - command_line /usr/lib/nagios/plugins/check_ntp_peer -H '$HOSTADDRESS$' -j 10 -k 15 '$ARG1$' - } - -# 'check_time' command definition -define command{ - command_name check_time - command_line /usr/lib/nagios/plugins/check_time -H '$HOSTADDRESS$' '$ARG1$' - } diff --git a/debian/pluginconfig/pgsql.cfg b/debian/pluginconfig/pgsql.cfg deleted file mode 100644 index 5c7f87c..0000000 --- a/debian/pluginconfig/pgsql.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# 'check_pgsql' command definition -define command{ - command_name check_pgsql - command_line /usr/lib/nagios/plugins/check_pgsql -H '$HOSTADDRESS$' '$ARG1$' - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_pgsql_4' command definition -define command{ - command_name check_pgsql_4 - command_line /usr/lib/nagios/plugins/check_pgsql -H '$HOSTADDRESS$' -4 '$ARG1$' - } diff --git a/debian/pluginconfig/ping.cfg b/debian/pluginconfig/ping.cfg deleted file mode 100644 index 4d76cab..0000000 --- a/debian/pluginconfig/ping.cfg +++ /dev/null @@ -1,72 +0,0 @@ -# 'check_ping' command definition -define command{ - command_name check_ping - command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$' - } - - -# 'check-host-alive' command definition -define command{ - command_name check-host-alive - command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 - } - - -# 'check-printer-alive' command definition -define command{ - command_name check-printer-alive - command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 - } - - -# 'check-switch-alive' command definition -define command{ - command_name check-switch-alive - command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 - } - - -# 'check-router-alive' command definition -define command{ - command_name check-router-alive - command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_ping_4' command definition -define command{ - command_name check_ping_4 - command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$' -4 - } - - -# 'check-host-alive_4' command definition -define command{ - command_name check-host-alive_4 - command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4 - } - - -# 'check-printer-alive_4' command definition -define command{ - command_name check-printer-alive_4 - command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4 - } - - -# 'check-switch-alive_4' command definition -define command{ - command_name check-switch-alive_4 - command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4 - } - - -# 'check-router-alive_4' command definition -define command{ - command_name check-router-alive_4 - command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4 - } - diff --git a/debian/pluginconfig/procs.cfg b/debian/pluginconfig/procs.cfg deleted file mode 100644 index 47158e4..0000000 --- a/debian/pluginconfig/procs.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# 'check_procs' command definition -define command{ - command_name check_procs - command_line /usr/lib/nagios/plugins/check_procs -w '$ARG1$' -c '$ARG2$' - } - - -# 'check_procs_zombie' command definition -define command{ - command_name check_procs_zombie - command_line /usr/lib/nagios/plugins/check_procs -w '$ARG1$' -c '$ARG2$' -s Z - } - - -# 'check_procs_httpd' command definition -define command{ - command_name check_procs_httpd - command_line /usr/lib/nagios/plugins/check_procs -w 5:'$ARG1$' -c 1:'$ARG2$' -C httpd - } - diff --git a/debian/pluginconfig/radius.cfg b/debian/pluginconfig/radius.cfg deleted file mode 100644 index 92c3679..0000000 --- a/debian/pluginconfig/radius.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# 'check_radius' command definition -define command{ - command_name check_radius - command_line /usr/lib/nagios/plugins/check_radius -F /etc/radcli/radiusclient.conf -H '$HOSTADDRESS$' -P '$ARG4$' -t '$ARG3$' -u '$ARG1$' -p '$ARG2$' - } - diff --git a/debian/pluginconfig/real.cfg b/debian/pluginconfig/real.cfg deleted file mode 100644 index 3afb59c..0000000 --- a/debian/pluginconfig/real.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# 'check_real_url' command definition -define command{ - command_name check_real_url - command_line /usr/lib/nagios/plugins/check_real '$HOSTADDRESS$' -p '$ARG1$' -wt '$ARG2$' -ct '$ARG3$' -to 5 -u '$ARG4$' - } - - -# 'check_real' command definition -define command{ - command_name check_real - command_line /usr/lib/nagios/plugins/check_real '$HOSTADDRESS$' -p '$ARG1$' -wt '$ARG2$' -ct '$ARG3$' -to 5 - } - diff --git a/debian/pluginconfig/rpc-nfs.cfg b/debian/pluginconfig/rpc-nfs.cfg deleted file mode 100644 index 0a551f4..0000000 --- a/debian/pluginconfig/rpc-nfs.cfg +++ /dev/null @@ -1,14 +0,0 @@ - -# 'check-rpc' command definition -define command{ - command_name check-rpc - command_line /usr/lib/nagios/plugins/check_rpc -H '$HOSTADDRESS$' -C '$ARG1$' - } - - -# 'check-nfs' command definition -define command{ - command_name check-nfs - command_line /usr/lib/nagios/plugins/check_rpc -H '$HOSTADDRESS$' -C nfs -c2,3 - } - diff --git a/debian/pluginconfig/snmp.cfg b/debian/pluginconfig/snmp.cfg deleted file mode 100644 index 21442ed..0000000 --- a/debian/pluginconfig/snmp.cfg +++ /dev/null @@ -1,132 +0,0 @@ -# 'snmp_load' command definition -define command{ - command_name snmp_load - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.10.1.5.1,.1.3.6.1.4.1.2021.10.1.5.2,.1.3.6.1.4.1.2021.10.1.5.3 -w :'$ARG2$',:'$ARG3$',:'$ARG4$' -c :'$ARG5$',:'$ARG6$',:'$ARG7$' -l load - } - - -# 'snmp_cpustats' command definition -define command{ - command_name snmp_cpustats - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.11.9.0,.1.3.6.1.4.1.2021.11.10.0,.1.3.6.1.4.1.2021.11.11.0 -l 'CPU usage (user system idle)' -u '%' - } - - -# 'snmp_procname' command definition -define command{ - command_name snmp_procname - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.2.1.5.'$ARG2$' -w '$ARG3$':'$ARG4$' -c '$ARG5$':'$ARG6$' - } - - -# 'snmp_disk' command definition -define command{ - command_name snmp_disk - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.9.1.7.'$ARG2$',.1.3.6.1.4.1.2021.9.1.9.'$ARG2$' -w '$ARG3$':,:'$ARG4$' -c '$ARG5$':,:'$ARG6$' -u 'kB free (','% used)' -l 'disk space' - } - - -# 'snmp_mem' command definition -define command{ - command_name snmp_mem - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.4.6.0,.1.3.6.1.4.1.2021.4.5.0 -w '$ARG2$': -c '$ARG3$': - } - - -# 'snmp_swap' command definition -define command{ - command_name snmp_swap - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.4.4.0,.1.3.6.1.4.1.2021.4.3.0 -w '$ARG2$': -c '$ARG3$': - } - - -# 'snmp_procs' command definition -define command{ - command_name snmp_procs - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemProcesses -w :'$ARG2$' -c :'$ARG3$' -l processes - } - - -# 'snmp_users' command definition -define command{ - command_name snmp_users - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemNumUsers.0 -w :'$ARG2$' -c :'$ARG3$' -l users - } - - -# 'snmp_mem2' command definition -define command{ - command_name snmp_mem2 - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$' - } - - -# 'snmp_swap2' command definition -define command{ - command_name snmp_swap2 - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$' - } - - -# 'snmp_mem3' command definition -define command{ - command_name snmp_mem3 - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$' - } - - -# 'snmp_swap3' command definition -define command{ - command_name snmp_swap3 - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$' - } - - -# 'snmp_disk2' command definition -define command{ - command_name snmp_disk2 - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$' -w '$ARG3$' -c '$ARG4$' - } - - -# 'snmp_tcpopen' command definition -define command{ - command_name snmp_tcpopen - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o tcp.tcpCurrEstab.0 -w '$ARG2$' -c '$ARG3$' - } - - -# 'snmp_tcpstats' command definition -define command{ - command_name snmp_tcpstats - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o tcp.tcpActiveOpens.0,tcp.tcpPassiveOpens.0,tcp.tcpInSegs.0,tcp.tcpOutSegs.0,tcp.tcpRetransSegs.0 -l 'TCP stats' - } - - -# 'check_netapp_uptime' command definition -define command{ - command_name check_netapp_uptime - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.2.1.1.3.0 --delimiter=')' -l "Uptime is" - } - - -# 'check_netapp_cpuload' command definition -define command{ - command_name check_netapp_cpuload - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.789.1.2.1.3.0 -w 90 -c 95 -u '%' -l "CPU LOAD " - } - - -# 'check_netapp_numdisks' command definition -define command{ - command_name check_netapp_numdisks - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.789.1.6.4.1.0,.1.3.6.1.4.1.789.1.6.4.2.0,.1.3.6.1.4.1.789.1.6.4.8.0,.1.3.6.1.4.1.789.1.6.4.7.0 -u 'Total Disks','Active','Spare','Failed' -l "" - } - - -# 'check_compaq_thermalCondition' command definition -define command{ - command_name check_compaq_thermalCondition - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.232.6.2.1.0,.1.3.6.1.4.1.232.6.2.2.0,.1.3.6.1.4.1.232.6.2.3.0,.1.3.6.1.4.1.232.6.2.4.0 -u 'ThermalCondition','ThermalTemp','ThermalSystem','ThermalCPUFan' -w 2:2,2:2,2:2,2:2 -c 1:2,1:2,1:2,1:2 -l "Thermal status " - } - diff --git a/debian/pluginconfig/ssh.cfg b/debian/pluginconfig/ssh.cfg deleted file mode 100644 index 29a6d17..0000000 --- a/debian/pluginconfig/ssh.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 'check_ssh' command definition -define command{ - command_name check_ssh - command_line /usr/lib/nagios/plugins/check_ssh '$HOSTADDRESS$' - } - -# 'check_ssh_port' command definition -define command{ - command_name check_ssh_port - command_line /usr/lib/nagios/plugins/check_ssh -p '$ARG1$' '$HOSTADDRESS$' - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_ssh_4' command definition -define command{ - command_name check_ssh_4 - command_line /usr/lib/nagios/plugins/check_ssh -4 '$HOSTADDRESS$' - } - -# 'check_ssh_port_4' command definition -define command{ - command_name check_ssh_port_4 - command_line /usr/lib/nagios/plugins/check_ssh -4 -p '$ARG1$' '$HOSTADDRESS$' - } diff --git a/debian/pluginconfig/tcp_udp.cfg b/debian/pluginconfig/tcp_udp.cfg deleted file mode 100644 index 140e84c..0000000 --- a/debian/pluginconfig/tcp_udp.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 'check_tcp' command definition -define command{ - command_name check_tcp - command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p '$ARG1$' '$ARG2$' - } - -# 'check_udp' command definition -define command{ - command_name check_udp - command_line /usr/lib/nagios/plugins/check_udp -H '$HOSTADDRESS$' -p '$ARG1$' '$ARG2$' - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_tcp_4' command definition -define command{ - command_name check_tcp_4 - command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p '$ARG1$' -4 '$ARG2$' - } - -# 'check_udp_4' command definition -define command{ - command_name check_udp_4 - command_line /usr/lib/nagios/plugins/check_udp -H '$HOSTADDRESS$' -p '$ARG1$' -4 '$ARG2$' - } diff --git a/debian/pluginconfig/telnet.cfg b/debian/pluginconfig/telnet.cfg deleted file mode 100644 index a87f842..0000000 --- a/debian/pluginconfig/telnet.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# 'check_telnet' command definition -define command{ - command_name check_telnet - command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p 23 '$ARG1$' - } - -#### -# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems -#### - -# 'check_telnet_4' command definition -define command{ - command_name check_telnet_4 - command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p 23 -4 '$ARG1$' - } diff --git a/debian/pluginconfig/users.cfg b/debian/pluginconfig/users.cfg deleted file mode 100644 index 614a622..0000000 --- a/debian/pluginconfig/users.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# 'check_users' command definition -define command{ - command_name check_users - command_line /usr/lib/nagios/plugins/check_users -w '$ARG1$' -c '$ARG2$' - } - diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 1dc8dd9..0000000 --- a/debian/rules +++ /dev/null @@ -1,236 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - -# for hardening -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk - -PACKAGE = monitoring-plugins - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -include /usr/share/dpkg/architecture.mk - -DEBIANDIR=$(CURDIR)/debian -NP_LIBEXEC:=/usr/lib/nagios/plugins -NP_COMMON_DIR:=$(DEBIANDIR)/monitoring-plugins-common -NP_BASIC_DIR:=$(DEBIANDIR)/monitoring-plugins-basic -NP_BASIC_TEMPLATES:=$(NP_BASIC_DIR)/usr/share/monitoring-plugins/templates-basic -NP_STD_DIR:=$(DEBIANDIR)/monitoring-plugins-standard -NP_STD_TEMPLATES:=$(NP_STD_DIR)/usr/share/monitoring-plugins/templates-standard - -std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \ - check_rpc check_snmp check_wave check_fping check_game \ - check_radius check_mysql check_mysql_query check_pgsql \ - check_disk_smb check_ldap check_ldaps \ - check_mailq \ - check_dns check_dig check_flexlm check_oracle \ - check_dbi - -common_files:=negate urlize utils.pm utils.sh - -basic_plugin_cfgs:=apt dhcp disk dummy ftp http curl-http load mail news ntp ping procs \ - real ssh tcp_udp telnet users -std_plugin_cfgs:=breeze disk-smb dns flexlm fping games hppjd ifstatus ldap \ - mailq mrtg mysql netware nt pgsql radius rpc-nfs snmp - -PATH = /bin:/sbin:/usr/bin:/usr/sbin - - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -ifeq ($(DEB_HOST_ARCH_OS),linux) -PING_CONFIGURE_ARGS = --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" \ - --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" -else -PING_CONFIGURE_ARGS = --with-ping-command="/bin/ping -n -w %d -c %d %s" \ - --with-ping6-command="/bin/ping6 -n -w %d -c %d %s" -endif - - -config.status: configure - export PATH=$(PATH) - dh_testdir - - # if /proc is not mounted, check_nagios and check_procs are - # silently omitted from build. - @if ! [ -d /proc/$$$$ ]; then \ - echo "monitoring-plugins needs a mounted /proc to correctly build"; \ - exit 1; \ - fi - - ln -sf /usr/share/misc/config.sub build-aux - ln -sf /usr/share/misc/config.guess build-aux - rm -f config.cache - - # Add here commands to configure the package. - # Append 'All warnings', 'Immediate binding' and dpkg-buildflags flags - CFLAGS="$$(DEB_CFLAGS_MAINT_APPEND='-Wall -Wl,-z,now' dpkg-buildflags --get CFLAGS)" \ - PATH_TO_APTGET=/usr/bin/apt-get \ - PGINCLUDE="-I`pg_config --includedir`" PGLIBS="-lpq -lcrypt" \ - ./configure \ - --disable-maintainer-mode \ - --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --libexecdir=${NP_LIBEXEC} \ - --with-perl=/usr/bin/perl \ - --with-openssl=/usr \ - --with-pgsql=/usr \ - --with-mysql=/usr \ - --with-proc-loadavg=/proc/loadavg \ - --with-ps-command="/bin/ps axwwo 'stat uid pid ppid vsz rss pcpu etime comm args'" \ - --with-ps-format="%s %d %d %d %d %d %f %s %s %n" \ - --with-ps-cols=10 \ - --with-ps-varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos" \ - $(PING_CONFIGURE_ARGS) \ - --with-nslookup-command="/usr/bin/nslookup -sil" \ - --with-uptime-command="/usr/bin/uptime" \ - --with-rpcinfo-command="/usr/sbin/rpcinfo" \ - --with-smbclient-command="/usr/bin/smbclient" \ - --with-snmpget-command="/usr/bin/snmpget" \ - --with-snmpgetnext-command="/usr/bin/snmpgetnext" \ - --with-qstat-command="/usr/bin/quakestat" \ - --with-fping-command="/usr/bin/fping" \ - --with-fping6-command="/usr/bin/fping6" \ - --with-ssh-command="/usr/bin/ssh" \ - --with-sudo-command="/usr/bin/sudo" \ - --with-mailq-command="/usr/bin/mailq" \ - --with-proc-meminfo="/proc/meminfo" \ - --with-dig-command="/usr/bin/dig" \ - --with-apt-get-command="/usr/bin/apt-get" \ - --enable-extra-opts \ - --disable-rpath - - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp - -build-stamp: config.status - dh_testdir - $(MAKE) - touch build-stamp - -clean: really-clean - -really-clean: - dh_testdir - dh_testroot - rm -f build-stamp debian/README.Debian.plugins debian/monitoring-plugins-standard.substvars.in - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - find -type d -name autom4te.cache -print0 | xargs -0 -r rm -rf \; - -rm -f platform.h auto-include.h - find -type d -name build -print0 | xargs -0 -r rm -rf \; - find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \; - -rm -f $(DEBIANDIR)/monitoring-plugins-basic.postrm $(DEBIANDIR)/monitoring-plugins-standard.postrm - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/monitoring-plugins. - $(MAKE) install DESTDIR=${NP_BASIC_DIR} - $(MAKE) install-root DESTDIR=${NP_BASIC_DIR} - chmod 644 ${NP_BASIC_DIR}/usr/lib/nagios/plugins/utils.pm - # split up basic vs. standard plugins - for p in ${std_plugins}; do \ - mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_STD_DIR}/${NP_LIBEXEC}; \ - done - # rename check_http to check_http_deprecated for making use of update-alternatives - mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/check_http ${NP_BASIC_DIR}/${NP_LIBEXEC}/check_http.deprecated - # slit out common files - for p in ${common_files}; do \ - mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_COMMON_DIR}/${NP_LIBEXEC}; \ - done - # remove check_uptime for now (conflicting with check_uptime from n-p-c) - rm ${NP_BASIC_DIR}/${NP_LIBEXEC}/check_uptime - # now do the same for their configs, copying them into seperate - # "template" directories outside of /usr/share/doc for ucf to use. - for c in ${basic_plugin_cfgs}; do \ - cp $(DEBIANDIR)/pluginconfig/$${c}.cfg ${NP_BASIC_TEMPLATES}; \ - done - for c in ${std_plugin_cfgs}; do \ - cp $(DEBIANDIR)/pluginconfig/$${c}.cfg ${NP_STD_TEMPLATES}; \ - done - # dynamically create the postrm scripts using a template, so that we - # don't have to define the same list of plugin configs over and over. - sed -e 's/@BASIC_PLUGINS@/${basic_plugin_cfgs}/' \ - < $(DEBIANDIR)/monitoring-plugins-basic.postrm.in \ - > $(DEBIANDIR)/monitoring-plugins-basic.postrm - sed -e 's/@STD_PLUGINS@/${std_plugin_cfgs}/' \ - < $(DEBIANDIR)/monitoring-plugins-standard.postrm.in \ - > $(DEBIANDIR)/monitoring-plugins-standard.postrm - # copy our dpkg-sourced functions etc into place - mkdir -p ${NP_COMMON_DIR}/usr/share/monitoring-plugins/dpkg - install -t ${NP_COMMON_DIR}/usr/share/monitoring-plugins/dpkg \ - $(DEBIANDIR)/functions - # remove /usr/include from monitoring-plugins-basic (in case its empty and exists) - [ ! -d ${NP_BASIC_DIR}/usr/include ] || rmdir ${NP_BASIC_DIR}/usr/include - # generate debian/README.Debian.plugins - perl ./debian/bin/gen_plugin_deps.pl - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installchangelogs -i - dh_installdocs -i - dh_link -i - dh_installexamples -i - dh_installman -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installchangelogs -p monitoring-plugins-basic -a ChangeLog - dh_installchangelogs -Nmonitoring-plugins-basic - dh_installdocs -a - dh_link -a - dh_installexamples -a - dh_installman -a - dh_installalternatives -a - dh_strip -a - dh_compress -a - dh_fixperms -a -X utils.pm - dh_installdeb -a - dh_shlibdeps -a -Nmonitoring-plugins-standard - dpkg-shlibdeps -Tdebian/monitoring-plugins-standard.substvars \ - ${NP_STD_DIR}/${NP_LIBEXEC}/check_dns - dpkg-shlibdeps -Tdebian/monitoring-plugins-standard.substvars.in \ - -dSuggests ${NP_STD_DIR}/${NP_LIBEXEC}/check_* - grep shlibs:Suggests debian/monitoring-plugins-standard.substvars.in \ - | sed -e 's/shlibs:Suggests/shlibs:Recommends/' \ - >> debian/monitoring-plugins-standard.substvars - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/source/options b/debian/source/options deleted file mode 100644 index e84d385..0000000 --- a/debian/source/options +++ /dev/null @@ -1 +0,0 @@ -extend-diff-ignore = '^\.github' diff --git a/debian/upstream/metadata b/debian/upstream/metadata deleted file mode 100644 index a11336b..0000000 --- a/debian/upstream/metadata +++ /dev/null @@ -1,5 +0,0 @@ -Name: monitoring-plugins -Bug-Database: https://github.com/monitoring-plugins/monitoring-plugins/issues -Bug-Submit: https://github.com/monitoring-plugins/monitoring-plugins/issues/new -Repository: https://github.com/monitoring-plugins/monitoring-plugins.git -Repository-Browse: https://github.com/monitoring-plugins/monitoring-plugins diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 534f948..0000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=4 -https://www.monitoring-plugins.org/download/.*-plugins-(\d+\.[\d\.a-z]+)\.tar\.gz \ - debian debian/bin/repack.sh diff --git a/gl/Makefile.in b/gl/Makefile.in index 71fd6f3..6ac6da9 100644 --- a/gl/Makefile.in +++ b/gl/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -280,7 +280,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \ $(top_srcdir)/gl/m4/open-cloexec.m4 \ $(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \ - $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/printf.m4 \ + $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/pid_t.m4 \ + $(top_srcdir)/gl/m4/printf.m4 \ $(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ @@ -293,6 +294,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ + $(top_srcdir)/gl/m4/std-gnu11.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ @@ -310,6 +312,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/time_r.m4 $(top_srcdir)/gl/m4/timegm.m4 \ $(top_srcdir)/gl/m4/ungetc.m4 $(top_srcdir)/gl/m4/unistd_h.m4 \ $(top_srcdir)/gl/m4/unlocked-io.m4 \ + $(top_srcdir)/gl/m4/vararrays.m4 \ $(top_srcdir)/gl/m4/vasnprintf.m4 \ $(top_srcdir)/gl/m4/vasprintf.m4 \ $(top_srcdir)/gl/m4/visibility.m4 \ @@ -653,6 +656,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp \ @@ -709,8 +714,6 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DBILIBS = @DBILIBS@ DEFS = @DEFS@ @@ -730,7 +733,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ EXTRAS = @EXTRAS@ EXTRAS_ROOT = @EXTRAS_ROOT@ @@ -2102,8 +2104,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -4268,6 +4268,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/gl/m4/pid_t.m4 b/gl/m4/pid_t.m4 new file mode 100644 index 0000000..0fd7d0a --- /dev/null +++ b/gl/m4/pid_t.m4 @@ -0,0 +1,38 @@ +# pid_t.m4 serial 4 +dnl Copyright (C) 2020-2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# The following implementation works around a problem in autoconf <= 2.69. +m4_version_prereq([2.70], [], [ + +dnl Define pid_t if the headers don't define it. +AC_DEFUN([AC_TYPE_PID_T], +[ + AC_CHECK_TYPE([pid_t], + [], + [dnl On 64-bit native Windows, define it to the equivalent of 'intptr_t' + dnl (= 'long long' = '__int64'), because that is the return type + dnl of the _spawnv* functions + dnl + dnl and the argument type of the _cwait function + dnl . + dnl Otherwise (on 32-bit Windows and on old Unix platforms), define it + dnl to 'int'. + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #if defined _WIN64 && !defined __CYGWIN__ + LLP64 + #endif + ]]) + ], + [gl_pid_type='int'], + [gl_pid_type='__int64']) + AC_DEFINE_UNQUOTED([pid_t], [$gl_pid_type], + [Define as a signed integer type capable of holding a process identifier.]) + ], + [AC_INCLUDES_DEFAULT]) +]) + +])# m4_version_prereq 2.70 diff --git a/gl/m4/std-gnu11.m4 b/gl/m4/std-gnu11.m4 new file mode 100644 index 0000000..4179470 --- /dev/null +++ b/gl/m4/std-gnu11.m4 @@ -0,0 +1,829 @@ +# Prefer GNU C11 and C++11 to earlier versions. -*- coding: utf-8 -*- + +# This implementation is taken from GNU Autoconf lib/autoconf/c.m4 +# commit 017d5ddd82854911f0119691d91ea8a1438824d6 +# dated Sun Apr 3 13:57:17 2016 -0700 +# This implementation will be obsolete once we can assume Autoconf 2.70 +# or later is installed everywhere a Gnulib program might be developed. + +m4_version_prereq([2.70], [], [ + + +# Copyright (C) 2001-2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Written by David MacKenzie, with help from +# Akim Demaille, Paul Eggert, +# François Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, +# Roland McGrath, Noah Friedman, david d zuhn, and many others. + + +# AC_PROG_CC([COMPILER ...]) +# -------------------------- +# COMPILER ... is a space separated list of C compilers to search for. +# This just gives the user an opportunity to specify an alternative +# search list for the C compiler. +AC_DEFUN_ONCE([AC_PROG_CC], +[AC_LANG_PUSH(C)dnl +AC_ARG_VAR([CC], [C compiler command])dnl +AC_ARG_VAR([CFLAGS], [C compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +_AC_ARG_VAR_LIBS()dnl +_AC_ARG_VAR_CPPFLAGS()dnl +m4_ifval([$1], + [AC_CHECK_TOOLS(CC, [$1])], +[AC_CHECK_TOOL(CC, gcc) +if test -z "$CC"; then + dnl Here we want: + dnl AC_CHECK_TOOL(CC, cc) + dnl but without the check for a tool without the prefix. + dnl Until the check is removed from there, copy the code: + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(CC, [${ac_tool_prefix}cc], [${ac_tool_prefix}cc]) + fi +fi +if test -z "$CC"; then + AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) +fi +if test -z "$CC"; then + AC_CHECK_TOOLS(CC, cl.exe) +fi +if test -z "$CC"; then + AC_CHECK_TOOL(CC, clang) +fi +]) + +test -z "$CC" && AC_MSG_FAILURE([no acceptable C compiler found in \$PATH]) + +# Provide some information about the compiler. +_AS_ECHO_LOG([checking for _AC_LANG compiler version]) +set X $ac_compile +ac_compiler=$[2] +for ac_option in --version -v -V -qversion -version; do + _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) +done + +m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl +m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl +_AC_LANG_COMPILER_GNU +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +_AC_PROG_CC_G +dnl +dnl Set ac_prog_cc_stdc to the supported C version. +dnl Also set the documented variable ac_cv_prog_cc_stdc; +dnl its name was chosen when it was cached, but it is no longer cached. +_AC_PROG_CC_C11([ac_prog_cc_stdc=c11 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11], + [_AC_PROG_CC_C99([ac_prog_cc_stdc=c99 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99], + [_AC_PROG_CC_C89([ac_prog_cc_stdc=c89 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89], + [ac_prog_cc_stdc=no + ac_cv_prog_cc_stdc=no])])]) +dnl +AC_LANG_POP(C)dnl +])# AC_PROG_CC + + + +# AC_PROG_CXX([LIST-OF-COMPILERS]) +# -------------------------------- +# LIST-OF-COMPILERS is a space separated list of C++ compilers to search +# for (if not specified, a default list is used). This just gives the +# user an opportunity to specify an alternative search list for the C++ +# compiler. +# aCC HP-UX C++ compiler much better than `CC', so test before. +# FCC Fujitsu C++ compiler +# KCC KAI C++ compiler +# RCC Rational C++ +# xlC_r AIX C Set++ (with support for reentrant code) +# xlC AIX C Set++ +AC_DEFUN([AC_PROG_CXX], +[AC_LANG_PUSH(C++)dnl +AC_ARG_VAR([CXX], [C++ compiler command])dnl +AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +_AC_ARG_VAR_LIBS()dnl +_AC_ARG_VAR_CPPFLAGS()dnl +_AC_ARG_VAR_PRECIOUS([CCC])dnl +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + AC_CHECK_TOOLS(CXX, + [m4_default([$1], + [g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++])], + g++) + fi +fi +# Provide some information about the compiler. +_AS_ECHO_LOG([checking for _AC_LANG compiler version]) +set X $ac_compile +ac_compiler=$[2] +for ac_option in --version -v -V -qversion; do + _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) +done + +m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl +m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl +_AC_LANG_COMPILER_GNU +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +_AC_PROG_CXX_G +_AC_PROG_CXX_CXX11([ac_prog_cxx_stdcxx=cxx11 + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_cv_prog_cxx_cxx98=$ac_cv_prog_cxx_cxx11], + [_AC_PROG_CXX_CXX98([ac_prog_cxx_stdcxx=cxx98 + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98], + [ac_prog_cxx_stdcxx=no + ac_cv_prog_cxx_stdcxx=no])]) +AC_LANG_POP(C++)dnl +])# AC_PROG_CXX + + +# _AC_C_STD_TRY(STANDARD, TEST-PROLOGUE, TEST-BODY, OPTION-LIST, +# ACTION-IF-AVAILABLE, ACTION-IF-UNAVAILABLE) +# -------------------------------------------------------------- +# Check whether the C compiler accepts features of STANDARD (e.g `c89', `c99') +# by trying to compile a program of TEST-PROLOGUE and TEST-BODY. If this fails, +# try again with each compiler option in the space-separated OPTION-LIST; if one +# helps, append it to CC. If eventually successful, run ACTION-IF-AVAILABLE, +# else ACTION-IF-UNAVAILABLE. +AC_DEFUN([_AC_C_STD_TRY], +[AC_MSG_CHECKING([for $CC option to enable ]m4_translit($1, [c], [C])[ features]) +AC_CACHE_VAL(ac_cv_prog_cc_$1, +[ac_cv_prog_cc_$1=no +ac_save_CC=$CC +AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])]) +for ac_arg in '' $4 +do + CC="$ac_save_CC $ac_arg" + _AC_COMPILE_IFELSE([], [ac_cv_prog_cc_$1=$ac_arg]) + test "x$ac_cv_prog_cc_$1" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +])# AC_CACHE_VAL +ac_prog_cc_stdc_options= +case "x$ac_cv_prog_cc_$1" in + x) + AC_MSG_RESULT([none needed]) ;; + xno) + AC_MSG_RESULT([unsupported]) ;; + *) + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_$1" + CC=$CC$ac_prog_cc_stdc_options + AC_MSG_RESULT([$ac_cv_prog_cc_$1]) ;; +esac +AS_IF([test "x$ac_cv_prog_cc_$1" != xno], [$5], [$6]) +])# _AC_C_STD_TRY + +# _AC_C_C99_TEST_HEADER +# --------------------- +# A C header suitable for testing for C99. +AC_DEFUN([_AC_C_C99_TEST_HEADER], +[[#include +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +}]])# _AC_C_C99_TEST_HEADER + +# _AC_C_C99_TEST_BODY +# ------------------- +# A C body suitable for testing for C99, assuming the corresponding header. +AC_DEFUN([_AC_C_C99_TEST_BODY], +[[ + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); +]]) + +# _AC_PROG_CC_C99 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ---------------------------------------------------------------- +# If the C compiler is not in ISO C99 mode by default, try to add an +# option to output variable CC to make it so. This macro tries +# various options that select ISO C99 on some system or another. It +# considers the compiler to be in ISO C99 mode if it handles _Bool, +# // comments, flexible array members, inline, long long int, mixed +# code and declarations, named initialization of structs, restrict, +# va_copy, varargs macros, variable declarations in for loops and +# variable length arrays. +AC_DEFUN([_AC_PROG_CC_C99], +[_AC_C_STD_TRY([c99], +[_AC_C_C99_TEST_HEADER], +[_AC_C_C99_TEST_BODY], +dnl Try +dnl GCC -std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999) +dnl IBM XL C -qlanglvl=extc1x (V12.1; does not pass C11 test) +dnl IBM XL C -qlanglvl=extc99 +dnl (pre-V12.1; unused restrictive mode: -qlanglvl=stdc99) +dnl HP cc -AC99 +dnl Intel ICC -std=c99, -c99 (deprecated) +dnl IRIX -c99 +dnl Solaris -D_STDC_C99= +dnl cc's -xc99 option uses linker magic to define the external +dnl symbol __xpg4 as if by "int __xpg4 = 1;", which enables C99 +dnl behavior for C library functions. This is not wanted here, +dnl because it means that a single module compiled with -xc99 +dnl alters C runtime behavior for the entire program, not for +dnl just the module. Instead, define the (private) symbol +dnl _STDC_C99, which suppresses a bogus failure in . +dnl The resulting compiler passes the test case here, and that's +dnl good enough. For more, please see the thread starting at: +dnl https://lists.gnu.org/r/autoconf/2010-12/msg00059.html +dnl Tru64 -c99 +dnl with extended modes being tried first. +[[-std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99]], [$1], [$2])[]dnl +])# _AC_PROG_CC_C99 + + +# _AC_PROG_CC_C11 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ---------------------------------------------------------------- +# If the C compiler is not in ISO C11 mode by default, try to add an +# option to output variable CC to make it so. This macro tries +# various options that select ISO C11 on some system or another. It +# considers the compiler to be in ISO C11 mode if it handles _Alignas, +# _Alignof, _Noreturn, _Static_assert, UTF-8 string literals, +# duplicate typedefs, and anonymous structures and unions. +AC_DEFUN([_AC_PROG_CC_C11], +[_AC_C_STD_TRY([c11], +[_AC_C_C99_TEST_HEADER[ +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +]], +[_AC_C_C99_TEST_BODY[ + v1.i = 2; + v1.w.k = 5; + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); +]], +dnl Try +dnl GCC -std=gnu11 (unused restrictive mode: -std=c11) +dnl with extended modes being tried first. +dnl +dnl Do not try -qlanglvl=extc1x, because IBM XL C V12.1 (the latest version as +dnl of September 2012) does not pass the C11 test. For now, try extc1x when +dnl compiling the C99 test instead, since it enables _Static_assert and +dnl _Noreturn, which is a win. If -qlanglvl=extc11 or -qlanglvl=extc1x passes +dnl the C11 test in some future version of IBM XL C, we'll add it here, +dnl preferably extc11. +[[-std=gnu11]], [$1], [$2])[]dnl +])# _AC_PROG_CC_C11 + + +# AC_PROG_CC_C89 +# -------------- +# Do not use AU_ALIAS here and in AC_PROG_CC_C99 and AC_PROG_CC_STDC, +# as that'd be incompatible with how Automake redefines AC_PROG_CC. See +# . +AU_DEFUN([AC_PROG_CC_C89], + [AC_REQUIRE([AC_PROG_CC])], + [$0 is obsolete; use AC_PROG_CC] +) + +# AC_PROG_CC_C99 +# -------------- +AU_DEFUN([AC_PROG_CC_C99], + [AC_REQUIRE([AC_PROG_CC])], + [$0 is obsolete; use AC_PROG_CC] +) + +# AC_PROG_CC_STDC +# --------------- +AU_DEFUN([AC_PROG_CC_STDC], + [AC_REQUIRE([AC_PROG_CC])], + [$0 is obsolete; use AC_PROG_CC] +) + + +# AC_C_PROTOTYPES +# --------------- +# Check if the C compiler supports prototypes, included if it needs +# options. +AC_DEFUN([AC_C_PROTOTYPES], +[AC_REQUIRE([AC_PROG_CC])dnl +if test "$ac_prog_cc_stdc" != no; then + AC_DEFINE(PROTOTYPES, 1, + [Define to 1 if the C compiler supports function prototypes.]) + AC_DEFINE(__PROTOTYPES, 1, + [Define like PROTOTYPES; this can be used by system headers.]) +fi +])# AC_C_PROTOTYPES + + +# _AC_CXX_STD_TRY(STANDARD, TEST-PROLOGUE, TEST-BODY, OPTION-LIST, +# ACTION-IF-AVAILABLE, ACTION-IF-UNAVAILABLE) +# ---------------------------------------------------------------- +# Check whether the C++ compiler accepts features of STANDARD (e.g +# `cxx98', `cxx11') by trying to compile a program of TEST-PROLOGUE +# and TEST-BODY. If this fails, try again with each compiler option +# in the space-separated OPTION-LIST; if one helps, append it to CXX. +# If eventually successful, run ACTION-IF-AVAILABLE, else +# ACTION-IF-UNAVAILABLE. +AC_DEFUN([_AC_CXX_STD_TRY], +[AC_MSG_CHECKING([for $CXX option to enable ]m4_translit(m4_translit($1, [x], [+]), [a-z], [A-Z])[ features]) +AC_LANG_PUSH(C++)dnl +AC_CACHE_VAL(ac_cv_prog_cxx_$1, +[ac_cv_prog_cxx_$1=no +ac_save_CXX=$CXX +AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])]) +for ac_arg in '' $4 +do + CXX="$ac_save_CXX $ac_arg" + _AC_COMPILE_IFELSE([], [ac_cv_prog_cxx_$1=$ac_arg]) + test "x$ac_cv_prog_cxx_$1" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +])# AC_CACHE_VAL +ac_prog_cxx_stdcxx_options= +case "x$ac_cv_prog_cxx_$1" in + x) + AC_MSG_RESULT([none needed]) ;; + xno) + AC_MSG_RESULT([unsupported]) ;; + *) + ac_prog_cxx_stdcxx_options=" $ac_cv_prog_cxx_$1" + CXX=$CXX$ac_prog_cxx_stdcxx_options + AC_MSG_RESULT([$ac_cv_prog_cxx_$1]) ;; +esac +AC_LANG_POP(C++)dnl +AS_IF([test "x$ac_cv_prog_cxx_$1" != xno], [$5], [$6]) +])# _AC_CXX_STD_TRY + +# _AC_CXX_CXX98_TEST_HEADER +# ------------------------- +# A C++ header suitable for testing for CXX98. +AC_DEFUN([_AC_CXX_CXX98_TEST_HEADER], +[[ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace test { + typedef std::vector string_vec; + typedef std::pair map_value; + typedef std::map map_type; + typedef std::set set_type; + + template + class printer { + public: + printer(std::ostringstream& os): os(os) {} + void operator() (T elem) { os << elem << std::endl; } + private: + std::ostringstream& os; + }; +} +]])# _AC_CXX_CXX98_TEST_HEADER + +# _AC_CXX_CXX98_TEST_BODY +# ----------------------- +# A C++ body suitable for testing for CXX98, assuming the corresponding header. +AC_DEFUN([_AC_CXX_CXX98_TEST_BODY], +[[ + +try { + // Basic string. + std::string teststr("ASCII text"); + teststr += " string"; + + // Simple vector. + test::string_vec testvec; + testvec.push_back(teststr); + testvec.push_back("foo"); + testvec.push_back("bar"); + if (testvec.size() != 3) { + throw std::runtime_error("vector size is not 1"); + } + + // Dump vector into stringstream and obtain string. + std::ostringstream os; + for (test::string_vec::const_iterator i = testvec.begin(); + i != testvec.end(); ++i) { + if (i + 1 != testvec.end()) { + os << teststr << '\n'; + } + } + // Check algorithms work. + std::for_each(testvec.begin(), testvec.end(), test::printer(os)); + std::string os_out = os.str(); + + // Test pair and map. + test::map_type testmap; + testmap.insert(std::make_pair(std::string("key"), + std::make_pair(53,false))); + + // Test set. + int values[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + test::set_type testset(values, values + sizeof(values)/sizeof(values[0])); + std::list testlist(testset.begin(), testset.end()); + std::copy(testset.begin(), testset.end(), std::back_inserter(testlist)); +} catch (const std::exception& e) { + std::cerr << "Caught exception: " << e.what() << std::endl; + + // Test fstream + std::ofstream of("test.txt"); + of << "Test ASCII text\n" << std::flush; + of << "N= " << std::hex << std::setw(8) << std::left << 534 << std::endl; + of.close(); +} +std::exit(0); +]]) + +# _AC_CXX_CXX11_TEST_HEADER +# ------------------------- +# A C++ header suitable for testing for CXX11. +AC_DEFUN([_AC_CXX_CXX11_TEST_HEADER], +[[ +#include +#include +#include +#include +#include +#include +#include + +namespace cxx11test +{ + typedef std::shared_ptr sptr; + typedef std::weak_ptr wptr; + + typedef std::tuple tp; + typedef std::array int_array; + + constexpr int get_val() { return 20; } + + struct testinit + { + int i; + double d; + }; + + class delegate { + public: + delegate(int n) : n(n) {} + delegate(): delegate(2354) {} + + virtual int getval() { return this->n; }; + protected: + int n; + }; + + class overridden : public delegate { + public: + overridden(int n): delegate(n) {} + virtual int getval() override final { return this->n * 2; } + }; + + class nocopy { + public: + nocopy(int i): i(i) {} + nocopy() = default; + nocopy(const nocopy&) = delete; + nocopy & operator=(const nocopy&) = delete; + private: + int i; + }; +} +]])# _AC_CXX_CXX11_TEST_HEADER + +# _AC_CXX_CXX11_TEST_BODY +# ----------------------- +# A C++ body suitable for testing for CXX11, assuming the corresponding header. +AC_DEFUN([_AC_CXX_CXX11_TEST_BODY], +[[ +{ + // Test auto and decltype + std::deque d; + d.push_front(43); + d.push_front(484); + d.push_front(3); + d.push_front(844); + int total = 0; + for (auto i = d.begin(); i != d.end(); ++i) { total += *i; } + + auto a1 = 6538; + auto a2 = 48573953.4; + auto a3 = "String literal"; + + decltype(a2) a4 = 34895.034; +} +{ + // Test constexpr + short sa[cxx11test::get_val()] = { 0 }; +} +{ + // Test initializer lists + cxx11test::testinit il = { 4323, 435234.23544 }; +} +{ + // Test range-based for and lambda + cxx11test::int_array array = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + for (int &x : array) { x += 23; } + std::for_each(array.begin(), array.end(), [](int v1){ std::cout << v1; }); +} +{ + using cxx11test::sptr; + using cxx11test::wptr; + + sptr sp(new std::string("ASCII string")); + wptr wp(sp); + sptr sp2(wp); +} +{ + cxx11test::tp tuple("test", 54, 45.53434); + double d = std::get<2>(tuple); + std::string s; + int i; + std::tie(s,i,d) = tuple; +} +{ + static std::regex filename_regex("^_?([a-z0-9_.]+-)+[a-z0-9]+$"); + std::string testmatch("Test if this string matches"); + bool match = std::regex_search(testmatch, filename_regex); +} +{ + cxx11test::int_array array = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + cxx11test::int_array::size_type size = array.size(); +} +{ + // Test constructor delegation + cxx11test::delegate d1; + cxx11test::delegate d2(); + cxx11test::delegate d3(45); +} +{ + // Test override and final + cxx11test::overridden o1(55464); +} +{ + // Test nullptr + char *c = nullptr; +} +{ + // Test template brackets + std::vector> v1; +} +{ + // Unicode literals + char const *utf8 = u8"UTF-8 string \u2500"; + char16_t const *utf16 = u"UTF-8 string \u2500"; + char32_t const *utf32 = U"UTF-32 string \u2500"; +} +]]) + +# _AC_PROG_CXX_CXX98 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ------------------------------------------------------------------- + +# If the C++ compiler is not in ISO C++98 mode by default, try to add +# an option to output variable CXX to make it so. This macro tries +# various options that select ISO C++98 on some system or another. It +# considers the compiler to be in ISO C++98 mode if it handles basic +# features of the std namespace including: string, containers (list, +# map, set, vector), streams (fstreams, iostreams, stringstreams, +# iomanip), pair, exceptions and algorithms. + + +AC_DEFUN([_AC_PROG_CXX_CXX98], +[_AC_CXX_STD_TRY([cxx98], +[_AC_CXX_CXX98_TEST_HEADER], +[_AC_CXX_CXX98_TEST_BODY], +dnl Try +dnl GCC -std=gnu++98 (unused restrictive mode: -std=c++98) +dnl IBM XL C -qlanglvl=extended +dnl HP aC++ -AA +dnl Intel ICC -std=gnu++98 +dnl Solaris N/A (default) +dnl Tru64 N/A (default, but -std gnu could be used) +dnl with extended modes being tried first. +[[-std=gnu++98 -std=c++98 -qlanglvl=extended -AA]], [$1], [$2])[]dnl +])# _AC_PROG_CXX_CXX98 + +# _AC_PROG_CXX_CXX11 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ------------------------------------------------------------------- +# If the C++ compiler is not in ISO CXX11 mode by default, try to add +# an option to output variable CXX to make it so. This macro tries +# various options that select ISO C++11 on some system or another. It +# considers the compiler to be in ISO C++11 mode if it handles all the +# tests from the C++98 checks, plus the following: Language features +# (auto, constexpr, decltype, default/deleted constructors, delegate +# constructors, final, initializer lists, lambda functions, nullptr, +# override, range-based for loops, template brackets without spaces, +# unicode literals) and library features (array, memory (shared_ptr, +# weak_ptr), regex and tuple types). +AC_DEFUN([_AC_PROG_CXX_CXX11], +[_AC_CXX_STD_TRY([cxx11], +[_AC_CXX_CXX11_TEST_HEADER +_AC_CXX_CXX98_TEST_HEADER], +[_AC_CXX_CXX11_TEST_BODY +_AC_CXX_CXX98_TEST_BODY], +dnl Try +dnl GCC -std=gnu++11 (unused restrictive mode: -std=c++11) [and 0x variants] +dnl IBM XL C -qlanglvl=extended0x +dnl (pre-V12.1; unused restrictive mode: -qlanglvl=stdcxx11) +dnl HP aC++ -AA +dnl Intel ICC -std=c++11 -std=c++0x +dnl Solaris N/A (no support) +dnl Tru64 N/A (no support) +dnl with extended modes being tried first. +[[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl +])# _AC_PROG_CXX_CXX11 + + +])# m4_version_prereq diff --git a/gl/m4/vararrays.m4 b/gl/m4/vararrays.m4 new file mode 100644 index 0000000..fd6230c --- /dev/null +++ b/gl/m4/vararrays.m4 @@ -0,0 +1,72 @@ +# Check for variable-length arrays. + +# serial 6 + +# From Paul Eggert + +# Copyright (C) 2001, 2009-2023 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. + +m4_version_prereq([2.70], [], [ + +# AC_C_VARARRAYS +# -------------- +# Check whether the C compiler supports variable-length arrays. +AC_DEFUN([AC_C_VARARRAYS], +[ + AC_CACHE_CHECK([for variable-length arrays], + ac_cv_c_vararrays, + [AC_EGREP_CPP([defined], + [#ifdef __STDC_NO_VLA__ + defined + #endif + ], + [ac_cv_c_vararrays='no: __STDC_NO_VLA__ is defined'], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[/* Test for VLA support. This test is partly inspired + from examples in the C standard. Use at least two VLA + functions to detect the GCC 3.4.3 bug described in: + https://lists.gnu.org/archive/html/bug-gnulib/2014-08/msg00014.html + */ + #ifdef __STDC_NO_VLA__ + syntax error; + #else + extern int n; + int B[100]; + int fvla (int m, int C[m][m]); + + int + simple (int count, int all[static count]) + { + return all[count - 1]; + } + + int + fvla (int m, int C[m][m]) + { + typedef int VLA[m][m]; + VLA x; + int D[m]; + static int (*q)[m] = &B; + int (*s)[n] = q; + return C && &x[0][0] == &D[0] && &D[0] == s[0]; + } + #endif + ]])], + [ac_cv_c_vararrays=yes], + [ac_cv_c_vararrays=no])])]) + if test "$ac_cv_c_vararrays" = yes; then + dnl This is for compatibility with Autoconf 2.61-2.69. + AC_DEFINE([HAVE_C_VARARRAYS], 1, + [Define to 1 if C supports variable-length arrays.]) + elif test "$ac_cv_c_vararrays" = no; then + AC_DEFINE([__STDC_NO_VLA__], 1, + [Define to 1 if C does not support variable-length arrays, and + if the compiler does not already define this.]) + fi +]) + +]) diff --git a/lib/Makefile.in b/lib/Makefile.in index 6b13d0c..22dc3f9 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -165,7 +165,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \ $(top_srcdir)/gl/m4/open-cloexec.m4 \ $(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \ - $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/printf.m4 \ + $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/pid_t.m4 \ + $(top_srcdir)/gl/m4/printf.m4 \ $(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ @@ -178,6 +179,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ + $(top_srcdir)/gl/m4/std-gnu11.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ @@ -195,6 +197,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/time_r.m4 $(top_srcdir)/gl/m4/timegm.m4 \ $(top_srcdir)/gl/m4/ungetc.m4 $(top_srcdir)/gl/m4/unistd_h.m4 \ $(top_srcdir)/gl/m4/unlocked-io.m4 \ + $(top_srcdir)/gl/m4/vararrays.m4 \ $(top_srcdir)/gl/m4/vasnprintf.m4 \ $(top_srcdir)/gl/m4/vasprintf.m4 \ $(top_srcdir)/gl/m4/visibility.m4 \ @@ -309,6 +312,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp \ @@ -365,8 +370,6 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DBILIBS = @DBILIBS@ DEFS = @DEFS@ @@ -386,7 +389,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ EXTRAS = @EXTRAS@ EXTRAS_ROOT = @EXTRAS_ROOT@ @@ -1758,8 +1760,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -1974,6 +1974,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/lib/parse_ini.c b/lib/parse_ini.c index 09c0dc4..0cc864a 100644 --- a/lib/parse_ini.c +++ b/lib/parse_ini.c @@ -36,7 +36,6 @@ */ typedef struct { char *file; - bool file_string_on_heap; char *stanza; } np_ini_info; @@ -96,22 +95,16 @@ parse_locator(const char *locator, const char *def_stanza, np_ini_info *i) i->stanza = malloc(sizeof(char) * (stanza_len + 1)); strncpy(i->stanza, locator, stanza_len); i->stanza[stanza_len] = '\0'; - } else {/* otherwise we use the default stanza */ + } else /* otherwise we use the default stanza */ i->stanza = strdup(def_stanza); - } if (i->stanza == NULL) die(STATE_UNKNOWN, _("malloc() failed!\n")); /* check whether there's an @file part */ - if (stanza_len == locator_len) { - i->file = default_file(); - i->file_string_on_heap = false; - } else { - i->file = strdup(&(locator[stanza_len + 1])); - i->file_string_on_heap = true; - } - + i->file = stanza_len == locator_len + ? default_file() + : strdup(&(locator[stanza_len + 1])); if (i->file == NULL || i->file[0] == '\0') die(STATE_UNKNOWN, _("Cannot find config file in any standard location.\n")); @@ -143,10 +136,7 @@ np_get_defaults(const char *locator, const char *default_section) _("Invalid section '%s' in config file '%s'\n"), i.stanza, i.file); - if (i.file_string_on_heap) { - free(i.file); - } - + free(i.file); if (inifile != stdin) fclose(inifile); free(i.stanza); @@ -368,18 +358,14 @@ add_option(FILE *f, np_arg_list **optlst) static char * default_file(void) { - char *ini_file; + char **p, *ini_file; if ((ini_file = getenv("MP_CONFIG_FILE")) != NULL || - (ini_file = default_file_in_path()) != NULL) { + (ini_file = default_file_in_path()) != NULL) return ini_file; - } - - for (char **p = default_ini_path_names; *p != NULL; p++) { - if (access(*p, F_OK) == 0) { + for (p = default_ini_path_names; *p != NULL; p++) + if (access(*p, F_OK) == 0) return *p; - } - } return NULL; } diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index f9dddb2..b06b0d1 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,7 +168,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \ $(top_srcdir)/gl/m4/open-cloexec.m4 \ $(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \ - $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/printf.m4 \ + $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/pid_t.m4 \ + $(top_srcdir)/gl/m4/printf.m4 \ $(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ @@ -181,6 +182,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ + $(top_srcdir)/gl/m4/std-gnu11.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ @@ -198,6 +200,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/time_r.m4 $(top_srcdir)/gl/m4/timegm.m4 \ $(top_srcdir)/gl/m4/ungetc.m4 $(top_srcdir)/gl/m4/unistd_h.m4 \ $(top_srcdir)/gl/m4/unlocked-io.m4 \ + $(top_srcdir)/gl/m4/vararrays.m4 \ $(top_srcdir)/gl/m4/vasnprintf.m4 \ $(top_srcdir)/gl/m4/vasprintf.m4 \ $(top_srcdir)/gl/m4/visibility.m4 \ @@ -336,6 +339,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -570,8 +575,6 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DBILIBS = @DBILIBS@ DEFS = @DEFS@ @@ -591,7 +594,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ EXTRAS = @EXTRAS@ EXTRAS_ROOT = @EXTRAS_ROOT@ @@ -1963,8 +1965,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -2352,6 +2352,7 @@ recheck: all $(check_PROGRAMS) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/lib/utils_base.c b/lib/utils_base.c index f8592f4..f86efbe 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c @@ -37,7 +37,7 @@ monitoring_plugin *this_monitoring_plugin=NULL; -int timeout_state = STATE_CRITICAL; +unsigned int timeout_state = STATE_CRITICAL; unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT; bool _np_state_read_file(FILE *); diff --git a/lib/utils_base.h b/lib/utils_base.h index 9d4dffe..80b8743 100644 --- a/lib/utils_base.h +++ b/lib/utils_base.h @@ -65,7 +65,7 @@ bool check_range(double, range *); int get_status(double, thresholds *); /* Handle timeouts */ -extern int timeout_state; +extern unsigned int timeout_state; extern unsigned int timeout_interval; /* All possible characters in a threshold range */ diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c index 7957ec1..cfb2073 100644 --- a/lib/utils_cmd.c +++ b/lib/utils_cmd.c @@ -390,12 +390,13 @@ cmd_file_read ( char *filename, output *out, int flags) void timeout_alarm_handler (int signo) { + size_t i; if (signo == SIGALRM) { printf (_("%s - Plugin timed out after %d seconds\n"), state_text(timeout_state), timeout_interval); long maxfd = mp_open_max(); - if(_cmd_pids) for(long int i = 0; i < maxfd; i++) { + if(_cmd_pids) for(i = 0; i < maxfd; i++) { if(_cmd_pids[i] != 0) kill(_cmd_pids[i], SIGKILL); } diff --git a/pkg/solaris/pkginfo b/pkg/solaris/pkginfo index ef314e8..75f7b70 100644 --- a/pkg/solaris/pkginfo +++ b/pkg/solaris/pkginfo @@ -2,11 +2,11 @@ PKG="NGOSplugin" NAME="monitoring-plugins" DESC="Network Monitoring Plugins for Nagios and compatible" ARCH="unknown" -VERSION="2.4.0,REV=2024.07.23.19.37" +VERSION="2.3.5,REV=2023.10.18.09.15" CATEGORY="application" VENDOR="Monitoring Plugins Development Team" EMAIL="devel@monitoring-plugins.org" -PSTAMP="nag20240723193729" +PSTAMP="nag20231018091518" BASEDIR="/" CLASSES="none" diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index a80229e..40aa020 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am @@ -26,7 +26,7 @@ EXTRA_PROGRAMS = pst3 EXTRA_DIST = t pst3.c -BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a +BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a $(LIB_CRYPTO) NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) NETLIBS = $(NETOBJS) $(SOCKETLIBS) @@ -80,8 +80,8 @@ install-exec-local: $(noinst_PROGRAMS) ############################################################################## # the actual targets -check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) $(LIB_CRYPTO) -check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) $(LIB_CRYPTO) +check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) +check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) # -m64 needed at compiler and linker phase pst3_CFLAGS = @PST3CFLAGS@ diff --git a/plugins-root/Makefile.in b/plugins-root/Makefile.in index c5ecbb2..5991e82 100644 --- a/plugins-root/Makefile.in +++ b/plugins-root/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -166,7 +166,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \ $(top_srcdir)/gl/m4/open-cloexec.m4 \ $(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \ - $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/printf.m4 \ + $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/pid_t.m4 \ + $(top_srcdir)/gl/m4/printf.m4 \ $(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ @@ -179,6 +180,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ + $(top_srcdir)/gl/m4/std-gnu11.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ @@ -196,6 +198,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/time_r.m4 $(top_srcdir)/gl/m4/timegm.m4 \ $(top_srcdir)/gl/m4/ungetc.m4 $(top_srcdir)/gl/m4/unistd_h.m4 \ $(top_srcdir)/gl/m4/unlocked-io.m4 \ + $(top_srcdir)/gl/m4/vararrays.m4 \ $(top_srcdir)/gl/m4/vasnprintf.m4 \ $(top_srcdir)/gl/m4/vasprintf.m4 \ $(top_srcdir)/gl/m4/visibility.m4 \ @@ -217,9 +220,11 @@ PROGRAMS = $(noinst_PROGRAMS) check_dhcp_SOURCES = check_dhcp.c check_dhcp_OBJECTS = check_dhcp.$(OBJEXT) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = ../plugins/netutils.o $(BASEOBJS) \ +am__DEPENDENCIES_2 = ../plugins/utils.o ../lib/libmonitoringplug.a \ + ../gl/libgnu.a $(am__DEPENDENCIES_1) +am__DEPENDENCIES_3 = ../plugins/netutils.o $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) -am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -292,6 +297,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -527,8 +534,6 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DBILIBS = @DBILIBS@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ @@ -548,7 +553,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ EXTRAS = @EXTRAS@ EXTRAS_ROOT = @EXTRAS_ROOT@ @@ -1920,8 +1924,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = $(datadir)/locale -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -1945,7 +1947,7 @@ with_trusted_path = @with_trusted_path@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"' AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@ EXTRA_DIST = t pst3.c -BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a +BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a $(LIB_CRYPTO) NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) NETLIBS = $(NETOBJS) $(SOCKETLIBS) TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir) @@ -1969,8 +1971,8 @@ INSTALL_SUID = \ ############################################################################## # the actual targets -check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) $(LIB_CRYPTO) -check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) $(LIB_CRYPTO) +check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) +check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) # -m64 needed at compiler and linker phase pst3_CFLAGS = @PST3CFLAGS@ @@ -2298,6 +2300,7 @@ recheck: all @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index 4b8f5e2..6b07df5 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c @@ -497,7 +497,7 @@ int send_dhcp_discover(int sock){ memcpy(&discover_packet.options[opts],&requested_address,sizeof(requested_address)); opts += sizeof(requested_address); } - discover_packet.options[opts++]= (char)DHCP_OPTION_END; + discover_packet.options[opts++]=DHCP_OPTION_END; /* unicast fields */ if(unicast) diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c index f788d42..303241d 100644 --- a/plugins-root/check_icmp.c +++ b/plugins-root/check_icmp.c @@ -1547,66 +1547,46 @@ finish(int sig) while(host) { if(debug) puts(""); - if (rta_mode) { - if (host->pl<100) { - printf("%srta=%0.3fms;%0.3f;%0.3f;0; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ", - (targets > 1) ? host->name : "", - host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000, - (targets > 1) ? host->name : "", (float)host->rtmax / 1000, - (targets > 1) ? host->name : "", (host->rtmin < INFINITY) ? (float)host->rtmin / 1000 : (float)0); - } else { - printf("%srta=U;;;; %srtmax=U;;;; %srtmin=U;;;; ", - (targets > 1) ? host->name : "", - (targets > 1) ? host->name : "", - (targets > 1) ? host->name : ""); - } + if (rta_mode && host->pl<100) { + printf("%srta=%0.3fms;%0.3f;%0.3f;0; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ", + (targets > 1) ? host->name : "", + host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000, + (targets > 1) ? host->name : "", (float)host->rtmax / 1000, + (targets > 1) ? host->name : "", (host->rtmin < INFINITY) ? (float)host->rtmin / 1000 : (float)0); } if (pl_mode) { printf("%spl=%u%%;%u;%u;0;100 ", (targets > 1) ? host->name : "", host->pl, warn.pl, crit.pl); } - if (jitter_mode) { - if (host->pl<100) { - printf("%sjitter_avg=%0.3fms;%0.3f;%0.3f;0; %sjitter_max=%0.3fms;;;; %sjitter_min=%0.3fms;;;; ", - (targets > 1) ? host->name : "", - (float)host->jitter, - (float)warn.jitter, - (float)crit.jitter, - (targets > 1) ? host->name : "", - (float)host->jitter_max / 1000, (targets > 1) ? host->name : "", - (float)host->jitter_min / 1000 - ); - } else { - printf("%sjitter_avg=U;;;; %sjitter_max=U;;;; %sjitter_min=U;;;; ", - (targets > 1) ? host->name : "", - (targets > 1) ? host->name : "", - (targets > 1) ? host->name : ""); - } + if (jitter_mode && host->pl<100) { + printf("%sjitter_avg=%0.3fms;%0.3f;%0.3f;0; %sjitter_max=%0.3fms;;;; %sjitter_min=%0.3fms;;;; ", + (targets > 1) ? host->name : "", + (float)host->jitter, + (float)warn.jitter, + (float)crit.jitter, + (targets > 1) ? host->name : "", + (float)host->jitter_max / 1000, (targets > 1) ? host->name : "", + (float)host->jitter_min / 1000 + ); } - if (mos_mode) { - if (host->pl<100) { - printf("%smos=%0.1f;%0.1f;%0.1f;0;5 ", - (targets > 1) ? host->name : "", - (float)host->mos, - (float)warn.mos, - (float)crit.mos); - } else { - printf("%smos=U;;;; ", (targets > 1) ? host->name : ""); - } + if (mos_mode && host->pl<100) { + printf("%smos=%0.1f;%0.1f;%0.1f;0;5 ", + (targets > 1) ? host->name : "", + (float)host->mos, + (float)warn.mos, + (float)crit.mos + ); } - if (score_mode) { - if (host->pl<100) { - printf("%sscore=%u;%u;%u;0;100 ", - (targets > 1) ? host->name : "", - (int)host->score, - (int)warn.score, - (int)crit.score); - } else { - printf("%sscore=U;;;; ", (targets > 1) ? host->name : ""); - } + if (score_mode && host->pl<100) { + printf("%sscore=%u;%u;%u;0;100 ", + (targets > 1) ? host->name : "", + (int)host->score, + (int)warn.score, + (int)crit.score + ); } host = host->next; diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t index de1d88d..4f9db86 100644 --- a/plugins-root/t/check_icmp.t +++ b/plugins-root/t/check_icmp.t @@ -12,7 +12,7 @@ my $allow_sudo = getTestParameter( "NP_ALLOW_SUDO", "no" ); if ($allow_sudo eq "yes" or $> == 0) { - plan tests => 40; + plan tests => 39; } else { plan skip_all => "Need sudo to test check_icmp"; } @@ -57,8 +57,7 @@ $res = NPTest->testCmd( "$sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -t 2" ); is( $res->return_code, 2, "Timeout - host nonresponsive" ); -like( $res->output, '/pl=100%/', "Error contains 'pl=100%' string (for 100% packet loss)" ); -like( $res->output, '/rta=U/', "Error contains 'rta=U' string" ); +like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" ); $res = NPTest->testCmd( "$sudo ./check_icmp -w 10000ms,100% -c 10000ms,100%" diff --git a/plugins-scripts/Makefile.in b/plugins-scripts/Makefile.in index 4265d6a..f22ee03 100644 --- a/plugins-scripts/Makefile.in +++ b/plugins-scripts/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,7 +163,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \ $(top_srcdir)/gl/m4/open-cloexec.m4 \ $(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \ - $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/printf.m4 \ + $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/pid_t.m4 \ + $(top_srcdir)/gl/m4/printf.m4 \ $(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ @@ -176,6 +177,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ + $(top_srcdir)/gl/m4/std-gnu11.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ @@ -193,6 +195,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/time_r.m4 $(top_srcdir)/gl/m4/timegm.m4 \ $(top_srcdir)/gl/m4/ungetc.m4 $(top_srcdir)/gl/m4/unistd_h.m4 \ $(top_srcdir)/gl/m4/unlocked-io.m4 \ + $(top_srcdir)/gl/m4/vararrays.m4 \ $(top_srcdir)/gl/m4/vasnprintf.m4 \ $(top_srcdir)/gl/m4/vasprintf.m4 \ $(top_srcdir)/gl/m4/visibility.m4 \ @@ -466,8 +469,6 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DBILIBS = @DBILIBS@ DEFS = @DEFS@ @@ -487,7 +488,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ EXTRAS = @EXTRAS@ EXTRAS_ROOT = @EXTRAS_ROOT@ @@ -1859,8 +1859,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -2143,6 +2141,7 @@ recheck: all @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl index 15a7080..4822fe6 100755 --- a/plugins-scripts/check_ircd.pl +++ b/plugins-scripts/check_ircd.pl @@ -40,16 +40,15 @@ # ----------------------------------------------------------------[ Require ]-- -require 5.14.0; +require 5.004; # -------------------------------------------------------------------[ Uses ]-- +use Socket; use strict; -use IO::Socket::IP; use Getopt::Long; -use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $opt_4 $opt_6 $verbose); +use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose); use vars qw($PROGNAME); -use vars qw($ClientSocket); use FindBin; use lib "$FindBin::Bin"; use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); @@ -59,6 +58,7 @@ use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); sub print_help (); sub print_usage (); sub connection ($$$$); +sub bindRemote ($$); # -------------------------------------------------------------[ Environment ]-- @@ -104,7 +104,7 @@ sub connection ($$$$) $answer = "Server $in_remotehost has less than 0 users! Something is Really WRONG!\n"; } - print $ClientSocket "quit\n"; + print ClientSocket "quit\n"; print $answer; exit $ERRORS{$state}; } @@ -112,7 +112,7 @@ sub connection ($$$$) # ------------------------------------------------------------[ print_usage ]-- sub print_usage () { - print "Usage: $PROGNAME -H [-w ] [-c ] [-p ] [ -4|-6 ]\n"; + print "Usage: $PROGNAME -H [-w ] [-c ] [-p ]\n"; } # -------------------------------------------------------------[ print_help ]-- @@ -135,15 +135,33 @@ Perl Check IRCD plugin for monitoring Number of connected users which generates a critical state (Default: 100) -p, --port=INTEGER Port that the ircd daemon is running on (Default: 6667) --4, --use-ipv4 - Use IPv4 connection --6, --use-ipv6 - Use IPv6 connection -v, --verbose Print extra debugging information "; } +# -------------------------------------------------------------[ bindRemote ]-- + +sub bindRemote ($$) +{ + my ($in_remotehost, $in_remoteport) = @_; + my $proto = getprotobyname('tcp'); + my $that; + my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost); + + if (!socket(ClientSocket,AF_INET, SOCK_STREAM, $proto)) { + print "IRCD UNKNOWN: Could not start socket ($!)\n"; + exit $ERRORS{"UNKNOWN"}; + } + $that = pack_sockaddr_in ($in_remoteport, $thataddr); + if (!connect(ClientSocket, $that)) { + print "IRCD UNKNOWN: Could not connect socket ($!)\n"; + exit $ERRORS{"UNKNOWN"}; + } + select(ClientSocket); $| = 1; select(STDOUT); + return \*ClientSocket; +} + # ===================================================================[ MAIN ]== MAIN: @@ -159,8 +177,6 @@ MAIN: "w=i" => \$opt_w, "warning=i" => \$opt_w, "c=i" => \$opt_c, "critical=i" => \$opt_c, "p=i" => \$opt_p, "port=i" => \$opt_p, - "4" => \$opt_4, "use-ipv4" => \$opt_4, - "6" => \$opt_6, "use-ipv6" => \$opt_6, "H=s" => \$opt_H, "hostname=s" => \$opt_H); if ($opt_V) { @@ -171,7 +187,7 @@ MAIN: if ($opt_h) {print_help(); exit $ERRORS{'UNKNOWN'};} ($opt_H) || ($opt_H = shift @ARGV) || usage("Host name/address not specified\n"); - my $remotehost = $1 if ($opt_H =~ /([-.:%A-Za-z0-9]+)/); + my $remotehost = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/); ($remotehost) || usage("Invalid host: $opt_H\n"); ($opt_w) || ($opt_w = shift @ARGV) || ($opt_w = 50); @@ -196,28 +212,21 @@ MAIN: alarm($TIMEOUT); + my ($name, $alias, $proto) = getprotobyname('tcp'); + print "MAIN(debug): binding to remote host: $remotehost -> $remoteport\n" if $verbose; - $ClientSocket = IO::Socket::IP->new( - PeerHost => $remotehost, - PeerService => $remoteport, - Family => $opt_4 ? AF_INET : $opt_6 ? AF_INET6 : undef, - Type => SOCK_STREAM, - ); - if (!$ClientSocket) { - print "IRCD UNKNOWN: Could not start socket ($!)\n"; - exit $ERRORS{"UNKNOWN"}; - } + my $ClientSocket = &bindRemote($remotehost,$remoteport); - print $ClientSocket "NICK $NICK\nUSER $USER_INFO\n"; + print ClientSocket "NICK $NICK\nUSER $USER_INFO\n"; - while (<$ClientSocket>) { + while () { print "MAIN(debug): default var = $_\n" if $verbose; # DALnet,LagNet,UnderNet etc. Require this! # Replies with a PONG when presented with a PING query. # If a server doesn't require it, it will be ignored. - if (m/^PING (.*)/) {print $ClientSocket "PONG $1\n";} + if (m/^PING (.*)/) {print ClientSocket "PONG $1\n";} alarm(0); diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl index f143c6f..49156af 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl @@ -1,7 +1,7 @@ #!@PERL@ -w # check_mailq - check to see how many messages are in the smtp queue awating -# transmittal. +# transmittal. # # Initial version support sendmail's mailq command # Support for multiple sendmail queues (Carlos Canau) @@ -29,8 +29,8 @@ use POSIX; use strict; use Getopt::Long; use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t $opt_s $opt_d - $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq $mailq_args - @lines %srcdomains %dstdomains); + $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq $mailq_args + @lines %srcdomains %dstdomains); use FindBin; use lib "$FindBin::Bin"; use utils qw(%ERRORS &print_revision &support &usage ); @@ -42,10 +42,10 @@ sub print_usage (); sub process_arguments (); $ENV{'PATH'}='@TRUSTED_PATH@'; -$ENV{'BASH_ENV'}=''; +$ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; $PROGNAME = "check_mailq"; -$mailq = 'sendmail'; # default +$mailq = 'sendmail'; # default $msg_q = 0 ; $msg_p = 0 ; # If appended, must start with a space @@ -55,49 +55,50 @@ $state = $ERRORS{'UNKNOWN'}; Getopt::Long::Configure('bundling'); $status = process_arguments(); if ($status){ - print "ERROR: processing arguments\n"; - exit $ERRORS{"UNKNOWN"}; + print "ERROR: processing arguments\n"; + exit $ERRORS{"UNKNOWN"}; } if ($opt_s) { - if (defined $utils::PATH_TO_SUDO && -x $utils::PATH_TO_SUDO) { - $sudo = $utils::PATH_TO_SUDO; - } else { - print "ERROR: Cannot execute sudo\n"; - exit $ERRORS{'UNKNOWN'}; - } + if (defined $utils::PATH_TO_SUDO && -x $utils::PATH_TO_SUDO) { + $sudo = $utils::PATH_TO_SUDO; + } else { + print "ERROR: Cannot execute sudo\n"; + exit $ERRORS{'UNKNOWN'}; + } } else { - $sudo = ""; + $sudo = ""; } if ($opt_d) { - $mailq_args = $mailq_args . ' -C ' . $opt_d; + $mailq_args = $mailq_args . ' -C ' . $opt_d; } $SIG{'ALRM'} = sub { - print ("ERROR: timed out waiting for $utils::PATH_TO_MAILQ \n"); - exit $ERRORS{"WARNING"}; + print ("ERROR: timed out waiting for $utils::PATH_TO_MAILQ \n"); + exit $ERRORS{"WARNING"}; }; alarm($opt_t); # switch based on MTA if ($mailq eq "sendmail") { - if( ! $utils::PATH_TO_MAILQ) { - print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; - exit $ERRORS{'UNKNOWN'}; - } - if ( ! -x $utils::PATH_TO_MAILQ) { - print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; - exit $ERRORS{'UNKNOWN'}; - } - - ## open mailq - if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) { - print "ERROR: could not open $sudo $utils::PATH_TO_MAILQ \n"; - exit $ERRORS{'UNKNOWN'}; - } + ## open mailq + if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) { + if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) { + print "ERROR: could not open $utils::PATH_TO_MAILQ \n"; + exit $ERRORS{'UNKNOWN'}; + } + }elsif( defined $utils::PATH_TO_MAILQ){ + unless (-x $utils::PATH_TO_MAILQ) { + print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; + exit $ERRORS{'UNKNOWN'}; + } + } else { + print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; + exit $ERRORS{'UNKNOWN'}; + } # single queue empty ##/var/spool/mqueue is empty # single queue: 1 @@ -167,207 +168,213 @@ if ($mailq eq "sendmail") { ## /var/spool/mqueue is empty ## Total requests: 0 - my $this_msg_q = 0; - while () { + my $this_msg_q = 0; + while () { + + # match email addr on queue listing + if ( (/<.*@.*\.(\w+\.\w+)>/) || (/<.*@(\w+\.\w+)>/) ) { + my $domain = $1; + if (/^\w+/) { + print "$utils::PATH_TO_MAILQ = srcdomain = $domain \n" if $verbose ; + $srcdomains{$domain} ++; + } + next; + } + + # + # ... + # sendmail considers a message with more than one destiny, say N, to the same MX + # to have N messages in queue. + # we will only consider one in this code + if (( /\s\(reply:\sread\serror\sfrom\s.*\.(\w+\.\w+)\.$/ ) || ( /\s\(reply:\sread\serror\sfrom\s(\w+\.\w+)\.$/ ) || + ( /\s\(timeout\swriting\smessage\sto\s.*\.(\w+\.\w+)\.:/ ) || ( /\s\(timeout\swriting\smessage\sto\s(\w+\.\w+)\.:/ ) || + ( /\s\(host\smap:\slookup\s\(.*\.(\w+\.\w+)\):/ ) || ( /\s\(host\smap:\slookup\s\((\w+\.\w+)\):/ ) || + ( /\s\(Deferred:\s.*\s.*\.(\w+\.\w+)\.\)/ ) || ( /\s\(Deferred:\s.*\s(\w+\.\w+)\.\)/ ) ) { + + print "$utils::PATH_TO_MAILQ = dstdomain = $1 \n" if $verbose ; + $dstdomains{$1} ++; + } + + if (/\s+\(I\/O\serror\)/) { + print "$utils::PATH_TO_MAILQ = dstdomain = UNKNOWN \n" if $verbose ; + $dstdomains{'UNKNOWN'} ++; + } - # match email addr on queue listing - if ( (/<.*@.*\.(\w+\.\w+)>/) || (/<.*@(\w+\.\w+)>/) ) { - my $domain = $1; - if (/^\w+/) { - print "$utils::PATH_TO_MAILQ = srcdomain = $domain \n" if $verbose ; - $srcdomains{$domain} ++; - } - next; - } + # Finally look at the overall queue length + # + if (/mqueue/) { + print "$utils::PATH_TO_MAILQ = $_ "if $verbose ; + if (/ \((\d+) request/) { + # + # single queue: first line + # multi queue: one for each queue. overwrite on multi queue below + $this_msg_q = $1 ; + $msg_q += $1 ; + } + } elsif (/^\s+Total\sRequests:\s(\d+)$/i) { + if ($this_msg_q) { + $this_msg_q = 0 ; + } else { + print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ; + # + # multi queue: last line + $msg_q += $1 ; + } + } + + } + - # - # ... - # sendmail considers a message with more than one destiny, say N, to the same MX - # to have N messages in queue. - # we will only consider one in this code - if (( /\s\(reply:\sread\serror\sfrom\s.*\.(\w+\.\w+)\.$/ ) || ( /\s\(reply:\sread\serror\sfrom\s(\w+\.\w+)\.$/ ) || - ( /\s\(timeout\swriting\smessage\sto\s.*\.(\w+\.\w+)\.:/ ) || ( /\s\(timeout\swriting\smessage\sto\s(\w+\.\w+)\.:/ ) || - ( /\s\(host\smap:\slookup\s\(.*\.(\w+\.\w+)\):/ ) || ( /\s\(host\smap:\slookup\s\((\w+\.\w+)\):/ ) || - ( /\s\(Deferred:\s.*\s.*\.(\w+\.\w+)\.\)/ ) || ( /\s\(Deferred:\s.*\s(\w+\.\w+)\.\)/ ) ) { + ## close mailq - print "$utils::PATH_TO_MAILQ = dstdomain = $1 \n" if $verbose ; - $dstdomains{$1} ++; - } + close (MAILQ); - if (/\s+\(I\/O\serror\)/) { - print "$utils::PATH_TO_MAILQ = dstdomain = UNKNOWN \n" if $verbose ; - $dstdomains{'UNKNOWN'} ++; - } + if ( $? ) { + print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/; + exit $ERRORS{CRITICAL}; + } - # Finally look at the overall queue length - # - if (/mqueue/) { - print "$utils::PATH_TO_MAILQ = $_ "if $verbose ; - if (/ \((\d+) request/) { - # - # single queue: first line - # multi queue: one for each queue. overwrite on multi queue below - $this_msg_q = $1 ; - $msg_q += $1 ; - } - } elsif (/^\s+Total\sRequests:\s(\d+)$/i) { - if ($this_msg_q) { - $this_msg_q = 0 ; - } else { - print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ; - # - # multi queue: last line - $msg_q += $1 ; - } - } + ## shut off the alarm + alarm(0); - } - ## close mailq - close (MAILQ); - if ( $? ) { - print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/; - exit $ERRORS{CRITICAL}; - } + ## now check the queue length(s) - ## shut off the alarm - alarm(0); + if ($msg_q == 0) { + $msg = "OK: $mailq mailq is empty"; + $state = $ERRORS{'OK'}; + } else { + print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose; + + # overall queue length + if ($msg_q < $opt_w) { + $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { + $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { + $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } - ## now check the queue length(s) + # check for domain specific queue lengths if requested + if (defined $opt_W) { + + # Apply threshold to queue lengths FROM domain + my @srckeys = sort { $srcdomains{$b} <=> $srcdomains{$a} } keys %srcdomains; + my $srcmaxkey = $srckeys[0]; + print "src max is $srcmaxkey with $srcdomains{$srcmaxkey} messages\n" if $verbose; + + if ($srcdomains{$srcmaxkey} >= $opt_W && $srcdomains{$srcmaxkey} < $opt_C) { + if ($state == $ERRORS{'OK'}) { + $msg = "WARNING: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)"; + $state = $ERRORS{'WARNING'}; + } elsif (($state == $ERRORS{'WARNING'}) || ($state == $ERRORS{'CRITICAL'})){ + $msg .= " -and- $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)"; + } else { + $msg = "WARNING: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)"; + $state = $ERRORS{'WARNING'}; + } + } elsif ($srcdomains{$srcmaxkey} >= $opt_C) { + if ($state == $ERRORS{'OK'}) { + $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold C = $opt_C)"; + $state = $ERRORS{'CRITICAL'}; + } elsif ($state == $ERRORS{'WARNING'}) { + $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold C = $opt_C) -and- " . $msg; + $msg =~ s/WARNING: //; + } elsif ($state == $ERRORS{'CRITICAL'}) { + $msg .= " -and- $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)"; + } else { + $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)"; + $state = $ERRORS{'CRITICAL'}; + } + } else { + if ($srcdomains{$srcmaxkey} > 0) { + $msg .= " $srcdomains{$srcmaxkey} msgs. FROM $srcmaxkey is below threshold ($opt_W/$opt_C)"; + } + } - if ($msg_q == 0) { - $msg = "OK: $mailq mailq is empty"; - $state = $ERRORS{'OK'}; - } else { - print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose; + # Apply threshold to queue lengths TO domain + my @dstkeys = sort { $dstdomains{$b} <=> $dstdomains{$a} } keys %dstdomains; + my $dstmaxkey = $dstkeys[0]; + print "dst max is $dstmaxkey with $dstdomains{$dstmaxkey} messages\n" if $verbose; + + if ($dstdomains{$dstmaxkey} >= $opt_W && $dstdomains{$dstmaxkey} < $opt_C) { + if ($state == $ERRORS{'OK'}) { + $msg = "WARNING: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)"; + $state = $ERRORS{'WARNING'}; + } elsif (($state == $ERRORS{'WARNING'}) || ($state == $ERRORS{'CRITICAL'})){ + $msg .= " -and- $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)"; + } else { + $msg = "WARNING: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)"; + $state = $ERRORS{'WARNING'}; + } + } elsif ($dstdomains{$dstmaxkey} >= $opt_C) { + if ($state == $ERRORS{'OK'}) { + $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold C = $opt_C)"; + $state = $ERRORS{'CRITICAL'}; + } elsif ($state == $ERRORS{'WARNING'}) { + $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold C = $opt_C) -and- " . $msg; + $msg =~ s/WARNING: //; + } elsif ($state == $ERRORS{'CRITICAL'}) { + $msg .= " -and- $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)"; + } else { + $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)"; + $state = $ERRORS{'CRITICAL'}; + } + } else { + if ($dstdomains{$dstmaxkey} > 0) { + $msg .= " $dstdomains{$dstmaxkey} msgs. TO $dstmaxkey is below threshold ($opt_W/$opt_C)"; + } + } - # overall queue length - if ($msg_q < $opt_w) { - $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; - $state = $ERRORS{'OK'}; - }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { - $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; - $state = $ERRORS{'WARNING'}; - }else { - $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; - $state = $ERRORS{'CRITICAL'}; - } + } # End of queue length thresholds - # check for domain specific queue lengths if requested - if (defined $opt_W) { - - # Apply threshold to queue lengths FROM domain - my @srckeys = sort { $srcdomains{$b} <=> $srcdomains{$a} } keys %srcdomains; - my $srcmaxkey = $srckeys[0]; - print "src max is $srcmaxkey with $srcdomains{$srcmaxkey} messages\n" if $verbose; - - if ($srcdomains{$srcmaxkey} >= $opt_W && $srcdomains{$srcmaxkey} < $opt_C) { - if ($state == $ERRORS{'OK'}) { - $msg = "WARNING: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)"; - $state = $ERRORS{'WARNING'}; - } elsif (($state == $ERRORS{'WARNING'}) || ($state == $ERRORS{'CRITICAL'})){ - $msg .= " -and- $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)"; - } else { - $msg = "WARNING: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)"; - $state = $ERRORS{'WARNING'}; - } - } elsif ($srcdomains{$srcmaxkey} >= $opt_C) { - if ($state == $ERRORS{'OK'}) { - $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold C = $opt_C)"; - $state = $ERRORS{'CRITICAL'}; - } elsif ($state == $ERRORS{'WARNING'}) { - $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold C = $opt_C) -and- " . $msg; - $msg =~ s/WARNING: //; - } elsif ($state == $ERRORS{'CRITICAL'}) { - $msg .= " -and- $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)"; - } else { - $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)"; - $state = $ERRORS{'CRITICAL'}; - } - } else { - if ($srcdomains{$srcmaxkey} > 0) { - $msg .= " $srcdomains{$srcmaxkey} msgs. FROM $srcmaxkey is below threshold ($opt_W/$opt_C)"; - } - } - - # Apply threshold to queue lengths TO domain - my @dstkeys = sort { $dstdomains{$b} <=> $dstdomains{$a} } keys %dstdomains; - my $dstmaxkey = $dstkeys[0]; - print "dst max is $dstmaxkey with $dstdomains{$dstmaxkey} messages\n" if $verbose; - - if ($dstdomains{$dstmaxkey} >= $opt_W && $dstdomains{$dstmaxkey} < $opt_C) { - if ($state == $ERRORS{'OK'}) { - $msg = "WARNING: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)"; - $state = $ERRORS{'WARNING'}; - } elsif (($state == $ERRORS{'WARNING'}) || ($state == $ERRORS{'CRITICAL'})){ - $msg .= " -and- $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)"; - } else { - $msg = "WARNING: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)"; - $state = $ERRORS{'WARNING'}; - } - } elsif ($dstdomains{$dstmaxkey} >= $opt_C) { - if ($state == $ERRORS{'OK'}) { - $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold C = $opt_C)"; - $state = $ERRORS{'CRITICAL'}; - } elsif ($state == $ERRORS{'WARNING'}) { - $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold C = $opt_C) -and- " . $msg; - $msg =~ s/WARNING: //; - } elsif ($state == $ERRORS{'CRITICAL'}) { - $msg .= " -and- $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)"; - } else { - $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)"; - $state = $ERRORS{'CRITICAL'}; - } - } else { - if ($dstdomains{$dstmaxkey} > 0) { - $msg .= " $dstdomains{$dstmaxkey} msgs. TO $dstmaxkey is below threshold ($opt_W/$opt_C)"; - } - } - - } # End of queue length thresholds - - } + } } # end of ($mailq eq "sendmail") elsif ( $mailq eq "postfix" ) { - if( ! $utils::PATH_TO_MAILQ ) { - print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; - exit $ERRORS{'UNKNOWN'}; - } - if ( ! -x $utils::PATH_TO_MAILQ) { - print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; - exit $ERRORS{'UNKNOWN'}; - } + ## open mailq + if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) { + if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ$mailq_args | " ) ) { + print "ERROR: could not open $utils::PATH_TO_MAILQ$mailq_args \n"; + exit $ERRORS{'UNKNOWN'}; + } + }elsif( defined $utils::PATH_TO_MAILQ){ + unless (-x $utils::PATH_TO_MAILQ) { + print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; + exit $ERRORS{'UNKNOWN'}; + } + } else { + print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; + exit $ERRORS{'UNKNOWN'}; + } - ## open mailq - if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ$mailq_args | " ) ) { - print "ERROR: could not open $utils::PATH_TO_MAILQ$mailq_args \n"; - exit $ERRORS{'UNKNOWN'}; - } - @lines = reverse ; + @lines = reverse ; - # close qmail-qstat - close MAILQ; + # close qmail-qstat + close MAILQ; - if ( $? ) { - print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ$mailq_args",$/; - exit $ERRORS{CRITICAL}; - } + if ( $? ) { + print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ$mailq_args",$/; + exit $ERRORS{CRITICAL}; + } - ## shut off the alarm - alarm(0); + ## shut off the alarm + alarm(0); - # check queue length - if ($lines[0]=~/Kbytes in (\d+)/) { - $msg_q = $1 ; - }elsif ($lines[0]=~/Mail queue is empty/) { - $msg_q = 0; + # check queue length + if ($lines[0]=~/Kbytes in (\d+)/) { + $msg_q = $1 ; + }elsif ($lines[0]=~/Mail queue is empty/) { + $msg_q = 0; }else{ - print "Couldn't match $utils::PATH_TO_MAILQ$mailq_args output\n"; - exit $ERRORS{'UNKNOWN'}; + print "Couldn't match $utils::PATH_TO_MAILQ$mailq_args output\n"; + exit $ERRORS{'UNKNOWN'}; } # check messages not processed @@ -383,193 +390,194 @@ elsif ( $mailq eq "postfix" ) { $msg = "OK: $mailq mailq reports queue is empty"; $state = $ERRORS{'OK'}; } else { - print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose; + print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose; - # overall queue length - if ($msg_q < $opt_w) { - $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; - $state = $ERRORS{'OK'}; - }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { - $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; - $state = $ERRORS{'WARNING'}; - }else { - $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; - $state = $ERRORS{'CRITICAL'}; - } + # overall queue length + if ($msg_q < $opt_w) { + $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { + $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { + $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } - # check messages not yet preprocessed (only compare is $opt_W and $opt_C - # are defined) + # check messages not yet preprocessed (only compare is $opt_W and $opt_C + # are defined) - #if (defined $opt_W) { - # $msg .= "[Preprocessed = $msg_p]"; - # if ($msg_p >= $opt_W && $msg_p < $opt_C ) { - # $state = $state == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"WARNING"} ; - # }elsif ($msg_p >= $opt_C ) { - # $state = $ERRORS{"CRITICAL"} ; - # } - #} + #if (defined $opt_W) { + # $msg .= "[Preprocessed = $msg_p]"; + # if ($msg_p >= $opt_W && $msg_p < $opt_C ) { + # $state = $state == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"WARNING"} ; + # }elsif ($msg_p >= $opt_C ) { + # $state = $ERRORS{"CRITICAL"} ; + # } + #} } } # end of ($mailq eq "postfix") elsif ( $mailq eq "qmail" ) { - if ( ! $utils::PATH_TO_QMAIL_QSTAT ) { - print "ERROR: \$utils::PATH_TO_QMAIL_QSTAT is not defined\n"; - exit $ERRORS{'UNKNOWN'}; - } - if ( ! -x $utils::PATH_TO_QMAIL_QSTAT) { - print "ERROR: $utils::PATH_TO_QMAIL_QSTAT is not executable by (uid $>:gid($)))\n"; - exit $ERRORS{'UNKNOWN'}; - } + # open qmail-qstat + if ( defined $utils::PATH_TO_QMAIL_QSTAT && -x $utils::PATH_TO_QMAIL_QSTAT ) { + if (! open (MAILQ, "$sudo $utils::PATH_TO_QMAIL_QSTAT | " ) ) { + print "ERROR: could not open $utils::PATH_TO_QMAIL_QSTAT \n"; + exit $ERRORS{'UNKNOWN'}; + } + }elsif( defined $utils::PATH_TO_QMAIL_QSTAT){ + unless (-x $utils::PATH_TO_QMAIL_QSTAT) { + print "ERROR: $utils::PATH_TO_QMAIL_QSTAT is not executable by (uid $>:gid($)))\n"; + exit $ERRORS{'UNKNOWN'}; + } + } else { + print "ERROR: \$utils::PATH_TO_QMAIL_QSTAT is not defined\n"; + exit $ERRORS{'UNKNOWN'}; + } - # open qmail-qstat - if (! open (MAILQ, "$sudo $utils::PATH_TO_QMAIL_QSTAT | " ) ) { - print "ERROR: could not open $utils::PATH_TO_QMAIL_QSTAT \n"; - exit $ERRORS{'UNKNOWN'}; - } + @lines = ; - @lines = ; + # close qmail-qstat + close MAILQ; - # close qmail-qstat - close MAILQ; + if ( $? ) { + print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/; + exit $ERRORS{CRITICAL}; + } - if ( $? ) { - print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/; - exit $ERRORS{CRITICAL}; - } + ## shut off the alarm + alarm(0); - ## shut off the alarm - alarm(0); + # check queue length + if ($lines[0]=~/^messages in queue: (\d+)/) { + $msg_q = $1 ; + }else{ + print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n"; + exit $ERRORS{'UNKNOWN'}; + } - # check queue length - if ($lines[0]=~/^messages in queue: (\d+)/) { - $msg_q = $1 ; - }else{ - print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n"; - exit $ERRORS{'UNKNOWN'}; - } - - # check messages not processed - if ($lines[1]=~/^messages in queue but not yet preprocessed: (\d+)/) { - my $msg_p = $1; - }else{ - print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n"; - exit $ERRORS{'UNKNOWN'}; - } + # check messages not processed + if ($lines[1]=~/^messages in queue but not yet preprocessed: (\d+)/) { + my $msg_p = $1; + }else{ + print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n"; + exit $ERRORS{'UNKNOWN'}; + } - # check queue length(s) - if ($msg_q == 0){ - $msg = "OK: qmail-qstat reports queue is empty"; - $state = $ERRORS{'OK'}; - } else { - print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose; - - # overall queue length - if ($msg_q < $opt_w) { - $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; - $state = $ERRORS{'OK'}; - }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { - $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; - $state = $ERRORS{'WARNING'}; - }else { - $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; - $state = $ERRORS{'CRITICAL'}; - } - - # check messages not yet preprocessed (only compare is $opt_W and $opt_C - # are defined) - - if (defined $opt_W) { - $msg .= "[Preprocessed = $msg_p]"; - if ($msg_p >= $opt_W && $msg_p < $opt_C ) { - $state = $state == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"WARNING"} ; - }elsif ($msg_p >= $opt_C ) { - $state = $ERRORS{"CRITICAL"} ; - } - } - } + # check queue length(s) + if ($msg_q == 0){ + $msg = "OK: qmail-qstat reports queue is empty"; + $state = $ERRORS{'OK'}; + } else { + print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose; + + # overall queue length + if ($msg_q < $opt_w) { + $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { + $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { + $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } + # check messages not yet preprocessed (only compare is $opt_W and $opt_C + # are defined) + + if (defined $opt_W) { + $msg .= "[Preprocessed = $msg_p]"; + if ($msg_p >= $opt_W && $msg_p < $opt_C ) { + $state = $state == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"WARNING"} ; + }elsif ($msg_p >= $opt_C ) { + $state = $ERRORS{"CRITICAL"} ; + } + } + } + } # end of ($mailq eq "qmail") elsif ( $mailq eq "exim" ) { - if ( ! $utils::PATH_TO_MAILQ ) { - print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; - exit $ERRORS{'UNKNOWN'}; - } + ## open mailq + if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) { + if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) { + print "ERROR: could not open $utils::PATH_TO_MAILQ \n"; + exit $ERRORS{'UNKNOWN'}; + } + }elsif( defined $utils::PATH_TO_MAILQ){ + unless (-x $utils::PATH_TO_MAILQ) { + print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; + exit $ERRORS{'UNKNOWN'}; + } + } else { + print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; + exit $ERRORS{'UNKNOWN'}; + } - if ( ! -x $utils::PATH_TO_MAILQ) { - print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; - exit $ERRORS{'UNKNOWN'}; - } - - ## open mailq - if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) { - print "ERROR: could not open $utils::PATH_TO_MAILQ \n"; - exit $ERRORS{'UNKNOWN'}; - } - - while () { - #22m 1.7K 19aEEr-0007hx-Dy <> *** frozen *** + while () { + #22m 1.7K 19aEEr-0007hx-Dy <> *** frozen *** #root@exlixams.glups.fr - if (/\s[\w\d]{6}-[\w\d]{6}-[\w\d]{2}\s/) { # message id 19aEEr-0007hx-Dy - $msg_q++ ; - } - } - close(MAILQ) ; + if (/\s[\w\d]{6}-[\w\d]{6}-[\w\d]{2}\s/) { # message id 19aEEr-0007hx-Dy + $msg_q++ ; + } + } + close(MAILQ) ; - if ( $? ) { - print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/; - exit $ERRORS{CRITICAL}; - } - if ($msg_q < $opt_w) { - $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; - $state = $ERRORS{'OK'}; - }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { - $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; - $state = $ERRORS{'WARNING'}; - }else { - $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; - $state = $ERRORS{'CRITICAL'}; - } + if ( $? ) { + print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/; + exit $ERRORS{CRITICAL}; + } + if ($msg_q < $opt_w) { + $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { + $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { + $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } } # end of ($mailq eq "exim") elsif ( $mailq eq "nullmailer" ) { - if( ! $utils::PATH_TO_MAILQ) { - print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; - exit $ERRORS{'UNKNOWN'}; - } + ## open mailq + if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) { + if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) { + print "ERROR: could not open $utils::PATH_TO_MAILQ \n"; + exit $ERRORS{'UNKNOWN'}; + } + }elsif( defined $utils::PATH_TO_MAILQ){ + unless (-x $utils::PATH_TO_MAILQ) { + print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; + exit $ERRORS{'UNKNOWN'}; + } + } else { + print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; + exit $ERRORS{'UNKNOWN'}; + } - if ( ! -x $utils::PATH_TO_MAILQ) { - print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; - exit $ERRORS{'UNKNOWN'}; - } + while () { + #2022-08-25 01:30:40 502 bytes from - ## open mailq - if ( ! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) { - print "ERROR: could not open $utils::PATH_TO_MAILQ \n"; - exit $ERRORS{'UNKNOWN'}; - } - - while () { - #2022-08-25 01:30:40 502 bytes from - - if (/^\d{4}-\d{2}-\d{2}\s+\d{2}\:\d{2}\:\d{2}\s+\d+\sbytes/) { - $msg_q++ ; - } - } - close(MAILQ) ; - if ($msg_q < $opt_w) { - $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; - $state = $ERRORS{'OK'}; - }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { - $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; - $state = $ERRORS{'WARNING'}; - }else { - $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; - $state = $ERRORS{'CRITICAL'}; - } + if (/^\d{4}-\d{2}-\d{2}\s+\d{2}\:\d{2}\:\d{2}\s+\d+\sbytes/) { + $msg_q++ ; + } + } + close(MAILQ) ; + if ($msg_q < $opt_w) { + $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { + $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { + $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } } # end of ($mailq eq "nullmailer") # Perfdata support @@ -582,130 +590,130 @@ exit $state; sub process_arguments(){ - GetOptions - ("V" => \$opt_V, "version" => \$opt_V, - "v" => \$opt_v, "verbose" => \$opt_v, - "h" => \$opt_h, "help" => \$opt_h, - "M:s" => \$opt_M, "mailserver:s" => \$opt_M, # mailserver (default sendmail) - "w=i" => \$opt_w, "warning=i" => \$opt_w, # warning if above this number - "c=i" => \$opt_c, "critical=i" => \$opt_c, # critical if above this number - "W=i" => \$opt_W, "warning-domain=i" => \$opt_W, # Warning if above this number - "C=i" => \$opt_C, "critical-domain=i" => \$opt_C, # Critical if above this number - "t=i" => \$opt_t, "timeout=i" => \$opt_t, - "s" => \$opt_s, "sudo" => \$opt_s, - "d:s" => \$opt_d, "configdir:s" => \$opt_d, - ); + GetOptions + ("V" => \$opt_V, "version" => \$opt_V, + "v" => \$opt_v, "verbose" => \$opt_v, + "h" => \$opt_h, "help" => \$opt_h, + "M:s" => \$opt_M, "mailserver:s" => \$opt_M, # mailserver (default sendmail) + "w=i" => \$opt_w, "warning=i" => \$opt_w, # warning if above this number + "c=i" => \$opt_c, "critical=i" => \$opt_c, # critical if above this number + "W=i" => \$opt_W, "warning-domain=i" => \$opt_W, # Warning if above this number + "C=i" => \$opt_C, "critical-domain=i" => \$opt_C, # Critical if above this number + "t=i" => \$opt_t, "timeout=i" => \$opt_t, + "s" => \$opt_s, "sudo" => \$opt_s, + "d:s" => \$opt_d, "configdir:s" => \$opt_d, + ); - if ($opt_V) { - print_revision($PROGNAME,'@NP_VERSION@'); - exit $ERRORS{'UNKNOWN'}; - } + if ($opt_V) { + print_revision($PROGNAME,'@NP_VERSION@'); + exit $ERRORS{'UNKNOWN'}; + } - if ($opt_h) { - print_help(); - exit $ERRORS{'UNKNOWN'}; - } + if ($opt_h) { + print_help(); + exit $ERRORS{'UNKNOWN'}; + } - if (defined $opt_v ){ - $verbose = $opt_v; - } + if (defined $opt_v ){ + $verbose = $opt_v; + } - unless (defined $opt_t) { - $opt_t = $utils::TIMEOUT ; # default timeout - } + unless (defined $opt_t) { + $opt_t = $utils::TIMEOUT ; # default timeout + } - unless ( defined $opt_w && defined $opt_c ) { - print_usage(); - exit $ERRORS{'UNKNOWN'}; - } + unless ( defined $opt_w && defined $opt_c ) { + print_usage(); + exit $ERRORS{'UNKNOWN'}; + } - if ( $opt_w >= $opt_c) { - print "Warning (-w) cannot be greater than Critical (-c)!\n"; - exit $ERRORS{'UNKNOWN'}; - } + if ( $opt_w >= $opt_c) { + print "Warning (-w) cannot be greater than Critical (-c)!\n"; + exit $ERRORS{'UNKNOWN'}; + } - if (defined $opt_W && ! defined !$opt_C) { - print "Need -C if using -W\n"; - exit $ERRORS{'UNKNOWN'}; - }elsif(defined $opt_W && defined $opt_C) { - if ($opt_W >= $opt_C) { - print "Warning (-W) cannot be greater than Critical (-C)!\n"; - exit $ERRORS{'UNKNOWN'}; - } - } + if (defined $opt_W && ! defined !$opt_C) { + print "Need -C if using -W\n"; + exit $ERRORS{'UNKNOWN'}; + }elsif(defined $opt_W && defined $opt_C) { + if ($opt_W >= $opt_C) { + print "Warning (-W) cannot be greater than Critical (-C)!\n"; + exit $ERRORS{'UNKNOWN'}; + } + } - if (defined $opt_M) { - if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) { - $mailq = $opt_M ; - }elsif( $opt_M eq ''){ - $mailq = 'sendmail'; - }else{ - print "-M: $opt_M is not supported\n"; - exit $ERRORS{'UNKNOWN'}; - } - }else{ - if (defined $utils::PATH_TO_QMAIL_QSTAT - && -x $utils::PATH_TO_QMAIL_QSTAT) - { - $mailq = 'qmail'; - } - elsif (-d '/var/lib/postfix' || -d '/var/local/lib/postfix' - || -e '/usr/sbin/postfix' || -e '/usr/local/sbin/postfix') - { - $mailq = 'postfix'; - } - elsif (-d '/usr/lib/exim4' || -d '/usr/local/lib/exim4' - || -e '/usr/sbin/exim' || -e '/usr/local/sbin/exim') - { - $mailq = 'exim'; - } - elsif (-d '/usr/lib/nullmailer' || -d '/usr/local/lib/nullmailer' - || -e '/usr/sbin/nullmailer-send' - || -e '/usr/local/sbin/nullmailer-send') - { - $mailq = 'nullmailer'; - } - else { - $mailq = 'sendmail'; - } - } - - return $ERRORS{'OK'}; + if (defined $opt_M) { + if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) { + $mailq = $opt_M ; + }elsif( $opt_M eq ''){ + $mailq = 'sendmail'; + }else{ + print "-M: $opt_M is not supported\n"; + exit $ERRORS{'UNKNOWN'}; + } + }else{ + if (defined $utils::PATH_TO_QMAIL_QSTAT + && -x $utils::PATH_TO_QMAIL_QSTAT) + { + $mailq = 'qmail'; + } + elsif (-d '/var/lib/postfix' || -d '/var/local/lib/postfix' + || -e '/usr/sbin/postfix' || -e '/usr/local/sbin/postfix') + { + $mailq = 'postfix'; + } + elsif (-d '/usr/lib/exim4' || -d '/usr/local/lib/exim4' + || -e '/usr/sbin/exim' || -e '/usr/local/sbin/exim') + { + $mailq = 'exim'; + } + elsif (-d '/usr/lib/nullmailer' || -d '/usr/local/lib/nullmailer' + || -e '/usr/sbin/nullmailer-send' + || -e '/usr/local/sbin/nullmailer-send') + { + $mailq = 'nullmailer'; + } + else { + $mailq = 'sendmail'; + } + } + + return $ERRORS{'OK'}; } sub print_usage () { - print "Usage: $PROGNAME -w -c [-W ] [-C ] [-M ] [-t ] [-s] [-d ] [-v]\n"; + print "Usage: $PROGNAME -w -c [-W ] [-C ] [-M ] [-t ] [-s] [-d ] [-v]\n"; } sub print_help () { - print_revision($PROGNAME,'@NP_VERSION@'); - print "Copyright (c) 2002 Subhendu Ghosh/Carlos Canau/Benjamin Schmid\n"; - print "\n"; - print_usage(); - print "\n"; - print " Checks the number of messages in the mail queue (supports multiple sendmail queues, qmail)\n"; - print " Feedback/patches to support non-sendmail mailqueue welcome\n\n"; - print "-w (--warning) = Min. number of messages in queue to generate warning\n"; - print "-c (--critical) = Min. number of messages in queue to generate critical alert ( w < c )\n"; - print "-W (--warning-domain) = Min. number of messages for same domain in queue to generate warning\n"; - print "-C (--critical-domain) = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n"; - print "-t (--timeout) = Plugin timeout in seconds (default = $utils::TIMEOUT)\n"; - print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer ] (default = autodetect)\n"; - print "-s (--sudo) = Use sudo to call the mailq command\n"; - print "-d (--configdir) = Config file or directory\n"; - print "-h (--help)\n"; - print "-V (--version)\n"; - print "-v (--verbose) = debugging output\n"; - print "\n\n"; - print "Note: -w and -c are required arguments. -W and -C are optional.\n"; - print " -W and -C are applied to domains listed on the queues - both FROM and TO. (sendmail)\n"; - print " -W and -C are applied message not yet preproccessed. (qmail)\n"; - print " This plugin tries to autodetect which mailserver you are running,\n"; - print " you can override the autodetection with -M.\n"; - print " This plugin uses the system mailq command (sendmail) or qmail-stat (qmail)\n"; - print " to look at the queues. Mailq can usually only be accessed by root or \n"; - print " a TrustedUser. You will have to set appropriate permissions for the plugin to work.\n"; - print ""; - print "\n\n"; - support(); + print_revision($PROGNAME,'@NP_VERSION@'); + print "Copyright (c) 2002 Subhendu Ghosh/Carlos Canau/Benjamin Schmid\n"; + print "\n"; + print_usage(); + print "\n"; + print " Checks the number of messages in the mail queue (supports multiple sendmail queues, qmail)\n"; + print " Feedback/patches to support non-sendmail mailqueue welcome\n\n"; + print "-w (--warning) = Min. number of messages in queue to generate warning\n"; + print "-c (--critical) = Min. number of messages in queue to generate critical alert ( w < c )\n"; + print "-W (--warning-domain) = Min. number of messages for same domain in queue to generate warning\n"; + print "-C (--critical-domain) = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n"; + print "-t (--timeout) = Plugin timeout in seconds (default = $utils::TIMEOUT)\n"; + print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer ] (default = autodetect)\n"; + print "-s (--sudo) = Use sudo to call the mailq command\n"; + print "-d (--configdir) = Config file or directory\n"; + print "-h (--help)\n"; + print "-V (--version)\n"; + print "-v (--verbose) = debugging output\n"; + print "\n\n"; + print "Note: -w and -c are required arguments. -W and -C are optional.\n"; + print " -W and -C are applied to domains listed on the queues - both FROM and TO. (sendmail)\n"; + print " -W and -C are applied message not yet preproccessed. (qmail)\n"; + print " This plugin tries to autodetect which mailserver you are running,\n"; + print " you can override the autodetection with -M.\n"; + print " This plugin uses the system mailq command (sendmail) or qmail-stat (qmail)\n"; + print " to look at the queues. Mailq can usually only be accessed by root or \n"; + print " a TrustedUser. You will have to set appropriate permissions for the plugin to work.\n"; + print ""; + print "\n\n"; + support(); } diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh index db824be..5998138 100755 --- a/plugins-scripts/check_oracle.sh +++ b/plugins-scripts/check_oracle.sh @@ -47,7 +47,7 @@ print_help() { echo "--cache" echo " Check local database for library and buffer cache hit ratios" echo " ---> Requires Oracle user/password and SID specified." - echo " ---> Requires select on v_\$sysstat and v_\$librarycache" + echo " ---> Requires select on v_$sysstat and v_$librarycache" echo "--tablespace" echo " Check local database for tablespace capacity in ORACLE_SID" echo " ---> Requires Oracle user/password specified." @@ -109,14 +109,14 @@ if [ -z "$ORACLE_HOME" ] ; then for oratab in /var/opt/oracle/oratab /etc/oratab do [ ! -f $oratab ] && continue - ORACLE_HOME=$(IFS=: - while read -r SID ORACLE_HOME _; + ORACLE_HOME=`IFS=: + while read -r SID ORACLE_HOME junk; do if [ "$SID" = "$2" ] || [ "$SID" = "*" ] ; then echo "$ORACLE_HOME"; exit; fi; - done < $oratab) + done < $oratab` [ -n "$ORACLE_HOME" ] && break done fi @@ -209,7 +209,7 @@ case "$cmd" in echo "UNKNOWN - Warning level is less then Crit" exit "$STATE_UNKNOWN" fi - result=$(sqlplus -s "${3}"/"${4}"@"${2}" << EOF + result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF set pagesize 0 set numf '9999999.99' select (1-(pr.value/(dbg.value+cg.value)))*100 @@ -217,8 +217,7 @@ from v\\$sysstat pr, v\\$sysstat dbg, v\\$sysstat cg where pr.name='physical reads' and dbg.name='db block gets' and cg.name='consistent gets'; -EOF -) +EOF` if echo "$result" | grep -q 'ORA-' ; then error=$(echo "$result" | grep "ORA-" | head -1) @@ -228,13 +227,12 @@ EOF buf_hr=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}') buf_hrx=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}') - result=$(sqlplus -s "${3}"/"${4}"@"${2}" << EOF + result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF set pagesize 0 set numf '9999999.99' select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100 from v\\$librarycache lc; -EOF -) +EOF` if echo "$result" | grep -q 'ORA-' ; then error=$(echo "$result" | grep "ORA-" | head -1) @@ -262,7 +260,7 @@ EOF echo "UNKNOWN - Warning level is more then Crit" exit "$STATE_UNKNOWN" fi - result=$(sqlplus -s "${3}"/"${4}"@"${2}" << EOF + result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF set pagesize 0 set numf '9999999.99' select NVL(b.free,0.0),a.total,100 - trunc(NVL(b.free,0.0)/a.total * 1000) / 10 prc @@ -273,8 +271,7 @@ LEFT OUTER JOIN ( select tablespace_name,sum(bytes)/1024/1024 free from dba_free_space group by tablespace_name) B ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${5}'; -EOF -) +EOF` if echo "$result" | grep -q 'ORA-' ; then error=$(echo "$result" | grep "ORA-" | head -1) diff --git a/plugins/Makefile.in b/plugins/Makefile.in index 3970232..dc5f6cf 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -182,7 +182,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \ $(top_srcdir)/gl/m4/open-cloexec.m4 \ $(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \ - $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/printf.m4 \ + $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/pid_t.m4 \ + $(top_srcdir)/gl/m4/printf.m4 \ $(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ @@ -195,6 +196,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ + $(top_srcdir)/gl/m4/std-gnu11.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ @@ -212,6 +214,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/time_r.m4 $(top_srcdir)/gl/m4/timegm.m4 \ $(top_srcdir)/gl/m4/ungetc.m4 $(top_srcdir)/gl/m4/unistd_h.m4 \ $(top_srcdir)/gl/m4/unlocked-io.m4 \ + $(top_srcdir)/gl/m4/vararrays.m4 \ $(top_srcdir)/gl/m4/vasnprintf.m4 \ $(top_srcdir)/gl/m4/vasprintf.m4 \ $(top_srcdir)/gl/m4/visibility.m4 \ @@ -517,6 +520,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -777,8 +782,6 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DBILIBS = @DBILIBS@ # gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this @@ -799,7 +802,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ EXTRAS = @EXTRAS@ EXTRAS_ROOT = @EXTRAS_ROOT@ @@ -2172,8 +2174,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = $(datadir)/locale -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -2908,6 +2908,7 @@ recheck: all @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/plugins/check_apt.c b/plugins/check_apt.c index 5c0f6e2..fa982ae 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c @@ -94,7 +94,7 @@ static int stderr_warning = 0; /* if a cmd issued output on stderr */ static int exec_warning = 0; /* if a cmd exited non-zero */ int main (int argc, char **argv) { - int result=STATE_UNKNOWN, packages_available=0, sec_count=0; + int result=STATE_UNKNOWN, packages_available=0, sec_count=0, i=0; char **packages_list=NULL, **secpackages_list=NULL; /* Parse extra opts if any */ @@ -142,11 +142,10 @@ int main (int argc, char **argv) { qsort(secpackages_list, sec_count, sizeof(char*), cmpstringp); qsort(packages_list, packages_available-sec_count, sizeof(char*), cmpstringp); - for(int i = 0; i < sec_count; i++) + for(i = 0; i < sec_count; i++) printf("%s (security)\n", secpackages_list[i]); - if (only_critical == false) { - for(int i = 0; i < packages_available - sec_count; i++) + for(i = 0; i < packages_available - sec_count; i++) printf("%s\n", packages_list[i]); } } @@ -252,7 +251,7 @@ int process_arguments (int argc, char **argv) { /* run an apt-get upgrade */ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkglist){ - int result=STATE_UNKNOWN, regres=0, pc=0, spc=0; + int i=0, result=STATE_UNKNOWN, regres=0, pc=0, spc=0; struct output chld_out, chld_err; regex_t ireg, ereg, sreg; char *cmdline=NULL, rerrbuf[64]; @@ -321,7 +320,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg * we may need to switch to the --print-uris output format, * in which case the logic here will slightly change. */ - for(size_t i = 0; i < chld_out.lines; i++) { + for(i = 0; i < chld_out.lines; i++) { if(verbose){ printf("%s\n", chld_out.line[i]); } @@ -354,7 +353,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg stderr_warning=1; result = max_state(result, STATE_WARNING); if(verbose){ - for(size_t i = 0; i < chld_err.lines; i++) { + for(i = 0; i < chld_err.lines; i++) { fprintf(stderr, "%s\n", chld_err.line[i]); } } @@ -368,7 +367,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg /* run an apt-get update (needs root) */ int run_update(void){ - int result=STATE_UNKNOWN; + int i=0, result=STATE_UNKNOWN; struct output chld_out, chld_err; char *cmdline; @@ -386,7 +385,7 @@ int run_update(void){ } if(verbose){ - for(size_t i = 0; i < chld_out.lines; i++) { + for(i = 0; i < chld_out.lines; i++) { printf("%s\n", chld_out.line[i]); } } @@ -396,7 +395,7 @@ int run_update(void){ stderr_warning=1; result = max_state(result, STATE_WARNING); if(verbose){ - for(size_t i = 0; i < chld_err.lines; i++) { + for(i = 0; i < chld_err.lines; i++) { fprintf(stderr, "%s\n", chld_err.line[i]); } } diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index 2a23b39..1ad547e 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c @@ -50,7 +50,7 @@ unsigned int services = 0; int skip_stdout = 0; int skip_stderr = 0; int warn_on_stderr = 0; -bool unknown_timeout = false; +bool unknown_timeout = FALSE; char *remotecmd = NULL; char **commargv = NULL; int commargc = 0; @@ -58,8 +58,8 @@ char *hostname = NULL; char *outputfile = NULL; char *host_shortname = NULL; char **service; -bool passive = false; -bool verbose = false; +int passive = FALSE; +int verbose = FALSE; int main (int argc, char **argv) @@ -68,6 +68,7 @@ main (int argc, char **argv) char *status_text; int cresult; int result = STATE_UNKNOWN; + int i; time_t local_time; FILE *fp = NULL; output chld_out, chld_err; @@ -95,7 +96,7 @@ main (int argc, char **argv) /* run the command */ if (verbose) { printf ("Command: %s\n", commargv[0]); - for (int i = 1; i < commargc; i++) + for (i=1; i (size_t)skip_stderr) { + if(chld_err.lines > skip_stderr) { printf (_("Remote command execution failed: %s\n"), chld_err.line[skip_stderr]); if ( warn_on_stderr ) @@ -133,8 +134,8 @@ main (int argc, char **argv) /* this is simple if we're not supposed to be passive. * Wrap up quickly and keep the tricks below */ if(!passive) { - if (chld_out.lines > (size_t)skip_stdout) - for (size_t i = skip_stdout; i < chld_out.lines; i++) + if (chld_out.lines > skip_stdout) + for (i = skip_stdout; i < chld_out.lines; i++) puts (chld_out.line[i]); else printf (_("%s - check_by_ssh: Remote command '%s' returned status %d\n"), @@ -155,7 +156,7 @@ main (int argc, char **argv) local_time = time (NULL); commands = 0; - for(size_t i = skip_stdout; i < chld_out.lines; i++) { + for(i = skip_stdout; i < chld_out.lines; i++) { status_text = chld_out.line[i++]; if (i == chld_out.lines || strstr (chld_out.line[i], "STATUS CODE: ") == NULL) die (STATE_UNKNOWN, _("%s: Error parsing output\n"), progname); @@ -234,7 +235,7 @@ process_arguments (int argc, char **argv) print_help (); exit (STATE_UNKNOWN); case 'v': /* help */ - verbose = true; + verbose = TRUE; break; case 't': /* timeout period */ if (!is_integer (optarg)) @@ -243,7 +244,7 @@ process_arguments (int argc, char **argv) timeout_interval = atoi (optarg); break; case 'U': - unknown_timeout = true; + unknown_timeout = TRUE; break; case 'H': /* host */ hostname = optarg; @@ -256,7 +257,7 @@ process_arguments (int argc, char **argv) break; case 'O': /* output file */ outputfile = optarg; - passive = true; + passive = TRUE; break; case 's': /* description of service to check */ p1 = optarg; diff --git a/plugins/check_curl.c b/plugins/check_curl.c index c54be5e..153e492 100644 --- a/plugins/check_curl.c +++ b/plugins/check_curl.c @@ -134,7 +134,6 @@ char regexp[MAX_RE_SIZE]; int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE; int errcode; bool invert_regex = false; -int state_regex = STATE_CRITICAL; char *server_address = NULL; char *host_name = NULL; @@ -224,7 +223,6 @@ curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN; int curl_http_version = CURL_HTTP_VERSION_NONE; bool automatic_decompression = false; char *cookie_jar_file = NULL; -bool haproxy_protocol = false; bool process_arguments (int, char**); void handle_curl_option_return_code (CURLcode res, const char* option); @@ -397,7 +395,7 @@ lookup_host (const char *host, char *buf, size_t buflen) char addrstr[100]; size_t addrstr_len; int errcode; - void *ptr = { 0 }; + void *ptr; size_t buflen_remaining = buflen - 1; memset (&hints, 0, sizeof (hints)); @@ -522,11 +520,6 @@ check_http (void) handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, socket_timeout), "CURLOPT_CONNECTTIMEOUT"); handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_TIMEOUT, socket_timeout), "CURLOPT_TIMEOUT"); - /* enable haproxy protocol */ - if (haproxy_protocol) { - handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HAPROXYPROTOCOL, 1L), "CURLOPT_HAPROXYPROTOCOL"); - } - // fill dns resolve cache to make curl connect to the given server_address instead of the host_name, only required for ssl, because we use the host_name later on to make SNI happy if(use_ssl && host_name != NULL) { if ( (res=lookup_host (server_address, addrstr, DEFAULT_BUFFER_SIZE/2)) != 0) { @@ -1134,7 +1127,7 @@ GOT_FIRST_CERT: strcpy(msg, tmp); } - result = state_regex; + result = STATE_CRITICAL; } else { regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER); @@ -1193,16 +1186,16 @@ int uri_strcmp (const UriTextRangeA range, const char* s) { if (!range.first) return -1; - if ( (size_t)(range.afterLast - range.first) < strlen (s) ) return -1; - return strncmp (s, range.first, min( (size_t)(range.afterLast - range.first), strlen (s))); + if (range.afterLast - range.first < strlen (s)) return -1; + return strncmp (s, range.first, min( range.afterLast - range.first, strlen (s))); } char* uri_string (const UriTextRangeA range, char* buf, size_t buflen) { if (!range.first) return "(null)"; - strncpy (buf, range.first, max (buflen-1, (size_t)(range.afterLast - range.first))); - buf[max (buflen-1, (size_t)(range.afterLast - range.first))] = '\0'; + strncpy (buf, range.first, max (buflen-1, range.afterLast - range.first)); + buf[max (buflen-1, range.afterLast - range.first)] = '\0'; buf[range.afterLast - range.first] = '\0'; return buf; } @@ -1391,9 +1384,7 @@ process_arguments (int argc, char **argv) CA_CERT_OPTION, HTTP_VERSION_OPTION, AUTOMATIC_DECOMPRESSION, - COOKIE_JAR, - HAPROXY_PROTOCOL, - STATE_REGEX + COOKIE_JAR }; int option = 0; @@ -1432,7 +1423,6 @@ process_arguments (int argc, char **argv) {"content-type", required_argument, 0, 'T'}, {"pagesize", required_argument, 0, 'm'}, {"invert-regex", no_argument, NULL, INVERT_REGEX}, - {"state-regex", required_argument, 0, STATE_REGEX}, {"use-ipv4", no_argument, 0, '4'}, {"use-ipv6", no_argument, 0, '6'}, {"extended-perfdata", no_argument, 0, 'E'}, @@ -1441,7 +1431,6 @@ process_arguments (int argc, char **argv) {"http-version", required_argument, 0, HTTP_VERSION_OPTION}, {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION}, {"cookie-jar", required_argument, 0, COOKIE_JAR}, - {"haproxy-protocol", no_argument, 0, HAPROXY_PROTOCOL}, {0, 0, 0, 0} }; @@ -1768,13 +1757,6 @@ process_arguments (int argc, char **argv) case INVERT_REGEX: invert_regex = true; break; - case STATE_REGEX: - if (!strcmp (optarg, "critical")) - state_regex = STATE_CRITICAL; - else if (!strcmp (optarg, "warning")) - state_regex = STATE_WARNING; - else usage2 (_("Invalid state-regex option"), optarg); - break; case '4': address_family = AF_INET; break; @@ -1859,9 +1841,6 @@ process_arguments (int argc, char **argv) case COOKIE_JAR: cookie_jar_file = optarg; break; - case HAPROXY_PROTOCOL: - haproxy_protocol = true; - break; case '?': /* print short usage statement if args not parsable */ usage5 (); @@ -2032,7 +2011,7 @@ print_help (void) printf (" %s\n", "-u, --url=PATH"); printf (" %s\n", _("URL to GET or POST (default: /)")); printf (" %s\n", "-P, --post=STRING"); - printf (" %s\n", _("URL decoded http POST data")); + printf (" %s\n", _("URL encoded http POST data")); printf (" %s\n", "-j, --method=STRING (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT)"); printf (" %s\n", _("Set HTTP method.")); printf (" %s\n", "-N, --no-body"); @@ -2050,10 +2029,7 @@ print_help (void) printf (" %s\n", "-R, --eregi=STRING"); printf (" %s\n", _("Search page for case-insensitive regex STRING")); printf (" %s\n", "--invert-regex"); - printf (" %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)")); - printf (" %s\n", _("can be changed with --state--regex)")); - printf (" %s\n", "--regex-state=STATE"); - printf (" %s\n", _("Return STATE if regex is found, OK if not\n")); + printf (" %s\n", _("Return CRITICAL if found, OK if not\n")); printf (" %s\n", "-a, --authorization=AUTH_PAIR"); printf (" %s\n", _("Username:password on sites with basic authentication")); printf (" %s\n", "-b, --proxy-authorization=AUTH_PAIR"); @@ -2084,8 +2060,6 @@ print_help (void) printf (" %s\n", _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)")); printf (" %s\n", "--enable-automatic-decompression"); printf (" %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING).")); - printf(" %s\n", "--haproxy-protocol"); - printf(" %s\n", _("Send HAProxy proxy protocol v1 header (CURLOPT_HAPROXYPROTOCOL).")); printf (" %s\n", "---cookie-jar=FILE"); printf (" %s\n", _("Store cookies in the cookie jar and send them out when requested.")); printf ("\n"); @@ -2170,7 +2144,7 @@ print_usage (void) printf (" [-b proxy_auth] [-f ]\n"); printf (" [-e ] [-d string] [-s string] [-l] [-r | -R ]\n"); printf (" [-P string] [-m :] [-4|-6] [-N] [-M ]\n"); - printf (" [-A string] [-k string] [-S ] [--sni] [--haproxy-protocol]\n"); + printf (" [-A string] [-k string] [-S ] [--sni]\n"); printf (" [-T ] [-j method]\n"); printf (" [--http-version=] [--enable-automatic-decompression]\n"); printf (" [--cookie-jar=\n"); @@ -2394,7 +2368,8 @@ remove_newlines (char *s) char * get_header_value (const struct phr_header* headers, const size_t nof_headers, const char* header) { - for(size_t i = 0; i < nof_headers; i++ ) { + int i; + for( i = 0; i < nof_headers; i++ ) { if(headers[i].name != NULL && strncasecmp( header, headers[i].name, max( headers[i].name_len, 4 ) ) == 0 ) { return strndup( headers[i].value, headers[i].value_len ); } @@ -2496,7 +2471,7 @@ check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFA int get_content_length (const curlhelp_write_curlbuf* header_buf, const curlhelp_write_curlbuf* body_buf) { - size_t content_length = 0; + int content_length = 0; struct phr_header headers[255]; size_t nof_headers = 255; size_t msglen; diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c index 29c8520..c24ca24 100644 --- a/plugins/check_dbi.c +++ b/plugins/check_dbi.c @@ -141,7 +141,7 @@ main (int argc, char **argv) if (verbose > 2) printf ("Initializing DBI\n"); - dbi_inst *instance_p = { 0 }; + dbi_inst *instance_p; if (dbi_initialize_r(NULL, instance_p) < 0) { printf ("UNKNOWN - failed to initialize DBI; possibly you don't have any drivers installed.\n"); diff --git a/plugins/check_dig.c b/plugins/check_dig.c index be7a610..5d85ae2 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c @@ -56,7 +56,7 @@ char *expected_address = NULL; char *dns_server = NULL; char *dig_args = ""; char *query_transport = ""; -bool verbose = false; +int verbose = FALSE; int server_port = DEFAULT_PORT; int number_tries = DEFAULT_TRIES; double warning_interval = UNDEFINED; @@ -176,11 +176,11 @@ main (int argc, char **argv) state_text (result), elapsed_time, msg ? msg : _("Probably a non-existent host/domain"), fperfdata("time", elapsed_time, "s", - (warning_interval>UNDEFINED ? true:false), + (warning_interval>UNDEFINED?TRUE:FALSE), warning_interval, - (critical_interval>UNDEFINED ? true:false), + (critical_interval>UNDEFINED?TRUE:FALSE), critical_interval, - true, 0, false, 0)); + TRUE, 0, FALSE, 0)); return result; } @@ -270,7 +270,7 @@ process_arguments (int argc, char **argv) dig_args = strdup(optarg); break; case 'v': /* verbose */ - verbose = true; + verbose = TRUE; break; case 'T': record_type = optarg; diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 24de2d4..2f066c7 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -46,7 +46,7 @@ const char *email = "devel@monitoring-plugins.org"; #include #include "fsusage.h" #include "mountlist.h" -#include +#include "intprops.h" /* necessary for TYPE_MAXIMUM */ #if HAVE_LIMITS_H # include #endif @@ -112,7 +112,8 @@ enum { SYNC_OPTION = CHAR_MAX + 1, NO_SYNC_OPTION, - BLOCK_SIZE_OPTION + BLOCK_SIZE_OPTION, + IGNORE_MISSING }; #ifdef _AIX @@ -134,12 +135,12 @@ char *exclude_device; char *units; uintmax_t mult = 1024 * 1024; int verbose = 0; -bool erronly = false; -bool display_mntp = false; -bool exact_match = false; +int erronly = FALSE; +int display_mntp = FALSE; +int exact_match = FALSE; bool ignore_missing = false; -bool freespace_ignore_reserved = false; -bool display_inodes_perfdata = false; +int freespace_ignore_reserved = FALSE; +int display_inodes_perfdata = FALSE; char *warn_freespace_units = NULL; char *crit_freespace_units = NULL; char *warn_freespace_percent = NULL; @@ -152,7 +153,7 @@ char *warn_usedinodes_percent = NULL; char *crit_usedinodes_percent = NULL; char *warn_freeinodes_percent = NULL; char *crit_freeinodes_percent = NULL; -bool path_selected = false; +int path_selected = FALSE; bool path_ignored = false; char *group = NULL; struct stat *stat_buf; @@ -204,7 +205,7 @@ main (int argc, char **argv) /* If a list of paths has not been selected, find entire mount list and create list of paths */ - if (path_selected == false && path_ignored == false) { + if (path_selected == FALSE && path_ignored == false) { for (me = mount_list; me; me = me->me_next) { if (! (path = np_find_parameter(path_select_list, me->me_mountdir))) { path = np_add_parameter(&path_select_list, me->me_mountdir); @@ -325,7 +326,7 @@ main (int argc, char **argv) get_stats (path, &fsp); if (verbose >= 3) { - printf ("For %s, used_pct=%f free_pct=%f used_units=%lu free_units=%lu total_units=%lu used_inodes_pct=%f free_inodes_pct=%f fsp.fsu_blocksize=%lu mult=%lu\n", + printf ("For %s, used_pct=%g free_pct=%g used_units=%lu free_units=%lu total_units=%lu used_inodes_pct=%g free_inodes_pct=%g fsp.fsu_blocksize=%lu mult=%lu\n", me->me_mountdir, path->dused_pct, path->dfree_pct, @@ -395,10 +396,10 @@ main (int argc, char **argv) perfdata_uint64 ( (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, path->dused_units * mult, "B", - (warning_high_tide == UINT64_MAX ? false : true), warning_high_tide, - (critical_high_tide == UINT64_MAX ? false : true), critical_high_tide, - true, 0, - true, path->dtotal_units * mult)); + (warning_high_tide == UINT64_MAX ? FALSE : TRUE), warning_high_tide, + (critical_high_tide == UINT64_MAX ? FALSE : TRUE), critical_high_tide, + TRUE, 0, + TRUE, path->dtotal_units * mult)); if (display_inodes_perfdata) { /* *_high_tide must be reinitialized at each run */ @@ -417,10 +418,10 @@ main (int argc, char **argv) xasprintf (&perf, "%s %s", perf, perfdata_uint64 (perf_ilabel, path->inodes_used, "", - (warning_high_tide != UINT64_MAX ? true : false), warning_high_tide, - (critical_high_tide != UINT64_MAX ? true : false), critical_high_tide, - true, 0, - true, path->inodes_total)); + (warning_high_tide != UINT64_MAX ? TRUE : FALSE), warning_high_tide, + (critical_high_tide != UINT64_MAX ? TRUE : FALSE), critical_high_tide, + TRUE, 0, + TRUE, path->inodes_total)); } if (disk_result==STATE_OK && erronly && !verbose) @@ -431,7 +432,7 @@ main (int argc, char **argv) } else { xasprintf(&flag_header, ""); } - xasprintf (&output, "%s%s %s %llu%s (%.1f%%", + xasprintf (&output, "%s%s %s %llu%s (%.0f%%", output, flag_header, (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, path->dfree_units, @@ -451,7 +452,7 @@ main (int argc, char **argv) if (strcmp(output, "") == 0 && ! erronly) { preamble = ""; - xasprintf (&output, " - No disks were found for provided parameters"); + xasprintf (&output, " - No disks were found for provided parameters;"); } printf ("DISK %s%s%s%s%s|%s\n", state_text (result), ((erronly && result==STATE_OK)) ? "" : preamble, output, (strcmp(ignored, "") == 0) ? "" : ignored_preamble, ignored, perf); @@ -461,8 +462,24 @@ main (int argc, char **argv) double calculate_percent(uintmax_t value, uintmax_t total) { double pct = -1; - if(value <= DBL_MAX && total != 0) { - pct = (double)value / total * 100.0; + /* I don't understand the below, but it is taken from coreutils' df */ + /* Seems to be calculating pct, in the best possible way */ + if (value <= TYPE_MAXIMUM(uintmax_t) / 100 + && total != 0) { + uintmax_t u100 = value * 100; + pct = u100 / total + (u100 % total != 0); + } else { + /* Possible rounding errors - see coreutils' df for more explanation */ + double u = value; + double t = total; + if (t) { + long int lipct = pct = u * 100 / t; + double ipct = lipct; + + /* Like 'pct = ceil (dpct);', but without ceil - from coreutils again */ + if (ipct - 1 < pct && pct <= ipct + 1) + pct = ipct + (ipct < pct); + } } return pct; } @@ -507,7 +524,7 @@ process_arguments (int argc, char **argv) {"ignore-ereg-partition", required_argument, 0, 'i'}, {"ignore-eregi-path", required_argument, 0, 'I'}, {"ignore-eregi-partition", required_argument, 0, 'I'}, - {"ignore-missing", no_argument, 0, 'n'}, + {"ignore-missing", no_argument, 0, IGNORE_MISSING}, {"local", no_argument, 0, 'l'}, {"stat-remote-fs", no_argument, 0, 'L'}, {"iperfdata", no_argument, 0, 'P'}, @@ -533,7 +550,7 @@ process_arguments (int argc, char **argv) strcpy (argv[c], "-t"); while (1) { - c = getopt_long (argc, argv, "+?VqhvefCt:c:w:K:W:u:p:x:X:N:mklLPg:R:r:i:I:MEAn", longopts, &option); + c = getopt_long (argc, argv, "+?VqhvefCt:c:w:K:W:u:p:x:X:N:mklLPg:R:r:i:I:MEA", longopts, &option); if (c == -1 || c == EOF) break; @@ -550,10 +567,6 @@ process_arguments (int argc, char **argv) /* See comments for 'c' */ case 'w': /* warning threshold */ - if (!is_percentage_expression(optarg) && !is_numeric(optarg)) { - die(STATE_UNKNOWN, "Argument for --warning invalid or missing: %s\n", optarg); - } - if (strstr(optarg, "%")) { if (*optarg == '@') { warn_freespace_percent = optarg; @@ -575,10 +588,6 @@ process_arguments (int argc, char **argv) force @ at the beginning of the range, so that it is backwards compatible */ case 'c': /* critical threshold */ - if (!is_percentage_expression(optarg) && !is_numeric(optarg)) { - die(STATE_UNKNOWN, "Argument for --critical invalid or missing: %s\n", optarg); - } - if (strstr(optarg, "%")) { if (*optarg == '@') { crit_freespace_percent = optarg; @@ -701,7 +710,7 @@ process_arguments (int argc, char **argv) mount_list = read_file_system_list (0); np_set_best_match(se, mount_list, exact_match); - path_selected = true; + path_selected = TRUE; break; case 'x': /* exclude path or partition */ np_add_name(&dp_exclude_list, optarg); @@ -725,18 +734,18 @@ process_arguments (int argc, char **argv) break; case 'q': /* TODO: this function should eventually go away (removed 2007-09-20) */ /* verbose--; **replaced by line below**. -q was only a broken way of implementing -e */ - erronly = true; + erronly = TRUE; break; case 'e': - erronly = true; + erronly = TRUE; break; case 'E': if (path_selected) die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set -E before selecting paths\n")); - exact_match = true; + exact_match = TRUE; break; case 'f': - freespace_ignore_reserved = true; + freespace_ignore_reserved = TRUE; break; case 'g': if (path_selected) @@ -783,7 +792,7 @@ process_arguments (int argc, char **argv) cflags = default_cflags; break; - case 'n': + case IGNORE_MISSING: ignore_missing = true; break; case 'A': @@ -808,7 +817,7 @@ process_arguments (int argc, char **argv) for (me = mount_list; me; me = me->me_next) { if (np_regex_match_mount_entry(me, &re)) { - fnd = true; + fnd = TRUE; if (verbose >= 3) printf("%s %s matching expression %s\n", me->me_devname, me->me_mountdir, optarg); @@ -823,24 +832,24 @@ process_arguments (int argc, char **argv) if (!fnd && ignore_missing == true) { path_ignored = true; - path_selected = true; + /* path_selected = TRUE;*/ break; } else if (!fnd) die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Regular expression did not match any path or disk"), optarg); - fnd = false; - path_selected = true; + fnd = FALSE; + path_selected = TRUE; np_set_best_match(path_select_list, mount_list, exact_match); cflags = default_cflags; break; case 'M': /* display mountpoint */ - display_mntp = true; + display_mntp = TRUE; break; case 'C': /* add all mount entries to path_select list if no partitions have been explicitly defined using -p */ - if (path_selected == false) { + if (path_selected == FALSE) { struct parameter_list *path; for (me = mount_list; me; me = me->me_next) { if (! (path = np_find_parameter(path_select_list, me->me_mountdir))) @@ -863,7 +872,7 @@ process_arguments (int argc, char **argv) warn_freeinodes_percent = NULL; crit_freeinodes_percent = NULL; - path_selected = false; + path_selected = FALSE; group = NULL; break; case 'V': /* version */ @@ -887,7 +896,7 @@ process_arguments (int argc, char **argv) if (argc > c) { se = np_add_parameter(&path_select_list, strdup(argv[c++])); - path_selected = true; + path_selected = TRUE; set_all_thresholds(se); } @@ -896,7 +905,7 @@ process_arguments (int argc, char **argv) mult = (uintmax_t)1024 * 1024; } - return true; + return TRUE; } @@ -995,7 +1004,7 @@ print_help (void) printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)")); printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION"); printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)")); - printf (" %s\n", "-n, --ignore-missing"); + printf (" %s\n", "--ignore-missing"); printf (" %s\n", _("Return OK if no filesystem matches, filesystem does not exist or is inaccessible.")); printf (" %s\n", _("(Provide this option before -p / -r / --ereg-path if used)")); printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); @@ -1122,7 +1131,7 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) { } /* finally calculate percentages for either plain FS or summed up group */ p->dused_pct = calculate_percent( p->used, p->used + p->available ); /* used + available can never be > uintmax */ - p->dfree_pct = 100.0 - p->dused_pct; + p->dfree_pct = 100 - p->dused_pct; p->dused_inodes_percent = calculate_percent(p->inodes_total - p->inodes_free, p->inodes_total); p->dfree_inodes_percent = 100 - p->dused_inodes_percent; diff --git a/plugins/check_dns.c b/plugins/check_dns.c index 468bc95..7ffce98 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c @@ -41,8 +41,8 @@ const char *email = "devel@monitoring-plugins.org"; int process_arguments (int, char **); int validate_arguments (void); -int error_scan (char *, bool *); -bool ip_match_cidr(const char *, const char *); +int error_scan (char *, int *); +int ip_match_cidr(const char *, const char *); unsigned long ip2long(const char *); void print_help (void); void print_usage (void); @@ -51,13 +51,13 @@ void print_usage (void); char query_address[ADDRESS_LENGTH] = ""; char dns_server[ADDRESS_LENGTH] = ""; char ptr_server[ADDRESS_LENGTH] = ""; -bool verbose = false; +int verbose = FALSE; char **expected_address = NULL; int expected_address_cnt = 0; -bool expect_nxdomain = false; +int expect_nxdomain = FALSE; -bool expect_authority = false; -bool all_match = false; +int expect_authority = FALSE; +int all_match = FALSE; thresholds *time_thresholds = NULL; static int @@ -80,14 +80,15 @@ main (int argc, char **argv) int n_addresses = 0; char *msg = NULL; char *temp_buffer = NULL; - bool non_authoritative = false; + int non_authoritative = FALSE; int result = STATE_UNKNOWN; double elapsed_time; long microsec; struct timeval tv; - bool parse_address = false; /* This flag scans for Address: but only after Name: */ + int parse_address = FALSE; /* This flag scans for Address: but only after Name: */ output chld_out, chld_err; - bool is_nxdomain = false; + size_t i; + int is_nxdomain = FALSE; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -121,7 +122,7 @@ main (int argc, char **argv) } /* scan stdout */ - for(size_t i = 0; i < chld_out.lines; i++) { + for(i = 0; i < chld_out.lines; i++) { if (addresses == NULL) addresses = malloc(sizeof(*addresses)*10); else if (!(n_addresses % 10)) @@ -163,8 +164,8 @@ main (int argc, char **argv) /* the server is responding, we just got the host name... */ if (strstr (chld_out.line[i], "Name:")) - parse_address = true; - else if (parse_address && (strstr (chld_out.line[i], "Address:") || + parse_address = TRUE; + else if (parse_address == TRUE && (strstr (chld_out.line[i], "Address:") || strstr (chld_out.line[i], "Addresses:"))) { temp_buffer = index (chld_out.line[i], ':'); temp_buffer++; @@ -183,7 +184,7 @@ main (int argc, char **argv) addresses[n_addresses++] = strdup(temp_buffer); } else if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) { - non_authoritative = true; + non_authoritative = TRUE; } @@ -196,7 +197,7 @@ main (int argc, char **argv) } /* scan stderr */ - for(size_t i = 0; i < chld_err.lines; i++) { + for(i = 0; i < chld_err.lines; i++) { if (verbose) puts(chld_err.line[i]); @@ -240,7 +241,7 @@ main (int argc, char **argv) unsigned long expect_match = (1 << expected_address_cnt) - 1; unsigned long addr_match = (1 << n_addresses) - 1; - for (int i=0; iwarning != NULL) && (time_thresholds->critical != NULL)) { printf ("|%s\n", fperfdata ("time", elapsed_time, "s", - true, time_thresholds->warning->end, - true, time_thresholds->critical->end, - true, 0, false, 0)); + TRUE, time_thresholds->warning->end, + TRUE, time_thresholds->critical->end, + TRUE, 0, FALSE, 0)); } else if ((time_thresholds->warning == NULL) && (time_thresholds->critical != NULL)) { printf ("|%s\n", fperfdata ("time", elapsed_time, "s", - false, 0, - true, time_thresholds->critical->end, - true, 0, false, 0)); + FALSE, 0, + TRUE, time_thresholds->critical->end, + TRUE, 0, FALSE, 0)); } else if ((time_thresholds->warning != NULL) && (time_thresholds->critical == NULL)) { printf ("|%s\n", fperfdata ("time", elapsed_time, "s", - true, time_thresholds->warning->end, - false, 0, - true, 0, false, 0)); + TRUE, time_thresholds->warning->end, + FALSE, 0, + TRUE, 0, FALSE, 0)); } else - printf ("|%s\n", fperfdata ("time", elapsed_time, "s", false, 0, false, 0, true, 0, false, 0)); + printf ("|%s\n", fperfdata ("time", elapsed_time, "s", FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0)); } else if (result == STATE_WARNING) printf (_("DNS WARNING - %s\n"), @@ -326,14 +327,15 @@ main (int argc, char **argv) return result; } -bool ip_match_cidr(const char *addr, const char *cidr_ro) { +int +ip_match_cidr(const char *addr, const char *cidr_ro) +{ char *subnet, *mask_c, *cidr = strdup(cidr_ro); int mask; subnet = strtok(cidr, "/"); mask_c = strtok(NULL, "\0"); - if (!subnet || !mask_c) { - return false; - } + if (!subnet || !mask_c) + return FALSE; mask = atoi(mask_c); /* https://www.cryptobells.com/verifying-ips-in-a-subnet-in-php/ */ @@ -353,14 +355,14 @@ ip2long(const char* src) { } int -error_scan (char *input_buffer, bool *is_nxdomain) +error_scan (char *input_buffer, int *is_nxdomain) { const int nxdomain = strstr (input_buffer, "Non-existent") || strstr (input_buffer, "** server can't find") || strstr (input_buffer, "** Can't find") || strstr (input_buffer, "NXDOMAIN"); - if (nxdomain) *is_nxdomain = true; + if (nxdomain) *is_nxdomain = TRUE; /* the DNS lookup timed out */ if (strstr (input_buffer, _("Note: nslookup is deprecated and may be removed from future releases.")) || @@ -459,7 +461,7 @@ process_arguments (int argc, char **argv) print_revision (progname, NP_VERSION); exit (STATE_UNKNOWN); case 'v': /* version */ - verbose = true; + verbose = TRUE; break; case 't': /* timeout period */ timeout_interval = atoi (optarg); @@ -506,13 +508,13 @@ process_arguments (int argc, char **argv) } break; case 'n': /* expect NXDOMAIN */ - expect_nxdomain = true; + expect_nxdomain = TRUE; break; case 'A': /* expect authority */ - expect_authority = true; + expect_authority = TRUE; break; case 'L': /* all must match */ - all_match = true; + all_match = TRUE; break; case 'w': warning = optarg; diff --git a/plugins/check_fping.c b/plugins/check_fping.c index 70d6f9f..23a9e99 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c @@ -59,16 +59,16 @@ int packet_size = PACKET_SIZE; int packet_count = PACKET_COUNT; int target_timeout = 0; int packet_interval = 0; -bool verbose = false; +int verbose = FALSE; int cpl; int wpl; double crta; double wrta; -bool cpl_p = false; -bool wpl_p = false; -bool alive_p = false; -bool crta_p = false; -bool wrta_p = false; +int cpl_p = FALSE; +int wpl_p = FALSE; +bool alive_p = FALSE; +int crta_p = FALSE; +int wrta_p = FALSE; int main (int argc, char **argv) @@ -194,8 +194,8 @@ int textscan (char *buf) { _("FPING %s - %s (rta=%f ms)|%s\n"), state_text (STATE_OK), server_name,rta, /* No loss since we only waited for the first reply - perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100), */ - fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, true, 0, false, 0)); + perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100), */ + fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, TRUE, 0, FALSE, 0)); } if (strstr (buf, "not found")) { @@ -228,21 +228,21 @@ int textscan (char *buf) { rtastr = 1 + index (rtastr, '/'); loss = strtod (losstr, NULL); rta = strtod (rtastr, NULL); - if (cpl_p && loss > cpl) + if (cpl_p == TRUE && loss > cpl) status = STATE_CRITICAL; - else if (crta_p && rta > crta) + else if (crta_p == TRUE && rta > crta) status = STATE_CRITICAL; - else if (wpl_p && loss > wpl) + else if (wpl_p == TRUE && loss > wpl) status = STATE_WARNING; - else if (wrta_p && rta > wrta) + else if (wrta_p == TRUE && rta > wrta) status = STATE_WARNING; else status = STATE_OK; die (status, _("FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"), state_text (status), server_name, loss, rta, - perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100), - fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, true, 0, false, 0)); + perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100), + fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, TRUE, 0, FALSE, 0)); } else if(strstr (buf, "xmt/rcv/%loss") ) { @@ -258,16 +258,16 @@ int textscan (char *buf) { loss = strtod (losstr, NULL); if (atoi(losstr) == 100) status = STATE_CRITICAL; - else if (cpl_p && loss > cpl) + else if (cpl_p == TRUE && loss > cpl) status = STATE_CRITICAL; - else if (wpl_p && loss > wpl) + else if (wpl_p == TRUE && loss > wpl) status = STATE_WARNING; else status = STATE_OK; /* loss=%.0f%%;%d;%d;0;100 */ die (status, _("FPING %s - %s (loss=%.0f%% )|%s\n"), state_text (status), server_name, loss , - perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100)); + perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100)); } else { @@ -329,7 +329,7 @@ process_arguments (int argc, char **argv) case '?': /* print short usage statement if args not parsable */ usage5 (); case 'a': /* host alive mode */ - alive_p = true; + alive_p = TRUE; break; case 'h': /* help */ print_help (); @@ -338,16 +338,16 @@ process_arguments (int argc, char **argv) print_revision (progname, NP_VERSION); exit (STATE_UNKNOWN); case 'v': /* verbose mode */ - verbose = true; + verbose = TRUE; break; case 'H': /* hostname */ - if (is_host (optarg) == false) { + if (is_host (optarg) == FALSE) { usage2 (_("Invalid hostname/address"), optarg); } server_name = strscpy (server_name, optarg); break; case 'S': /* sourceip */ - if (is_host (optarg) == false) { + if (is_host (optarg) == FALSE) { usage2 (_("Invalid hostname/address"), optarg); } sourceip = strscpy (sourceip, optarg); @@ -369,12 +369,12 @@ process_arguments (int argc, char **argv) get_threshold (optarg, rv); if (rv[RTA]) { crta = strtod (rv[RTA], NULL); - crta_p = true; + crta_p = TRUE; rv[RTA] = NULL; } if (rv[PL]) { cpl = atoi (rv[PL]); - cpl_p = true; + cpl_p = TRUE; rv[PL] = NULL; } break; @@ -382,12 +382,12 @@ process_arguments (int argc, char **argv) get_threshold (optarg, rv); if (rv[RTA]) { wrta = strtod (rv[RTA], NULL); - wrta_p = true; + wrta_p = TRUE; rv[RTA] = NULL; } if (rv[PL]) { wpl = atoi (rv[PL]); - wpl_p = true; + wpl_p = TRUE; rv[PL] = NULL; } break; diff --git a/plugins/check_game.c b/plugins/check_game.c index ca12697..a534b69 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c @@ -53,7 +53,7 @@ char *server_ip; char *game_type; int port = 0; -bool verbose = false; +int verbose; int qstat_game_players_max = -1; int qstat_game_players = -1; @@ -90,7 +90,7 @@ main (int argc, char **argv) if (port) xasprintf (&command_line, "%s:%-d", command_line, port); - if (verbose) + if (verbose > 0) printf ("%s\n", command_line); /* run the command. historically, this plugin ignores output on stderr, @@ -142,11 +142,11 @@ main (int argc, char **argv) ret[qstat_map_field], ret[qstat_ping_field], perfdata ("players", atol(ret[qstat_game_players]), "", - false, 0, false, 0, - true, 0, true, atol(ret[qstat_game_players_max])), + FALSE, 0, FALSE, 0, + TRUE, 0, TRUE, atol(ret[qstat_game_players_max])), fperfdata ("ping", strtod(ret[qstat_ping_field], NULL), "", - false, 0, false, 0, - true, 0, false, 0)); + FALSE, 0, FALSE, 0, + TRUE, 0, FALSE, 0)); } return result; @@ -201,7 +201,7 @@ process_arguments (int argc, char **argv) print_revision (progname, NP_VERSION); exit (STATE_UNKNOWN); case 'v': /* version */ - verbose = true; + verbose = TRUE; break; case 't': /* timeout period */ timeout_interval = atoi (optarg); diff --git a/plugins/check_http.c b/plugins/check_http.c index cdf768c..b9d8145 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -85,7 +85,6 @@ char errbuf[MAX_INPUT_BUFFER]; int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE; int errcode; int invert_regex = 0; -int state_regex = STATE_CRITICAL; struct timeval tv; struct timeval tv_temp; @@ -211,8 +210,7 @@ bool process_arguments (int argc, char **argv) INVERT_REGEX = CHAR_MAX + 1, SNI_OPTION, MAX_REDIRS_OPTION, - CONTINUE_AFTER_CHECK_CERT, - STATE_REGEX + CONTINUE_AFTER_CHECK_CERT }; int option = 0; @@ -248,7 +246,6 @@ bool process_arguments (int argc, char **argv) {"content-type", required_argument, 0, 'T'}, {"pagesize", required_argument, 0, 'm'}, {"invert-regex", no_argument, NULL, INVERT_REGEX}, - {"state-regex", required_argument, 0, STATE_REGEX}, {"use-ipv4", no_argument, 0, '4'}, {"use-ipv6", no_argument, 0, '6'}, {"extended-perfdata", no_argument, 0, 'E'}, @@ -474,9 +471,10 @@ bool process_arguments (int argc, char **argv) free(http_method); http_method = strdup (optarg); char *tmp; - if ((tmp = strstr(http_method, ":")) != NULL) { - tmp[0] = '\0'; // set the ":" in the middle to 0 - http_method_proxy = ++tmp; // this points to the second part + if ((tmp = strstr(http_method, ":")) > 0) { + tmp[0] = '\0'; + http_method = http_method; + http_method_proxy = ++tmp; } break; case 'd': /* string or substring */ @@ -514,13 +512,6 @@ bool process_arguments (int argc, char **argv) case INVERT_REGEX: invert_regex = 1; break; - case STATE_REGEX: - if (!strcmp (optarg, "critical")) - state_regex = STATE_CRITICAL; - else if (!strcmp (optarg, "warning")) - state_regex = STATE_WARNING; - else usage2 (_("Invalid state-regex option"), optarg); - break; case '4': address_family = AF_INET; break; @@ -1327,7 +1318,7 @@ check_http (void) xasprintf (&msg, _("%spattern not found, "), msg); else xasprintf (&msg, _("%spattern found, "), msg); - result = state_regex; + result = STATE_CRITICAL; } else { /* FIXME: Shouldn't that be UNKNOWN? */ @@ -1784,7 +1775,7 @@ print_help (void) printf (" %s\n", "-u, --url=PATH"); printf (" %s\n", _("URL to GET or POST (default: /)")); printf (" %s\n", "-P, --post=STRING"); - printf (" %s\n", _("URL decoded http POST data")); + printf (" %s\n", _("URL encoded http POST data")); printf (" %s\n", "-j, --method=STRING (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT, CONNECT:POST)"); printf (" %s\n", _("Set HTTP method.")); printf (" %s\n", "-N, --no-body"); @@ -1803,10 +1794,7 @@ print_help (void) printf (" %s\n", "-R, --eregi=STRING"); printf (" %s\n", _("Search page for case-insensitive regex STRING")); printf (" %s\n", "--invert-regex"); - printf (" %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)")); - printf (" %s\n", _("can be changed with --state--regex)")); - printf (" %s\n", "--regex-state=STATE"); - printf (" %s\n", _("Return STATE if regex is found, OK if not\n")); + printf (" %s\n", _("Return CRITICAL if found, OK if not\n")); printf (" %s\n", "-a, --authorization=AUTH_PAIR"); printf (" %s\n", _("Username:password on sites with basic authentication")); diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c index 3872e34..0160d98 100644 --- a/plugins/check_ide_smart.c +++ b/plugins/check_ide_smart.c @@ -73,6 +73,10 @@ void print_usage (void); #define NR_ATTRIBUTES 30 +#ifndef TRUE +#define TRUE 1 +#endif /* */ + #define PREFAILURE 2 #define ADVISORY 1 #define OPERATIONAL 0 @@ -165,9 +169,9 @@ int smart_read_values (int, values_t *); int nagios (values_t *, thresholds_t *); void print_value (value_t *, threshold_t *); void print_values (values_t *, thresholds_t *); -int smart_cmd_simple (int, enum SmartCommand, __u8, bool); +int smart_cmd_simple (int, enum SmartCommand, __u8, char); int smart_read_thresholds (int, thresholds_t *); -bool verbose = false; +int verbose = FALSE; int main (int argc, char *argv[]) @@ -199,7 +203,7 @@ main (int argc, char *argv[]) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - while (true) { + while (1) { o = getopt_long (argc, argv, "+d:iq10nhVv", longopts, &longindex); @@ -225,7 +229,7 @@ main (int argc, char *argv[]) fprintf (stderr, "%s\n", _("default and will be removed from future releases.")); break; case 'v': /* verbose */ - verbose = true; + verbose = TRUE; break; case 'h': print_help (); @@ -254,7 +258,7 @@ main (int argc, char *argv[]) return STATE_CRITICAL; } - if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, false)) { + if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, FALSE)) { printf (_("CRITICAL - SMART_CMD_ENABLE\n")); return STATE_CRITICAL; } @@ -443,7 +447,9 @@ print_values (values_t * p, thresholds_t * t) } -int smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, bool show_error) { +int +smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error) +{ int e = STATE_UNKNOWN; #ifdef __linux__ __u8 args[4]; diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index 868ffc1..15113b1 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c @@ -71,9 +71,9 @@ thresholds *entries_thresholds = NULL; struct timeval tv; char* warn_entries = NULL; char* crit_entries = NULL; -bool starttls = false; -bool ssl_on_connect = false; -bool verbose = false; +int starttls = FALSE; +int ssl_on_connect = FALSE; +int verbose = 0; /* for ldap tls */ @@ -115,7 +115,7 @@ main (int argc, char *argv[]) usage4 (_("Could not parse arguments")); if (strstr(argv[0],"check_ldaps") && ! starttls && ! ssl_on_connect) - starttls = true; + starttls = TRUE; /* initialize alarm signal handling */ signal (SIGALRM, socket_timeout_alarm_handler); @@ -253,11 +253,11 @@ main (int argc, char *argv[]) fperfdata ("time", elapsed_time, "s", (int)warn_time, warn_time, (int)crit_time, crit_time, - true, 0, false, 0), + TRUE, 0, FALSE, 0), sperfdata ("entries", (double)num_entries, "", warn_entries, crit_entries, - true, 0.0, false, 0.0)); + TRUE, 0.0, FALSE, 0.0)); } else { printf (_("LDAP %s - %.3f seconds response time|%s\n"), state_text (status), @@ -265,7 +265,7 @@ main (int argc, char *argv[]) fperfdata ("time", elapsed_time, "s", (int)warn_time, warn_time, (int)crit_time, crit_time, - true, 0, false, 0)); + TRUE, 0, FALSE, 0)); } return status; @@ -313,7 +313,7 @@ process_arguments (int argc, char **argv) strcpy (argv[c], "-t"); } - while (true) { + while (1) { c = getopt_long (argc, argv, "hvV234TS6t:c:w:H:b:p:a:D:P:C:W:", longopts, &option); if (c == -1 || c == EOF) @@ -374,17 +374,17 @@ process_arguments (int argc, char **argv) address_family = AF_INET; break; case 'v': - verbose = true; + verbose++; break; case 'T': if (! ssl_on_connect) - starttls = true; + starttls = TRUE; else usage_va(_("%s cannot be combined with %s"), "-T/--starttls", "-S/--ssl"); break; case 'S': if (! starttls) { - ssl_on_connect = true; + ssl_on_connect = TRUE; if (ld_port == -1) ld_port = LDAPS_PORT; } else diff --git a/plugins/check_load.c b/plugins/check_load.c index 1431d13..313df8a 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c @@ -110,6 +110,10 @@ main (int argc, char **argv) double la[3] = { 0.0, 0.0, 0.0 }; /* NetBSD complains about uninitialized arrays */ #ifndef HAVE_GETLOADAVG char input_buffer[MAX_INPUT_BUFFER]; +# ifdef HAVE_PROC_LOADAVG + FILE *fp; + char *str, *next; +# endif #endif setlocale (LC_ALL, ""); @@ -128,6 +132,23 @@ main (int argc, char **argv) if (result != 3) return STATE_UNKNOWN; #else +# ifdef HAVE_PROC_LOADAVG + fp = fopen (PROC_LOADAVG, "r"); + if (fp == NULL) { + printf (_("Error opening %s\n"), PROC_LOADAVG); + return STATE_UNKNOWN; + } + + while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) { + str = (char *)input_buffer; + for(i = 0; i < 3; i++) { + la[i] = strtod(str, &next); + str = next; + } + } + + fclose (fp); +# else child_process = spopen (PATH_TO_UPTIME); if (child_process == NULL) { printf (_("Error opening %s\n"), PATH_TO_UPTIME); @@ -154,13 +175,18 @@ main (int argc, char **argv) printf (_("Error code %d returned in %s\n"), result, PATH_TO_UPTIME); return STATE_UNKNOWN; } +# endif #endif if ((la[0] < 0.0) || (la[1] < 0.0) || (la[2] < 0.0)) { #ifdef HAVE_GETLOADAVG printf (_("Error in getloadavg()\n")); #else +# ifdef HAVE_PROC_LOADAVG + printf (_("Error processing %s\n"), PROC_LOADAVG); +# else printf (_("Error processing %s\n"), PATH_TO_UPTIME); +# endif #endif return STATE_UNKNOWN; } diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c index 826b77e..1fda549 100644 --- a/plugins/check_mrtg.c +++ b/plugins/check_mrtg.c @@ -43,7 +43,7 @@ void print_usage (void); char *log_file = NULL; int expire_minutes = 0; -bool use_average = true; +int use_average = TRUE; int variable_number = -1; unsigned long value_warning_threshold = 0L; unsigned long value_critical_threshold = 0L; @@ -138,7 +138,7 @@ main (int argc, char **argv) } /* else check the incoming/outgoing rates */ - if (use_average) + if (use_average == TRUE) rate = average_value_rate; else rate = maximum_value_rate; @@ -149,7 +149,7 @@ main (int argc, char **argv) result = STATE_WARNING; printf("%s. %s = %lu %s|%s\n", - (use_average) ? _("Avg") : _("Max"), + (use_average == TRUE) ? _("Avg") : _("Max"), label, rate, units, perfdata(label, (long) rate, units, (int) value_warning_threshold, (long) value_warning_threshold, @@ -211,9 +211,9 @@ process_arguments (int argc, char **argv) break; case 'a': /* port */ if (!strcmp (optarg, "MAX")) - use_average = false; + use_average = FALSE; else - use_average = true; + use_average = TRUE; break; case 'v': variable_number = atoi (optarg); @@ -258,11 +258,11 @@ process_arguments (int argc, char **argv) } if (argc > c && strcmp (argv[c], "MAX") == 0) { - use_average = false; + use_average = FALSE; c++; } else if (argc > c && strcmp (argv[c], "AVG") == 0) { - use_average = true; + use_average = TRUE; c++; } diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c index bd25d47..eb66f62 100644 --- a/plugins/check_mrtgtraf.c +++ b/plugins/check_mrtgtraf.c @@ -43,7 +43,7 @@ void print_usage(void); char *log_file = NULL; int expire_minutes = -1; -bool use_average = true; +int use_average = TRUE; unsigned long incoming_warning_threshold = 0L; unsigned long incoming_critical_threshold = 0L; unsigned long outgoing_warning_threshold = 0L; @@ -137,7 +137,7 @@ main (int argc, char **argv) (int) ((current_time - timestamp) / 60)); /* else check the incoming/outgoing rates */ - if (use_average) { + if (use_average == TRUE) { incoming_rate = average_incoming_rate; outgoing_rate = average_outgoing_rate; } @@ -192,17 +192,17 @@ main (int argc, char **argv) } xasprintf (&error_message, _("%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n"), - (use_average) ? _("Avg") : _("Max"), adjusted_incoming_rate, - incoming_speed_rating, (use_average) ? _("Avg") : _("Max"), + (use_average == TRUE) ? _("Avg") : _("Max"), adjusted_incoming_rate, + incoming_speed_rating, (use_average == TRUE) ? _("Avg") : _("Max"), adjusted_outgoing_rate, outgoing_speed_rating, fperfdata("in", adjusted_incoming_rate, incoming_speed_rating, (int)incoming_warning_threshold, incoming_warning_threshold, (int)incoming_critical_threshold, incoming_critical_threshold, - true, 0, false, 0), + TRUE, 0, FALSE, 0), fperfdata("out", adjusted_outgoing_rate, outgoing_speed_rating, (int)outgoing_warning_threshold, outgoing_warning_threshold, (int)outgoing_critical_threshold, outgoing_critical_threshold, - true, 0, false, 0)); + TRUE, 0, FALSE, 0)); printf (_("Traffic %s - %s\n"), state_text(result), error_message); @@ -256,9 +256,9 @@ process_arguments (int argc, char **argv) break; case 'a': /* aggregation (AVE or MAX) */ if (!strcmp (optarg, "MAX")) - use_average = false; + use_average = FALSE; else - use_average = true; + use_average = TRUE; break; case 'c': /* warning threshold */ sscanf (optarg, "%lu,%lu", &incoming_critical_threshold, @@ -289,11 +289,11 @@ process_arguments (int argc, char **argv) } if (argc > c && strcmp (argv[c], "MAX") == 0) { - use_average = false; + use_average = FALSE; c++; } else if (argc > c && strcmp (argv[c], "AVG") == 0) { - use_average = true; + use_average = TRUE; c++; } diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index 6a7daf1..7d85554 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c @@ -113,7 +113,7 @@ main (int argc, char **argv) char slaveresult[SLAVERESULTSIZE] = { 0 }; char* perf; - perf = strdup (""); + perf = strdup (""); setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -193,14 +193,14 @@ main (int argc, char **argv) for(i = 0; i < LENGTH_METRIC_UNIT; i++) { if (strcmp(row[0], metric_unit[i]) == 0) { xasprintf(&perf, "%s%s ", perf, perfdata(metric_unit[i], - atol(row[1]), "", false, 0, false, 0, false, 0, false, 0)); + atol(row[1]), "", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0)); continue; } } for(i = 0; i < LENGTH_METRIC_COUNTER; i++) { if (strcmp(row[0], metric_counter[i]) == 0) { xasprintf(&perf, "%s%s ", perf, perfdata(metric_counter[i], - atol(row[1]), "c", false, 0, false, 0, false, 0, false, 0)); + atol(row[1]), "c", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0)); continue; } } @@ -322,10 +322,10 @@ main (int argc, char **argv) status = get_status(value, my_threshold); xasprintf (&perf, "%s %s", perf, fperfdata ("seconds behind master", value, "s", - true, (double) warning_time, - true, (double) critical_time, - false, 0, - false, 0)); + TRUE, (double) warning_time, + TRUE, (double) critical_time, + FALSE, 0, + FALSE, 0)); if (status == STATE_WARNING) { printf("SLOW_SLAVE %s: %s|%s\n", _("WARNING"), slaveresult, perf); diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c index 842b7a2..ac2fb15 100644 --- a/plugins/check_mysql_query.c +++ b/plugins/check_mysql_query.c @@ -162,10 +162,10 @@ main (int argc, char **argv) } printf(_("'%s' returned %f | %s"), sql_query, value, fperfdata("result", value, "", - my_thresholds->warning?true:false, my_thresholds->warning?my_thresholds->warning->end:0, - my_thresholds->critical?true:false, my_thresholds->critical?my_thresholds->critical->end:0, - false, 0, - false, 0) + my_thresholds->warning?TRUE:FALSE, my_thresholds->warning?my_thresholds->warning->end:0, + my_thresholds->critical?TRUE:FALSE, my_thresholds->critical?my_thresholds->critical->end:0, + FALSE, 0, + FALSE, 0) ); printf("\n"); diff --git a/plugins/check_nt.c b/plugins/check_nt.c index 19c050d..d73d83c 100644 --- a/plugins/check_nt.c +++ b/plugins/check_nt.c @@ -67,17 +67,17 @@ char *req_password=NULL; unsigned long lvalue_list[MAX_VALUE_LIST]; unsigned long warning_value=0L; unsigned long critical_value=0L; -bool check_warning_value=false; -bool check_critical_value=false; +int check_warning_value=FALSE; +int check_critical_value=FALSE; enum checkvars vars_to_check = CHECK_NONE; -bool show_all = false; +int show_all=FALSE; char recv_buffer[MAX_INPUT_BUFFER]; void fetch_data (const char* address, int port, const char* sendb); int process_arguments(int, char **); void preparelist(char *string); -bool strtoularray(unsigned long *array, char *string, const char *delim); +int strtoularray(unsigned long *array, char *string, const char *delim); void print_help(void); void print_usage(void); @@ -113,8 +113,8 @@ int main(int argc, char **argv){ int uphours=0; int upminutes=0; - bool isPercent = false; - bool allRight = false; + int isPercent = FALSE; + int allRight = FALSE; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -151,7 +151,7 @@ int main(int argc, char **argv){ if (value_list==NULL) output_message = strdup (_("missing -l parameters")); - else if (! strtoularray(lvalue_list,value_list,",")) + else if (strtoularray(lvalue_list,value_list,",")==FALSE) output_message = strdup (_("wrong -l parameter.")); else { /* -l parameters is present with only integers */ @@ -224,9 +224,9 @@ int main(int argc, char **argv){ xasprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu"),updays, uphours, upminutes, uptime); - if (check_critical_value && uptime <= critical_value) + if (check_critical_value==TRUE && uptime <= critical_value) return_code=STATE_CRITICAL; - else if (check_warning_value && uptime <= warning_value) + else if (check_warning_value==TRUE && uptime <= warning_value) return_code=STATE_WARNING; else return_code=STATE_OK; @@ -261,9 +261,9 @@ int main(int argc, char **argv){ (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824, critical_used_space / 1073741824, total_disk_space / 1073741824); - if(check_critical_value && percent_used_space >= critical_value) + if(check_critical_value==TRUE && percent_used_space >= critical_value) return_code=STATE_CRITICAL; - else if (check_warning_value && percent_used_space >= warning_value) + else if (check_warning_value==TRUE && percent_used_space >= warning_value) return_code=STATE_WARNING; else return_code=STATE_OK; @@ -285,7 +285,7 @@ int main(int argc, char **argv){ else { preparelist(value_list); /* replace , between services with & to send the request */ xasprintf(&send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6, - (show_all) ? "ShowAll" : "ShowFail",value_list); + (show_all==TRUE) ? "ShowAll" : "ShowFail",value_list); fetch_data (server_address, server_port, send_buffer); numstr = strtok(recv_buffer,"&"); if (numstr == NULL) @@ -321,9 +321,9 @@ int main(int argc, char **argv){ warning_used_space / 1048567, critical_used_space / 1048567, mem_commitLimit / 1048567); return_code=STATE_OK; - if(check_critical_value && percent_used_space >= critical_value) + if(check_critical_value==TRUE && percent_used_space >= critical_value) return_code=STATE_CRITICAL; - else if (check_warning_value && percent_used_space >= warning_value) + else if (check_warning_value==TRUE && percent_used_space >= warning_value) return_code=STATE_WARNING; break; @@ -371,7 +371,7 @@ int main(int argc, char **argv){ else if (isPercent) { counter_unit = strdup ("%"); - allRight = true; + allRight = TRUE; } if ((counter_unit != NULL) && (!allRight)) @@ -391,7 +391,7 @@ int main(int argc, char **argv){ if ((fmaxval == 0) && (maxval == errcvt)) output_message = strdup (_("Maximum value contains non-numbers")); else - allRight = true; /* Everything is OK. */ + allRight = TRUE; /* Everything is OK. */ } } @@ -418,9 +418,9 @@ int main(int argc, char **argv){ if (critical_value > warning_value) { /* Normal thresholds */ - if (check_critical_value && counter_value >= critical_value) + if (check_critical_value == TRUE && counter_value >= critical_value) return_code = STATE_CRITICAL; - else if (check_warning_value && counter_value >= warning_value) + else if (check_warning_value == TRUE && counter_value >= warning_value) return_code = STATE_WARNING; else return_code = STATE_OK; @@ -428,9 +428,9 @@ int main(int argc, char **argv){ else { /* inverse thresholds */ return_code = STATE_OK; - if (check_critical_value && counter_value <= critical_value) + if (check_critical_value == TRUE && counter_value <= critical_value) return_code = STATE_CRITICAL; - else if (check_warning_value && counter_value <= warning_value) + else if (check_warning_value == TRUE && counter_value <= warning_value) return_code = STATE_WARNING; } break; @@ -448,17 +448,17 @@ int main(int argc, char **argv){ output_message = strdup (description); if (critical_value > warning_value) { /* Normal thresholds */ - if(check_critical_value && age_in_minutes >= critical_value) + if(check_critical_value==TRUE && age_in_minutes >= critical_value) return_code=STATE_CRITICAL; - else if (check_warning_value && age_in_minutes >= warning_value) + else if (check_warning_value==TRUE && age_in_minutes >= warning_value) return_code=STATE_WARNING; else return_code=STATE_OK; } else { /* inverse thresholds */ - if(check_critical_value && age_in_minutes <= critical_value) + if(check_critical_value==TRUE && age_in_minutes <= critical_value) return_code=STATE_CRITICAL; - else if (check_warning_value && age_in_minutes <= warning_value) + else if (check_warning_value==TRUE && age_in_minutes <= warning_value) return_code=STATE_WARNING; else return_code=STATE_OK; @@ -600,15 +600,15 @@ int process_arguments(int argc, char **argv){ break; case 'w': /* warning threshold */ warning_value=strtoul(optarg,NULL,10); - check_warning_value=true; + check_warning_value=TRUE; break; case 'c': /* critical threshold */ critical_value=strtoul(optarg,NULL,10); - check_critical_value=true; + check_critical_value=TRUE; break; case 'd': /* Display select for services */ if (!strcmp(optarg,"SHOWALL")) - show_all = true; + show_all = TRUE; break; case 'u': socket_timeout_state=STATE_UNKNOWN; @@ -646,7 +646,7 @@ void fetch_data (const char *address, int port, const char *sendb) { die (STATE_UNKNOWN, "NSClient - %s\n",recv_buffer); } -bool strtoularray(unsigned long *array, char *string, const char *delim) { +int strtoularray(unsigned long *array, char *string, const char *delim) { /* split a delimited string into a long array */ int idx=0; char *t1; @@ -660,9 +660,9 @@ bool strtoularray(unsigned long *array, char *string, const char *delim) { array[idx]=strtoul(t1,NULL,10); idx++; } else - return false; + return FALSE; } - return true; + return TRUE; } void preparelist(char *string) { diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index 61b2d69..99537c8 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c @@ -40,10 +40,10 @@ const char *email = "devel@monitoring-plugins.org"; static char *server_address=NULL; static int verbose=0; -static bool do_offset = false; +static short do_offset=0; static char *owarn="60"; static char *ocrit="120"; -static bool do_jitter = false; +static short do_jitter=0; static char *jwarn="5000"; static char *jcrit="10000"; @@ -513,8 +513,7 @@ setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq){ /* XXX handle responses with the error bit set */ double jitter_request(int *status){ - int conn=-1, i, npeers=0, num_candidates=0; - bool syncsource_found = false; + int conn=-1, i, npeers=0, num_candidates=0, syncsource_found=0; int run=0, min_peer_sel=PEER_INCLUDED, num_selected=0, num_valid=0; int peers_size=0, peer_offset=0; ntp_assoc_status_pair *peers=NULL; @@ -571,7 +570,7 @@ double jitter_request(int *status){ if (PEER_SEL(peers[i].status) >= PEER_INCLUDED){ num_candidates++; if(PEER_SEL(peers[i].status) >= PEER_SYNCSOURCE){ - syncsource_found = true; + syncsource_found=1; min_peer_sel=PEER_SYNCSOURCE; } } @@ -700,23 +699,23 @@ int process_arguments(int argc, char **argv){ verbose++; break; case 'w': - do_offset = true; + do_offset=1; owarn = optarg; break; case 'c': - do_offset = true; + do_offset=1; ocrit = optarg; break; case 'j': - do_jitter = true; + do_jitter=1; jwarn = optarg; break; case 'k': - do_jitter = true; + do_jitter=1; jcrit = optarg; break; case 'H': - if(!is_host(optarg)) + if(is_host(optarg) == FALSE) usage2(_("Invalid hostname/address"), optarg); server_address = strdup(optarg); break; @@ -750,9 +749,9 @@ int process_arguments(int argc, char **argv){ char *perfd_offset (double offset) { return fperfdata ("offset", offset, "s", - true, offset_thresholds->warning->end, - true, offset_thresholds->critical->end, - false, 0, false, 0); + TRUE, offset_thresholds->warning->end, + TRUE, offset_thresholds->critical->end, + FALSE, 0, FALSE, 0); } char *perfd_jitter (double jitter) @@ -760,7 +759,7 @@ char *perfd_jitter (double jitter) return fperfdata ("jitter", jitter, "s", do_jitter, jitter_thresholds->warning->end, do_jitter, jitter_thresholds->critical->end, - true, 0, false, 0); + TRUE, 0, FALSE, 0); } int main(int argc, char *argv[]){ diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index 464a9e1..49cb100 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c @@ -46,20 +46,21 @@ const char *email = "devel@monitoring-plugins.org"; static char *server_address=NULL; static int port=123; static int verbose=0; -static bool quiet = false; +static int quiet=0; +static short do_offset=0; static char *owarn="60"; static char *ocrit="120"; -static bool do_stratum = false; +static short do_stratum=0; static char *swarn="-1:16"; static char *scrit="-1:16"; -static bool do_jitter = false; +static short do_jitter=0; static char *jwarn="-1:5000"; static char *jcrit="-1:10000"; -static bool do_truechimers = false; +static short do_truechimers=0; static char *twarn="0:"; static char *tcrit="0:"; -static bool syncsource_found = false; -static bool li_alarm = false; +static int syncsource_found=0; +static int li_alarm=0; int process_arguments (int, char **); thresholds *offset_thresholds = NULL; @@ -253,7 +254,7 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum die(STATE_CRITICAL, "NTP CRITICAL: Invalid packet received from NTP server\n"); } while (!(req.op&OP_READSTAT && ntohs(req.seq) == 1)); - if (LI(req.flags) == LI_ALARM) li_alarm = true; + if (LI(req.flags) == LI_ALARM) li_alarm = 1; /* Each peer identifier is 4 bytes in the data section, which * we represent as a ntp_assoc_status_pair datatype. */ @@ -275,7 +276,7 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum if(PEER_SEL(peers[i].status) >= PEER_INCLUDED){ num_candidates++; if(PEER_SEL(peers[i].status) >= PEER_SYNCSOURCE){ - syncsource_found = true; + syncsource_found=1; min_peer_sel=PEER_SYNCSOURCE; } } @@ -439,7 +440,7 @@ int process_arguments(int argc, char **argv){ if (argc < 2) usage ("\n"); - while (true) { + while (1) { c = getopt_long (argc, argv, "Vhv46qw:c:W:C:j:k:m:n:t:H:p:", longopts, &option); if (c == -1 || c == EOF || c == 1) break; @@ -457,40 +458,42 @@ int process_arguments(int argc, char **argv){ verbose++; break; case 'q': - quiet = true; + quiet = 1; break; case 'w': + do_offset=1; owarn = optarg; break; case 'c': + do_offset=1; ocrit = optarg; break; case 'W': - do_stratum = true; + do_stratum=1; swarn = optarg; break; case 'C': - do_stratum = true; + do_stratum=1; scrit = optarg; break; case 'j': - do_jitter = true; + do_jitter=1; jwarn = optarg; break; case 'k': - do_jitter = true; + do_jitter=1; jcrit = optarg; break; case 'm': - do_truechimers = true; + do_truechimers=1; twarn = optarg; break; case 'n': - do_truechimers = true; + do_truechimers=1; tcrit = optarg; break; case 'H': - if(!is_host(optarg)) + if(is_host(optarg) == FALSE) usage2(_("Invalid hostname/address"), optarg); server_address = strdup(optarg); break; @@ -527,9 +530,9 @@ int process_arguments(int argc, char **argv){ char *perfd_offset (double offset) { return fperfdata ("offset", offset, "s", - true, offset_thresholds->warning->end, - true, offset_thresholds->critical->end, - false, 0, false, 0); + TRUE, offset_thresholds->warning->end, + TRUE, offset_thresholds->critical->end, + FALSE, 0, FALSE, 0); } char *perfd_jitter (double jitter) @@ -537,7 +540,7 @@ char *perfd_jitter (double jitter) return fperfdata ("jitter", jitter, "", do_jitter, jitter_thresholds->warning->end, do_jitter, jitter_thresholds->critical->end, - true, 0, false, 0); + TRUE, 0, FALSE, 0); } char *perfd_stratum (int stratum) @@ -545,7 +548,7 @@ char *perfd_stratum (int stratum) return perfdata ("stratum", stratum, "", do_stratum, (int)stratum_thresholds->warning->end, do_stratum, (int)stratum_thresholds->critical->end, - true, 0, true, 16); + TRUE, 0, TRUE, 16); } char *perfd_truechimers (int num_truechimers) @@ -553,11 +556,11 @@ char *perfd_truechimers (int num_truechimers) return perfdata ("truechimers", num_truechimers, "", do_truechimers, (int)truechimer_thresholds->warning->end, do_truechimers, (int)truechimer_thresholds->critical->end, - true, 0, false, 0); + TRUE, 0, FALSE, 0); } int main(int argc, char *argv[]){ - int result, offset_result, stratum, num_truechimers; + int result, offset_result, stratum, num_truechimers, oresult, jresult, sresult, tresult; double offset=0, jitter=0; char *result_line, *perfdata_line; @@ -587,35 +590,25 @@ int main(int argc, char *argv[]){ if(offset_result == STATE_UNKNOWN) { /* if there's no sync peer (this overrides ntp_request output): */ - result = (quiet ? STATE_UNKNOWN : STATE_CRITICAL); + result = (quiet == 1 ? STATE_UNKNOWN : STATE_CRITICAL); } else { /* Be quiet if there's no candidates either */ - if (quiet && result == STATE_WARNING) + if (quiet == 1 && result == STATE_WARNING) result = STATE_UNKNOWN; result = max_state_alt(result, get_status(fabs(offset), offset_thresholds)); } - - int oresult = result; - - - int tresult = STATE_UNKNOWN; + oresult = result; if(do_truechimers) { tresult = get_status(num_truechimers, truechimer_thresholds); result = max_state_alt(result, tresult); } - - int sresult = STATE_UNKNOWN; - if(do_stratum) { sresult = get_status(stratum, stratum_thresholds); result = max_state_alt(result, sresult); } - - int jresult = STATE_UNKNOWN; - if(do_jitter) { jresult = get_status(jitter, jitter_thresholds); result = max_state_alt(result, jresult); diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index b2e1655..46cc604 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c @@ -45,7 +45,7 @@ const char *email = "devel@monitoring-plugins.org"; static char *server_address=NULL; static char *port="123"; static int verbose=0; -static bool quiet = false; +static int quiet=0; static char *owarn="60"; static char *ocrit="120"; static int time_offset=0; @@ -485,7 +485,7 @@ int process_arguments(int argc, char **argv){ verbose++; break; case 'q': - quiet = true; + quiet = 1; break; case 'w': owarn = optarg; @@ -494,7 +494,7 @@ int process_arguments(int argc, char **argv){ ocrit = optarg; break; case 'H': - if(!is_host(optarg)) + if(is_host(optarg) == FALSE) usage2(_("Invalid hostname/address"), optarg); server_address = strdup(optarg); break; @@ -531,11 +531,12 @@ int process_arguments(int argc, char **argv){ return 0; } -char *perfd_offset (double offset) { +char *perfd_offset (double offset) +{ return fperfdata ("offset", offset, "s", - true, offset_thresholds->warning->end, - true, offset_thresholds->critical->end, - false, 0, false, 0); + TRUE, offset_thresholds->warning->end, + TRUE, offset_thresholds->critical->end, + FALSE, 0, FALSE, 0); } int main(int argc, char *argv[]){ @@ -565,7 +566,7 @@ int main(int argc, char *argv[]){ offset = offset_request(server_address, &offset_result); if (offset_result == STATE_UNKNOWN) { - result = ( (!quiet) ? STATE_UNKNOWN : STATE_CRITICAL); + result = (quiet == 1 ? STATE_UNKNOWN : STATE_CRITICAL); } else { result = get_status(fabs(offset), offset_thresholds); } diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c index 10c493b..3c9d23e 100644 --- a/plugins/check_nwstat.c +++ b/plugins/check_nwstat.c @@ -46,7 +46,6 @@ enum checkvar { VPF, /* check % free space on volume */ VMF, /* check MB free space on volume */ VMU, /* check MB used space on volume */ - VPU, /* check % used space on volume */ VMP, /* check MB purgeable space on volume */ VKF, /* check KB free space on volume */ LTCH, /* check long-term cache hit percentage */ @@ -105,9 +104,9 @@ char *nss7_name=NULL; int server_port=PORT; unsigned long warning_value=0L; unsigned long critical_value=0L; -bool check_warning_value = false; -bool check_critical_value = false; -bool check_netware_version = false; +int check_warning_value=FALSE; +int check_critical_value=FALSE; +int check_netware_version=FALSE; enum checkvar vars_to_check = NONE; int sap_number=-1; @@ -147,8 +146,6 @@ main(int argc, char **argv) { unsigned long nss6_value=0L; unsigned long nss7_value=0L; unsigned long total_disk_space=0L; - unsigned long used_disk_space=0L; - unsigned long percent_used_disk_space=0L; unsigned long purgeable_disk_space=0L; unsigned long non_purgeable_disk_space=0L; unsigned long percent_free_space=0; @@ -185,7 +182,7 @@ main(int argc, char **argv) { my_tcp_connect (server_address, server_port, &sd); /* get OS version string */ - if (check_netware_version) { + if (check_netware_version==TRUE) { send_buffer = strdup ("S19\r\n"); result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer)); if (result!=STATE_OK) @@ -234,9 +231,9 @@ main(int argc, char **argv) { recv_buffer[strlen(recv_buffer)-1]=0; sprintf(uptime,_("Up %s,"),recv_buffer); - if (check_critical_value && utilization >= critical_value) + if (check_critical_value==TRUE && utilization >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && utilization >= warning_value) + else if (check_warning_value==TRUE && utilization >= warning_value) result=STATE_WARNING; xasprintf (&output_message, @@ -262,9 +259,9 @@ main(int argc, char **argv) { return result; current_connections=strtoul(recv_buffer,NULL,10); - if (check_critical_value && current_connections >= critical_value) + if (check_critical_value==TRUE && current_connections >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && current_connections >= warning_value) + else if (check_warning_value==TRUE && current_connections >= warning_value) result=STATE_WARNING; xasprintf (&output_message, @@ -287,9 +284,9 @@ main(int argc, char **argv) { return result; cache_hits=atoi(recv_buffer); - if (check_critical_value && cache_hits <= critical_value) + if (check_critical_value==TRUE && cache_hits <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && cache_hits <= warning_value) + else if (check_warning_value==TRUE && cache_hits <= warning_value) result=STATE_WARNING; xasprintf (&output_message, @@ -309,9 +306,9 @@ main(int argc, char **argv) { return result; cache_buffers=strtoul(recv_buffer,NULL,10); - if (check_critical_value && cache_buffers <= critical_value) + if (check_critical_value==TRUE && cache_buffers <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && cache_buffers <= warning_value) + else if (check_warning_value==TRUE && cache_buffers <= warning_value) result=STATE_WARNING; xasprintf (&output_message, @@ -334,9 +331,9 @@ main(int argc, char **argv) { return result; cache_buffers=strtoul(recv_buffer,NULL,10); - if (check_critical_value && cache_buffers >= critical_value) + if (check_critical_value==TRUE && cache_buffers >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && cache_buffers >= warning_value) + else if (check_warning_value==TRUE && cache_buffers >= warning_value) result=STATE_WARNING; xasprintf (&output_message, @@ -359,9 +356,9 @@ main(int argc, char **argv) { return result; lru_time=strtoul(recv_buffer,NULL,10); - if (check_critical_value && lru_time <= critical_value) + if (check_critical_value==TRUE && lru_time <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && lru_time <= warning_value) + else if (check_warning_value==TRUE && lru_time <= warning_value) result=STATE_WARNING; xasprintf (&output_message, @@ -386,9 +383,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { free_disk_space=strtoul(recv_buffer,NULL,10); - if (check_critical_value && free_disk_space <= critical_value) + if (check_critical_value==TRUE && free_disk_space <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && free_disk_space <= warning_value) + else if (check_warning_value==TRUE && free_disk_space <= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;"), @@ -414,9 +411,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { free_disk_space=strtoul(recv_buffer,NULL,10); - if (check_critical_value && free_disk_space <= critical_value) + if (check_critical_value==TRUE && free_disk_space <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && free_disk_space <= warning_value) + else if (check_warning_value==TRUE && free_disk_space <= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;"), @@ -441,9 +438,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { free_disk_space=strtoul(recv_buffer,NULL,10); - if (check_critical_value && free_disk_space <= critical_value) + if (check_critical_value==TRUE && free_disk_space <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && free_disk_space <= warning_value) + else if (check_warning_value==TRUE && free_disk_space <= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;"), @@ -455,50 +452,7 @@ main(int argc, char **argv) { warning_value, critical_value); } - /* check % used space on volume */ - } else if (vars_to_check==VPU) { - close(sd); - my_tcp_connect (server_address, server_port, &sd); - asprintf (&send_buffer,"VMU%s\r\n",volume_name); - result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer)); - - if (result!=STATE_OK) - return result; - - if (!strcmp(recv_buffer,"-1\n")) { - asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name); - result=STATE_CRITICAL; - - } else { - used_disk_space=strtoul(recv_buffer,NULL,10); - close(sd); - my_tcp_connect (server_address, server_port, &sd); - /* get total volume in MB */ - asprintf (&send_buffer,"VMS%s\r\n",volume_name); - result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer)); - if (result!=STATE_OK) - return result; - total_disk_space=strtoul(recv_buffer,NULL,10); - /* calculate percent used on volume */ - percent_used_disk_space=(unsigned long)(((double)used_disk_space/(double)total_disk_space)*100.0); - - if (check_critical_value && percent_used_disk_space >= critical_value) - result=STATE_CRITICAL; - else if (check_warning_value && percent_used_disk_space >= warning_value) - result=STATE_WARNING; - - asprintf (&output_message,_("%lu MB (%lu%%) used on volume %s - total %lu MB|Used space in percent on %s=%lu;%lu;%lu;0;100"), - used_disk_space, - percent_used_disk_space, - volume_name, - total_disk_space, - volume_name, - percent_used_disk_space, - warning_value, - critical_value - ); - } /* check % free space on volume */ } else if (vars_to_check==VPF) { @@ -531,9 +485,9 @@ main(int argc, char **argv) { percent_free_space=(unsigned long)(((double)free_disk_space/(double)total_disk_space)*100.0); - if (check_critical_value && percent_free_space <= critical_value) + if (check_critical_value==TRUE && percent_free_space <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && percent_free_space <= warning_value) + else if (check_warning_value==TRUE && percent_free_space <= warning_value) result=STATE_WARNING; free_disk_space/=1024; total_disk_space/=1024; @@ -642,14 +596,14 @@ main(int argc, char **argv) { percent_used_packet_receive_buffers=(unsigned long)(((double)used_packet_receive_buffers/(double)max_packet_receive_buffers)*100.0); if (vars_to_check==UPRB) { - if (check_critical_value && used_packet_receive_buffers >= critical_value) + if (check_critical_value==TRUE && used_packet_receive_buffers >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && used_packet_receive_buffers >= warning_value) + else if (check_warning_value==TRUE && used_packet_receive_buffers >= warning_value) result=STATE_WARNING; } else { - if (check_critical_value && percent_used_packet_receive_buffers >= critical_value) + if (check_critical_value==TRUE && percent_used_packet_receive_buffers >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && percent_used_packet_receive_buffers >= warning_value) + else if (check_warning_value==TRUE && percent_used_packet_receive_buffers >= warning_value) result=STATE_WARNING; } @@ -671,9 +625,9 @@ main(int argc, char **argv) { sap_entries=atoi(recv_buffer); - if (check_critical_value && sap_entries >= critical_value) + if (check_critical_value==TRUE && sap_entries >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && sap_entries >= warning_value) + else if (check_warning_value==TRUE && sap_entries >= warning_value) result=STATE_WARNING; if (sap_number==-1) @@ -697,9 +651,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { purgeable_disk_space=strtoul(recv_buffer,NULL,10); - if (check_critical_value && purgeable_disk_space >= critical_value) + if (check_critical_value==TRUE && purgeable_disk_space >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && purgeable_disk_space >= warning_value) + else if (check_warning_value==TRUE && purgeable_disk_space >= warning_value) result=STATE_WARNING; xasprintf (&output_message,_("%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"), (result==STATE_OK)?"":_("Only "), @@ -723,9 +677,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { purgeable_disk_space=strtoul(recv_buffer,NULL,10); - if (check_critical_value && purgeable_disk_space >= critical_value) + if (check_critical_value==TRUE && purgeable_disk_space >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && purgeable_disk_space >= warning_value) + else if (check_warning_value==TRUE && purgeable_disk_space >= warning_value) result=STATE_WARNING; xasprintf (&output_message,_("%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"), (result==STATE_OK)?"":_("Only "), @@ -768,9 +722,9 @@ main(int argc, char **argv) { percent_purgeable_space=(unsigned long)(((double)purgeable_disk_space/(double)total_disk_space)*100.0); - if (check_critical_value && percent_purgeable_space >= critical_value) + if (check_critical_value==TRUE && percent_purgeable_space >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && percent_purgeable_space >= warning_value) + else if (check_warning_value==TRUE && percent_purgeable_space >= warning_value) result=STATE_WARNING; purgeable_disk_space/=1024; xasprintf (&output_message,_("%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100"), @@ -800,9 +754,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { non_purgeable_disk_space=strtoul(recv_buffer,NULL,10); - if (check_critical_value && non_purgeable_disk_space >= critical_value) + if (check_critical_value==TRUE && non_purgeable_disk_space >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && non_purgeable_disk_space >= warning_value) + else if (check_warning_value==TRUE && non_purgeable_disk_space >= warning_value) result=STATE_WARNING; xasprintf (&output_message,_("%s%lu KB not yet purgeable on volume %s"),(result==STATE_OK)?"":_("Only "),non_purgeable_disk_space,volume_name); } @@ -838,9 +792,9 @@ main(int argc, char **argv) { percent_non_purgeable_space=(unsigned long)(((double)non_purgeable_disk_space/(double)total_disk_space)*100.0); - if (check_critical_value && percent_non_purgeable_space >= critical_value) + if (check_critical_value==TRUE && percent_non_purgeable_space >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && percent_non_purgeable_space >= warning_value) + else if (check_warning_value==TRUE && percent_non_purgeable_space >= warning_value) result=STATE_WARNING; purgeable_disk_space/=1024; xasprintf (&output_message,_("%lu MB (%lu%%) not yet purgeable on volume %s"),non_purgeable_disk_space,percent_non_purgeable_space,volume_name); @@ -859,9 +813,9 @@ main(int argc, char **argv) { open_files=atoi(recv_buffer); - if (check_critical_value && open_files >= critical_value) + if (check_critical_value==TRUE && open_files >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && open_files >= warning_value) + else if (check_warning_value==TRUE && open_files >= warning_value) result=STATE_WARNING; xasprintf (&output_message,_("%lu open files|Openfiles=%lu;%lu;%lu;0,0"), @@ -884,9 +838,9 @@ main(int argc, char **argv) { abended_threads=atoi(recv_buffer); - if (check_critical_value && abended_threads >= critical_value) + if (check_critical_value==TRUE && abended_threads >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && abended_threads >= warning_value) + else if (check_warning_value==TRUE && abended_threads >= warning_value) result=STATE_WARNING; xasprintf (&output_message,_("%lu abended threads|Abends=%lu;%lu;%lu;;"), @@ -918,9 +872,9 @@ main(int argc, char **argv) { current_service_processes=atoi(recv_buffer); - if (check_critical_value && current_service_processes >= critical_value) + if (check_critical_value==TRUE && current_service_processes >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && current_service_processes >= warning_value) + else if (check_warning_value==TRUE && current_service_processes >= warning_value) result=STATE_WARNING; xasprintf (&output_message, @@ -969,9 +923,9 @@ main(int argc, char **argv) { return result; lru_time=strtoul(recv_buffer,NULL,10); - if (check_critical_value && lru_time <= critical_value) + if (check_critical_value==TRUE && lru_time <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && lru_time <= warning_value) + else if (check_warning_value==TRUE && lru_time <= warning_value) result=STATE_WARNING; xasprintf (&output_message,_("LRU sitting time = %lu seconds"),lru_time); @@ -988,9 +942,9 @@ main(int argc, char **argv) { return result; dirty_cache_buffers=atoi(recv_buffer); - if (check_critical_value && dirty_cache_buffers <= critical_value) + if (check_critical_value==TRUE && dirty_cache_buffers <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && dirty_cache_buffers <= warning_value) + else if (check_warning_value==TRUE && dirty_cache_buffers <= warning_value) result=STATE_WARNING; xasprintf (&output_message,_("Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100"), dirty_cache_buffers, @@ -1010,9 +964,9 @@ main(int argc, char **argv) { return result; total_cache_buffers=atoi(recv_buffer); - if (check_critical_value && total_cache_buffers <= critical_value) + if (check_critical_value==TRUE && total_cache_buffers <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && total_cache_buffers <= warning_value) + else if (check_warning_value==TRUE && total_cache_buffers <= warning_value) result=STATE_WARNING; xasprintf (&output_message,_("Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100"), total_cache_buffers, @@ -1080,9 +1034,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { nrmp_value=strtoul(recv_buffer,NULL,10); - if (check_critical_value && nrmp_value <= critical_value) + if (check_critical_value==TRUE && nrmp_value <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && nrmp_value <= warning_value) + else if (check_warning_value==TRUE && nrmp_value <= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s is %lu|%s=%lu;%lu;%lu;;"), @@ -1106,9 +1060,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { nrmm_value=strtoul(recv_buffer,NULL,10); - if (check_critical_value && nrmm_value <= critical_value) + if (check_critical_value==TRUE && nrmm_value <= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && nrmm_value <= warning_value) + else if (check_warning_value==TRUE && nrmm_value <= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s is %lu|%s=%lu;%lu;%lu;;"), @@ -1132,9 +1086,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { nrms_value=strtoul(recv_buffer,NULL,10); - if (check_critical_value && nrms_value >= critical_value) + if (check_critical_value==TRUE && nrms_value >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && nrms_value >= warning_value) + else if (check_warning_value==TRUE && nrms_value >= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s is %lu|%s=%lu;%lu;%lu;;"), @@ -1158,9 +1112,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { nss1_value=strtoul(recv_buffer,NULL,10); - if (check_critical_value && nss1_value >= critical_value) + if (check_critical_value==TRUE && nss1_value >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && nss1_value >= warning_value) + else if (check_warning_value==TRUE && nss1_value >= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s is %lu|%s=%lu;%lu;%lu;;"), @@ -1184,9 +1138,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { nss2_value=strtoul(recv_buffer,NULL,10); - if (check_critical_value && nss2_value >= critical_value) + if (check_critical_value==TRUE && nss2_value >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && nss2_value >= warning_value) + else if (check_warning_value==TRUE && nss2_value >= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s is %lu|%s=%lu;%lu;%lu;;"), @@ -1210,9 +1164,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { nss3_value=strtoul(recv_buffer,NULL,10); - if (check_critical_value && nss3_value >= critical_value) + if (check_critical_value==TRUE && nss3_value >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && nss3_value >= warning_value) + else if (check_warning_value==TRUE && nss3_value >= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s is %lu|%s=%lu;%lu;%lu;;"), @@ -1236,9 +1190,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { nss4_value=strtoul(recv_buffer,NULL,10); - if (check_critical_value && nss4_value >= critical_value) + if (check_critical_value==TRUE && nss4_value >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && nss4_value >= warning_value) + else if (check_warning_value==TRUE && nss4_value >= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s is %lu|%s=%lu;%lu;%lu;;"), @@ -1262,9 +1216,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { nss5_value=strtoul(recv_buffer,NULL,10); - if (check_critical_value && nss5_value >= critical_value) + if (check_critical_value==TRUE && nss5_value >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && nss5_value >= warning_value) + else if (check_warning_value==TRUE && nss5_value >= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s is %lu|%s=%lu;%lu;%lu;;"), @@ -1288,9 +1242,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { nss6_value=strtoul(recv_buffer,NULL,10); - if (check_critical_value && nss6_value >= critical_value) + if (check_critical_value==TRUE && nss6_value >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && nss6_value >= warning_value) + else if (check_warning_value==TRUE && nss6_value >= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s is %lu|%s=%lu;%lu;%lu;;"), @@ -1314,9 +1268,9 @@ main(int argc, char **argv) { result=STATE_CRITICAL; } else { nss7_value=strtoul(recv_buffer,NULL,10); - if (check_critical_value && nss7_value >= critical_value) + if (check_critical_value==TRUE && nss7_value >= critical_value) result=STATE_CRITICAL; - else if (check_warning_value && nss7_value >= warning_value) + else if (check_warning_value==TRUE && nss7_value >= warning_value) result=STATE_WARNING; xasprintf (&output_message, _("%s is %lu|%s=%lu;%lu;%lu;;"), @@ -1408,7 +1362,7 @@ int process_arguments(int argc, char **argv) { server_address=optarg; break; case 'o': /* display nos version */ - check_netware_version = true; + check_netware_version=TRUE; break; case 'p': /* port */ if (is_intnonneg(optarg)) @@ -1496,12 +1450,6 @@ int process_arguments(int argc, char **argv) { if (!strcmp(volume_name,"")) volume_name = strdup ("SYS"); } - else if (strncmp(optarg,"VPU",3)==0) { - vars_to_check=VPU; - volume_name = strdup (optarg+3); - if (!strcmp(volume_name,"")) - volume_name = strdup ("SYS"); - } else if (strncmp(optarg,"VPP",3)==0) { vars_to_check=VPP; volume_name = strdup (optarg+3); @@ -1621,11 +1569,11 @@ int process_arguments(int argc, char **argv) { break; case 'w': /* warning threshold */ warning_value=strtoul(optarg,NULL,10); - check_warning_value = true; + check_warning_value=TRUE; break; case 'c': /* critical threshold */ critical_value=strtoul(optarg,NULL,10); - check_critical_value = true; + check_critical_value=TRUE; break; case 't': /* timeout */ socket_timeout=atoi(optarg); @@ -1678,7 +1626,6 @@ void print_help(void) printf (" %s\n", _("OFILES = number of open files")); printf (" %s\n", _(" VMF = MB of free space on Volume ")); printf (" %s\n", _(" VMU = MB used space on Volume ")); - printf (" %s\n", _(" VPU = percent used space on Volume ")); printf (" %s\n", _(" VMP = MB of purgeable space on Volume ")); printf (" %s\n", _(" VPF = percent free space on volume ")); printf (" %s\n", _(" VKF = KB of free space on volume ")); diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c index 5165c82..9a4d25f 100644 --- a/plugins/check_overcr.c +++ b/plugins/check_overcr.c @@ -56,15 +56,15 @@ char *server_address = NULL; int server_port = PORT; double warning_value = 0L; double critical_value = 0L; -bool check_warning_value = false; -bool check_critical_value = false; +int check_warning_value = FALSE; +int check_critical_value = FALSE; enum checkvar vars_to_check = NONE; int cmd_timeout = 1; int netstat_port = 0; char *disk_name = NULL; char *process_name = NULL; -char send_buffer[MAX_INPUT_BUFFER]; + char send_buffer[MAX_INPUT_BUFFER]; int process_arguments (int, char **); void print_usage (void); @@ -77,7 +77,7 @@ main (int argc, char **argv) char recv_buffer[MAX_INPUT_BUFFER]; char temp_buffer[MAX_INPUT_BUFFER]; char *temp_ptr = NULL; - bool found_disk = false; + int found_disk = FALSE; unsigned long percent_used_disk_space = 100; double load; double load_1min; @@ -155,9 +155,9 @@ main (int argc, char **argv) break; } - if (check_critical_value && (load >= critical_value)) + if (check_critical_value == TRUE && (load >= critical_value)) result = STATE_CRITICAL; - else if (check_warning_value && (load >= warning_value)) + else if (check_warning_value == TRUE && (load >= warning_value)) result = STATE_WARNING; die (result, @@ -178,7 +178,7 @@ main (int argc, char **argv) temp_ptr = (char *) strtok (NULL, " ")) { if (!strcmp (temp_ptr, disk_name)) { - found_disk = true; + found_disk = TRUE; temp_ptr = (char *) strtok (NULL, "%"); if (temp_ptr == NULL) die (STATE_CRITICAL, _("Invalid response from server\n")); @@ -191,14 +191,14 @@ main (int argc, char **argv) } /* error if we couldn't find the info for the disk */ - if (!found_disk) + if (found_disk == FALSE) die (STATE_CRITICAL, "CRITICAL - Disk '%s' non-existent or not mounted", disk_name); - if (check_critical_value && (percent_used_disk_space >= critical_value)) + if (check_critical_value == TRUE && (percent_used_disk_space >= critical_value)) result = STATE_CRITICAL; - else if (check_warning_value && (percent_used_disk_space >= warning_value)) + else if (check_warning_value == TRUE && (percent_used_disk_space >= warning_value)) result = STATE_WARNING; die (result, "Disk %s - %lu%% used on %s", state_text(result), percent_used_disk_space, disk_name); @@ -212,9 +212,9 @@ main (int argc, char **argv) else port_connections = strtod (recv_buffer, NULL); - if (check_critical_value && (port_connections >= critical_value)) + if (check_critical_value == TRUE && (port_connections >= critical_value)) result = STATE_CRITICAL; - else if (check_warning_value && (port_connections >= warning_value)) + else if (check_warning_value == TRUE && (port_connections >= warning_value)) result = STATE_WARNING; die (result, @@ -241,9 +241,9 @@ main (int argc, char **argv) else processes = strtod (temp_ptr, NULL); - if (check_critical_value && (processes >= critical_value)) + if (check_critical_value == TRUE && (processes >= critical_value)) result = STATE_CRITICAL; - else if (check_warning_value && (processes >= warning_value)) + else if (check_warning_value == TRUE && (processes >= warning_value)) result = STATE_WARNING; die (result, @@ -262,9 +262,9 @@ main (int argc, char **argv) uptime_raw_hours = strtod (recv_buffer, NULL); uptime_raw_minutes = (unsigned long) (uptime_raw_hours * 60.0); - if (check_critical_value && (uptime_raw_minutes <= critical_value)) + if (check_critical_value == TRUE && (uptime_raw_minutes <= critical_value)) result = STATE_CRITICAL; - else if (check_warning_value && (uptime_raw_minutes <= warning_value)) + else if (check_warning_value == TRUE && (uptime_raw_minutes <= warning_value)) result = STATE_WARNING; uptime_days = uptime_raw_minutes / 1440; @@ -388,11 +388,11 @@ process_arguments (int argc, char **argv) break; case 'w': /* warning threshold */ warning_value = strtoul (optarg, NULL, 10); - check_warning_value = true; + check_warning_value = TRUE; break; case 'c': /* critical threshold */ critical_value = strtoul (optarg, NULL, 10); - check_critical_value = true; + check_critical_value = TRUE; break; case 't': /* timeout */ socket_timeout = atoi (optarg); diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c index 94d589e..6199033 100644 --- a/plugins/check_pgsql.c +++ b/plugins/check_pgsql.c @@ -69,7 +69,7 @@ int process_arguments (int, char **); int validate_arguments (void); void print_usage (void); void print_help (void); -bool is_pg_logname (char *); +int is_pg_logname (char *); int do_query (PGconn *, char *); char *pghost = NULL; /* host name of the backend server */ @@ -252,7 +252,7 @@ main (int argc, char **argv) printf (_(" %s - database %s (%f sec.)|%s\n"), state_text(status), dbName, elapsed_time, fperfdata("time", elapsed_time, "s", - !!(twarn > 0.0), twarn, !!(tcrit > 0.0), tcrit, true, 0, false,0)); + !!(twarn > 0.0), twarn, !!(tcrit > 0.0), tcrit, TRUE, 0, FALSE,0)); if (pgquery) query_status = do_query (conn, pgquery); @@ -393,7 +393,7 @@ process_arguments (int argc, char **argv) &PROTO_validate_arguments; -Given a database name, this function returns true if the string +Given a database name, this function returns TRUE if the string is a valid PostgreSQL database name, and returns false if it is not. @@ -424,7 +424,7 @@ function prototype &PROTO_is_pg_logname; -Given a username, this function returns true if the string is a +Given a username, this function returns TRUE if the string is a valid PostgreSQL username, and returns false if it is not. Valid PostgreSQL usernames are less than &NAMEDATALEN; characters long and consist of letters, numbers, dashes, and underscores, plus possibly some other @@ -439,10 +439,12 @@ should be added. -bool is_pg_logname (char *username) { +int +is_pg_logname (char *username) +{ if (strlen (username) > NAMEDATALEN - 1) - return (false); - return (true); + return (FALSE); + return (TRUE); } /****************************************************************************** diff --git a/plugins/check_ping.c b/plugins/check_ping.c index 6e162e6..741f732 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -55,7 +55,7 @@ int error_scan (char buf[MAX_INPUT_BUFFER], const char *addr); void print_usage (void); void print_help (void); -bool display_html = false; +int display_html = FALSE; int wpl = UNKNOWN_PACKET_LOSS; int cpl = UNKNOWN_PACKET_LOSS; float wrta = UNKNOWN_TRIP_TIME; @@ -153,7 +153,7 @@ main (int argc, char **argv) if (n_addresses > 1 && this_result != STATE_UNKNOWN) die (STATE_OK, "%s is alive\n", addresses[i]); - if (display_html == true) + if (display_html == TRUE) printf ("", CGIURL, addresses[i]); if (pl == 100) printf (_("PING %s - %sPacket loss = %d%%"), state_text (this_result), warn_text, @@ -161,22 +161,22 @@ main (int argc, char **argv) else printf (_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"), state_text (this_result), warn_text, pl, rta); - if (display_html == true) + if (display_html == TRUE) printf (""); /* Print performance data */ if (pl != 100) { printf("|%s", fperfdata ("rta", (double) rta, "ms", - wrta>0?true:false, wrta, - crta>0?true:false, crta, - true, 0, false, 0)); + wrta>0?TRUE:FALSE, wrta, + crta>0?TRUE:FALSE, crta, + TRUE, 0, FALSE, 0)); } else { printf("| rta=U;%f;%f;;", wrta, crta); } printf(" %s\n", perfdata ("pl", (long) pl, "%", - wpl>0?true:false, wpl, - cpl>0?true:false, cpl, - true, 0, false, 0)); + wpl>0?TRUE:FALSE, wpl, + cpl>0?TRUE:FALSE, cpl, + TRUE, 0, FALSE, 0)); if (verbose >= 2) printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl); @@ -278,10 +278,10 @@ process_arguments (int argc, char **argv) usage2 (_(" (%s) must be a non-negative number\n"), optarg); break; case 'n': /* no HTML */ - display_html = false; + display_html = FALSE; break; case 'L': /* show HTML */ - display_html = true; + display_html = TRUE; break; case 'c': get_threshold (optarg, &crta, &cpl); @@ -297,7 +297,7 @@ process_arguments (int argc, char **argv) return validate_arguments (); if (addresses[0] == NULL) { - if (!is_host (argv[c])) { + if (is_host (argv[c]) == FALSE) { usage2 (_("Invalid hostname/address"), argv[c]); } else { addresses[0] = argv[c++]; @@ -308,7 +308,7 @@ process_arguments (int argc, char **argv) } if (wpl == UNKNOWN_PACKET_LOSS) { - if (!is_intpercent (argv[c])) { + if (is_intpercent (argv[c]) == FALSE) { printf (_(" (%s) must be an integer percentage\n"), argv[c]); return ERROR; } else { @@ -319,7 +319,7 @@ process_arguments (int argc, char **argv) } if (cpl == UNKNOWN_PACKET_LOSS) { - if (!is_intpercent (argv[c])) { + if (is_intpercent (argv[c]) == FALSE) { printf (_(" (%s) must be an integer percentage\n"), argv[c]); return ERROR; } else { @@ -420,7 +420,7 @@ validate_arguments () timeout_interval = (int)max_seconds; for (i=0; i= 3) @@ -258,13 +255,6 @@ main (int argc, char **argv) continue; } - /* Ignore our own children */ - if (procppid == mypid) { - if (verbose >= 3) - printf("not considering - is our child\n"); - continue; - } - /* Ignore excluded processes by name */ if(options & EXCLUDE_PROGS) { int found = 0; @@ -738,23 +728,18 @@ convert_to_seconds(char *etime) { void print_help (void) { - print_revision (progname, NP_VERSION); + print_revision (progname, NP_VERSION); - printf ("Copyright (c) 1999 Ethan Galstad \n"); - printf (COPYRIGHT, copyright, email); + printf ("Copyright (c) 1999 Ethan Galstad \n"); + printf (COPYRIGHT, copyright, email); - printf ("%s\n", _("Checks all processes and generates WARNING or CRITICAL states if the specified")); + printf ("%s\n", _("Checks all processes and generates WARNING or CRITICAL states if the specified")); printf ("%s\n", _("metric is outside the required threshold ranges. The metric defaults to number")); printf ("%s\n", _("of processes. Search filters can be applied to limit the processes to check.")); printf ("\n\n"); - printf ("%s\n", _("The parent process, check_procs itself and any child process of check_procs (ps)")); - printf ("%s\n", _("are excluded from any checks to prevent false positives.")); - - printf ("\n\n"); - - print_usage (); + print_usage (); printf (UT_HELP_VRSN); printf (UT_EXTRA_OPTS); @@ -770,11 +755,11 @@ print_help (void) printf (" %s\n", _("CPU - percentage CPU")); /* only linux etime is support currently */ #if defined( __linux__ ) - printf (" %s\n", _("ELAPSED - time elapsed in seconds")); + printf (" %s\n", _("ELAPSED - time elapsed in seconds")); #endif /* defined(__linux__) */ - printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); - printf (" %s\n", "-v, --verbose"); + printf (" %s\n", "-v, --verbose"); printf (" %s\n", _("Extra information. Up to 3 verbosity levels")); printf (" %s\n", "-T, --traditional"); @@ -792,7 +777,7 @@ print_help (void) printf (" %s\n", _("Only scan for processes with VSZ higher than indicated.")); printf (" %s\n", "-r, --rss=RSS"); printf (" %s\n", _("Only scan for processes with RSS higher than indicated.")); - printf (" %s\n", "-P, --pcpu=PCPU"); + printf (" %s\n", "-P, --pcpu=PCPU"); printf (" %s\n", _("Only scan for processes with PCPU higher than indicated.")); printf (" %s\n", "-u, --user=USER"); printf (" %s\n", _("Only scan for processes with user name or ID indicated.")); @@ -807,19 +792,19 @@ print_help (void) printf (" %s\n", "-k, --no-kthreads"); printf (" %s\n", _("Only scan for non kernel threads (works on Linux only).")); - printf(_("\n\ + printf(_("\n\ RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n\ specified 'max:min', a warning status will be generated if the\n\ count is inside the specified range\n\n")); - printf(_("\ + printf(_("\ This plugin checks the number of currently running processes and\n\ generates WARNING or CRITICAL states if the process count is outside\n\ the specified threshold ranges. The process count can be filtered by\n\ process owner, parent process PID, current state (e.g., 'Z'), or may\n\ be the total number of running processes\n\n")); - printf ("%s\n", _("Examples:")); + printf ("%s\n", _("Examples:")); printf (" %s\n", "check_procs -w 2:2 -c 2:1024 -C portsentry"); printf (" %s\n", _("Warning if not two processes with command name portsentry.")); printf (" %s\n\n", _("Critical if < 2 or > 1024 processes")); @@ -836,14 +821,14 @@ be the total number of running processes\n\n")); printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU"); printf (" %s\n", _("Alert if CPU of any processes over 10\% or 20\%")); - printf (UT_SUPPORT); + printf (UT_SUPPORT); } void print_usage (void) { printf ("%s\n", _("Usage:")); - printf ("%s -w -c [-m metric] [-s state] [-p ppid]\n", progname); + printf ("%s -w -c [-m metric] [-s state] [-p ppid]\n", progname); printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n"); printf (" [-C command] [-X process_to_exclude] [-k] [-t timeout] [-v]\n"); } diff --git a/plugins/check_radius.c b/plugins/check_radius.c index 6b32710..b1b4938 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c @@ -93,7 +93,7 @@ char *expect = NULL; char *config_file = NULL; unsigned short port = PW_AUTH_UDP_PORT; int retries = 1; -bool verbose = false; +int verbose = FALSE; /****************************************************************************** @@ -272,10 +272,10 @@ process_arguments (int argc, char **argv) print_revision (progname, NP_VERSION); exit (STATE_UNKNOWN); case 'v': /* verbose mode */ - verbose = true; + verbose = TRUE; break; case 'H': /* hostname */ - if (!is_host (optarg)) { + if (is_host (optarg) == FALSE) { usage2 (_("Invalid hostname/address"), optarg); } server = optarg; diff --git a/plugins/check_real.c b/plugins/check_real.c index 15e035b..fbdb70f 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c @@ -54,10 +54,10 @@ char *host_name; char *server_url = NULL; char *server_expect; int warning_time = 0; -bool check_warning_time = false; +int check_warning_time = FALSE; int critical_time = 0; -bool check_critical_time = false; -bool verbose = false; +int check_critical_time = FALSE; +int verbose = FALSE; @@ -238,9 +238,9 @@ main (int argc, char **argv) /* Return results */ if (result == STATE_OK) { - if (check_critical_time + if (check_critical_time == TRUE && (end_time - start_time) > critical_time) result = STATE_CRITICAL; - else if (check_warning_time + else if (check_warning_time == TRUE && (end_time - start_time) > warning_time) result = STATE_WARNING; @@ -331,7 +331,7 @@ process_arguments (int argc, char **argv) case 'w': /* warning time threshold */ if (is_intnonneg (optarg)) { warning_time = atoi (optarg); - check_warning_time = true; + check_warning_time = TRUE; } else { usage4 (_("Warning time must be a positive integer")); @@ -340,14 +340,14 @@ process_arguments (int argc, char **argv) case 'c': /* critical time threshold */ if (is_intnonneg (optarg)) { critical_time = atoi (optarg); - check_critical_time = true; + check_critical_time = TRUE; } else { usage4 (_("Critical time must be a positive integer")); } break; case 'v': /* verbose */ - verbose = true; + verbose = TRUE; break; case 't': /* timeout */ if (is_intnonneg (optarg)) { diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 986c3e1..fc0ae2c 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c @@ -40,7 +40,7 @@ const char *email = "devel@monitoring-plugins.org"; #include #ifdef HAVE_SSL -bool check_cert = false; +int check_cert = FALSE; int days_till_exp_warn, days_till_exp_crit; # define my_recv(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_read(buf, len) : read(sd, buf, len)) # define my_send(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0)) @@ -100,17 +100,17 @@ char *authtype = NULL; char *authuser = NULL; char *authpass = NULL; double warning_time = 0; -bool check_warning_time = false; +int check_warning_time = FALSE; double critical_time = 0; -bool check_critical_time = false; +int check_critical_time = FALSE; int verbose = 0; -bool use_ssl = false; -bool use_starttls = false; -bool use_sni = false; -bool use_proxy_prefix = false; -bool use_ehlo = false; -bool use_lhlo = false; -bool ssl_established = false; +int use_ssl = FALSE; +int use_starttls = FALSE; +int use_sni = FALSE; +short use_proxy_prefix = FALSE; +short use_ehlo = FALSE; +short use_lhlo = FALSE; +short ssl_established = 0; char *localhostname = NULL; int sd; char buffer[MAX_INPUT_BUFFER]; @@ -118,13 +118,13 @@ enum { TCP_PROTOCOL = 1, UDP_PROTOCOL = 2, }; -bool ignore_send_quit_failure = false; +int ignore_send_quit_failure = FALSE; int main (int argc, char **argv) { - bool supports_tls = false; + short supports_tls=FALSE; int n = 0; double elapsed_time; long microsec; @@ -230,7 +230,7 @@ main (int argc, char **argv) } else if(use_ehlo || use_lhlo){ if(strstr(buffer, "250 STARTTLS") != NULL || strstr(buffer, "250-STARTTLS") != NULL){ - supports_tls=true; + supports_tls=TRUE; } } @@ -466,7 +466,7 @@ main (int argc, char **argv) fperfdata ("time", elapsed_time, "s", (int)check_warning_time, warning_time, (int)check_critical_time, critical_time, - true, 0, false, 0)); + TRUE, 0, FALSE, 0)); return result; } @@ -480,8 +480,6 @@ process_arguments (int argc, char **argv) int c; char* temp; - bool implicit_tls = false; - enum { SNI_OPTION }; @@ -562,7 +560,7 @@ process_arguments (int argc, char **argv) break; case 'A': authtype = optarg; - use_ehlo = true; + use_ehlo = TRUE; break; case 'U': authuser = optarg; @@ -602,7 +600,7 @@ process_arguments (int argc, char **argv) usage4 (_("Critical time must be a positive")); else { critical_time = strtod (optarg, NULL); - check_critical_time = true; + check_critical_time = TRUE; } break; case 'w': /* warning time threshold */ @@ -610,14 +608,14 @@ process_arguments (int argc, char **argv) usage4 (_("Warning time must be a positive")); else { warning_time = strtod (optarg, NULL); - check_warning_time = true; + check_warning_time = TRUE; } break; case 'v': /* verbose */ verbose++; break; case 'q': - ignore_send_quit_failure = true; /* ignore problem sending QUIT */ + ignore_send_quit_failure++; /* ignore problem sending QUIT */ break; case 't': /* timeout */ if (is_intnonneg (optarg)) { @@ -647,35 +645,33 @@ process_arguments (int argc, char **argv) usage2 ("Invalid certificate expiration period", optarg); days_till_exp_warn = atoi (optarg); } - check_cert = true; - ignore_send_quit_failure = true; + check_cert = TRUE; + ignore_send_quit_failure = TRUE; #else usage (_("SSL support not available - install OpenSSL and recompile")); #endif - implicit_tls = true; - // fallthrough case 's': /* ssl */ - use_ssl = true; + use_ssl = TRUE; server_port = SMTPS_PORT; break; case 'S': /* starttls */ - use_starttls = true; - use_ehlo = true; + use_starttls = TRUE; + use_ehlo = TRUE; break; case SNI_OPTION: #ifdef HAVE_SSL - use_sni = true; + use_sni = TRUE; #else usage (_("SSL support not available - install OpenSSL and recompile")); #endif break; case 'r': - use_proxy_prefix = true; + use_proxy_prefix = TRUE; break; case 'L': - use_lhlo = true; + use_lhlo = TRUE; break; case '4': address_family = AF_INET; @@ -721,12 +717,7 @@ process_arguments (int argc, char **argv) from_arg = strdup(" "); if (use_starttls && use_ssl) { - if (implicit_tls) { - use_ssl = false; - server_port = SMTP_PORT; - } else { - usage4 (_("Set either -s/--ssl/--tls or -S/--starttls")); - } + usage4 (_("Set either -s/--ssl/--tls or -S/--starttls")); } if (server_port_option != 0) { diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 295aa9b..56a586a 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -131,11 +131,11 @@ size_t nlabels = 0; size_t labels_size = OID_COUNT_STEP; size_t nunits = 0; size_t unitv_size = OID_COUNT_STEP; -size_t numoids = 0; +int numoids = 0; int numauthpriv = 0; int numcontext = 0; int verbose = 0; -bool usesnmpgetnext = false; +int usesnmpgetnext = FALSE; char *warning_thresholds = NULL; char *critical_thresholds = NULL; thresholds **thlds; @@ -148,7 +148,7 @@ size_t eval_size = OID_COUNT_STEP; char *delimiter; char *output_delim; char *miblist = NULL; -bool needmibs = false; +int needmibs = FALSE; int calculate_rate = 0; double offset = 0.0; int rate_multiplier = 1; @@ -187,8 +187,7 @@ static char *fix_snmp_range(char *th) int main (int argc, char **argv) { - int len, total_oids; - size_t line; + int i, len, line, total_oids; unsigned int bk_count = 0, dq_count = 0; int iresult = STATE_UNKNOWN; int result = STATE_UNKNOWN; @@ -254,16 +253,14 @@ main (int argc, char **argv) if(calculate_rate) { if (!strcmp(label, "SNMP")) label = strdup("SNMP RATE"); - - size_t i = 0; - + i=0; previous_state = np_state_read(); if(previous_state!=NULL) { /* Split colon separated values */ previous_string = strdup((char *) previous_state->data); while((ap = strsep(&previous_string, ":")) != NULL) { if(verbose>2) - printf("State for %zd=%s\n", i, ap); + printf("State for %d=%s\n", i, ap); while (i >= previous_size) { previous_size += OID_COUNT_STEP; previous_value = realloc(previous_value, previous_size * sizeof(*previous_value)); @@ -276,7 +273,7 @@ main (int argc, char **argv) /* Populate the thresholds */ th_warn=warning_thresholds; th_crit=critical_thresholds; - for (size_t i = 0; i < numoids; i++) { + for (i=0; i 0) { printf (_("External command error: %s\n"), chld_err.line[0]); - for (size_t i = 1; i < chld_err.lines; i++) { + for (i = 1; i < chld_err.lines; i++) { printf ("%s\n", chld_err.line[i]); } } else { @@ -395,14 +392,12 @@ main (int argc, char **argv) } if (verbose) { - for (size_t i = 0; i < chld_out.lines; i++) { + for (i = 0; i < chld_out.lines; i++) { printf ("%s\n", chld_out.line[i]); } } - line = 0; - total_oids = 0; - for (size_t i = 0; line < chld_out.lines && i < numoids ; line++, i++, total_oids++) { + for (line=0, i=0; line < chld_out.lines && i < numoids ; line++, i++) { if(calculate_rate) conv = "%.10g"; else @@ -415,7 +410,7 @@ main (int argc, char **argv) break; if (verbose > 2) { - printf("Processing oid %zi (line %zi)\n oidname: %s\n response: %s\n", i+1, line+1, oidname, response); + printf("Processing oid %i (line %i)\n oidname: %s\n response: %s\n", i+1, line+1, oidname, response); } /* Clean up type array - Sol10 does not necessarily zero it out */ @@ -639,6 +634,7 @@ main (int argc, char **argv) strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1); } } + total_oids=i; /* Save state data, as all data collected now */ if(calculate_rate) { @@ -648,7 +644,7 @@ main (int argc, char **argv) die(STATE_UNKNOWN, _("Cannot malloc")); current_length=0; - for(int i = 0; i < total_oids; i++) { + for(i=0; i= oids_size) { @@ -847,6 +843,7 @@ process_arguments (int argc, char **argv) numoids = j; if (c == 'E' || c == 'e') { jj++; + ii++; while (j+1 >= eval_size) { eval_size += OID_COUNT_STEP; eval_method = realloc(eval_method, eval_size * sizeof(*eval_method)); @@ -873,6 +870,7 @@ process_arguments (int argc, char **argv) memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8); } eval_method[jj++] = CRIT_STRING; + ii++; break; case 'R': /* regex */ cflags = REG_ICASE; @@ -893,6 +891,7 @@ process_arguments (int argc, char **argv) memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8); } eval_method[jj++] = CRIT_REGEX; + ii++; break; /* Format */ @@ -1035,7 +1034,7 @@ validate_arguments () { /* check whether to load locally installed MIBS (CPU/disk intensive) */ if (miblist == NULL) { - if (needmibs) { + if ( needmibs == TRUE ) { miblist = strdup (DEFAULT_MIBLIST); }else{ miblist = ""; /* don't read any mib files for numeric oids */ diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index 34ef37b..8ccbd5a 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c @@ -1,39 +1,39 @@ /***************************************************************************** -* +* * Monitoring check_ssh plugin -* +* * License: GPL * Copyright (c) 2000-2007 Monitoring Plugins Development Team -* +* * Description: -* +* * This file contains the check_ssh plugin -* +* * Try to connect to an SSH server at specified server and port -* -* +* +* * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program. If not, see . -* -* +* +* *****************************************************************************/ const char *progname = "check_ssh"; const char *copyright = "2000-2007"; const char *email = "devel@monitoring-plugins.org"; -#include "./common.h" -#include "./netutils.h" +#include "common.h" +#include "netutils.h" #include "utils.h" #ifndef MSG_DONTWAIT @@ -47,7 +47,7 @@ int port = -1; char *server_name = NULL; char *remote_version = NULL; char *remote_protocol = NULL; -bool verbose = false; +int verbose = FALSE; int process_arguments (int, char **); int validate_arguments (void); @@ -57,6 +57,7 @@ void print_usage (void); int ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol); + int main (int argc, char **argv) { @@ -105,7 +106,7 @@ process_arguments (int argc, char **argv) {"timeout", required_argument, 0, 't'}, {"verbose", no_argument, 0, 'v'}, {"remote-version", required_argument, 0, 'r'}, - {"remote-protocol", required_argument, 0, 'P'}, + {"remote-protcol", required_argument, 0, 'P'}, {0, 0, 0, 0} }; @@ -132,7 +133,7 @@ process_arguments (int argc, char **argv) print_help (); exit (STATE_UNKNOWN); case 'v': /* verbose */ - verbose = true; + verbose = TRUE; break; case 't': /* timeout period */ if (!is_integer (optarg)) @@ -157,7 +158,7 @@ process_arguments (int argc, char **argv) remote_protocol = optarg; break; case 'H': /* host */ - if (!is_host (optarg)) + if (is_host (optarg) == FALSE) usage2 (_("Invalid hostname/address"), optarg); server_name = optarg; break; @@ -214,9 +215,7 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol { int sd; int result; - int len = 0; - ssize_t recv_ret = 0; - char *version_control_string = NULL; + char *output = NULL; char *buffer = NULL; char *ssh_proto = NULL; char *ssh_server = NULL; @@ -231,126 +230,52 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol if (result != STATE_OK) return result; - char *output = (char *) calloc (BUFF_SZ + 1, sizeof(char)); + output = (char *) malloc (BUFF_SZ + 1); + memset (output, 0, BUFF_SZ + 1); + recv (sd, output, BUFF_SZ, 0); + if (strncmp (output, "SSH", 3)) { + printf (_("Server answer: %s"), output); + close(sd); + exit (STATE_CRITICAL); + } + else { + strip (output); + if (verbose) + printf ("%s\n", output); + ssh_proto = output + 4; + ssh_server = ssh_proto + strspn (ssh_proto, "-0123456789. "); + ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0; - unsigned int iteration = 0; - ssize_t byte_offset = 0; + xasprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, rev_no); + send (sd, buffer, strlen (buffer), MSG_DONTWAIT); + if (verbose) + printf ("%s\n", buffer); - while ((version_control_string == NULL) && (recv_ret = recv(sd, output+byte_offset, BUFF_SZ - byte_offset, 0) > 0)) { - - if (strchr(output, '\n')) { /* we've got at least one full line, start parsing*/ - byte_offset = 0; - - char *index = NULL; - while ((index = strchr(output+byte_offset, '\n')) != NULL) { - /*Partition the buffer so that this line is a separate string, - * by replacing the newline with NUL*/ - output[(index - output)] = '\0'; - len = strlen(output + byte_offset); - - if ((len >= 4) && (strncmp (output+byte_offset, "SSH-", 4) == 0)) { - /*if the string starts with SSH-, this _should_ be a valid version control string*/ - version_control_string = output+byte_offset; - break; - } - - /*the start of the next line (if one exists) will be after the current one (+ NUL)*/ - byte_offset += (len + 1); - } - - if(version_control_string == NULL) { - /* move unconsumed data to beginning of buffer, null rest */ - memmove((void *)output, (void *)output+byte_offset+1, BUFF_SZ - len+1); - memset(output+byte_offset+1, 0, BUFF_SZ-byte_offset+1); - - /*start reading from end of current line chunk on next recv*/ - byte_offset = strlen(output); - } - } else { - byte_offset += recv_ret; + if (remote_version && strcmp(remote_version, ssh_server)) { + printf + (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"), + ssh_server, ssh_proto, remote_version); + close(sd); + exit (STATE_CRITICAL); } - } - if (recv_ret < 0) { - printf("SSH CRITICAL - %s", strerror(errno)); - exit(STATE_CRITICAL); - } + if (remote_protocol && strcmp(remote_protocol, ssh_proto)) { + printf + (_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"), + ssh_server, ssh_proto, remote_protocol); + close(sd); + exit (STATE_CRITICAL); + } - if (version_control_string == NULL) { - printf("SSH CRITICAL - No version control string received"); - exit(STATE_CRITICAL); - } - /* - * "When the connection has been established, both sides MUST send an - * identification string. This identification string MUST be - * - * SSH-protoversion-softwareversion SP comments CR LF" - * - RFC 4253:4.2 - */ - strip (version_control_string); - if (verbose) - printf ("%s\n", version_control_string); - ssh_proto = version_control_string + 4; + elapsed_time = (double)deltime(tv) / 1.0e6; - /* - * We assume the protoversion is of the form Major.Minor, although - * this is not _strictly_ required. See - * - * "Both the 'protoversion' and 'softwareversion' strings MUST consist of - * printable US-ASCII characters, with the exception of whitespace - * characters and the minus sign (-)" - * - RFC 4253:4.2 - * and, - * - * "As stated earlier, the 'protoversion' specified for this protocol is - * "2.0". Earlier versions of this protocol have not been formally - * documented, but it is widely known that they use 'protoversion' of - * "1.x" (e.g., "1.5" or "1.3")." - * - RFC 4253:5 - */ - ssh_server = ssh_proto + strspn (ssh_proto, "0123456789.") + 1; /* (+1 for the '-' separating protoversion from softwareversion) */ - - /* If there's a space in the version string, whatever's after the space is a comment - * (which is NOT part of the server name/version)*/ - char *tmp = strchr(ssh_server, ' '); - if (tmp) { - ssh_server[tmp - ssh_server] = '\0'; - } - if (strlen(ssh_proto) == 0 || strlen(ssh_server) == 0) { - printf(_("SSH CRITICAL - Invalid protocol version control string %s\n"), version_control_string); - exit (STATE_CRITICAL); - } - ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0; - - xasprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, rev_no); - send (sd, buffer, strlen (buffer), MSG_DONTWAIT); - if (verbose) - printf ("%s\n", buffer); - - if (remote_version && strcmp(remote_version, ssh_server)) { printf - (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"), - ssh_server, ssh_proto, remote_version); + (_("SSH OK - %s (protocol %s) | %s\n"), + ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s", + FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout)); close(sd); - exit (STATE_CRITICAL); + exit (STATE_OK); } - - if (remote_protocol && strcmp(remote_protocol, ssh_proto)) { - printf - (_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s' | %s\n"), - ssh_server, ssh_proto, remote_protocol, fperfdata("time", elapsed_time, "s", - false, 0, false, 0, true, 0, true, (int)socket_timeout)); - close(sd); - exit (STATE_CRITICAL); - } - elapsed_time = (double)deltime(tv) / 1.0e6; - - printf - (_("SSH OK - %s (protocol %s) | %s\n"), - ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s", - false, 0, false, 0, true, 0, true, (int)socket_timeout)); - close(sd); - exit (STATE_OK); } @@ -368,7 +293,7 @@ print_help (void) printf ("%s\n", _("Try to connect to an SSH server at specified server and port")); - printf ("\n\n"); + printf ("\n\n"); print_usage (); @@ -382,10 +307,10 @@ print_help (void) printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-r, --remote-version=STRING"); - printf (" %s\n", _("Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); + printf (" %s\n", _("Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); printf (" %s\n", "-P, --remote-protocol=STRING"); - printf (" %s\n", _("Alert if protocol doesn't match expected protocol version (ex: 2.0)")); + printf (" %s\n", _("Alert if protocol doesn't match expected protocol version (ex: 2.0)")); printf (UT_VERBOSE); @@ -397,7 +322,7 @@ print_help (void) void print_usage (void) { - printf ("%s\n", _("Usage:")); + printf ("%s\n", _("Usage:")); printf ("%s [-4|-6] [-t ] [-r ] [-p ] \n", progname); } diff --git a/plugins/check_swap.c b/plugins/check_swap.c index e7ee785..cd965e3 100644 --- a/plugins/check_swap.c +++ b/plugins/check_swap.c @@ -4,7 +4,7 @@ * * License: GPL * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) -* Copyright (c) 2000-2024 Monitoring Plugins Development Team +* Copyright (c) 2000-2007 Monitoring Plugins Development Team * * Description: * @@ -28,7 +28,7 @@ *****************************************************************************/ const char *progname = "check_swap"; -const char *copyright = "2000-2024"; +const char *copyright = "2000-2007"; const char *email = "devel@monitoring-plugins.org"; #include "common.h" @@ -52,9 +52,9 @@ const char *email = "devel@monitoring-plugins.org"; #endif typedef struct { - bool is_percentage; + int is_percentage; uint64_t value; -} threshold; +} threshold_t; int check_swap (float free_swap_mb, float total_swap_mb); int process_arguments (int argc, char **argv); @@ -62,10 +62,10 @@ int validate_arguments (void); void print_usage (void); void print_help (void); -threshold warn; -threshold crit; +threshold_t warn; +threshold_t crit; int verbose; -bool allswaps = false; +int allswaps; int no_swap_state = STATE_CRITICAL; int @@ -383,10 +383,10 @@ main (int argc, char **argv) if (crit.is_percentage) crit_print = crit.value * (total_swap_mb *1024 *1024/100); puts (perfdata_uint64 ("swap", free_swap_mb *1024 *1024, "B", - true, warn_print, - true, crit_print, - true, 0, - true, (long) total_swap_mb * 1024 * 1024)); + TRUE, warn_print, + TRUE, crit_print, + TRUE, 0, + TRUE, (long) total_swap_mb * 1024 * 1024)); return result; } @@ -399,30 +399,28 @@ check_swap(float free_swap_mb, float total_swap_mb) if (!total_swap_mb) return no_swap_state; uint64_t free_swap = free_swap_mb * (1024 * 1024); /* Convert back to bytes as warn and crit specified in bytes */ + + if (!crit.is_percentage && crit.value >= free_swap) return STATE_CRITICAL; + if (!warn.is_percentage && warn.value >= free_swap) return STATE_WARNING; + + uint64_t usage_percentage = ((total_swap_mb - free_swap_mb) / total_swap_mb) * 100; - if (warn.value || crit.value) { /* Thresholds defined */ - if (!crit.is_percentage && crit.value >= free_swap) return STATE_CRITICAL; - if (!warn.is_percentage && warn.value >= free_swap) return STATE_WARNING; + if (crit.is_percentage && + crit.value != 0 && + usage_percentage >= (100 - crit.value)) + { + return STATE_CRITICAL; + } - if (crit.is_percentage && - crit.value != 0 && - usage_percentage >= (100 - crit.value)) - { - return STATE_CRITICAL; - } + if (warn.is_percentage && + warn.value != 0 && + usage_percentage >= (100 - warn.value)) + { + return STATE_WARNING; + } - if (warn.is_percentage && - warn.value != 0 && - usage_percentage >= (100 - warn.value)) - { - return STATE_WARNING; - } - - return STATE_OK; - } else { /* Without thresholds */ - return STATE_OK; - } + return STATE_OK; } @@ -445,6 +443,9 @@ process_arguments (int argc, char **argv) {0, 0, 0, 0} }; + if (argc < 2) + return ERROR; + while (1) { c = getopt_long (argc, argv, "+?Vvhac:w:n:", longopts, &option); @@ -464,7 +465,7 @@ process_arguments (int argc, char **argv) if (optarg[length - 1] == '%') { /* It's percentage */ - warn.is_percentage = true; + warn.is_percentage = 1; optarg[length - 1] = '\0'; if (is_uint64(optarg, &warn.value)) { if (warn.value > 100) { @@ -474,7 +475,7 @@ process_arguments (int argc, char **argv) break; } else { /* It's Bytes */ - warn.is_percentage = false; + warn.is_percentage = 0; if (is_uint64(optarg, &warn.value)) { break; } else { @@ -494,7 +495,7 @@ process_arguments (int argc, char **argv) if (optarg[length - 1] == '%') { /* It's percentage */ - crit.is_percentage = true; + crit.is_percentage = 1; optarg[length - 1] = '\0'; if (is_uint64(optarg, &crit.value)) { if (crit.value> 100) { @@ -504,7 +505,7 @@ process_arguments (int argc, char **argv) break; } else { /* It's Bytes */ - crit.is_percentage = false; + crit.is_percentage = 0; if (is_uint64(optarg, &crit.value)) { break; } else { @@ -513,7 +514,7 @@ process_arguments (int argc, char **argv) } } case 'a': /* all swap */ - allswaps = true; + allswaps = TRUE; break; case 'n': if ((no_swap_state = mp_translate_state(optarg)) == ERROR) { @@ -546,7 +547,10 @@ process_arguments (int argc, char **argv) int validate_arguments (void) { - if ((warn.is_percentage == crit.is_percentage) && (warn.value < crit.value)) { + if (warn.value == 0 && crit.value == 0) { + return ERROR; + } + else if ((warn.is_percentage == crit.is_percentage) && (warn.value < crit.value)) { /* This is NOT triggered if warn and crit are different units, e.g warn is percentage * and crit is absolute. We cannot determine the condition at this point since we * dont know the value of total swap yet @@ -591,7 +595,6 @@ print_help (void) printf ("\n"); printf ("%s\n", _("Notes:")); printf (" %s\n", _("Both INTEGER and PERCENT thresholds can be specified, they are all checked.")); - printf (" %s\n", _("Without thresholds, the plugin shows free swap space and performance data, but always returns OK.")); printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.")); printf (UT_SUPPORT); @@ -602,6 +605,6 @@ void print_usage (void) { printf ("%s\n", _("Usage:")); - printf (" %s [-av] [-w %%] [-c %%]\n",progname); - printf (" [-w ] [-c ] [-n ]\n"); + printf (" %s [-av] -w %% -c %%\n",progname); + printf (" -w -c [-n ]\n"); } diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index 01dd35e..1d307cf 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -41,7 +41,7 @@ const char *email = "devel@monitoring-plugins.org"; #include #ifdef HAVE_SSL -static bool check_cert = false; +static int check_cert = FALSE; static int days_till_exp_warn, days_till_exp_crit; # define my_recv(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_read(buf, len) : read(sd, buf, len)) # define my_send(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0)) @@ -65,12 +65,12 @@ static int READ_TIMEOUT = 2; static int server_port = 0; static char *server_address = NULL; -static bool host_specified = false; +static int host_specified = FALSE; static char *server_send = NULL; static char *server_quit = NULL; static char **server_expect; static size_t server_expect_count = 0; -static ssize_t maxbytes = 0; +static size_t maxbytes = 0; static char **warn_codes = NULL; static size_t warn_codes_count = 0; static char **crit_codes = NULL; @@ -88,7 +88,7 @@ static int match_flags = NP_MATCH_EXACT; #ifdef HAVE_SSL static char *sni = NULL; -static bool sni_specified = false; +static int sni_specified = FALSE; #endif #define FLAG_SSL 0x01 @@ -102,9 +102,11 @@ int main (int argc, char **argv) { int result = STATE_UNKNOWN; + int i; char *status = NULL; struct timeval tv; struct timeval timeout; + size_t len; int match = -1; fd_set rfds; @@ -119,10 +121,10 @@ main (int argc, char **argv) if(progname != NULL) progname++; else progname = argv[0]; - size_t prog_name_len = strlen(progname); - if(prog_name_len > 6 && !memcmp(progname, "check_", 6)) { + len = strlen(progname); + if(len > 6 && !memcmp(progname, "check_", 6)) { SERVICE = strdup(progname + 6); - for(size_t i = 0; i < prog_name_len - 6; i++) + for(i = 0; i < len - 6; i++) SERVICE[i] = toupper(SERVICE[i]); } @@ -245,7 +247,7 @@ main (int argc, char **argv) #ifdef HAVE_SSL if (flags & FLAG_SSL){ result = np_net_ssl_init_with_hostname(sd, (sni_specified ? sni : NULL)); - if (result == STATE_OK && check_cert) { + if (result == STATE_OK && check_cert == TRUE) { result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit); } } @@ -273,21 +275,19 @@ main (int argc, char **argv) printf("Quit string: %s\n", server_quit); } printf("server_expect_count: %d\n", (int)server_expect_count); - for(size_t i = 0; i < server_expect_count; i++) - printf("\t%zd: %s\n", i, server_expect[i]); + for(i = 0; i < server_expect_count; i++) + printf("\t%d: %s\n", i, server_expect[i]); } /* if(len) later on, we know we have a non-NULL response */ - ssize_t len = 0; - + len = 0; if (server_expect_count) { - ssize_t received = 0; /* watch for the expect string */ - while ((received = my_recv(buffer, sizeof(buffer))) > 0) { - status = realloc(status, len + received + 1); - memcpy(&status[len], buffer, received); - len += received; + while ((i = my_recv(buffer, sizeof(buffer))) > 0) { + status = realloc(status, len + i + 1); + memcpy(&status[len], buffer, i); + len += i; status[len] = '\0'; /* stop reading if user-forced */ @@ -307,7 +307,6 @@ main (int argc, char **argv) if(select(sd + 1, &rfds, NULL, NULL, &timeout) <= 0) break; } - if (match == NP_MATCH_RETRY) match = NP_MATCH_FAILURE; @@ -379,18 +378,18 @@ main (int argc, char **argv) if(match == NP_MATCH_FAILURE) printf ("|%s", fperfdata ("time", elapsed_time, "s", - (flags & FLAG_TIME_WARN ? true : false), 0, - (flags & FLAG_TIME_CRIT ? true : false), 0, - true, 0, - true, socket_timeout) + (flags & FLAG_TIME_WARN ? TRUE : FALSE), 0, + (flags & FLAG_TIME_CRIT ? TRUE : FALSE), 0, + TRUE, 0, + TRUE, socket_timeout) ); else printf("|%s", fperfdata ("time", elapsed_time, "s", - (flags & FLAG_TIME_WARN ? true : false), warning_time, - (flags & FLAG_TIME_CRIT ? true : false), critical_time, - true, 0, - true, socket_timeout) + (flags & FLAG_TIME_WARN ? TRUE : FALSE), warning_time, + (flags & FLAG_TIME_CRIT ? TRUE : FALSE), critical_time, + TRUE, 0, + TRUE, socket_timeout) ); putchar('\n'); @@ -400,9 +399,11 @@ main (int argc, char **argv) /* process command-line arguments */ -static int process_arguments (int argc, char **argv) { +static int +process_arguments (int argc, char **argv) +{ int c; - bool escape = false; + int escape = 0; char *temp; enum { @@ -491,7 +492,7 @@ static int process_arguments (int argc, char **argv) { #endif break; case 'H': /* hostname */ - host_specified = true; + host_specified = TRUE; server_address = optarg; break; case 'c': /* critical */ @@ -526,7 +527,7 @@ static int process_arguments (int argc, char **argv) { server_port = atoi (optarg); break; case 'E': - escape = true; + escape = 1; break; case 's': if (escape) @@ -600,7 +601,7 @@ static int process_arguments (int argc, char **argv) { usage2 (_("Invalid certificate expiration period"), optarg); days_till_exp_warn = atoi (optarg); } - check_cert = true; + check_cert = TRUE; flags |= FLAG_SSL; break; # endif /* USE_OPENSSL */ @@ -616,7 +617,7 @@ static int process_arguments (int argc, char **argv) { case SNI_OPTION: #ifdef HAVE_SSL flags |= FLAG_SSL; - sni_specified = true; + sni_specified = TRUE; sni = optarg; #else die (STATE_UNKNOWN, _("Invalid option - SSL is not available")); @@ -629,15 +630,15 @@ static int process_arguments (int argc, char **argv) { } c = optind; - if(!host_specified && c < argc) + if(host_specified == FALSE && c < argc) server_address = strdup (argv[c++]); if (server_address == NULL) usage4 (_("You must provide a server address")); - else if (server_address[0] != '/' && !is_host(server_address)) + else if (server_address[0] != '/' && is_host (server_address) == FALSE) die (STATE_CRITICAL, "%s %s - %s: %s\n", SERVICE, state_text(STATE_CRITICAL), _("Invalid hostname, address or socket"), server_address); - return OK; + return TRUE; } diff --git a/plugins/check_time.c b/plugins/check_time.c index f50ea42..baf8c59 100644 --- a/plugins/check_time.c +++ b/plugins/check_time.c @@ -45,16 +45,16 @@ enum { uint32_t raw_server_time; unsigned long server_time, diff_time; int warning_time = 0; -bool check_warning_time = false; +int check_warning_time = FALSE; int critical_time = 0; -bool check_critical_time = false; +int check_critical_time = FALSE; unsigned long warning_diff = 0; -bool check_warning_diff = false; +int check_warning_diff = FALSE; unsigned long critical_diff = 0; -bool check_critical_diff = false; +int check_critical_diff = FALSE; int server_port = TIME_PORT; char *server_address = NULL; -bool use_udp = false; +int use_udp = FALSE; int process_arguments (int, char **); void print_help (void); @@ -92,9 +92,9 @@ main (int argc, char **argv) } if (result != STATE_OK) { - if (check_critical_time) + if (check_critical_time == TRUE) result = STATE_CRITICAL; - else if (check_warning_time) + else if (check_warning_time == TRUE) result = STATE_WARNING; else result = STATE_UNKNOWN; @@ -105,9 +105,9 @@ main (int argc, char **argv) if (use_udp) { if (send (sd, "", 0, 0) < 0) { - if (check_critical_time) + if (check_critical_time == TRUE) result = STATE_CRITICAL; - else if (check_warning_time) + else if (check_warning_time == TRUE) result = STATE_WARNING; else result = STATE_UNKNOWN; @@ -129,9 +129,9 @@ main (int argc, char **argv) /* return a WARNING status if we couldn't read any data */ if (result <= 0) { - if (check_critical_time) + if (check_critical_time == TRUE) result = STATE_CRITICAL; - else if (check_warning_time) + else if (check_warning_time == TRUE) result = STATE_WARNING; else result = STATE_UNKNOWN; @@ -143,9 +143,9 @@ main (int argc, char **argv) result = STATE_OK; conntime = (end_time - start_time); - if (check_critical_time&& conntime > critical_time) + if (check_critical_time == TRUE && conntime > critical_time) result = STATE_CRITICAL; - else if (check_warning_time && conntime > warning_time) + else if (check_warning_time == TRUE && conntime > warning_time) result = STATE_WARNING; if (result != STATE_OK) @@ -154,7 +154,7 @@ main (int argc, char **argv) perfdata ("time", (long)conntime, "s", check_warning_time, (long)warning_time, check_critical_time, (long)critical_time, - true, 0, false, 0)); + TRUE, 0, FALSE, 0)); server_time = ntohl (raw_server_time) - UNIX_EPOCH; if (server_time > (unsigned long)end_time) @@ -162,9 +162,9 @@ main (int argc, char **argv) else diff_time = (unsigned long)end_time - server_time; - if (check_critical_diff&& diff_time > critical_diff) + if (check_critical_diff == TRUE && diff_time > critical_diff) result = STATE_CRITICAL; - else if (check_warning_diff&& diff_time > warning_diff) + else if (check_warning_diff == TRUE && diff_time > warning_diff) result = STATE_WARNING; printf (_("TIME %s - %lu second time difference|%s %s\n"), @@ -172,11 +172,11 @@ main (int argc, char **argv) perfdata ("time", (long)conntime, "s", check_warning_time, (long)warning_time, check_critical_time, (long)critical_time, - true, 0, false, 0), + TRUE, 0, FALSE, 0), perfdata ("offset", diff_time, "s", check_warning_diff, warning_diff, check_critical_diff, critical_diff, - true, 0, false, 0)); + TRUE, 0, FALSE, 0)); return result; } @@ -219,7 +219,7 @@ process_arguments (int argc, char **argv) strcpy (argv[c], "-C"); } - while (true) { + while (1) { c = getopt_long (argc, argv, "hVH:w:c:W:C:p:t:u", longopts, &option); @@ -236,19 +236,19 @@ process_arguments (int argc, char **argv) print_revision (progname, NP_VERSION); exit (STATE_UNKNOWN); case 'H': /* hostname */ - if (!is_host (optarg)) + if (is_host (optarg) == FALSE) usage2 (_("Invalid hostname/address"), optarg); server_address = optarg; break; case 'w': /* warning-variance */ if (is_intnonneg (optarg)) { warning_diff = strtoul (optarg, NULL, 10); - check_warning_diff = true; + check_warning_diff = TRUE; } else if (strspn (optarg, "0123456789:,") > 0) { if (sscanf (optarg, "%lu%*[:,]%d", &warning_diff, &warning_time) == 2) { - check_warning_diff = true; - check_warning_time = true; + check_warning_diff = TRUE; + check_warning_time = TRUE; } else { usage4 (_("Warning thresholds must be a positive integer")); @@ -261,13 +261,13 @@ process_arguments (int argc, char **argv) case 'c': /* critical-variance */ if (is_intnonneg (optarg)) { critical_diff = strtoul (optarg, NULL, 10); - check_critical_diff = true; + check_critical_diff = TRUE; } else if (strspn (optarg, "0123456789:,") > 0) { if (sscanf (optarg, "%lu%*[:,]%d", &critical_diff, &critical_time) == 2) { - check_critical_diff = true; - check_critical_time = true; + check_critical_diff = TRUE; + check_critical_time = TRUE; } else { usage4 (_("Critical thresholds must be a positive integer")); @@ -282,14 +282,14 @@ process_arguments (int argc, char **argv) usage4 (_("Warning threshold must be a positive integer")); else warning_time = atoi (optarg); - check_warning_time = true; + check_warning_time = TRUE; break; case 'C': /* critical-connect */ if (!is_intnonneg (optarg)) usage4 (_("Critical threshold must be a positive integer")); else critical_time = atoi (optarg); - check_critical_time = true; + check_critical_time = TRUE; break; case 'p': /* port */ if (!is_intnonneg (optarg)) @@ -304,14 +304,14 @@ process_arguments (int argc, char **argv) socket_timeout = atoi (optarg); break; case 'u': /* udp */ - use_udp = true; + use_udp = TRUE; } } c = optind; if (server_address == NULL) { if (argc > c) { - if (!is_host (argv[c])) + if (is_host (argv[c]) == FALSE) usage2 (_("Invalid hostname/address"), optarg); server_address = argv[c]; } diff --git a/plugins/check_ups.c b/plugins/check_ups.c index 380ff3b..68737c4 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -1,746 +1,665 @@ /***************************************************************************** - * - * Monitoring check_ups plugin - * - * License: GPL - * Copyright (c) 2000 Tom Shields - * 2004 Alain Richard - * 2004 Arnaud Quette - * Copyright (c) 2002-2023 Monitoring Plugins Development Team - * - * Description: - * - * This file contains Network UPS Tools plugin for Monitoring - * - * This plugin tests the UPS service on the specified host. Network UPS Tools - * from www.networkupstools.org must be running for this plugin to work. - * - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * - *****************************************************************************/ +* +* Monitoring check_ups plugin +* +* License: GPL +* Copyright (c) 2000 Tom Shields +* 2004 Alain Richard +* 2004 Arnaud Quette +* Copyright (c) 2002-2007 Monitoring Plugins Development Team +* +* Description: +* +* This file contains Network UPS Tools plugin for Monitoring +* +* This plugin tests the UPS service on the specified host. Network UPS Tools +* from www.networkupstools.org must be running for this plugin to work. +* +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* +*****************************************************************************/ const char *progname = "check_ups"; -const char *copyright = "2000-2023"; +const char *copyright = "2000-2007"; const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" #include "utils.h" -enum { PORT = 3493 }; +enum { + PORT = 3493 +}; -#define UPS_NONE 0 /* no supported options */ -#define UPS_UTILITY 1 /* supports utility line */ -#define UPS_BATTPCT 2 /* supports percent battery remaining */ -#define UPS_STATUS 4 /* supports UPS status */ -#define UPS_TEMP 8 /* supports UPS temperature */ -#define UPS_LOADPCT 16 /* supports load percent */ -#define UPS_REALPOWER 32 /* supports real power */ +#define CHECK_NONE 0 -#define UPSSTATUS_NONE 0 -#define UPSSTATUS_OFF 1 -#define UPSSTATUS_OL 2 -#define UPSSTATUS_OB 4 -#define UPSSTATUS_LB 8 -#define UPSSTATUS_CAL 16 -#define UPSSTATUS_RB 32 /*Replace Battery */ -#define UPSSTATUS_BYPASS 64 -#define UPSSTATUS_OVER 128 -#define UPSSTATUS_TRIM 256 -#define UPSSTATUS_BOOST 512 +#define UPS_NONE 0 /* no supported options */ +#define UPS_UTILITY 1 /* supports utility line voltage */ +#define UPS_BATTPCT 2 /* supports percent battery remaining */ +#define UPS_STATUS 4 /* supports UPS status */ +#define UPS_TEMP 8 /* supports UPS temperature */ +#define UPS_LOADPCT 16 /* supports load percent */ + +#define UPSSTATUS_NONE 0 +#define UPSSTATUS_OFF 1 +#define UPSSTATUS_OL 2 +#define UPSSTATUS_OB 4 +#define UPSSTATUS_LB 8 +#define UPSSTATUS_CAL 16 +#define UPSSTATUS_RB 32 /*Replace Battery */ +#define UPSSTATUS_BYPASS 64 +#define UPSSTATUS_OVER 128 +#define UPSSTATUS_TRIM 256 +#define UPSSTATUS_BOOST 512 #define UPSSTATUS_CHRG 1024 #define UPSSTATUS_DISCHRG 2048 -#define UPSSTATUS_UNKNOWN 4096 -#define UPSSTATUS_ALARM 8192 +#define UPSSTATUS_UNKNOWN 4096 -enum { NOSUCHVAR = ERROR - 1 }; +enum { NOSUCHVAR = ERROR-1 }; -typedef struct ups_config { - unsigned int server_port; - char *server_address; - char *ups_name; - double warning_value; - double critical_value; - bool check_warn; - bool check_crit; - int check_variable; - int status; - bool temp_output_c; -} ups_config; +int server_port = PORT; +char *server_address; +char *ups_name = NULL; +double warning_value = 0.0; +double critical_value = 0.0; +int check_warn = FALSE; +int check_crit = FALSE; +int check_variable = UPS_NONE; +int supported_options = UPS_NONE; +int status = UPSSTATUS_NONE; -ups_config ups_config_init(void) { - ups_config tmp = {0}; - tmp.server_port = PORT; - tmp.server_address = NULL; - tmp.ups_name = NULL; - tmp.check_variable = UPS_NONE; - tmp.status = UPSSTATUS_NONE; +double ups_utility_voltage = 0.0; +double ups_battery_percent = 0.0; +double ups_load_percent = 0.0; +double ups_temperature = 0.0; +char *ups_status; +int temp_output_c = 0; - return tmp; -} +int determine_status (void); +int get_ups_variable (const char *, char *); -// Forward declarations -int determine_status(ups_config *, int *supported_options); -int get_ups_variable(const char *, char *, const ups_config config); +int process_arguments (int, char **); +int validate_arguments (void); +void print_help (void); +void print_usage (void); -int process_arguments(int, char **, ups_config *); -int validate_arguments(ups_config); -void print_help(void); -void print_usage(void); - -int main(int argc, char **argv) { - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - - char *ups_status; - ups_status = strdup("N/A"); - - char *data; - data = strdup(""); - - char *message; - message = strdup(""); - - // Exit result +int +main (int argc, char **argv) +{ int result = STATE_UNKNOWN; + char *message; + char *data; + char *tunits; + char temp_buffer[MAX_INPUT_BUFFER]; + double ups_utility_deviation = 0.0; + int res; + + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + + ups_status = strdup ("N/A"); + data = strdup (""); + message = strdup (""); /* Parse extra opts if any */ - argv = np_extra_opts(&argc, argv, progname); + argv=np_extra_opts (&argc, argv, progname); - // Config from commandline - ups_config config = ups_config_init(); - - if (process_arguments(argc, argv, &config) == ERROR) { - usage4(_("Could not parse arguments")); - } + if (process_arguments (argc, argv) == ERROR) + usage4 (_("Could not parse arguments")); /* initialize alarm signal handling */ - signal(SIGALRM, socket_timeout_alarm_handler); + signal (SIGALRM, socket_timeout_alarm_handler); /* set socket timeout */ - alarm(socket_timeout); - - int supported_options = UPS_NONE; + alarm (socket_timeout); /* get the ups status if possible */ - if (determine_status(&config, &supported_options) != OK) { + if (determine_status () != OK) return STATE_CRITICAL; - } - - if (supported_options & UPS_STATUS) { - ups_status = strdup(""); - + ups_status = strdup (""); result = STATE_OK; - if (config.status & UPSSTATUS_OFF) { - xasprintf(&ups_status, "Off"); + if (status & UPSSTATUS_OFF) { + xasprintf (&ups_status, "Off"); result = STATE_CRITICAL; - } else if ((config.status & (UPSSTATUS_OB | UPSSTATUS_LB)) == - (UPSSTATUS_OB | UPSSTATUS_LB)) { - xasprintf(&ups_status, _("On Battery, Low Battery")); + } + else if ((status & (UPSSTATUS_OB | UPSSTATUS_LB)) == + (UPSSTATUS_OB | UPSSTATUS_LB)) { + xasprintf (&ups_status, _("On Battery, Low Battery")); result = STATE_CRITICAL; - } else { - if (config.status & UPSSTATUS_OL) { - xasprintf(&ups_status, "%s%s", ups_status, _("Online")); + } + else { + if (status & UPSSTATUS_OL) { + xasprintf (&ups_status, "%s%s", ups_status, _("Online")); } - if (config.status & UPSSTATUS_OB) { - xasprintf(&ups_status, "%s%s", ups_status, _("On Battery")); - result = max_state(result, STATE_WARNING); + if (status & UPSSTATUS_OB) { + xasprintf (&ups_status, "%s%s", ups_status, _("On Battery")); + result = STATE_WARNING; } - if (config.status & UPSSTATUS_LB) { - xasprintf(&ups_status, "%s%s", ups_status, _(", Low Battery")); - result = max_state(result, STATE_WARNING); + if (status & UPSSTATUS_LB) { + xasprintf (&ups_status, "%s%s", ups_status, _(", Low Battery")); + result = STATE_WARNING; } - if (config.status & UPSSTATUS_CAL) { - xasprintf(&ups_status, "%s%s", ups_status, _(", Calibrating")); + if (status & UPSSTATUS_CAL) { + xasprintf (&ups_status, "%s%s", ups_status, _(", Calibrating")); } - if (config.status & UPSSTATUS_RB) { - xasprintf(&ups_status, "%s%s", ups_status, - _(", Replace Battery")); - result = max_state(result, STATE_WARNING); + if (status & UPSSTATUS_RB) { + xasprintf (&ups_status, "%s%s", ups_status, _(", Replace Battery")); + result = STATE_WARNING; } - if (config.status & UPSSTATUS_BYPASS) { - xasprintf(&ups_status, "%s%s", ups_status, _(", On Bypass")); - // Bypassing the battery is likely a bad thing - result = STATE_CRITICAL; + if (status & UPSSTATUS_BYPASS) { + xasprintf (&ups_status, "%s%s", ups_status, _(", On Bypass")); } - if (config.status & UPSSTATUS_OVER) { - xasprintf(&ups_status, "%s%s", ups_status, _(", Overload")); - result = max_state(result, STATE_WARNING); + if (status & UPSSTATUS_OVER) { + xasprintf (&ups_status, "%s%s", ups_status, _(", Overload")); } - if (config.status & UPSSTATUS_TRIM) { - xasprintf(&ups_status, "%s%s", ups_status, _(", Trimming")); + if (status & UPSSTATUS_TRIM) { + xasprintf (&ups_status, "%s%s", ups_status, _(", Trimming")); } - if (config.status & UPSSTATUS_BOOST) { - xasprintf(&ups_status, "%s%s", ups_status, _(", Boosting")); + if (status & UPSSTATUS_BOOST) { + xasprintf (&ups_status, "%s%s", ups_status, _(", Boosting")); } - if (config.status & UPSSTATUS_CHRG) { - xasprintf(&ups_status, "%s%s", ups_status, _(", Charging")); + if (status & UPSSTATUS_CHRG) { + xasprintf (&ups_status, "%s%s", ups_status, _(", Charging")); } - if (config.status & UPSSTATUS_DISCHRG) { - xasprintf(&ups_status, "%s%s", ups_status, _(", Discharging")); - result = max_state(result, STATE_WARNING); + if (status & UPSSTATUS_DISCHRG) { + xasprintf (&ups_status, "%s%s", ups_status, _(", Discharging")); } - if (config.status & UPSSTATUS_ALARM) { - xasprintf(&ups_status, "%s%s", ups_status, _(", ALARM")); - result = STATE_CRITICAL; - } - if (config.status & UPSSTATUS_UNKNOWN) { - xasprintf(&ups_status, "%s%s", ups_status, _(", Unknown")); + if (status & UPSSTATUS_UNKNOWN) { + xasprintf (&ups_status, "%s%s", ups_status, _(", Unknown")); } } - xasprintf(&message, "%sStatus=%s ", message, ups_status); + xasprintf (&message, "%sStatus=%s ", message, ups_status); } - int res; - char temp_buffer[MAX_INPUT_BUFFER]; - /* get the ups utility voltage if possible */ - res = get_ups_variable("input.voltage", temp_buffer, config); - if (res == NOSUCHVAR) { - supported_options &= ~UPS_UTILITY; - } else if (res != OK) { + res=get_ups_variable ("input.voltage", temp_buffer); + if (res == NOSUCHVAR) supported_options &= ~UPS_UTILITY; + else if (res != OK) return STATE_CRITICAL; - } else { + else { supported_options |= UPS_UTILITY; - double ups_utility_voltage = 0.0; - ups_utility_voltage = atof(temp_buffer); - xasprintf(&message, "%sUtility=%3.1fV ", message, ups_utility_voltage); + ups_utility_voltage = atof (temp_buffer); + xasprintf (&message, "%sUtility=%3.1fV ", message, ups_utility_voltage); - double ups_utility_deviation = 0.0; - - if (ups_utility_voltage > 120.0) { + if (ups_utility_voltage > 120.0) ups_utility_deviation = 120.0 - ups_utility_voltage; - } else { + else ups_utility_deviation = ups_utility_voltage - 120.0; - } - if (config.check_variable == UPS_UTILITY) { - if (config.check_crit && - ups_utility_deviation >= config.critical_value) { + if (check_variable == UPS_UTILITY) { + if (check_crit==TRUE && ups_utility_deviation>=critical_value) { result = STATE_CRITICAL; - } else if (config.check_warn && - ups_utility_deviation >= config.warning_value) { - result = max_state(result, STATE_WARNING); } - xasprintf(&data, "%s", - perfdata("voltage", (long)(1000 * ups_utility_voltage), - "mV", config.check_warn, - (long)(1000 * config.warning_value), - config.check_crit, - (long)(1000 * config.critical_value), true, 0, - false, 0)); + else if (check_warn==TRUE && ups_utility_deviation>=warning_value) { + result = max_state (result, STATE_WARNING); + } + xasprintf (&data, "%s", + perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV", + check_warn, (long)(1000*warning_value), + check_crit, (long)(1000*critical_value), + TRUE, 0, FALSE, 0)); } else { - xasprintf(&data, "%s", - perfdata("voltage", (long)(1000 * ups_utility_voltage), - "mV", false, 0, false, 0, true, 0, false, 0)); + xasprintf (&data, "%s", + perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV", + FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0)); } } /* get the ups battery percent if possible */ - res = get_ups_variable("battery.charge", temp_buffer, config); - if (res == NOSUCHVAR) { - supported_options &= ~UPS_BATTPCT; - } else if (res != OK) { + res=get_ups_variable ("battery.charge", temp_buffer); + if (res == NOSUCHVAR) supported_options &= ~UPS_BATTPCT; + else if ( res != OK) return STATE_CRITICAL; - } else { + else { supported_options |= UPS_BATTPCT; + ups_battery_percent = atof (temp_buffer); + xasprintf (&message, "%sBatt=%3.1f%% ", message, ups_battery_percent); - double ups_battery_percent = 0.0; - ups_battery_percent = atof(temp_buffer); - xasprintf(&message, "%sBatt=%3.1f%% ", message, ups_battery_percent); - - if (config.check_variable == UPS_BATTPCT) { - if (config.check_crit && - ups_battery_percent <= config.critical_value) { + if (check_variable == UPS_BATTPCT) { + if (check_crit==TRUE && ups_battery_percent <= critical_value) { result = STATE_CRITICAL; - } else if (config.check_warn && - ups_battery_percent <= config.warning_value) { - result = max_state(result, STATE_WARNING); } - xasprintf(&data, "%s %s", data, - perfdata("battery", (long)ups_battery_percent, "%", - config.check_warn, (long)(config.warning_value), - config.check_crit, (long)(config.critical_value), - true, 0, true, 100)); + else if (check_warn==TRUE && ups_battery_percent<=warning_value) { + result = max_state (result, STATE_WARNING); + } + xasprintf (&data, "%s %s", data, + perfdata ("battery", (long)ups_battery_percent, "%", + check_warn, (long)(warning_value), + check_crit, (long)(critical_value), + TRUE, 0, TRUE, 100)); } else { - xasprintf(&data, "%s %s", data, - perfdata("battery", (long)ups_battery_percent, "%", false, - 0, false, 0, true, 0, true, 100)); + xasprintf (&data, "%s %s", data, + perfdata ("battery", (long)ups_battery_percent, "%", + FALSE, 0, FALSE, 0, TRUE, 0, TRUE, 100)); } } /* get the ups load percent if possible */ - res = get_ups_variable("ups.load", temp_buffer, config); - if (res == NOSUCHVAR) { - supported_options &= ~UPS_LOADPCT; - } else if (res != OK) { + res=get_ups_variable ("ups.load", temp_buffer); + if ( res == NOSUCHVAR ) supported_options &= ~UPS_LOADPCT; + else if ( res != OK) return STATE_CRITICAL; - } else { + else { supported_options |= UPS_LOADPCT; + ups_load_percent = atof (temp_buffer); + xasprintf (&message, "%sLoad=%3.1f%% ", message, ups_load_percent); - double ups_load_percent = 0.0; - ups_load_percent = atof(temp_buffer); - xasprintf(&message, "%sLoad=%3.1f%% ", message, ups_load_percent); - - if (config.check_variable == UPS_LOADPCT) { - if (config.check_crit && - ups_load_percent >= config.critical_value) { + if (check_variable == UPS_LOADPCT) { + if (check_crit==TRUE && ups_load_percent>=critical_value) { result = STATE_CRITICAL; - } else if (config.check_warn && - ups_load_percent >= config.warning_value) { - result = max_state(result, STATE_WARNING); } - xasprintf(&data, "%s %s", data, - perfdata("load", (long)ups_load_percent, "%", - config.check_warn, (long)(config.warning_value), - config.check_crit, (long)(config.critical_value), - true, 0, true, 100)); + else if (check_warn==TRUE && ups_load_percent>=warning_value) { + result = max_state (result, STATE_WARNING); + } + xasprintf (&data, "%s %s", data, + perfdata ("load", (long)ups_load_percent, "%", + check_warn, (long)(warning_value), + check_crit, (long)(critical_value), + TRUE, 0, TRUE, 100)); } else { - xasprintf(&data, "%s %s", data, - perfdata("load", (long)ups_load_percent, "%", false, 0, - false, 0, true, 0, true, 100)); + xasprintf (&data, "%s %s", data, + perfdata ("load", (long)ups_load_percent, "%", + FALSE, 0, FALSE, 0, TRUE, 0, TRUE, 100)); } } /* get the ups temperature if possible */ - res = get_ups_variable("ups.temperature", temp_buffer, config); - if (res == NOSUCHVAR) { - supported_options &= ~UPS_TEMP; - } else if (res != OK) { + res=get_ups_variable ("ups.temperature", temp_buffer); + if ( res == NOSUCHVAR ) supported_options &= ~UPS_TEMP; + else if ( res != OK) return STATE_CRITICAL; - } else { - supported_options |= UPS_TEMP; - - double ups_temperature = 0.0; - char *tunits; - - if (config.temp_output_c) { - tunits = "degC"; - ups_temperature = atof(temp_buffer); - xasprintf(&message, "%sTemp=%3.1fC", message, ups_temperature); - } else { - tunits = "degF"; - ups_temperature = (atof(temp_buffer) * 1.8) + 32; - xasprintf(&message, "%sTemp=%3.1fF", message, ups_temperature); + else { + supported_options |= UPS_TEMP; + if (temp_output_c) { + tunits="degC"; + ups_temperature = atof (temp_buffer); + xasprintf (&message, "%sTemp=%3.1fC", message, ups_temperature); + } + else { + tunits="degF"; + ups_temperature = (atof (temp_buffer) * 1.8) + 32; + xasprintf (&message, "%sTemp=%3.1fF", message, ups_temperature); } - if (config.check_variable == UPS_TEMP) { - if (config.check_crit && ups_temperature >= config.critical_value) { + if (check_variable == UPS_TEMP) { + if (check_crit==TRUE && ups_temperature>=critical_value) { result = STATE_CRITICAL; - } else if (config.check_warn && - ups_temperature >= config.warning_value) { - result = max_state(result, STATE_WARNING); } - xasprintf(&data, "%s %s", data, - perfdata("temp", (long)ups_temperature, tunits, - config.check_warn, (long)(config.warning_value), - config.check_crit, (long)(config.critical_value), - true, 0, false, 0)); + else if (check_warn == TRUE && ups_temperature>=warning_value) { + result = max_state (result, STATE_WARNING); + } + xasprintf (&data, "%s %s", data, + perfdata ("temp", (long)ups_temperature, tunits, + check_warn, (long)(warning_value), + check_crit, (long)(critical_value), + TRUE, 0, FALSE, 0)); } else { - xasprintf(&data, "%s %s", data, - perfdata("temp", (long)ups_temperature, tunits, false, 0, - false, 0, true, 0, false, 0)); + xasprintf (&data, "%s %s", data, + perfdata ("temp", (long)ups_temperature, tunits, + FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0)); } } - /* get the ups real power if possible */ - res = get_ups_variable("ups.realpower", temp_buffer, config); - if (res == NOSUCHVAR) { - supported_options &= ~UPS_REALPOWER; - } else if (res != OK) { - return STATE_CRITICAL; - } else { - supported_options |= UPS_REALPOWER; - double ups_realpower = 0.0; - ups_realpower = atof(temp_buffer); - xasprintf(&message, "%sReal power=%3.1fW ", message, ups_realpower); - - if (config.check_variable == UPS_REALPOWER) { - if (config.check_crit && ups_realpower >= config.critical_value) { - result = STATE_CRITICAL; - } else if (config.check_warn && - ups_realpower >= config.warning_value) { - result = max_state(result, STATE_WARNING); - } - xasprintf(&data, "%s %s", data, - perfdata("realpower", (long)ups_realpower, "W", - config.check_warn, (long)(config.warning_value), - config.check_crit, (long)(config.critical_value), - true, 0, false, 0)); - } else { - xasprintf(&data, "%s %s", data, - perfdata("realpower", (long)ups_realpower, "W", false, 0, - false, 0, true, 0, false, 0)); - } - } - - /* if the UPS does not support any options we are looking for, report an - * error */ + /* if the UPS does not support any options we are looking for, report an error */ if (supported_options == UPS_NONE) { result = STATE_CRITICAL; - xasprintf(&message, _("UPS does not support any available options\n")); + xasprintf (&message, _("UPS does not support any available options\n")); } /* reset timeout */ - alarm(0); + alarm (0); - printf("UPS %s - %s|%s\n", state_text(result), message, data); + printf ("UPS %s - %s|%s\n", state_text(result), message, data); return result; } + + /* determines what options are supported by the UPS */ -int determine_status(ups_config *config, int *supported_options) { +int +determine_status (void) +{ char recv_buffer[MAX_INPUT_BUFFER]; + char temp_buffer[MAX_INPUT_BUFFER]; + char *ptr; + int res; - int res = get_ups_variable("ups.status", recv_buffer, *config); - if (res == NOSUCHVAR) { - return OK; - } - + res=get_ups_variable ("ups.status", recv_buffer); + if (res == NOSUCHVAR) return OK; if (res != STATE_OK) { - printf("%s\n", _("Invalid response received from host")); + printf ("%s\n", _("Invalid response received from host")); return ERROR; } - *supported_options |= UPS_STATUS; + supported_options |= UPS_STATUS; - char temp_buffer[MAX_INPUT_BUFFER]; - - strcpy(temp_buffer, recv_buffer); - for (char *ptr = (char *)strtok(temp_buffer, " "); ptr != NULL; - ptr = (char *)strtok(NULL, " ")) { - if (!strcmp(ptr, "OFF")) { - config->status |= UPSSTATUS_OFF; - } else if (!strcmp(ptr, "OL")) { - config->status |= UPSSTATUS_OL; - } else if (!strcmp(ptr, "OB")) { - config->status |= UPSSTATUS_OB; - } else if (!strcmp(ptr, "LB")) { - config->status |= UPSSTATUS_LB; - } else if (!strcmp(ptr, "CAL")) { - config->status |= UPSSTATUS_CAL; - } else if (!strcmp(ptr, "RB")) { - config->status |= UPSSTATUS_RB; - } else if (!strcmp(ptr, "BYPASS")) { - config->status |= UPSSTATUS_BYPASS; - } else if (!strcmp(ptr, "OVER")) { - config->status |= UPSSTATUS_OVER; - } else if (!strcmp(ptr, "TRIM")) { - config->status |= UPSSTATUS_TRIM; - } else if (!strcmp(ptr, "BOOST")) { - config->status |= UPSSTATUS_BOOST; - } else if (!strcmp(ptr, "CHRG")) { - config->status |= UPSSTATUS_CHRG; - } else if (!strcmp(ptr, "DISCHRG")) { - config->status |= UPSSTATUS_DISCHRG; - } else if (!strcmp(ptr, "ALARM")) { - config->status |= UPSSTATUS_ALARM; - } else { - config->status |= UPSSTATUS_UNKNOWN; - } + strcpy (temp_buffer, recv_buffer); + for (ptr = (char *) strtok (temp_buffer, " "); ptr != NULL; + ptr = (char *) strtok (NULL, " ")) { + if (!strcmp (ptr, "OFF")) + status |= UPSSTATUS_OFF; + else if (!strcmp (ptr, "OL")) + status |= UPSSTATUS_OL; + else if (!strcmp (ptr, "OB")) + status |= UPSSTATUS_OB; + else if (!strcmp (ptr, "LB")) + status |= UPSSTATUS_LB; + else if (!strcmp (ptr, "CAL")) + status |= UPSSTATUS_CAL; + else if (!strcmp (ptr, "RB")) + status |= UPSSTATUS_RB; + else if (!strcmp (ptr, "BYPASS")) + status |= UPSSTATUS_BYPASS; + else if (!strcmp (ptr, "OVER")) + status |= UPSSTATUS_OVER; + else if (!strcmp (ptr, "TRIM")) + status |= UPSSTATUS_TRIM; + else if (!strcmp (ptr, "BOOST")) + status |= UPSSTATUS_BOOST; + else if (!strcmp (ptr, "CHRG")) + status |= UPSSTATUS_CHRG; + else if (!strcmp (ptr, "DISCHRG")) + status |= UPSSTATUS_DISCHRG; + else + status |= UPSSTATUS_UNKNOWN; } return OK; } + /* gets a variable value for a specific UPS */ -int get_ups_variable(const char *varname, char *buf, const ups_config config) { +int +get_ups_variable (const char *varname, char *buf) +{ + /* char command[MAX_INPUT_BUFFER]; */ + char temp_buffer[MAX_INPUT_BUFFER]; char send_buffer[MAX_INPUT_BUFFER]; + char *ptr; + char *logout = "OK Goodbye\n"; + int logout_len = strlen(logout); + int len; + + *buf=0; /* create the command string to send to the UPS daemon */ /* Add LOGOUT to avoid read failure logs */ - int res = snprintf(send_buffer, sizeof(send_buffer), - "GET VAR %s %s\nLOGOUT\n", config.ups_name, varname); - if ((res > 0) && ((size_t)res >= sizeof(send_buffer))) { + if (snprintf (send_buffer, sizeof(send_buffer), "GET VAR %s %s\nLOGOUT\n", ups_name, varname) >= sizeof(send_buffer)) { printf("%s\n", _("UPS name to long for buffer")); return ERROR; } - char temp_buffer[MAX_INPUT_BUFFER]; - /* send the command to the daemon and get a response back */ - if (process_tcp_request(config.server_address, config.server_port, - send_buffer, temp_buffer, - sizeof(temp_buffer)) != STATE_OK) { - printf("%s\n", _("Invalid response received from host")); + if (process_tcp_request + (server_address, server_port, send_buffer, temp_buffer, + sizeof (temp_buffer)) != STATE_OK) { + printf ("%s\n", _("Invalid response received from host")); return ERROR; } - char *ptr = temp_buffer; - int len = strlen(ptr); - const char *logout = "OK Goodbye\n"; - const int logout_len = strlen(logout); - - if (len > logout_len && strcmp(ptr + len - logout_len, logout) == 0) { - len -= logout_len; - } - if (len > 0 && ptr[len - 1] == '\n') { - ptr[len - 1] = 0; - } - if (strcmp(ptr, "ERR UNKNOWN-UPS") == 0) { - printf(_("CRITICAL - no such UPS '%s' on that host\n"), - config.ups_name); + ptr = temp_buffer; + len = strlen(ptr); + if (len > logout_len && strcmp (ptr + len - logout_len, logout) == 0) len -= logout_len; + if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0; + if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) { + printf (_("CRITICAL - no such UPS '%s' on that host\n"), ups_name); return ERROR; } - if (strcmp(ptr, "ERR VAR-NOT-SUPPORTED") == 0) { + if (strcmp (ptr, "ERR VAR-NOT-SUPPORTED") == 0) { /*printf ("Error: Variable '%s' is not supported\n", varname);*/ return NOSUCHVAR; } - if (strcmp(ptr, "ERR DATA-STALE") == 0) { - printf("%s\n", _("CRITICAL - UPS data is stale")); + if (strcmp (ptr, "ERR DATA-STALE") == 0) { + printf ("%s\n", _("CRITICAL - UPS data is stale")); return ERROR; } - if (strncmp(ptr, "ERR", 3) == 0) { - printf(_("Unknown error: %s\n"), ptr); + if (strncmp (ptr, "ERR", 3) == 0) { + printf (_("Unknown error: %s\n"), ptr); return ERROR; } - ptr = temp_buffer + strlen(varname) + strlen(config.ups_name) + 6; + ptr = temp_buffer + strlen (varname) + strlen (ups_name) + 6; len = strlen(ptr); - if (len < 2 || ptr[0] != '"' || ptr[len - 1] != '"') { - printf("%s\n", _("Error: unable to parse variable")); + if (len < 2 || ptr[0] != '"' || ptr[len-1] != '"') { + printf ("%s\n", _("Error: unable to parse variable")); return ERROR; } - - *buf = 0; - strncpy(buf, ptr + 1, len - 2); + strncpy (buf, ptr+1, len - 2); buf[len - 2] = 0; return OK; } + /* Command line: CHECK_UPS -H -u ups [-p port] [-v variable] [-wv warn_value] [-cv crit_value] [-to to_sec] */ + /* process command-line arguments */ -int process_arguments(int argc, char **argv, ups_config *config) { - - static struct option longopts[] = {{"hostname", required_argument, 0, 'H'}, - {"ups", required_argument, 0, 'u'}, - {"port", required_argument, 0, 'p'}, - {"critical", required_argument, 0, 'c'}, - {"warning", required_argument, 0, 'w'}, - {"timeout", required_argument, 0, 't'}, - {"temperature", no_argument, 0, 'T'}, - {"variable", required_argument, 0, 'v'}, - {"version", no_argument, 0, 'V'}, - {"help", no_argument, 0, 'h'}, - {0, 0, 0, 0}}; - - if (argc < 2) { - return ERROR; - } - +int +process_arguments (int argc, char **argv) +{ int c; - for (c = 1; c < argc; c++) { - if (strcmp("-to", argv[c]) == 0) { - strcpy(argv[c], "-t"); - } else if (strcmp("-wt", argv[c]) == 0) { - strcpy(argv[c], "-w"); - } else if (strcmp("-ct", argv[c]) == 0) { - strcpy(argv[c], "-c"); - } - } int option = 0; - while (1) { - c = getopt_long(argc, argv, "hVTH:u:p:v:c:w:t:", longopts, &option); + static struct option longopts[] = { + {"hostname", required_argument, 0, 'H'}, + {"ups", required_argument, 0, 'u'}, + {"port", required_argument, 0, 'p'}, + {"critical", required_argument, 0, 'c'}, + {"warning", required_argument, 0, 'w'}, + {"timeout", required_argument, 0, 't'}, + {"temperature", no_argument, 0, 'T'}, + {"variable", required_argument, 0, 'v'}, + {"version", no_argument, 0, 'V'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; - if (c == -1 || c == EOF) { + if (argc < 2) + return ERROR; + + for (c = 1; c < argc; c++) { + if (strcmp ("-to", argv[c]) == 0) + strcpy (argv[c], "-t"); + else if (strcmp ("-wt", argv[c]) == 0) + strcpy (argv[c], "-w"); + else if (strcmp ("-ct", argv[c]) == 0) + strcpy (argv[c], "-c"); + } + + while (1) { + c = getopt_long (argc, argv, "hVTH:u:p:v:c:w:t:", longopts, + &option); + + if (c == -1 || c == EOF) break; - } switch (c) { - case '?': /* help */ - usage5(); - case 'H': /* hostname */ - if (is_host(optarg)) { - config->server_address = optarg; - } else { - usage2(_("Invalid hostname/address"), optarg); + case '?': /* help */ + usage5 (); + case 'H': /* hostname */ + if (is_host (optarg)) { + server_address = optarg; + } + else { + usage2 (_("Invalid hostname/address"), optarg); } break; - case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for - Fahrenheit) */ - config->temp_output_c = true; + case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for Fahrenheit) */ + temp_output_c = 1; break; - case 'u': /* ups name */ - config->ups_name = optarg; + case 'u': /* ups name */ + ups_name = optarg; break; - case 'p': /* port */ - if (is_intpos(optarg)) { - config->server_port = atoi(optarg); - } else { - usage2(_("Port must be a positive integer"), optarg); + case 'p': /* port */ + if (is_intpos (optarg)) { + server_port = atoi (optarg); + } + else { + usage2 (_("Port must be a positive integer"), optarg); } break; - case 'c': /* critical time threshold */ - if (is_intnonneg(optarg)) { - config->critical_value = atoi(optarg); - config->check_crit = true; - } else { - usage2(_("Critical time must be a positive integer"), optarg); + case 'c': /* critical time threshold */ + if (is_intnonneg (optarg)) { + critical_value = atoi (optarg); + check_crit = TRUE; + } + else { + usage2 (_("Critical time must be a positive integer"), optarg); } break; - case 'w': /* warning time threshold */ - if (is_intnonneg(optarg)) { - config->warning_value = atoi(optarg); - config->check_warn = true; - } else { - usage2(_("Warning time must be a positive integer"), optarg); + case 'w': /* warning time threshold */ + if (is_intnonneg (optarg)) { + warning_value = atoi (optarg); + check_warn = TRUE; + } + else { + usage2 (_("Warning time must be a positive integer"), optarg); } break; - case 'v': /* variable */ - if (!strcmp(optarg, "LINE")) { - config->check_variable = UPS_UTILITY; - } else if (!strcmp(optarg, "TEMP")) { - config->check_variable = UPS_TEMP; - } else if (!strcmp(optarg, "BATTPCT")) { - config->check_variable = UPS_BATTPCT; - } else if (!strcmp(optarg, "LOADPCT")) { - config->check_variable = UPS_LOADPCT; - } else if (!strcmp(optarg, "REALPOWER")) { - config->check_variable = UPS_REALPOWER; - } else { - usage2(_("Unrecognized UPS variable"), optarg); + case 'v': /* variable */ + if (!strcmp (optarg, "LINE")) + check_variable = UPS_UTILITY; + else if (!strcmp (optarg, "TEMP")) + check_variable = UPS_TEMP; + else if (!strcmp (optarg, "BATTPCT")) + check_variable = UPS_BATTPCT; + else if (!strcmp (optarg, "LOADPCT")) + check_variable = UPS_LOADPCT; + else + usage2 (_("Unrecognized UPS variable"), optarg); + break; + case 't': /* timeout */ + if (is_intnonneg (optarg)) { + socket_timeout = atoi (optarg); + } + else { + usage4 (_("Timeout interval must be a positive integer")); } break; - case 't': /* timeout */ - if (is_intnonneg(optarg)) { - socket_timeout = atoi(optarg); - } else { - usage4(_("Timeout interval must be a positive integer")); - } - break; - case 'V': /* version */ - print_revision(progname, NP_VERSION); - exit(STATE_UNKNOWN); - case 'h': /* help */ - print_help(); - exit(STATE_UNKNOWN); + case 'V': /* version */ + print_revision (progname, NP_VERSION); + exit (STATE_UNKNOWN); + case 'h': /* help */ + print_help (); + exit (STATE_UNKNOWN); } } - if (config->server_address == NULL && argc > optind) { - if (is_host(argv[optind])) { - config->server_address = argv[optind++]; - } else { - usage2(_("Invalid hostname/address"), optarg); - } + + if (server_address == NULL && argc > optind) { + if (is_host (argv[optind])) + server_address = argv[optind++]; + else + usage2 (_("Invalid hostname/address"), optarg); } - if (config->server_address == NULL) { - config->server_address = strdup("127.0.0.1"); - } + if (server_address == NULL) + server_address = strdup("127.0.0.1"); - return validate_arguments(*config); + return validate_arguments(); } -int validate_arguments(ups_config config) { - if (!config.ups_name) { - printf("%s\n", _("Error : no UPS indicated")); + +int +validate_arguments (void) +{ + if (! ups_name) { + printf ("%s\n", _("Error : no UPS indicated")); return ERROR; } return OK; } -void print_help(void) { - print_revision(progname, NP_VERSION); - - printf("Copyright (c) 2000 Tom Shields\n"); - printf("Copyright (c) 2004 Alain Richard \n"); - printf("Copyright (c) 2004 Arnaud Quette \n"); - printf(COPYRIGHT, copyright, email); - - printf("%s\n", _("This plugin tests the UPS service on the specified host. " - "Network UPS Tools")); - printf("%s\n", _("from www.networkupstools.org must be running for this " - "plugin to work.")); - - printf("\n\n"); - - print_usage(); - - printf(UT_HELP_VRSN); - printf(UT_EXTRA_OPTS); +void +print_help (void) +{ char *myport; - xasprintf(&myport, "%d", PORT); - printf(UT_HOST_PORT, 'p', myport); + xasprintf (&myport, "%d", PORT); - printf(" %s\n", "-u, --ups=STRING"); - printf(" %s\n", _("Name of UPS")); - printf(" %s\n", "-T, --temperature"); - printf(" %s\n", _("Output of temperatures in Celsius")); - printf(" %s\n", "-v, --variable=STRING"); - printf(" %s %s\n", _("Valid values for STRING are"), - "LINE, TEMP, BATTPCT, LOADPCT or REALPOWER"); + print_revision (progname, NP_VERSION); - printf(UT_WARN_CRIT); + printf ("Copyright (c) 2000 Tom Shields\n"); + printf ("Copyright (c) 2004 Alain Richard \n"); + printf ("Copyright (c) 2004 Arnaud Quette \n"); + printf (COPYRIGHT, copyright, email); - printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf ("%s\n", _("This plugin tests the UPS service on the specified host. Network UPS Tools")); + printf ("%s\n", _("from www.networkupstools.org must be running for this plugin to work.")); - /* TODO: -v clashing with -v/-variable. Commenting out help text since - verbose is unused up to now */ - /* printf (UT_VERBOSE); */ + printf ("\n\n"); - printf("\n"); - printf("%s\n", _("This plugin attempts to determine the status of a UPS " - "(Uninterruptible Power")); - printf("%s\n", _("Supply) on a local or remote host. If the UPS is online " - "or calibrating, the")); - printf("%s\n", _("plugin will return an OK state. If the battery is on it " - "will return a WARNING")); - printf("%s\n", _("state. If the UPS is off or has a low battery the plugin " - "will return a CRITICAL")); - printf("%s\n", _("state.")); + print_usage (); - printf("\n"); - printf("%s\n", _("Notes:")); - printf(" %s\n", _("You may also specify a variable to check (such as " - "temperature, utility voltage,")); - printf(" %s\n", _("battery load, etc.) as well as warning and critical " - "thresholds for the value")); - printf(" %s\n", _("of that variable. If the remote host has multiple UPS " - "that are being monitored")); - printf(" %s\n", _("you will have to use the --ups option to specify which " - "UPS to check.")); - printf("\n"); - printf(" %s\n", _("This plugin requires that the UPSD daemon distributed " - "with Russell Kroll's")); - printf(" %s\n", _("Network UPS Tools be installed on the remote host. If " - "you do not have the")); - printf(" %s\n", - _("package installed on your system, you can download it from")); - printf(" %s\n", _("http://www.networkupstools.org")); + printf (UT_HELP_VRSN); + printf (UT_EXTRA_OPTS); - printf(UT_SUPPORT); + printf (UT_HOST_PORT, 'p', myport); + + printf (" %s\n", "-u, --ups=STRING"); + printf (" %s\n", _("Name of UPS")); + printf (" %s\n", "-T, --temperature"); + printf (" %s\n", _("Output of temperatures in Celsius")); + printf (" %s\n", "-v, --variable=STRING"); + printf (" %s %s\n", _("Valid values for STRING are"), "LINE, TEMP, BATTPCT or LOADPCT"); + + printf (UT_WARN_CRIT); + + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + +/* TODO: -v clashing with -v/-variable. Commenting out help text since verbose + is unused up to now */ +/* printf (UT_VERBOSE); */ + + printf ("\n"); + printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power")); + printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the")); + printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING")); + printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL")); + printf ("%s\n", _("state.")); + + printf ("\n"); + printf ("%s\n", _("Notes:")); + printf (" %s\n", _("You may also specify a variable to check (such as temperature, utility voltage,")); + printf (" %s\n", _("battery load, etc.) as well as warning and critical thresholds for the value")); + printf (" %s\n", _("of that variable. If the remote host has multiple UPS that are being monitored")); + printf (" %s\n", _("you will have to use the --ups option to specify which UPS to check.")); + printf ("\n"); + printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's")); + printf (" %s\n", _("Network UPS Tools be installed on the remote host. If you do not have the")); + printf (" %s\n", _("package installed on your system, you can download it from")); + printf (" %s\n", _("http://www.networkupstools.org")); + + printf (UT_SUPPORT); } -void print_usage(void) { - printf("%s\n", _("Usage:")); - printf("%s -H host -u ups [-p port] [-v variable] [-w warn_value] [-c " - "crit_value] [-to to_sec] [-T]\n", - progname); + +void +print_usage (void) +{ + printf ("%s\n", _("Usage:")); + printf ("%s -H host -u ups [-p port] [-v variable] [-w warn_value] [-c crit_value] [-to to_sec] [-T]\n", progname); } diff --git a/plugins/check_users.c b/plugins/check_users.c index 89b9536..2a9ee98 100644 --- a/plugins/check_users.c +++ b/plugins/check_users.c @@ -179,7 +179,7 @@ main (int argc, char **argv) printf (_("USERS %s - %d users currently logged in |%s\n"), state_text(result), users, sperfdata_int("users", users, "", warning_range, - critical_range, true, 0, false, 0)); + critical_range, TRUE, 0, FALSE, 0)); } return result; @@ -202,7 +202,7 @@ process_arguments (int argc, char **argv) if (argc < 2) usage ("\n"); - while (true) { + while (1) { c = getopt_long (argc, argv, "+hVvc:w:", longopts, &option); if (c == -1 || c == EOF || c == 1) @@ -227,23 +227,18 @@ process_arguments (int argc, char **argv) } c = optind; - if (warning_range == NULL && argc > c) warning_range = argv[c++]; - if (critical_range == NULL && argc > c) critical_range = argv[c++]; /* this will abort in case of invalid ranges */ set_thresholds (&thlds, warning_range, critical_range); - if (!thlds->warning) { - usage4 (_("Warning threshold must be a valid range expression")); - } - - if (!thlds->critical) { - usage4 (_("Critical threshold must be a valid range expression")); - } + if (thlds->warning->end < 0) + usage4 (_("Warning threshold must be a positive integer")); + if (thlds->critical->end < 0) + usage4 (_("Critical threshold must be a positive integer")); return OK; } @@ -266,10 +261,10 @@ print_help (void) printf (UT_HELP_VRSN); printf (UT_EXTRA_OPTS); - printf (" %s\n", "-w, --warning=RANGE_EXPRESSION"); - printf (" %s\n", _("Set WARNING status if number of logged in users violates RANGE_EXPRESSION")); - printf (" %s\n", "-c, --critical=RANGE_EXPRESSION"); - printf (" %s\n", _("Set CRITICAL status if number of logged in users violates RANGE_EXPRESSION")); + printf (" %s\n", "-w, --warning=INTEGER"); + printf (" %s\n", _("Set WARNING status if more than INTEGER users are logged in")); + printf (" %s\n", "-c, --critical=INTEGER"); + printf (" %s\n", _("Set CRITICAL status if more than INTEGER users are logged in")); printf (UT_SUPPORT); } diff --git a/plugins/common.h b/plugins/common.h index 833479c..6bf4fca 100644 --- a/plugins/common.h +++ b/plugins/common.h @@ -184,6 +184,14 @@ enum { ERROR = -1 }; +/* AIX seems to have this defined somewhere else */ +#ifndef FALSE +enum { + FALSE, + TRUE +}; +#endif + enum { STATE_OK, STATE_WARNING, diff --git a/plugins/negate.c b/plugins/negate.c index c5fe7e1..50f62d3 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -47,7 +47,7 @@ static const char **process_arguments (int, char **); void validate_arguments (char **); void print_help (void); void print_usage (void); -bool subst_text = false; +int subst_text = FALSE; static int state[4] = { STATE_OK, @@ -63,6 +63,7 @@ main (int argc, char **argv) char *sub; char **command_line; output chld_out, chld_err; + int i; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -85,7 +86,7 @@ main (int argc, char **argv) result = cmd_run_array (command_line, &chld_out, &chld_err, 0); } if (chld_err.lines > 0) { - for (size_t i = 0; i < chld_err.lines; i++) { + for (i = 0; i < chld_err.lines; i++) { fprintf (stderr, "%s\n", chld_err.line[i]); } } @@ -94,7 +95,7 @@ main (int argc, char **argv) if (chld_out.lines == 0) die (max_state_alt (result, STATE_UNKNOWN), _("No data returned from command\n")); - for (size_t i = 0; i < chld_out.lines; i++) { + for (i = 0; i < chld_out.lines; i++) { if (subst_text && result >= 0 && result <= 4 && result != state[result]) { /* Loop over each match found */ while ((sub = strstr (chld_out.line[i], state_text (result)))) { @@ -121,7 +122,7 @@ static const char ** process_arguments (int argc, char **argv) { int c; - bool permute = true; + int permute = TRUE; int option = 0; static struct option longopts[] = { @@ -167,26 +168,26 @@ process_arguments (int argc, char **argv) case 'o': /* replacement for OK */ if ((state[STATE_OK] = mp_translate_state(optarg)) == ERROR) usage4 (_("Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); - permute = false; + permute = FALSE; break; case 'w': /* replacement for WARNING */ if ((state[STATE_WARNING] = mp_translate_state(optarg)) == ERROR) usage4 (_("Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); - permute = false; + permute = FALSE; break; case 'c': /* replacement for CRITICAL */ if ((state[STATE_CRITICAL] = mp_translate_state(optarg)) == ERROR) usage4 (_("Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); - permute = false; + permute = FALSE; break; case 'u': /* replacement for UNKNOWN */ if ((state[STATE_UNKNOWN] = mp_translate_state(optarg)) == ERROR) usage4 (_("Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); - permute = false; + permute = FALSE; break; case 's': /* Substitute status text */ - subst_text = true; + subst_text = TRUE; break; } } @@ -220,10 +221,8 @@ print_help (void) printf (COPYRIGHT, copyright, email); - printf ("%s\n", _("Negates only the return code of a plugin (returns OK for CRITICAL and vice-versa) by default.")); - printf ("%s\n", _("Additional switches can be used to control:\n")); - printf ("\t - which state becomes what\n"); - printf ("\t - changing the plugin output text to match the return code"); + printf ("%s\n", _("Negates the status of a plugin (returns OK for CRITICAL and vice-versa).")); + printf ("%s\n", _("Additional switches can be used to control which state becomes what.")); printf ("\n\n"); diff --git a/plugins/netutils.c b/plugins/netutils.c index c6af248..1bb4f07 100644 --- a/plugins/netutils.c +++ b/plugins/netutils.c @@ -34,7 +34,7 @@ unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT; unsigned int socket_timeout_state = STATE_CRITICAL; int econn_refuse_state = STATE_CRITICAL; -bool was_refused = false; +int was_refused = FALSE; #if USE_IPV6 int address_family = AF_UNSPEC; #else @@ -215,14 +215,14 @@ np_net_connect (const char *host_name, int port, int *sd, int proto) result = connect (*sd, r->ai_addr, r->ai_addrlen); if (result == 0) { - was_refused = false; + was_refused = FALSE; break; } if (result < 0) { switch (errno) { case ECONNREFUSED: - was_refused = true; + was_refused = TRUE; break; } } @@ -246,7 +246,7 @@ np_net_connect (const char *host_name, int port, int *sd, int proto) } result = connect(*sd, (struct sockaddr *)&su, sizeof(su)); if (result < 0 && errno == ECONNREFUSED) - was_refused = true; + was_refused = TRUE; } if (result == 0) @@ -326,11 +326,13 @@ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int } -bool is_host (const char *address) { +int +is_host (const char *address) +{ if (is_addr (address) || is_hostname (address)) - return (true); + return (TRUE); - return (false); + return (FALSE); } void @@ -340,18 +342,20 @@ host_or_die(const char *str) usage_va(_("Invalid hostname/address - %s"), str); } -bool is_addr (const char *address) { +int +is_addr (const char *address) +{ #ifdef USE_IPV6 if (address_family == AF_INET && is_inet_addr (address)) - return true; + return TRUE; else if (address_family == AF_INET6 && is_inet6_addr (address)) - return true; + return TRUE; #else if (is_inet_addr (address)) - return (true); + return (TRUE); #endif - return (false); + return (FALSE); } int @@ -366,10 +370,10 @@ dns_lookup (const char *in, struct sockaddr_storage *ss, int family) retval = getaddrinfo (in, NULL, &hints, &res); if (retval != 0) - return false; + return FALSE; if (ss != NULL) memcpy (ss, res->ai_addr, res->ai_addrlen); freeaddrinfo (res); - return true; + return TRUE; } diff --git a/plugins/netutils.h b/plugins/netutils.h index a95057e..ea653e7 100644 --- a/plugins/netutils.h +++ b/plugins/netutils.h @@ -73,8 +73,8 @@ int send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, /* "is_*" wrapper macros and functions */ -bool is_host (const char *); -bool is_addr (const char *); +int is_host (const char *); +int is_addr (const char *); int dns_lookup (const char *, struct sockaddr_storage *, int); void host_or_die(const char *str); #define resolve_host_or_addr(addr, family) dns_lookup(addr, NULL, family) @@ -89,7 +89,7 @@ void host_or_die(const char *str); extern unsigned int socket_timeout; extern unsigned int socket_timeout_state; extern int econn_refuse_state; -extern bool was_refused; +extern int was_refused; extern int address_family; void socket_timeout_alarm_handler (int) __attribute__((noreturn)); diff --git a/plugins/picohttpparser/Makefile.in b/plugins/picohttpparser/Makefile.in index fd1dc34..75fea6b 100644 --- a/plugins/picohttpparser/Makefile.in +++ b/plugins/picohttpparser/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -164,7 +164,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \ $(top_srcdir)/gl/m4/open-cloexec.m4 \ $(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \ - $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/printf.m4 \ + $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/pid_t.m4 \ + $(top_srcdir)/gl/m4/printf.m4 \ $(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ @@ -177,6 +178,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ + $(top_srcdir)/gl/m4/std-gnu11.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ @@ -194,6 +196,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/time_r.m4 $(top_srcdir)/gl/m4/timegm.m4 \ $(top_srcdir)/gl/m4/ungetc.m4 $(top_srcdir)/gl/m4/unistd_h.m4 \ $(top_srcdir)/gl/m4/unlocked-io.m4 \ + $(top_srcdir)/gl/m4/vararrays.m4 \ $(top_srcdir)/gl/m4/vasnprintf.m4 \ $(top_srcdir)/gl/m4/vasprintf.m4 \ $(top_srcdir)/gl/m4/visibility.m4 \ @@ -283,6 +286,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp \ $(top_srcdir)/build-aux/mkinstalldirs @@ -313,8 +318,6 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DBILIBS = @DBILIBS@ DEFS = @DEFS@ @@ -334,7 +337,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ EXTRAS = @EXTRAS@ EXTRAS_ROOT = @EXTRAS_ROOT@ @@ -1706,8 +1708,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -1863,6 +1863,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/plugins/popen.c b/plugins/popen.c index 54e63bc..036bc60 100644 --- a/plugins/popen.c +++ b/plugins/popen.c @@ -105,7 +105,7 @@ spopen (const char *cmdstring) #endif env[0] = strdup("LC_ALL=C"); - env[1] = NULL; + env[1] = '\0'; /* if no command was passed, return with no error */ if (cmdstring == NULL) diff --git a/plugins/runcmd.c b/plugins/runcmd.c index ed49bb9..4f3e349 100644 --- a/plugins/runcmd.c +++ b/plugins/runcmd.c @@ -115,7 +115,7 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr) if(!np_pids) NP_RUNCMD_INIT; env[0] = strdup("LC_ALL=C"); - env[1] = NULL; + env[1] = '\0'; /* make copy of command string so strtok() doesn't silently modify it */ /* (the calling program may want to access it later) */ @@ -240,12 +240,13 @@ np_runcmd_close(int fd) void runcmd_timeout_alarm_handler (int signo) { + size_t i; if (signo == SIGALRM) puts(_("CRITICAL - Plugin timed out while executing system call")); long maxfd = mp_open_max(); - if(np_pids) for(long int i = 0; i < maxfd; i++) { + if(np_pids) for(i = 0; i < maxfd; i++) { if(np_pids[i] != 0) kill(np_pids[i], SIGKILL); } diff --git a/plugins/t/check_curl.t b/plugins/t/check_curl.t index 7a930a4..eae98cc 100644 --- a/plugins/t/check_curl.t +++ b/plugins/t/check_curl.t @@ -205,9 +205,9 @@ SKIP: { like ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' ); like ( $res->output, '/time_ssl=[\d\.]+/', 'Extended Performance Data SSL Output OK' ); - $res = NPTest->testCmd( "./$plugin -H monitoring-plugins.org -u /download.html -f follow" ); + $res = NPTest->testCmd( "./$plugin -H www.mozilla.com -u /firefox -f curl" ); is( $res->return_code, 0, "Redirection based on location is okay"); - $res = NPTest->testCmd( "./$plugin -H monitoring-plugins.org --extended-perfdata" ); + $res = NPTest->testCmd( "./$plugin -H www.mozilla.com --extended-perfdata" ); like ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' ); } diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t index 9eb77ce..ca035ce 100644 --- a/plugins/t/check_disk.t +++ b/plugins/t/check_disk.t @@ -23,11 +23,11 @@ my $mountpoint2_valid = getTestParameter( "NP_MOUNTPOINT2_VALID", "Path to anoth if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") { plan skip_all => "Need 2 mountpoints to test"; } else { - plan tests => 94; + plan tests => 88; } -$result = NPTest->testCmd( - "./check_disk -w 1% -c 1% -p $mountpoint_valid -w 1% -c 1% -p $mountpoint2_valid" +$result = NPTest->testCmd( + "./check_disk -w 1% -c 1% -p $mountpoint_valid -w 1% -c 1% -p $mountpoint2_valid" ); cmp_ok( $result->return_code, "==", 0, "Checking two mountpoints (must have at least 1% free in space and inodes)"); my $c = 0; @@ -44,7 +44,7 @@ my @perf_data = sort(split(/ /, $result->perf_output)); # Calculate avg_free free on mountpoint1 and mountpoint2 # because if you check in the middle, you should get different errors $_ = $result->output; -my ($free_on_mp1, $free_on_mp2) = (m/\((\d+\.\d+)%.*\((\d+\.\d+)%/); +my ($free_on_mp1, $free_on_mp2) = (m/\((\d+)%.*\((\d+)%/); die "Cannot parse output: $_" unless ($free_on_mp1 && $free_on_mp2); my $avg_free = ceil(($free_on_mp1+$free_on_mp2)/2); my ($more_free, $less_free); @@ -103,8 +103,8 @@ is ($crit_percth_data, int((1-10/100)*$total_percth_data), "Wrong critical in pe # Check when order of mount points are reversed, that perf data remains same -$result = NPTest->testCmd( - "./check_disk -w 1% -c 1% -p $mountpoint2_valid -w 1% -c 1% -p $mountpoint_valid" +$result = NPTest->testCmd( + "./check_disk -w 1% -c 1% -p $mountpoint2_valid -w 1% -c 1% -p $mountpoint_valid" ); @_ = sort(split(/ /, $result->perf_output)); is_deeply( \@perf_data, \@_, "perf data for both filesystems same when reversed"); @@ -119,12 +119,8 @@ like ( $result->only_output, qr/$more_free/, "Have disk name in text"); $result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free -p $less_free" ); cmp_ok( $result->return_code, '==', 0, "At least 1 MB available on $more_free and $less_free"); - $_ = $result->output; - my ($free_mb_on_mp1, $free_mb_on_mp2) = (m/(\d+)MiB .* (\d+)MiB /g); -die "Cannot parse output: $_" unless ($free_mb_on_mp1 && $free_mb_on_mp2); - my $free_mb_on_all = $free_mb_on_mp1 + $free_mb_on_mp2; @@ -138,8 +134,8 @@ cmp_ok( $result->return_code, '==', 0, "Old syntax okay" ); $result = NPTest->testCmd( "./check_disk -w 1% -c 1% -p $more_free" ); cmp_ok( $result->return_code, "==", 0, "At least 1% free" ); -$result = NPTest->testCmd( - "./check_disk -w 1% -c 1% -p $more_free -w 100% -c 100% -p $less_free" +$result = NPTest->testCmd( + "./check_disk -w 1% -c 1% -p $more_free -w 100% -c 100% -p $less_free" ); cmp_ok( $result->return_code, "==", 2, "Get critical on less_free mountpoint $less_free" ); like( $result->output, $failureOutput, "Right output" ); @@ -155,14 +151,14 @@ $result = NPTest->testCmd( ); cmp_ok( $result->return_code, '==', 0, "Get ok on more_free mountpoint, when checking avg_free"); -$result = NPTest->testCmd( - "./check_disk -w $avg_free% -c 0% -p $less_free -w $avg_free% -c $avg_free% -p $more_free" +$result = NPTest->testCmd( + "./check_disk -w $avg_free% -c 0% -p $less_free -w $avg_free% -c $avg_free% -p $more_free" ); cmp_ok( $result->return_code, "==", 1, "Combining above two tests, get warning"); my $all_disks = $result->output; $result = NPTest->testCmd( - "./check_disk -e -w $avg_free% -c 0% -p $less_free -w $avg_free% -c $avg_free% -p $more_free" + "./check_disk -e -w $avg_free% -c 0% -p $less_free -w $avg_free% -c $avg_free% -p $more_free" ); isnt( $result->output, $all_disks, "-e gives different output"); @@ -244,7 +240,7 @@ TODO: { cmp_ok( $result->return_code, '==', 3, "Invalid command line options" ); } -$result = NPTest->testCmd( +$result = NPTest->testCmd( "./check_disk -p $mountpoint_valid -w 10% -c 15%" ); cmp_ok( $result->return_code, "==", 3, "Invalid options: -p must come after thresholds" ); @@ -315,8 +311,8 @@ $result = NPTest->testCmd( "./check_disk -w 0% -c 0% -C -w 0% -c 0% -p $mountpoi like( $result->output, '/;.*;\|/', "-C selects partitions if -p is not given"); # grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit -$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all + 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" ); -cmp_ok( $result->return_code, '==', 2, "grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit\nInstead received: " . $result->output); +$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all + 1) ."-g group -p $mountpoint_valid -p $mountpoint2_valid" ); +cmp_ok( $result->return_code, '==', 2, "grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit"); # grouping: exit warning if the sum of free megs on mp1+mp2 is between -w and -c $result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all - 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" ); @@ -326,7 +322,7 @@ cmp_ok( $result->return_code, '==', 1, "grouping: exit warning if the sum of fre $result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all - 1) ." -c ". ($free_mb_on_all - 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" ); cmp_ok( $result->return_code, '==', 0, "grouping: exit ok if the sum of free megs on mp1+mp2 is more than warn/crit"); -# grouping: exit unknown if group name is given after -p +# grouping: exit unknown if group name is given after -p $result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all - 1) ." -c ". ($free_mb_on_all - 1) ." -p $mountpoint_valid -g group -p $mountpoint2_valid" ); cmp_ok( $result->return_code, '==', 3, "Invalid options: -p must come after groupname"); @@ -359,17 +355,17 @@ like( $result->output, qr/$mountpoint2_valid/,"ignore: output data does have $mo # ignore-missing: exit okay, when fs is not accessible $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -p /bob"); cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for not existing filesystem /bob"); -like( $result->output, '/^DISK OK - No disks were found for provided parameters - ignored paths: /bob;.*$/', 'Output OK'); +like( $result->output, '/^DISK OK - No disks were found for provided parameters; - ignored paths: /bob;.*$/', 'Output OK'); # ignore-missing: exit okay, when regex does not match $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -r /bob"); cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching"); -like( $result->output, '/^DISK OK - No disks were found for provided parameters.*$/', 'Output OK'); +like( $result->output, '/^DISK OK - No disks were found for provided parameters;.*$/', 'Output OK'); # ignore-missing: exit okay, when fs with exact match (-E) is not found $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -E -p /etc"); cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay when exact match does not find fs"); -like( $result->output, '/^DISK OK - No disks were found for provided parameters - ignored paths: /etc;.*$/', 'Output OK'); +like( $result->output, '/^DISK OK - No disks were found for provided parameters; - ignored paths: /etc;.*$/', 'Output OK'); # ignore-missing: exit okay, when checking one existing fs and one non-existing fs (regex) $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -r '/bob' -r '^/\$'"); @@ -379,19 +375,4 @@ like( $result->output, '/^DISK OK - free space: \/ .*$/', 'Output OK'); # ignore-missing: exit okay, when checking one existing fs and one non-existing fs (path) $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -p '/bob' -p '/'"); cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching"); -like( $result->output, '/^DISK OK - free space: / .*; - ignored paths: /bob;.*$/', 'Output OK'); - -# ignore-missing: exit okay, when checking one non-existing fs (path) and one ignored -$result = NPTest->testCmd( "./check_disk -n -w 0% -c 0% -r /dummy -i /dummy2"); -cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching"); -like( $result->output, '/^DISK OK - No disks were found for provided parameters\|$/', 'Output OK'); - -# ignore-missing: exit okay, when regex match does not find anything -$result = NPTest->testCmd( "./check_disk -n -e -l -w 10% -c 5% -W 10% -K 5% -r /dummy"); -cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching"); -like( $result->output, '/^DISK OK\|$/', 'Output OK'); - -# ignore-missing: exit okay, when regex match does not find anything -$result = NPTest->testCmd( "./check_disk -n -l -w 10% -c 5% -W 10% -K 5% -r /dummy"); -cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching"); -like( $result->output, '/^DISK OK - No disks were found for provided parameters\|$/', 'Output OK'); +like( $result->output, '/^DISK OK - free space: / .*; - ignored paths: /bob;.*$/', 'Output OK'); \ No newline at end of file diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t index 6ab4a5b..1f2fbdf 100644 --- a/plugins/t/check_http.t +++ b/plugins/t/check_http.t @@ -166,10 +166,10 @@ SKIP: { like ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' ); like ( $res->output, '/time_ssl=[\d\.]+/', 'Extended Performance Data SSL Output OK' ); - $res = NPTest->testCmd( "./$plugin -H monitoring-plugins.org -u /download.html -f follow" ); + $res = NPTest->testCmd( "./$plugin -H www.mozilla.com -u /firefox -f follow" ); is( $res->return_code, 0, "Redirection based on location is okay"); - $res = NPTest->testCmd( "./$plugin -H monitoring-plugins.org --extended-perfdata" ); + $res = NPTest->testCmd( "./$plugin -H www.mozilla.com --extended-perfdata" ); like ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' ); } diff --git a/plugins/t/check_ssh.t b/plugins/t/check_ssh.t index 907d33a..a5cd23c 100644 --- a/plugins/t/check_ssh.t +++ b/plugins/t/check_ssh.t @@ -8,116 +8,34 @@ use strict; use Test::More; use NPTest; -my $res; - # Required parameters -my $ssh_host = getTestParameter("NP_SSH_HOST", - "A host providing SSH service", - "localhost"); - -my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", - "The hostname of system not responsive to network requests", - "10.0.0.1" ); - -my $hostname_invalid = getTestParameter("NP_HOSTNAME_INVALID", - "An invalid (not known to DNS) hostname", - "nosuchhost" ); +my $ssh_host = getTestParameter("NP_SSH_HOST", "A host providing SSH service", "localhost"); +my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", "The hostname of system not responsive to network requests", "10.0.0.1" ); +my $hostname_invalid = getTestParameter("NP_HOSTNAME_INVALID", "An invalid (not known to DNS) hostname", "nosuchhost" ); -plan tests => 14 + 6; - -SKIP: { - skip "SSH_HOST must be defined", 6 unless $ssh_host; - my $result = NPTest->testCmd( - "./check_ssh -H $ssh_host" - ); - cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)"); - like($result->output, '/^SSH OK - /', "Status text if command returned none (OK)"); +plan skip_all => "SSH_HOST must be defined" unless $ssh_host; +plan tests => 6; - $result = NPTest->testCmd( - "./check_ssh -H $host_nonresponsive -t 2" - ); - cmp_ok($result->return_code, '==', 2, "Exit with return code 0 (OK)"); - like($result->output, '/^CRITICAL - Socket timeout after 2 seconds/', "Status text if command returned none (OK)"); +my $result = NPTest->testCmd( + "./check_ssh -H $ssh_host" + ); +cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)"); +like($result->output, '/^SSH OK - /', "Status text if command returned none (OK)"); + + +$result = NPTest->testCmd( + "./check_ssh -H $host_nonresponsive -t 2" + ); +cmp_ok($result->return_code, '==', 2, "Exit with return code 0 (OK)"); +like($result->output, '/^CRITICAL - Socket timeout after 2 seconds/', "Status text if command returned none (OK)"); - $result = NPTest->testCmd( - "./check_ssh -H $hostname_invalid -t 2" - ); - cmp_ok($result->return_code, '==', 3, "Exit with return code 0 (OK)"); - like($result->output, '/^check_ssh: Invalid hostname/', "Status text if command returned none (OK)"); +$result = NPTest->testCmd( + "./check_ssh -H $hostname_invalid -t 2" + ); +cmp_ok($result->return_code, '==', 3, "Exit with return code 0 (OK)"); +like($result->output, '/^check_ssh: Invalid hostname/', "Status text if command returned none (OK)"); - -} -SKIP: { - - skip "No netcat available", 14 unless (system("which nc > /dev/null") == 0); - - # netcat on linux (on debian) will just keep the socket open if not advised otherwise - # therefore we add -q to close it after two seconds after receiving the EOF from input - my $nc_flags = "-l 5003 -N"; - #A valid protocol version control string has the form - # SSH-protoversion-softwareversion SP comments CR LF - # - # where `comments` is optional, protoversion is the SSH protocol version and - # softwareversion is an arbitrary string representing the server software version - open(NC, "echo 'SSH-2.0-nagiosplug.ssh.0.1' | nc ${nc_flags}|"); - sleep 0.1; - $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ); - cmp_ok( $res->return_code, '==', 0, "Got SSH protocol version control string"); - like( $res->output, '/^SSH OK - nagiosplug.ssh.0.1 \(protocol 2.0\)/', "Output OK"); - close NC; - - open(NC, "echo 'SSH-2.0-3.2.9.1' | nc ${nc_flags}|"); - sleep 0.1; - $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ); - cmp_ok( $res->return_code, "==", 0, "Got SSH protocol version control string with non-alpha softwareversion string"); - like( $res->output, '/^SSH OK - 3.2.9.1 \(protocol 2.0\)/', "Output OK for non-alpha softwareversion string"); - close NC; - - open(NC, "echo 'SSH-2.0-nagiosplug.ssh.0.1 this is a comment' | nc ${nc_flags} |"); - sleep 0.1; - $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003 -r nagiosplug.ssh.0.1" ); - cmp_ok( $res->return_code, '==', 0, "Got SSH protocol version control string, and parsed comment appropriately"); - like( $res->output, '/^SSH OK - nagiosplug.ssh.0.1 \(protocol 2.0\)/', "Output OK"); - close NC; - - open(NC, "echo 'SSH-' | nc ${nc_flags}|"); - sleep 0.1; - $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ); - cmp_ok( $res->return_code, '==', 2, "Got invalid SSH protocol version control string"); - like( $res->output, '/^SSH CRITICAL/', "Output OK"); - close NC; - - open(NC, "echo '' | nc ${nc_flags}|"); - sleep 0.1; - $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ); - cmp_ok( $res->return_code, '==', 2, "No version control string received"); - like( $res->output, '/^SSH CRITICAL - No version control string received/', "Output OK"); - close NC; - - open(NC, "echo 'Not a version control string' | nc ${nc_flags}|"); - sleep 0.1; - $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ); - cmp_ok( $res->return_code, '==', 2, "No version control string received"); - like( $res->output, '/^SSH CRITICAL - No version control string received/', "Output OK"); - close NC; - - - #RFC 4253 permits servers to send any number of data lines prior to sending the protocol version control string - open(NC, "{ echo 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'; sleep 0.5; - echo 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB'; sleep 0.5; - echo 'CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC'; sleep 0.2; - echo 'DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD'; sleep 0.3; - printf 'EEEEEEEEEEEEEEEEEE'; sleep 0.2; - printf 'EEEEEEEEEEEEEEEEEE\n'; sleep 0.2; - echo 'Some\nPrepended\nData\nLines\n'; sleep 0.2; - echo 'SSH-2.0-nagiosplug.ssh.0.2';} | nc ${nc_flags}|"); - sleep 0.1; - $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ); - cmp_ok( $res->return_code, '==', 0, "Got delayed SSH protocol version control string"); - like( $res->output, '/^SSH OK - nagiosplug.ssh.0.2 \(protocol 2.0\)/', "Output OK"); - close NC; -} diff --git a/plugins/t/check_swap.t b/plugins/t/check_swap.t index 1878038..de9e0f0 100644 --- a/plugins/t/check_swap.t +++ b/plugins/t/check_swap.t @@ -5,7 +5,7 @@ # use strict; -use Test::More tests => 14; +use Test::More tests => 8; use NPTest; my $successOutput = '/^SWAP OK - [0-9]+\% free \([0-9]+MB out of [0-9]+MB\)/'; @@ -14,10 +14,6 @@ my $warnOutput = '/^SWAP WARNING - [0-9]+\% free \([0-9]+MB out of [0-9]+MB\) my $result; -$result = NPTest->testCmd( "./check_swap" ); # Always OK -cmp_ok( $result->return_code, "==", 0, "Always OK" ); -like( $result->output, $successOutput, "Right output" ); - $result = NPTest->testCmd( "./check_swap -w 1048576 -c 1048576" ); # 1 MB free cmp_ok( $result->return_code, "==", 0, "At least 1MB free" ); like( $result->output, $successOutput, "Right output" ); @@ -33,11 +29,3 @@ like( $result->output, $failureOutput, "Right output" ); $result = NPTest->testCmd( "./check_swap -w 100% -c 1%" ); # 100% (always warn) cmp_ok( $result->return_code, "==", 1, 'Get warning because not 100% free' ); like( $result->output, $warnOutput, "Right output" ); - -$result = NPTest->testCmd( "./check_swap -w 100%" ); # 100% (single threshold, always warn) -cmp_ok( $result->return_code, "==", 1, 'Get warning because not 100% free' ); -like( $result->output, $warnOutput, "Right output" ); - -$result = NPTest->testCmd( "./check_swap -c 100%" ); # 100% (single threshold, always critical) -cmp_ok( $result->return_code, "==", 2, 'Get critical because not 100% free' ); -like( $result->output, $failureOutput, "Right output" ); diff --git a/plugins/t/check_users.t b/plugins/t/check_users.t index 21c3e53..9ebc2fc 100644 --- a/plugins/t/check_users.t +++ b/plugins/t/check_users.t @@ -13,11 +13,10 @@ use Test; use NPTest; use vars qw($tests); -BEGIN {$tests = 12; plan tests => $tests} +BEGIN {$tests = 8; plan tests => $tests} my $successOutput = '/^USERS OK - [0-9]+ users currently logged in/'; my $failureOutput = '/^USERS CRITICAL - [0-9]+ users currently logged in/'; -my $wrongOptionOutput = '/Usage:/'; my $t; @@ -25,8 +24,6 @@ $t += checkCmd( "./check_users 1000 1000", 0, $successOutput ); $t += checkCmd( "./check_users 0 0", 2, $failureOutput ); $t += checkCmd( "./check_users -w 0:1000 -c 0:1000", 0, $successOutput ); $t += checkCmd( "./check_users -w 0:0 -c 0:0", 2, $failureOutput ); -$t += checkCmd( "./check_users -w 0:1000", 3, $wrongOptionOutput); -$t += checkCmd( "./check_users", 3, $wrongOptionOutput); exit(0) if defined($Test::Harness::VERSION); exit($tests - $t); diff --git a/plugins/utils.c b/plugins/utils.c index 77d6a6f..71c0bdd 100644 --- a/plugins/utils.c +++ b/plugins/utils.c @@ -23,15 +23,13 @@ *****************************************************************************/ #include "common.h" -#include "./utils.h" +#include "utils.h" #include "utils_base.h" #include #include #include #include -#include - #include extern void print_usage (void); @@ -149,107 +147,98 @@ print_revision (const char *command_name, const char *revision) command_name, revision, PACKAGE, VERSION); } -bool is_numeric (char *number) { +int +is_numeric (char *number) +{ char tmp[1]; float x; if (!number) - return false; + return FALSE; else if (sscanf (number, "%f%c", &x, tmp) == 1) - return true; + return TRUE; else - return false; + return FALSE; } -bool is_positive (char *number) { +int +is_positive (char *number) +{ if (is_numeric (number) && atof (number) > 0.0) - return true; + return TRUE; else - return false; + return FALSE; } -bool is_negative (char *number) { +int +is_negative (char *number) +{ if (is_numeric (number) && atof (number) < 0.0) - return true; + return TRUE; else - return false; + return FALSE; } -bool is_nonnegative (char *number) { +int +is_nonnegative (char *number) +{ if (is_numeric (number) && atof (number) >= 0.0) - return true; + return TRUE; else - return false; + return FALSE; } -bool is_percentage (char *number) { +int +is_percentage (char *number) +{ int x; if (is_numeric (number) && (x = atof (number)) >= 0 && x <= 100) - return true; + return TRUE; else - return false; + return FALSE; } -bool is_percentage_expression (const char str[]) { - if (!str) { - return false; - } - - size_t len = strlen(str); - - if (str[len-1] != '%') { - return false; - } - - char *foo = calloc(sizeof(char), len + 1); - - if (!foo) { - die (STATE_UNKNOWN, _("calloc failed \n")); - } - - strcpy(foo, str); - foo[len-1] = '\0'; - - bool result = is_numeric(foo); - - free(foo); - - return result; -} - -bool is_integer (char *number) { +int +is_integer (char *number) +{ long int n; if (!number || (strspn (number, "-0123456789 ") != strlen (number))) - return false; + return FALSE; n = strtol (number, NULL, 10); if (errno != ERANGE && n >= INT_MIN && n <= INT_MAX) - return true; + return TRUE; else - return false; + return FALSE; } -bool is_intpos (char *number) { +int +is_intpos (char *number) +{ if (is_integer (number) && atoi (number) > 0) - return true; + return TRUE; else - return false; + return FALSE; } -bool is_intneg (char *number) { +int +is_intneg (char *number) +{ if (is_integer (number) && atoi (number) < 0) - return true; + return TRUE; else - return false; + return FALSE; } -bool is_intnonneg (char *number) { +int +is_intnonneg (char *number) +{ if (is_integer (number) && atoi (number) >= 0) - return true; + return TRUE; else - return false; + return FALSE; } /* @@ -257,27 +246,19 @@ bool is_intnonneg (char *number) { * On success the number will be written to the _target_ address, if _target_ is not set * to NULL. */ -bool is_int64(char *number, int64_t *target) { +int is_int64(char *number, int64_t *target) { errno = 0; - char *endptr = { 0 }; - - int64_t tmp = strtoll(number, &endptr, 10); + uint64_t tmp = strtoll(number, NULL, 10); if (errno != 0) { - return false; - } - - if (*endptr == '\0') { return 0; } - if (tmp < INT64_MIN || tmp > INT64_MAX) { - return false; + return 0; } - if (target != NULL) { *target = tmp; } - return true; + return 1; } /* @@ -285,45 +266,40 @@ bool is_int64(char *number, int64_t *target) { * On success the number will be written to the _target_ address, if _target_ is not set * to NULL. */ -bool is_uint64(char *number, uint64_t *target) { +int is_uint64(char *number, uint64_t *target) { errno = 0; - char *endptr = { 0 }; - unsigned long long tmp = strtoull(number, &endptr, 10); - + uint64_t tmp = strtoll(number, NULL, 10); if (errno != 0) { - return false; + return 0; } - - if (*endptr != '\0') { - return false; + if (tmp < 0 || tmp > UINT64_MAX) { + return 0; } - - if (tmp > UINT64_MAX) { - return false; - } - if (target != NULL) { - *target = (uint64_t)tmp; + *target = tmp; } - - return true; + return 1; } -bool is_intpercent (char *number) { +int +is_intpercent (char *number) +{ int i; if (is_integer (number) && (i = atoi (number)) >= 0 && i <= 100) - return true; + return TRUE; else - return false; + return FALSE; } -bool is_option (char *str) { +int +is_option (char *str) +{ if (!str) - return false; + return FALSE; else if (strspn (str, "-") == 1 || strspn (str, "-") == 2) - return true; + return TRUE; else - return false; + return FALSE; } #ifdef NEED_GETTIMEOFDAY diff --git a/plugins/utils.h b/plugins/utils.h index f939e33..cb979ce 100644 --- a/plugins/utils.h +++ b/plugins/utils.h @@ -16,8 +16,6 @@ suite of plugins. */ /* now some functions etc are being defined in ../lib/utils_base.c */ #include "utils_base.h" -#include - #ifdef NP_EXTRA_OPTS /* Include extra-opts functions if compiled in */ @@ -36,22 +34,21 @@ extern time_t start_time, end_time; /* Test input types */ -bool is_integer (char *); -bool is_intpos (char *); -bool is_intneg (char *); -bool is_intnonneg (char *); -bool is_intpercent (char *); -bool is_uint64(char *number, uint64_t *target); -bool is_int64(char *number, int64_t *target); +int is_integer (char *); +int is_intpos (char *); +int is_intneg (char *); +int is_intnonneg (char *); +int is_intpercent (char *); +int is_uint64(char *number, uint64_t *target); +int is_int64(char *number, int64_t *target); -bool is_numeric (char *); -bool is_positive (char *); -bool is_negative (char *); -bool is_nonnegative (char *); -bool is_percentage (char *); -bool is_percentage_expression (const char[]); +int is_numeric (char *); +int is_positive (char *); +int is_negative (char *); +int is_nonnegative (char *); +int is_percentage (char *); -bool is_option (char *); +int is_option (char *); /* Generalized timer that will do milliseconds if available */ #ifndef HAVE_STRUCT_TIMEVAL diff --git a/po/ChangeLog b/po/ChangeLog new file mode 100644 index 0000000..1074102 --- /dev/null +++ b/po/ChangeLog @@ -0,0 +1,11 @@ +2003-07-02 gettextize + + * Makefile.in.in: New file, from gettext-0.11.4. + * boldquot.sed: New file, from gettext-0.11.4. + * en@boldquot.header: New file, from gettext-0.11.4. + * en@quot.header: New file, from gettext-0.11.4. + * insert-header.sin: New file, from gettext-0.11.4. + * quot.sed: New file, from gettext-0.11.4. + * remove-potcdate.sin: New file, from gettext-0.11.4. + * Rules-quot: New file, from gettext-0.11.4. + diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..1ce0c39 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,2 @@ +fr de + diff --git a/po/Makefile.in.in b/po/Makefile.in.in new file mode 100644 index 0000000..82864b2 --- /dev/null +++ b/po/Makefile.in.in @@ -0,0 +1,395 @@ +# -*- buffer-read-only: t -*- vi: set ro: +# DO NOT EDIT! GENERATED AUTOMATICALLY! +# Makefile for PO directory in any package using GNU gettext. +# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License but which still want to provide support for the GNU gettext +# functionality. +# Please note that the actual code of GNU gettext is covered by the GNU +# General Public License and is *not* in the public domain. +# +# Origin: gettext-0.15 + +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + +SHELL = /bin/sh +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ +datadir = @datadir@ +localedir = @localedir@ +gettextsrcdir = $(datadir)/gettext/po + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +mkinstalldirs = $(SHELL) @install_sh@ -d +mkdir_p = @MKDIR_P@ + +GMSGFMT_ = @GMSGFMT@ +GMSGFMT_no = @GMSGFMT@ +GMSGFMT_yes = @GMSGFMT_015@ +GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) +MSGFMT_ = @MSGFMT@ +MSGFMT_no = @MSGFMT@ +MSGFMT_yes = @MSGFMT_015@ +MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) +XGETTEXT_ = @XGETTEXT@ +XGETTEXT_no = @XGETTEXT@ +XGETTEXT_yes = @XGETTEXT_015@ +XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) +MSGMERGE = msgmerge +MSGMERGE_UPDATE = @MSGMERGE@ --update +MSGINIT = msginit +MSGCONV = msgconv +MSGFILTER = msgfilter + +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +UPDATEPOFILES = @UPDATEPOFILES@ +DUMMYPOFILES = @DUMMYPOFILES@ +DISTFILES.common = Makefile.in.in remove-potcdate.sin \ +$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) +DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ +$(POFILES) $(GMOFILES) \ +$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) + +POTFILES = \ + +CATALOGS = @CATALOGS@ + +# Makevars gets inserted here. (Don't remove this line!) + +.SUFFIXES: +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update + +.po.mo: + @echo "$(MSGFMT) -c -o $@ $<"; \ + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ + +.po.gmo: + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + +.sin.sed: + sed -e '/^#/d' $< > t-$@ + mv t-$@ $@ + + +all: all-@USE_NLS@ + +all-yes: stamp-po +all-no: + +# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no +# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because +# we don't want to bother translators with empty POT files). We assume that +# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. +# In this case, stamp-po is a nop (i.e. a phony target). + +# stamp-po is a timestamp denoting the last time at which the CATALOGS have +# been loosely updated. Its purpose is that when a developer or translator +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +# invocations of "make" will do nothing. This timestamp would not be necessary +# if updating the $(CATALOGS) would always touch them; however, the rule for +# $(POFILES) has been designed to not touch files that don't need to be +# changed. +stamp-po: $(srcdir)/$(DOMAIN).pot + test ! -f $(srcdir)/$(DOMAIN).pot || \ + test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) + @test ! -f $(srcdir)/$(DOMAIN).pot || { \ + echo "touch stamp-po" && \ + echo timestamp > stamp-poT && \ + mv stamp-poT stamp-po; \ + } + +# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', +# otherwise packages like GCC can not be built if only parts of the source +# have been downloaded. + +# This target rebuilds $(DOMAIN).pot; it is an expensive operation. +# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ + msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ + else \ + msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ + fi; \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address="$$msgid_bugs_address" + test ! -f $(DOMAIN).po || { \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ + else \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + else \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + } + +# This rule has no dependencies: we don't need to update $(DOMAIN).pot at +# every "make" invocation, only create it when it is missing. +# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. +$(srcdir)/$(DOMAIN).pot: + $(MAKE) $(DOMAIN).pot-update + +# This target rebuilds a PO file if $(DOMAIN).pot has changed. +# Note that a PO file is not touched if it doesn't need to be changed. +$(POFILES): $(srcdir)/$(DOMAIN).pot + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + if test -f "$(srcdir)/$${lang}.po"; then \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + else \ + $(MAKE) $${lang}.po-create; \ + fi + + +install: install-exec install-data +install-exec: +install-data: install-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + for file in Makevars; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi +install-data-no: all +install-data-yes: all + $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $(DESTDIR)$$dir; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ + fi; \ + done; \ + done + +install-strip: install + +installdirs: installdirs-exec installdirs-data +installdirs-exec: +installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi +installdirs-data-no: +installdirs-data-yes: + $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + fi; \ + done; \ + done + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: uninstall-exec uninstall-data +uninstall-exec: +uninstall-data: uninstall-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in $(DISTFILES.common) Makevars.template; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi +uninstall-data-no: +uninstall-data-yes: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + done; \ + done + +check: all + +info dvi ps pdf html tags TAGS ctags CTAGS ID: + +mostlyclean: + rm -f remove-potcdate.sed + rm -f stamp-poT + rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po + rm -fr *.o + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f stamp-po $(GMOFILES) + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: + $(MAKE) update-po + @$(MAKE) dist2 +# This is a separate target because 'update-po' must be executed before. +dist2: stamp-po $(DISTFILES) + dists="$(DISTFILES)"; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + dists="$$dists Makevars.template"; \ + fi; \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + dists="$$dists $(DOMAIN).pot stamp-po"; \ + fi; \ + if test -f $(srcdir)/ChangeLog; then \ + dists="$$dists ChangeLog"; \ + fi; \ + for i in 0 1 2 3 4 5 6 7 8 9; do \ + if test -f $(srcdir)/ChangeLog.$$i; then \ + dists="$$dists ChangeLog.$$i"; \ + fi; \ + done; \ + if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ + for file in $$dists; do \ + if test -f $$file; then \ + cp -p $$file $(distdir) || exit 1; \ + else \ + cp -p $(srcdir)/$$file $(distdir) || exit 1; \ + fi; \ + done + +update-po: Makefile + $(MAKE) $(DOMAIN).pot-update + test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) + $(MAKE) update-gmo + +# General rule for creating PO files. + +.nop.po-create: + @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ + echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ + exit 1 + +# General rule for updating PO files. + +.nop.po-update: + @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + cd $(srcdir); \ + if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$lang.po failed!" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi + +$(DUMMYPOFILES): + +update-gmo: Makefile $(GMOFILES) + @: + +Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ + cd $(top_builddir) \ + && $(SHELL) ./config.status $(subdir)/$@.in po-directories + +force: + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..b35f5ad --- /dev/null +++ b/po/Makevars @@ -0,0 +1,29 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --flag=error:3:c-format --flag=error_at_line:5:c-format --flag=asprintf:2:c-format --flag=vasprintf:2:c-format --no-location + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Monitoring Plugins Development Team + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = + +# Email address were to send bug report for the .po translation files +PACKAGE_BUGREPORT = devel@monitoring-plugins.org + diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..6e491d7 --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,44 @@ +plugins/check_by_ssh.c +plugins/check_cluster.c +plugins/check_dig.c +plugins/check_disk.c +plugins/check_dns.c +plugins/check_dummy.c +plugins/check_fping.c +plugins/check_game.c +plugins/check_hpjd.c +plugins/check_http.c +plugins/check_ldap.c +plugins/check_load.c +plugins/check_mrtg.c +plugins/check_mrtgtraf.c +plugins/check_mysql.c +plugins/check_nagios.c +plugins/check_nt.c +plugins/check_ntp.c +plugins/check_ntp_peer.c +plugins/check_ntp_time.c +plugins/check_nwstat.c +plugins/check_overcr.c +plugins/check_pgsql.c +plugins/check_ping.c +plugins/check_procs.c +plugins/check_radius.c +plugins/check_real.c +plugins/check_smtp.c +plugins/check_snmp.c +plugins/check_ssh.c +plugins/check_swap.c +plugins/check_tcp.c +plugins/check_time.c +plugins/check_ups.c +plugins/check_users.c +plugins/check_ide_smart.c +plugins/negate.c +plugins/netutils.c +plugins/popen.c +plugins/urlize.c +plugins/utils.c +plugins/utils.h +plugins-root/check_dhcp.c +plugins-root/check_icmp.c diff --git a/po/de.gmo b/po/de.gmo new file mode 100644 index 0000000..8617038 Binary files /dev/null and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po new file mode 100644 index 0000000..1b666f4 --- /dev/null +++ b/po/de.po @@ -0,0 +1,5447 @@ +# translation of de.po to +# German Language Translation File. +# This file is distributed under the same license as the nagios-plugins package. +# Copyright (C) 2023 Nagios Plugin Development Group. +# Karl DeBisschop , 2003, 2004. +# +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" +"POT-Creation-Date: 2023-10-01 15:10+0200\n" +"PO-Revision-Date: 2004-12-23 17:46+0100\n" +"Last-Translator: \n" +"Language-Team: Monitoring Plugin Development Team \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: KBabel 1.3.1\n" + +msgid "Could not parse arguments" +msgstr "Argumente konnten nicht ausgewertet werden" + +msgid "Cannot catch SIGALRM" +msgstr "Konnte SIGALRM nicht erhalten" + +#, c-format +msgid "SSH connection failed: %s\n" +msgstr "" + +#, c-format +msgid "Remote command execution failed: %s\n" +msgstr "" + +#, c-format +msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n" +msgstr "" + +#, c-format +msgid "SSH WARNING: could not open %s\n" +msgstr "SSH WARNING: Konnte %s nicht öffnen\n" + +#, c-format +msgid "%s: Error parsing output\n" +msgstr "" + +msgid "Timeout interval must be a positive integer" +msgstr "Timeout interval muss ein positiver Integer sein" + +msgid "Port must be a positive integer" +msgstr "Port muss ein positiver Integer sein" + +#, fuzzy +msgid "skip-stdout argument must be an integer" +msgstr "skip-stdout argument muss ein Integer sein" + +#, fuzzy +msgid "skip-stderr argument must be an integer" +msgstr "skip-stderr argument muss ein Integer sein" + +#, c-format +msgid "%s: You must provide a host name\n" +msgstr "%s: Hostname muss angegeben werden\n" + +msgid "No remotecmd" +msgstr "Kein remotecm" + +#, c-format +msgid "%s: Argument limit of %d exceeded\n" +msgstr "" + +#, fuzzy +msgid "Can not (re)allocate 'commargv' buffer\n" +msgstr "Konnte·url·nicht·zuweisen\n" + +#, c-format +msgid "" +"%s: In passive mode, you must provide a service name for each command.\n" +msgstr "" +"%s: Im passive mode muss ein Servicename für jeden Befehl angegeben werden.\n" + +#, fuzzy, c-format +msgid "" +"%s: In passive mode, you must provide the host short name from the " +"monitoring configs.\n" +msgstr "" +"%s: Im passive mode muss der \"host short name\" aus der Nagios " +"Konfiguration angegeben werden\n" + +#, fuzzy, c-format +msgid "This plugin uses SSH to execute commands on a remote host" +msgstr "" +"Dieses Plugin nutzt SSH um Befehle auf dem entfernten Rechner auszuführen\n" +"\n" + +msgid "tell ssh to use Protocol 1 [optional]" +msgstr "" + +msgid "tell ssh to use Protocol 2 [optional]" +msgstr "" + +msgid "Ignore all or (if specified) first n lines on STDOUT [optional]" +msgstr "" + +msgid "Ignore all or (if specified) first n lines on STDERR [optional]" +msgstr "" + +msgid "Exit with an warning, if there is an output on STDERR" +msgstr "" + +msgid "" +"tells ssh to fork rather than create a tty [optional]. This will always " +"return OK if ssh is executed" +msgstr "" + +msgid "command to execute on the remote machine" +msgstr "" + +msgid "SSH user name on remote host [optional]" +msgstr "" + +msgid "identity of an authorized key [optional]" +msgstr "" + +msgid "external command file for monitoring [optional]" +msgstr "" + +msgid "list of monitoring service names, separated by ':' [optional]" +msgstr "" + +msgid "short name of host in the monitoring configuration [optional]" +msgstr "" + +msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" +msgstr "" + +msgid "Tell ssh to use this configfile [optional]" +msgstr "" + +msgid "Tell ssh to suppress warning and diagnostic messages [optional]" +msgstr "" + +msgid "Make connection problems return UNKNOWN instead of CRITICAL" +msgstr "" + +msgid "The most common mode of use is to refer to a local identity file with" +msgstr "" + +msgid "the '-i' option. In this mode, the identity pair should have a null" +msgstr "" + +msgid "passphrase and the public key should be listed in the authorized_keys" +msgstr "" + +msgid "file of the remote host. Usually the key will be restricted to running" +msgstr "" + +msgid "only one command on the remote server. If the remote SSH server tracks" +msgstr "" + +msgid "invocation arguments, the one remote program may be an agent that can" +msgstr "" + +msgid "execute additional commands as proxy" +msgstr "" + +msgid "To use passive mode, provide multiple '-C' options, and provide" +msgstr "" + +msgid "" +"all of -O, -s, and -n options (servicelist order must match '-C'options)" +msgstr "" + +msgid "Examples:" +msgstr "" + +msgid "Usage:" +msgstr "" + +#, c-format +msgid "Host/Service Cluster Plugin for Monitoring" +msgstr "" + +msgid "Options:" +msgstr "" + +msgid "Check service cluster status" +msgstr "" + +msgid "Check host cluster status" +msgstr "" + +msgid "Optional prepended text output (i.e. \"Host cluster\")" +msgstr "" + +msgid "Specifies the range of hosts or services in cluster that must be in a" +msgstr "" + +msgid "non-OK state in order to return a WARNING status level" +msgstr "" + +msgid "non-OK state in order to return a CRITICAL status level" +msgstr "" + +msgid "The status codes of the hosts or services in the cluster, separated by" +msgstr "" + +msgid "commas" +msgstr "" + +msgid "Notes:" +msgstr "" + +msgid "" +"Will alert critical if there are 3 or more service data points in a non-OK" +msgstr "" + +msgid "state." +msgstr "" + +#, c-format +msgid "Looking for: '%s'\n" +msgstr "" + +msgid "dig returned an error status" +msgstr "dig hat einen Fehler zurückgegeben" + +msgid "Server not found in ANSWER SECTION" +msgstr "Server nicht gefunden in ANSWER SECTION" + +msgid "No ANSWER SECTION found" +msgstr "Keine ANSWER SECTION gefunden" + +#, fuzzy +msgid "Probably a non-existent host/domain" +msgstr "nicht existierender Host/Domain" + +#, fuzzy, c-format +msgid "Port must be a positive integer - %s" +msgstr "Port muss ein positiver Integer sein - %s" + +#, fuzzy, c-format +msgid "Warning interval must be a positive integer - %s" +msgstr "Warning interval muss ein positiver Integer sein - %s" + +#, fuzzy, c-format +msgid "Critical interval must be a positive integer - %s" +msgstr "Critical interval muss ein positiver Integer sein - %s" + +#, fuzzy, c-format +msgid "Timeout interval must be a positive integer - %s" +msgstr "Timeout interval muss ein positiver Integer sein - %s" + +#, fuzzy, c-format +msgid "This plugin tests the DNS service on the specified host using dig" +msgstr "Testet den DNS Dienst auf dem angegebenen Host mit dig" + +msgid "Force dig to only use IPv4 query transport" +msgstr "" + +msgid "Force dig to only use IPv6 query transport" +msgstr "" + +#, fuzzy +msgid "Machine name to lookup" +msgstr "zu prüfender Hostname" + +#, fuzzy +msgid "Record type to lookup (default: A)" +msgstr "abzufragender Datensatztyp (Default: A)" + +#, fuzzy +msgid "" +"An address expected to be in the answer section. If not set, uses whatever" +msgstr "" +"Adresse die in der ANSWER SECTION erwartet wird.wenn nicht gesetzt, " +"ubernommen aus -l" + +msgid "was in -l" +msgstr "" + +msgid "Pass STRING as argument(s) to dig" +msgstr "" + +#, fuzzy, c-format +msgid "DISK %s: %s not found\n" +msgstr "%s [%s nicht gefunden]" + +#, c-format +msgid "CRITICAL" +msgstr "CRITICAL" + +#, c-format +msgid "unit type %s not known\n" +msgstr "unbekannter unit type: %s\n" + +#, c-format +msgid "failed allocating storage for '%s'\n" +msgstr "konnte keinen Speicher für '%s' reservieren\n" + +#, c-format +msgid "UNKNOWN" +msgstr "UNKNOWN" + +msgid "Must set a threshold value before using -p\n" +msgstr "" + +msgid "Could not compile regular expression" +msgstr "" + +msgid "Must set -E before selecting paths\n" +msgstr "" + +msgid "Must set group value before selecting paths\n" +msgstr "" + +msgid "" +"Paths need to be selected before using -i/-I. Use -A to select all paths " +"explicitly" +msgstr "" + +msgid "" +"Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--" +"all)\n" +msgstr "" + +msgid "Regular expression did not match any path or disk" +msgstr "" + +#, fuzzy +msgid "Unknown argument" +msgstr "Unbekanntes Argument" + +#, c-format +msgid " for %s\n" +msgstr "" + +#, fuzzy +msgid "" +"This plugin checks the amount of used disk space on a mounted file system" +msgstr "" +"Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem" + +#, fuzzy +msgid "" +"and generates an alert if free space is less than one of the threshold values" +msgstr "" +"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte " +"unterschritten wird." + +msgid "Exit with WARNING status if less than INTEGER units of disk are free" +msgstr "" + +msgid "Exit with WARNING status if less than PERCENT of disk space is free" +msgstr "" + +msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" +msgstr "" + +msgid "Exit with CRITICAL status if less than PERCENT of disk space is free" +msgstr "" + +msgid "Exit with WARNING status if less than PERCENT of inode space is free" +msgstr "" + +msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" +msgstr "" + +msgid "" +"Mount point or block device as emitted by the mount(8) command (may be " +"repeated)" +msgstr "" + +msgid "Ignore device (only works if -p unspecified)" +msgstr "" + +msgid "Clear thresholds" +msgstr "" + +msgid "For paths or partitions specified with -p, only check for exact paths" +msgstr "" + +msgid "Display only devices/mountpoints with errors" +msgstr "" + +msgid "Don't account root-reserved blocks into freespace in perfdata" +msgstr "" + +msgid "Display inode usage in perfdata" +msgstr "" + +msgid "" +"Group paths. Thresholds apply to (free-)space of all partitions together" +msgstr "" + +msgid "Same as '--units kB'" +msgstr "" + +msgid "Only check local filesystems" +msgstr "" + +msgid "" +"Only check local filesystems against thresholds. Yet call stat on remote " +"filesystems" +msgstr "" + +msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" +msgstr "" + +msgid "Display the (block) device instead of the mount point" +msgstr "" + +msgid "Same as '--units MB'" +msgstr "" + +msgid "Explicitly select all paths. This is equivalent to -R '.*'" +msgstr "" + +msgid "" +"Case insensitive regular expression for path/partition (may be repeated)" +msgstr "" + +msgid "Regular expression for path or partition (may be repeated)" +msgstr "" + +msgid "" +"Regular expression to ignore selected path/partition (case insensitive) (may " +"be repeated)" +msgstr "" + +msgid "" +"Regular expression to ignore selected path or partition (may be repeated)" +msgstr "" + +msgid "" +"Return OK if no filesystem matches, filesystem does not exist or is " +"inaccessible." +msgstr "" + +msgid "(Provide this option before -p / -r / --ereg-path if used)" +msgstr "" + +msgid "Choose bytes, kB, MB, GB, TB (default: MB)" +msgstr "" + +msgid "" +"Ignore all filesystems of types matching given regex(7) (may be repeated)" +msgstr "" + +msgid "" +"Check only filesystems where the type matches this given regex(7) (may be " +"repeated)" +msgstr "" + +msgid "General usage hints:" +msgstr "Allgemeine Nutzungshinweise:" + +msgid "" +"- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the " +"same as" +msgstr "" + +msgid "\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\"." +msgstr "" + +msgid "" +"- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} " +"{thresholds b} ...\"" +msgstr "" + +msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" +msgstr "" + +msgid "" +"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" +"r regex" +msgstr "" + +msgid "" +"are grouped which means the freespace thresholds are applied to all disks " +"together" +msgstr "" + +msgid "" +"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " +"100M/50M" +msgstr "" + +#, c-format +msgid "%s %s: %s\n" +msgstr "" + +msgid "is not accessible" +msgstr "" + +#, fuzzy +msgid "nslookup returned an error status" +msgstr "nslookup hat einen Fehler zurückgegeben" + +msgid "Warning plugin error" +msgstr "Warnung Plugin Fehler" + +#, fuzzy, c-format +msgid "DNS CRITICAL - '%s' returned empty server string\n" +msgstr "DNS CRITICAL - '%s' hat einen leeren Hostnamen zurückgegeben\n" + +#, fuzzy, c-format +msgid "DNS CRITICAL - No response from DNS %s\n" +msgstr "Keine Antwort von DNS %s\n" + +#, c-format +msgid "DNS CRITICAL - '%s' returned empty host name string\n" +msgstr "DNS CRITICAL - '%s' hat einen leeren Hostnamen zurückgegeben\n" + +msgid "Non-authoritative answer:" +msgstr "" + +#, fuzzy, c-format +msgid "Domain '%s' was not found by the server\n" +msgstr "Domäne %s wurde vom Server nicht gefunden\n" + +#, fuzzy, c-format +msgid "DNS CRITICAL - '%s' msg parsing exited with no address\n" +msgstr "DNS CRITICAL - '%s' Ausgabeverarbeitung hat keine Adresse ergeben\n" + +#, fuzzy, c-format +msgid "expected '%s' but got '%s'" +msgstr "Erwartet: %s aber: %s erhalten" + +#, fuzzy, c-format +msgid "Domain '%s' was found by the server: '%s'\n" +msgstr "Domäne %s wurde vom Server nicht gefunden\n" + +#, c-format +msgid "server %s is not authoritative for %s" +msgstr "Server %s ist nicht autoritativ für %s" + +#, c-format +msgid "OK" +msgstr "OK" + +#, c-format +msgid "WARNING" +msgstr "WARNING" + +#, fuzzy, c-format +msgid "%.3f second response time" +msgid_plural "%.3f seconds response time" +msgstr[0] "%.3f Sekunden Antwortzeit " +msgstr[1] "%.3f Sekunden Antwortzeit " + +#, fuzzy, c-format +msgid ". %s returns %s" +msgstr "%s hat %s zurückgegeben" + +#, c-format +msgid "DNS WARNING - %s\n" +msgstr "DNS WARNING - %s\n" + +msgid " Probably a non-existent host/domain" +msgstr "nicht existierender Host/Domain" + +#, c-format +msgid "DNS CRITICAL - %s\n" +msgstr "DNS CRITICAL - %s\n" + +#, fuzzy, c-format +msgid "DNS UNKNOWN - %s\n" +msgstr "DNS UNKNOWN - %s\n" + +msgid "Note: nslookup is deprecated and may be removed from future releases." +msgstr "" + +msgid "Consider using the `dig' or `host' programs instead. Run nslookup with" +msgstr "" + +msgid "the `-sil[ent]' option to prevent this message from appearing." +msgstr "" + +#, c-format +msgid "No response from DNS %s\n" +msgstr "Keine Antwort von DNS %s\n" + +#, c-format +msgid "DNS %s has no records\n" +msgstr "Nameserver %s hat keine Datensätze\n" + +#, c-format +msgid "Connection to DNS %s was refused\n" +msgstr "Verbindung zum Nameserver %s wurde verweigert\n" + +#, c-format +msgid "Query was refused by DNS server at %s\n" +msgstr "" + +#, c-format +msgid "No information returned by DNS server at %s\n" +msgstr "" + +msgid "Network is unreachable\n" +msgstr "Netzwerk nicht erreichbar\n" + +#, c-format +msgid "DNS failure for %s\n" +msgstr "DNS Fehler für %s\n" + +msgid "Input buffer overflow\n" +msgstr "Eingabe-Pufferüberlauf\n" + +msgid "" +"This plugin uses the nslookup program to obtain the IP address for the given " +"host/domain query." +msgstr "" + +msgid "An optional DNS server to use may be specified." +msgstr "" + +msgid "" +"If no DNS server is specified, the default server(s) specified in /etc/" +"resolv.conf will be used." +msgstr "" + +msgid "The name or address you want to query" +msgstr "" + +msgid "Optional DNS server you want to use for the lookup" +msgstr "" + +msgid "" +"Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end" +msgstr "" + +msgid "" +"with a dot (.). This option can be repeated multiple times (Returns OK if any" +msgstr "" + +msgid "value matches)." +msgstr "" + +msgid "" +"Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)" +msgstr "" + +msgid "Cannot be used together with -a" +msgstr "" + +msgid "Optionally expect the DNS server to be authoritative for the lookup" +msgstr "" + +msgid "Return warning if elapsed time exceeds value. Default off" +msgstr "" + +msgid "Return critical if elapsed time exceeds value. Default off" +msgstr "" + +msgid "" +"Return critical if the list of expected addresses does not match all " +"addresses" +msgstr "" + +msgid "returned. Default off" +msgstr "" + +msgid "Arguments to check_dummy must be an integer" +msgstr "Argument für check_dummy muss ein Integer sein" + +#, c-format +msgid "Status %d is not a supported error state\n" +msgstr "Status %d ist kein bekannter Fehlerstatus\n" + +msgid "" +"This plugin will simply return the state corresponding to the numeric value" +msgstr "" + +msgid "of the argument with optional text" +msgstr "" + +#, c-format +msgid "Could not open pipe: %s\n" +msgstr "Pipe: %s konnte nicht geöffnet werden\n" + +#, c-format +msgid "Could not open stderr for %s\n" +msgstr "Konnte stderr nicht öffnen für: %s\n" + +#, fuzzy +msgid "FPING UNKNOWN - IP address not found\n" +msgstr "FPING UNKNOWN - %s nicht gefunden\n" + +msgid "FPING UNKNOWN - invalid commandline argument\n" +msgstr "" + +#, fuzzy +msgid "FPING UNKNOWN - failed system call\n" +msgstr "FPING UNKNOWN - %s nicht gefunden\n" + +#, fuzzy, c-format +msgid "FPING %s - %s (rta=%f ms)|%s\n" +msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n" + +#, c-format +msgid "FPING UNKNOWN - %s not found\n" +msgstr "FPING UNKNOWN - %s nicht gefunden\n" + +#, c-format +msgid "FPING CRITICAL - %s is unreachable\n" +msgstr "FPING CRITICAL - %s ist nicht erreichbar\n" + +#, fuzzy, c-format +msgid "FPING UNKNOWN - %s parameter error\n" +msgstr "FPING UNKNOWN - %s nicht gefunden\n" + +#, c-format +msgid "FPING CRITICAL - %s is down\n" +msgstr "FPING CRITICAL - %s ist down\n" + +#, c-format +msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n" +msgstr "FPING %s - %s (verloren=%.0f%%, rta=%f ms)|%s %s\n" + +#, c-format +msgid "FPING %s - %s (loss=%.0f%% )|%s\n" +msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n" + +msgid "Invalid hostname/address" +msgstr "Ungültige(r) Hostname/Adresse" + +msgid "IPv6 support not available\n" +msgstr "" + +msgid "Packet size must be a positive integer" +msgstr "Paketgröße muss ein positiver Integer sein" + +msgid "Packet count must be a positive integer" +msgstr "Paketanzahl muss ein positiver Integer sein" + +#, fuzzy +msgid "Target timeout must be a positive integer" +msgstr "Warnung time muss ein positiver Integer sein" + +#, fuzzy +msgid "Interval must be a positive integer" +msgstr "Timeout interval muss ein positiver Integer sein" + +msgid "Hostname was not supplied" +msgstr "" + +#, c-format +msgid "%s: Only one threshold may be packet loss (%s)\n" +msgstr "%s: Nur ein Wert darf für packet loss angegeben werden (%s)\n" + +#, c-format +msgid "%s: Only one threshold must be packet loss (%s)\n" +msgstr "%s: Nur ein Wert darf für packet loss angegeben werden (%s)\n" + +msgid "" +"This plugin will use the fping command to ping the specified host for a fast " +"check" +msgstr "" + +msgid "Note that it is necessary to set the suid flag on fping." +msgstr "" + +msgid "" +"name or IP Address of host to ping (IP Address bypasses name lookup, " +"reducing system load)" +msgstr "" + +#, fuzzy +msgid "warning threshold pair" +msgstr "Warning threshold Integer sein" + +#, fuzzy +msgid "critical threshold pair" +msgstr "Critical threshold muss ein Integer sein" + +msgid "Return OK after first successful reply" +msgstr "" + +msgid "size of ICMP packet" +msgstr "" + +msgid "number of ICMP packets to send" +msgstr "" + +msgid "Target timeout (ms)" +msgstr "" + +msgid "Interval (ms) between sending packets" +msgstr "" + +msgid "name or IP Address of sourceip" +msgstr "" + +msgid "source interface name" +msgstr "" + +#, c-format +msgid "" +"THRESHOLD is ,%% where is the round trip average travel time " +"(ms)" +msgstr "" + +msgid "" +"which triggers a WARNING or CRITICAL state, and is the percentage of" +msgstr "" + +msgid "packet loss to trigger an alarm state." +msgstr "" + +msgid "IPv4 is used by default. Specify -6 to use IPv6." +msgstr "" + +#, c-format +msgid "CRITICAL - Host type parameter incorrect!\n" +msgstr "CRITICAL - Host type parameter unkorrekt!\n" + +#, fuzzy, c-format +msgid "CRITICAL - Host not found\n" +msgstr "CRITICAL - Text nicht gefunden%s|%s %s\n" + +#, fuzzy, c-format +msgid "CRITICAL - Game server down or unavailable\n" +msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden" + +#, fuzzy, c-format +msgid "CRITICAL - Game server timeout\n" +msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n" + +#, c-format +msgid "This plugin tests game server connections with the specified host." +msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." + +msgid "Optional port of which to connect" +msgstr "" + +msgid "Field number in raw qstat output that contains game name" +msgstr "" + +msgid "Field number in raw qstat output that contains map name" +msgstr "" + +msgid "Field number in raw qstat output that contains ping time" +msgstr "" + +#, fuzzy +msgid "" +"This plugin uses the 'qstat' command, the popular game server status query " +"tool." +msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." + +msgid "" +"If you don't have the package installed, you will need to download it from" +msgstr "" + +msgid "https://github.com/multiplay/qstat before you can use this plugin." +msgstr "" + +msgid "Paper Jam" +msgstr "Papierstau" + +msgid "Out of Paper" +msgstr "Kein Papier" + +msgid "Printer Offline" +msgstr "Drucker ausgeschaltet" + +msgid "Peripheral Error" +msgstr "Peripheriefehler" + +msgid "Intervention Required" +msgstr "Eingriff benötigt" + +msgid "Toner Low" +msgstr "Wenig Toner" + +msgid "Insufficient Memory" +msgstr "Nicht genügend Speicher" + +msgid "A Door is Open" +msgstr "Eine Abdeckung ist offen" + +msgid "Output Tray is Full" +msgstr "Ausgabeschacht ist voll" + +msgid "Data too Slow for Engine" +msgstr "" + +msgid "Unknown Paper Error" +msgstr "Papierfehler" + +#, c-format +msgid "Printer ok - (%s)\n" +msgstr "Printer ok - (%s)\n" + +#, fuzzy +msgid "Port must be a positive short integer" +msgstr "Port muss ein positiver Integer sein" + +#, fuzzy +msgid "This plugin tests the STATUS of an HP printer with a JetDirect card." +msgstr "" +"Dieses Plugin testet den STATUS eines HP Druckers mit einer JetDirect " +"Karte.\n" +"Net-snmp muss auf dem ausführenden Computer installiert sein.\n" +"\n" + +#, fuzzy +msgid "Net-snmp must be installed on the computer running the plugin." +msgstr "" +"Dieses Plugin testet den STATUS eines HP Druckers mit einer JetDirect " +"Karte.\n" +"Net-snmp muss auf dem ausführenden Computer installiert sein.\n" +"\n" + +msgid "The SNMP community name " +msgstr "" + +#, c-format +msgid "(default=%s)" +msgstr "" + +msgid "Specify the port to check " +msgstr "" + +msgid "Disable paper check " +msgstr "" + +msgid "file does not exist or is not readable" +msgstr "" + +msgid "Invalid certificate expiration period" +msgstr "Ungültiger Zertifikatsablauftermin" + +msgid "" +"Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional " +"'+' suffix)" +msgstr "" + +#, fuzzy +msgid "Invalid option - SSL is not available" +msgstr "Ungültige Option - SSL ist nicht verfügbar\n" + +msgid "Invalid max_redirs count" +msgstr "" + +msgid "Invalid onredirect option" +msgstr "" + +#, c-format +msgid "option f:%d \n" +msgstr "Option f:%d \n" + +msgid "Invalid port number" +msgstr "Ungültige Portnummer" + +#, c-format +msgid "Could Not Compile Regular Expression: %s" +msgstr "" + +msgid "IPv6 support not available" +msgstr "IPv6 Unterstützung nicht vorhanden" + +msgid "You must specify a server address or host name" +msgstr "Hostname oder Serveradresse muss angegeben werden" + +msgid "" +"If you use a client certificate you must also specify a private key file" +msgstr "" + +#, fuzzy +msgid "HTTP UNKNOWN - Memory allocation error\n" +msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n" + +#, fuzzy, c-format +msgid "%sServer date unknown, " +msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n" + +#, fuzzy, c-format +msgid "%sDocument modification date unknown, " +msgstr "HTTP CRITICAL - Datum der letzten Änderung unbekannt\n" + +#, fuzzy, c-format +msgid "%sServer date \"%100s\" unparsable, " +msgstr "HTTP CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden" + +#, fuzzy, c-format +msgid "%sDocument date \"%100s\" unparsable, " +msgstr "" +"HTTP CRITICAL - Dokumentendatum \"%100s\" konnte nicht verarbeitet werden" + +#, fuzzy, c-format +msgid "%sDocument is %d seconds in the future, " +msgstr "HTTP CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" + +#, fuzzy, c-format +msgid "%sLast modified %.1f days ago, " +msgstr "HTTP CRITICAL - Letzte Änderung vor %.1f Tagen\n" + +#, fuzzy, c-format +msgid "%sLast modified %d:%02d:%02d ago, " +msgstr "HTTP CRITICAL - Letzte Änderung vor %d:%02d:%02d \n" + +msgid "HTTP CRITICAL - Unable to open TCP socket\n" +msgstr "HTTP CRITICAL - Konnte TCP socket nicht öffnen\n" + +#, fuzzy +msgid "HTTP UNKNOWN - Could not allocate memory for full_page\n" +msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n" + +msgid "HTTP CRITICAL - Error on receive\n" +msgstr "HTTP CRITICAL - Fehler beim Empfangen\n" + +#, fuzzy +msgid "HTTP CRITICAL - No data received from host\n" +msgstr "HTTP CRITICAL - Keine Daten empfangen\n" + +#, fuzzy, c-format +msgid "Invalid HTTP response received from host: %s\n" +msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +#, fuzzy, c-format +msgid "Invalid HTTP response received from host on port %d: %s\n" +msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n" + +#, c-format +msgid "" +"%s\n" +"%s" +msgstr "" + +#, fuzzy, c-format +msgid "Status line output matched \"%s\" - " +msgstr "HTTP OK: Statusausgabe passt auf \"%s\"\n" + +#, c-format +msgid "HTTP CRITICAL: Invalid Status Line (%s)\n" +msgstr "HTTP CRITICAL: Ungültige Statusmeldung (%s)\n" + +#, c-format +msgid "HTTP CRITICAL: Invalid Status (%s)\n" +msgstr "HTTP CRITICAL: Ungültiger Status (%s)\n" + +#, c-format +msgid "%s - " +msgstr "" + +#, fuzzy, c-format +msgid "%sheader '%s' not found on '%s://%s:%d%s', " +msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n" + +#, fuzzy, c-format +msgid "%sstring '%s' not found on '%s://%s:%d%s', " +msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n" + +#, fuzzy, c-format +msgid "%spattern not found, " +msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n" + +#, fuzzy, c-format +msgid "%spattern found, " +msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n" + +#, fuzzy, c-format +msgid "%sExecute Error: %s, " +msgstr "HTTP CRITICAL - Fehler: %s\n" + +#, fuzzy, c-format +msgid "%spage size %d too large, " +msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n" + +#, fuzzy, c-format +msgid "%spage size %d too small, " +msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n" + +#, fuzzy, c-format +msgid "%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s" +msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" + +#, fuzzy, c-format +msgid "%s - %d bytes in %.3f second response time %s|%s %s" +msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" + +msgid "HTTP UNKNOWN - Could not allocate addr\n" +msgstr "HTTP UNKNOWN - Konnte addr nicht zuweisen\n" + +#, fuzzy +msgid "HTTP UNKNOWN - Could not allocate URL\n" +msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n" + +#, c-format +msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" +msgstr "" + +#, fuzzy, c-format +msgid "HTTP UNKNOWN - Empty redirect location%s\n" +msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n" + +#, c-format +msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" +msgstr "" + +#, fuzzy, c-format +msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" +msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" + +#, fuzzy, c-format +msgid "HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n" +msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" + +#, fuzzy, c-format +msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" +msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" + +#, c-format +msgid "Redirection to %s://%s:%d%s\n" +msgstr "" + +#, fuzzy +msgid "This plugin tests the HTTP service on the specified host. It can test" +msgstr "" +"Testet den DNS Dienst auf dem angegebenen Host mit dig\n" +"\n" + +msgid "normal (http) and secure (https) servers, follow redirects, search for" +msgstr "" + +msgid "strings and regular expressions, check connection times, and report on" +msgstr "" + +#, fuzzy +msgid "certificate expiration times." +msgstr "Clientzertifikat benötigt\n" + +#, c-format +msgid "In the first form, make an HTTP request." +msgstr "" + +#, c-format +msgid "" +"In the second form, connect to the server and check the TLS certificate." +msgstr "" + +#, c-format +msgid "NOTE: One or both of -H and -I must be specified" +msgstr "" + +msgid "Host name argument for servers using host headers (virtual host)" +msgstr "" + +msgid "Append a port to include it in the header (eg: example.com:5000)" +msgstr "" + +msgid "" +"IP address or name (use numeric address if possible to bypass DNS lookup)." +msgstr "" + +msgid "Port number (default: " +msgstr "" + +msgid "" +"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents" +msgstr "" + +msgid "auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1," +msgstr "" + +msgid "1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted." +msgstr "" + +msgid "Enable SSL/TLS hostname extension support (SNI)" +msgstr "" + +msgid "" +"Minimum number of days a certificate has to be valid. Port defaults to 443" +msgstr "" + +msgid "" +"(when this option is used the URL is not checked by default. You can use" +msgstr "" + +msgid " --continue-after-certificate to override this behavior)" +msgstr "" + +msgid "" +"Allows the HTTP check to continue after performing the certificate check." +msgstr "" + +msgid "Does nothing unless -C is used." +msgstr "" + +msgid "Name of file that contains the client certificate (PEM format)" +msgstr "" + +msgid "to be used in establishing the SSL session" +msgstr "" + +msgid "Name of file containing the private key (PEM format)" +msgstr "" + +msgid "matching the client certificate" +msgstr "" + +msgid "Comma-delimited list of strings, at least one of them is expected in" +msgstr "" + +msgid "the first (status) line of the server response (default: " +msgstr "" + +msgid "" +"If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" +msgstr "" + +msgid "String to expect in the response headers" +msgstr "" + +msgid "String to expect in the content" +msgstr "" + +msgid "URL to GET or POST (default: /)" +msgstr "" + +msgid "URL encoded http POST data" +msgstr "" + +msgid "Set HTTP method." +msgstr "" + +msgid "Don't wait for document body: stop reading after headers." +msgstr "" + +msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" +msgstr "" + +msgid "Warn if document is more than SECONDS old. the number can also be of" +msgstr "" + +msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." +msgstr "" + +msgid "specify Content-Type header media type when POSTing\n" +msgstr "" + +msgid "Allow regex to span newlines (must precede -r or -R)" +msgstr "" + +msgid "Search page for regex STRING" +msgstr "" + +msgid "Search page for case-insensitive regex STRING" +msgstr "" + +msgid "Return CRITICAL if found, OK if not\n" +msgstr "" + +msgid "Username:password on sites with basic authentication" +msgstr "" + +msgid "Username:password on proxy-servers with basic authentication" +msgstr "" + +msgid "String to be sent in http header as \"User Agent\"" +msgstr "" + +msgid "" +"Any other tags to be sent in http header. Use multiple times for additional " +"headers" +msgstr "" + +msgid "Print additional performance data" +msgstr "" + +msgid "Print body content below status line" +msgstr "" + +msgid "Wrap output in HTML link (obsoleted by urlize)" +msgstr "" + +msgid "How to handle redirected pages. sticky is like follow but stick to the" +msgstr "" + +msgid "specified IP address. stickyport also ensures port stays the same." +msgstr "" + +#, fuzzy +msgid "Maximal number of redirects (default: " +msgstr "Ungültige Portnummer" + +msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" +msgstr "" + +#, fuzzy +msgid "This plugin will attempt to open an HTTP connection with the host." +msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." + +msgid "" +"Successful connects return STATE_OK, refusals and timeouts return " +"STATE_CRITICAL" +msgstr "" + +msgid "" +"other errors return STATE_UNKNOWN. Successful connects, but incorrect " +"response" +msgstr "" + +msgid "" +"messages from the host result in STATE_WARNING return values. If you are" +msgstr "" + +msgid "" +"checking a virtual server that uses 'host headers' you must supply the FQDN" +msgstr "" + +msgid "(fully qualified domain name) as the [host_name] argument." +msgstr "" + +msgid "This plugin can also check whether an SSL enabled web server is able to" +msgstr "" + +msgid "serve content (optionally within a specified time) or whether the X509 " +msgstr "" + +msgid "certificate is still valid for the specified number of days." +msgstr "" + +#, fuzzy +msgid "Please note that this plugin does not check if the presented server" +msgstr "" +"Testet den DNS Dienst auf dem angegebenen Host mit dig\n" +"\n" + +msgid "certificate matches the hostname of the server, or if the certificate" +msgstr "" + +msgid "has a valid chain of trust to one of the locally installed CAs." +msgstr "" + +msgid "" +"When the 'www.verisign.com' server returns its content within 5 seconds," +msgstr "" + +msgid "" +"a STATE_OK will be returned. When the server returns its content but exceeds" +msgstr "" + +msgid "" +"the 5-second threshold, a STATE_WARNING will be returned. When an error " +"occurs," +msgstr "" + +msgid "a STATE_CRITICAL will be returned." +msgstr "" + +msgid "" +"When the certificate of 'www.verisign.com' is valid for more than 14 days," +msgstr "" + +msgid "" +"a STATE_OK is returned. When the certificate is still valid, but for less " +"than" +msgstr "" + +msgid "" +"14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" +msgstr "" + +#, fuzzy +msgid "the certificate is expired." +msgstr "Clientzertifikat benötigt\n" + +msgid "" +"When the certificate of 'www.verisign.com' is valid for more than 30 days," +msgstr "" + +msgid "30 days, but more than 14 days, a STATE_WARNING is returned." +msgstr "" + +msgid "" +"A STATE_CRITICAL will be returned when certificate expires in less than 14 " +"days" +msgstr "" + +msgid "" +"check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j " +"CONNECT -H www.verisign.com " +msgstr "" + +msgid "" +"all these options are needed: -I -p -u -" +"S(sl) -j CONNECT -H " +msgstr "" + +msgid "" +"a STATE_CRITICAL will be returned. By adding a colon to the method you can " +"set the method used" +msgstr "" + +msgid "inside the proxied connection: -j CONNECT:POST" +msgstr "" + +#, c-format +msgid "Could not connect to the server at port %i\n" +msgstr "" + +#, c-format +msgid "Could not set protocol version %d\n" +msgstr "" + +#, fuzzy, c-format +msgid "Could not init TLS at port %i!\n" +msgstr "Konnte stderr nicht öffnen für: %s\n" + +#, c-format +msgid "TLS not supported by the libraries!\n" +msgstr "" + +#, fuzzy, c-format +msgid "Could not init startTLS at port %i!\n" +msgstr "Konnte stderr nicht öffnen für: %s\n" + +#, c-format +msgid "startTLS not supported by the library, needs LDAPv3!\n" +msgstr "" + +#, c-format +msgid "Could not bind to the LDAP server\n" +msgstr "" + +#, c-format +msgid "Could not search/find objectclasses in %s\n" +msgstr "" + +#, fuzzy, c-format +msgid "LDAP %s - found %d entries in %.3f seconds|%s %s\n" +msgstr "HTTP OK %s - %.3f Sekunde Antwortzeit %s%s|%s %s\n" + +#, c-format +msgid "LDAP %s - %.3f seconds response time|%s\n" +msgstr "" + +#, c-format +msgid "%s cannot be combined with %s" +msgstr "" + +msgid "Please specify the host name\n" +msgstr "" + +msgid "Please specify the LDAP base\n" +msgstr "" + +msgid "ldap attribute to search (default: \"(objectclass=*)\"" +msgstr "" + +msgid "ldap base (eg. ou=my unit, o=my org, c=at" +msgstr "" + +msgid "ldap bind DN (if required)" +msgstr "" + +msgid "" +"ldap password (if required, or set the password through environment variable " +"'LDAP_PASSWORD')" +msgstr "" + +msgid "use starttls mechanism introduced in protocol version 3" +msgstr "" + +msgid "use ldaps (ldap v2 ssl method). this also sets the default port to" +msgstr "" + +msgid "use ldap protocol version 2" +msgstr "" + +msgid "use ldap protocol version 3" +msgstr "" + +msgid "default protocol version:" +msgstr "" + +msgid "Number of found entries to result in warning status" +msgstr "" + +msgid "Number of found entries to result in critical status" +msgstr "" + +msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be" +msgstr "" + +#, c-format +msgid "" +" implied (using default port %i) unless --port=636 is specified. In that " +"case\n" +msgstr "" + +msgid "'SSL on connect' will be used no matter how the plugin was called." +msgstr "" + +msgid "" +"This detection is deprecated, please use 'check_ldap' with the '--starttls' " +"or '--ssl' flags" +msgstr "" + +msgid "to define the behaviour explicitly instead." +msgstr "" + +msgid "The parameters --warn-entries and --crit-entries are optional." +msgstr "" + +msgid "Warning threshold must be float or float triplet!\n" +msgstr "" + +#, c-format +msgid "Error opening %s\n" +msgstr "" + +#, fuzzy, c-format +msgid "could not parse load from uptime %s: %d\n" +msgstr "Argumente konnten nicht ausgewertet werden" + +#, c-format +msgid "Error code %d returned in %s\n" +msgstr "" + +#, c-format +msgid "Error in getloadavg()\n" +msgstr "" + +#, c-format +msgid "Error processing %s\n" +msgstr "" + +#, c-format +msgid "load average: %.2f, %.2f, %.2f" +msgstr "" + +#, fuzzy, c-format +msgid "Critical threshold for %d-minute load average is not specified\n" +msgstr "Critical threshold muss ein positiver Integer sein\n" + +#, fuzzy, c-format +msgid "Warning threshold for %d-minute load average is not specified\n" +msgstr "Warning threshold muss ein positiver Integer sein\n" + +#, c-format +msgid "" +"Parameter inconsistency: %d-minute \"warning load\" is greater than " +"\"critical load\"\n" +msgstr "" + +#, c-format +msgid "This plugin tests the current system load average." +msgstr "" + +msgid "Exit with WARNING status if load average exceeds WLOADn" +msgstr "" + +msgid "Exit with CRITICAL status if load average exceed CLOADn" +msgstr "" + +msgid "the load average format is the same used by \"uptime\" and \"w\"" +msgstr "" + +msgid "Divide the load averages by the number of CPUs (when possible)" +msgstr "" + +msgid "Number of processes to show when printing the top consuming processes." +msgstr "" + +msgid "NUMBER_OF_PROCS=0 disables this feature. Default value is 0" +msgstr "" + +#, c-format +msgid "'%s' exited with non-zero status.\n" +msgstr "" + +#, c-format +msgid "some error occurred getting procs list.\n" +msgstr "" + +msgid "Could not parse arguments\n" +msgstr "" + +#, c-format +msgid "Unable to open MRTG log file\n" +msgstr "" + +#, c-format +msgid "Unable to process MRTG log file\n" +msgstr "" + +#, c-format +msgid "MRTG data has expired (%d minutes old)\n" +msgstr "" + +msgid "Avg" +msgstr "" + +msgid "Max" +msgstr "" + +msgid "Invalid variable number" +msgstr "" + +#, c-format +msgid "" +"%s is not a valid expiration time\n" +"Use '%s -h' for additional help\n" +msgstr "" + +msgid "Invalid variable number\n" +msgstr "" + +msgid "You must supply the variable number" +msgstr "" + +msgid "" +"This plugin will check either the average or maximum value of one of the" +msgstr "" + +#, fuzzy +msgid "two variables recorded in an MRTG log file." +msgstr "Konnte MRTG Logfile nicht öffnen" + +msgid "The MRTG log file containing the data you want to monitor" +msgstr "" + +msgid "Minutes before MRTG data is considered to be too old" +msgstr "" + +msgid "Should we check average or maximum values?" +msgstr "" + +msgid "Which variable set should we inspect? (1 or 2)" +msgstr "" + +msgid "Threshold value for data to result in WARNING status" +msgstr "" + +msgid "Threshold value for data to result in CRITICAL status" +msgstr "" + +msgid "Type label for data (Examples: Conns, \"Processor Load\", In, Out)" +msgstr "" + +msgid "Option units label for data (Example: Packets/Sec, Errors/Sec," +msgstr "" + +#, c-format +msgid "\"Bytes Per Second\", \"%% Utilization\")" +msgstr "" + +msgid "" +"If the value exceeds the threshold, a WARNING status is returned. If" +msgstr "" + +msgid "" +"the value exceeds the threshold, a CRITICAL status is returned. If" +msgstr "" + +msgid "the data in the log file is older than old, a WARNING" +msgstr "" + +msgid "status is returned and a warning message is printed." +msgstr "" + +msgid "" +"This plugin is useful for monitoring MRTG data that does not correspond to" +msgstr "" + +msgid "" +"bandwidth usage. (Use the check_mrtgtraf plugin for monitoring bandwidth)." +msgstr "" + +msgid "" +"It can be used to monitor any kind of data that MRTG is monitoring - errors," +msgstr "" + +msgid "" +"packets/sec, etc. I use MRTG in conjunction with the Novell NLM that allows" +msgstr "" + +msgid "" +"me to track processor utilization, user connections, drive space, etc and" +msgstr "" + +msgid "this plugin works well for monitoring that kind of data as well." +msgstr "" + +msgid "" +"- This plugin only monitors one of the two variables stored in the MRTG log" +msgstr "" + +msgid "file. If you want to monitor both values you will have to define two" +msgstr "" + +msgid "commands with different values for the argument. Of course," +msgstr "" + +msgid "you can always hack the code to make this plugin work for you..." +msgstr "" + +msgid "" +"- MRTG stands for the Multi Router Traffic Grapher. It can be downloaded " +"from" +msgstr "" + +msgid "Unable to open MRTG log file" +msgstr "Konnte MRTG Logfile nicht öffnen" + +msgid "Unable to process MRTG log file" +msgstr "" + +#, c-format +msgid "%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n" +msgstr "" + +#, c-format +msgid "Traffic %s - %s\n" +msgstr "" + +msgid "" +"This plugin will check the incoming/outgoing transfer rates of a router," +msgstr "" + +msgid "switch, etc recorded in an MRTG log. If the newest log entry is older" +msgstr "" + +msgid "than , a WARNING status is returned. If either the" +msgstr "" + +msgid "incoming or outgoing rates exceed the or thresholds (in" +msgstr "" + +msgid "Bytes/sec), a CRITICAL status results. If either of the rates exceed" +msgstr "" + +msgid "the or thresholds (in Bytes/sec), a WARNING status results." +msgstr "" + +msgid "File to read log from" +msgstr "" + +msgid "Minutes after which log expires" +msgstr "" + +msgid "Test average or maximum" +msgstr "" + +#, fuzzy +msgid "Warning threshold pair ," +msgstr "Warning threshold Integer sein" + +#, fuzzy +msgid "Critical threshold pair ," +msgstr "Critical threshold muss ein Integer sein" + +msgid "" +"- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from" +msgstr "" + +msgid "- While MRTG can monitor things other than traffic rates, this" +msgstr "" + +msgid " plugin probably won't work with much else without modification." +msgstr "" + +msgid "- The calculated i/o rates are a little off from what MRTG actually" +msgstr "" + +msgid " reports. I'm not sure why this is right now, but will look into it" +msgstr "" + +msgid " for future enhancements of this plugin." +msgstr "" + +#, c-format +msgid "Usage" +msgstr "" + +#, c-format +msgid "status store_result error: %s\n" +msgstr "" + +#, c-format +msgid "slave query error: %s\n" +msgstr "" + +#, c-format +msgid "slave store_result error: %s\n" +msgstr "" + +msgid "No slaves defined" +msgstr "" + +#, c-format +msgid "slave fetch row error: %s\n" +msgstr "" + +#, c-format +msgid "Slave running: %s" +msgstr "" + +msgid "This program tests connections to a MySQL server" +msgstr "" + +msgid "Ignore authentication failure and check for mysql connectivity only" +msgstr "" + +msgid "Use the specified socket (has no effect if -H is used)" +msgstr "" + +msgid "Check database with indicated name" +msgstr "" + +msgid "Read from the specified client options file" +msgstr "" + +msgid "Use a client options group" +msgstr "" + +msgid "Connect using the indicated username" +msgstr "" + +msgid "Use the indicated password to authenticate the connection" +msgstr "" + +msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!" +msgstr "" + +msgid "Your clear-text password could be visible as a process table entry" +msgstr "" + +msgid "Check if the slave thread is running properly." +msgstr "" + +msgid "Exit with WARNING status if slave server is more than INTEGER seconds" +msgstr "" + +msgid "behind master" +msgstr "" + +msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds" +msgstr "" + +msgid "Use ssl encryption" +msgstr "" + +msgid "Path to CA signing the cert" +msgstr "" + +msgid "Path to SSL certificate" +msgstr "" + +msgid "Path to private SSL key" +msgstr "" + +msgid "Path to CA directory" +msgstr "" + +msgid "List of valid SSL ciphers" +msgstr "" + +msgid "" +"There are no required arguments. By default, the local database is checked" +msgstr "" + +msgid "" +"using the default unix socket. You can force TCP on localhost by using an" +msgstr "" + +msgid "IP address or FQDN ('localhost' will use the socket as well)." +msgstr "" + +msgid "You must specify -p with an empty string to force an empty password," +msgstr "" + +msgid "overriding any my.cnf settings." +msgstr "" + +msgid "Cannot open status log for reading!" +msgstr "" + +#, c-format +msgid "Found process: %s %s\n" +msgstr "" + +msgid "Could not locate a running Nagios process!" +msgstr "" + +msgid "Cannot parse Nagios log file for valid time" +msgstr "" + +#, c-format +msgid "%d process" +msgid_plural "%d processes" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "status log updated %d second ago" +msgid_plural "status log updated %d seconds ago" +msgstr[0] "" +msgstr[1] "" + +#, fuzzy +msgid "Expiration time must be an integer (seconds)\n" +msgstr "skip lines muss ein Integer sein" + +#, fuzzy +msgid "Timeout must be an integer (seconds)\n" +msgstr "skip lines muss ein Integer sein" + +#, fuzzy +msgid "You must provide the status_log\n" +msgstr "%s: Hostname muss angegeben werden\n" + +#, fuzzy +msgid "You must provide a process string\n" +msgstr "%s: Hostname muss angegeben werden\n" + +#, fuzzy +msgid "" +"This plugin checks the status of the Nagios process on the local machine" +msgstr "" +"Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem\n" +"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte " +"unterschritten wird.\n" +"\n" + +msgid "" +"The plugin will check to make sure the Nagios status log is no older than" +msgstr "" + +msgid "the number of minutes specified by the expires option." +msgstr "" + +msgid "" +"It also checks the process table for a process matching the command argument." +msgstr "" + +msgid "Name of the log file to check" +msgstr "" + +msgid "Minutes aging after which logfile is considered stale" +msgstr "" + +msgid "Substring to search for in process arguments" +msgstr "" + +msgid "Timeout for the plugin in seconds" +msgstr "" + +#, c-format +msgid "Wrong client version - running: %s, required: %s" +msgstr "" + +msgid "missing -l parameters" +msgstr "" + +msgid "wrong -l parameter." +msgstr "" + +msgid "CPU Load" +msgstr "" + +#, c-format +msgid " %lu%% (%lu min average)" +msgstr "" + +#, c-format +msgid " '%lu min avg Load'=%lu%%;%lu;%lu;0;100" +msgstr "" + +msgid "not enough values for -l parameters" +msgstr "" + +msgid "wrong -l argument" +msgstr "" + +#, c-format +msgid "System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu" +msgstr "" + +#, c-format +msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)" +msgstr "" + +#, c-format +msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f" +msgstr "" + +msgid "Free disk space : Invalid drive" +msgstr "" + +msgid "No service/process specified" +msgstr "" + +msgid "could not fetch information from server\n" +msgstr "" + +#, c-format +msgid "" +"Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)" +msgstr "" + +#, c-format +msgid "'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f" +msgstr "" + +msgid "No counter specified" +msgstr "" + +msgid "Minimum value contains non-numbers" +msgstr "" + +msgid "Maximum value contains non-numbers" +msgstr "" + +msgid "No unit counter specified" +msgstr "" + +msgid "Please specify a variable to check" +msgstr "" + +#, fuzzy +msgid "Server port must be an integer\n" +msgstr "skip lines muss ein Integer sein" + +#, fuzzy +msgid "You must provide a server address or host name" +msgstr "Hostname oder Serveradresse muss angegeben werden" + +msgid "None" +msgstr "" + +msgid "This plugin collects data from the NSClient service running on a" +msgstr "" + +msgid "Windows NT/2000/XP/2003 server." +msgstr "" + +msgid "Name of the host to check" +msgstr "" + +#, fuzzy +msgid "Optional port number (default: " +msgstr "Ungültige Portnummer" + +msgid "Password needed for the request" +msgstr "" + +msgid "Threshold which will result in a warning status" +msgstr "" + +msgid "Threshold which will result in a critical status" +msgstr "" + +msgid "Seconds before connection attempt times out (default: " +msgstr "" + +msgid "Parameters passed to specified check (see below)" +msgstr "" + +msgid "Display options (currently only SHOWALL works)" +msgstr "" + +msgid "Return UNKNOWN on timeouts" +msgstr "" + +msgid "Print this help screen" +msgstr "" + +msgid "Print version information" +msgstr "" + +msgid "Variable to check" +msgstr "" + +msgid "Valid variables are:" +msgstr "" + +msgid "Get the NSClient version" +msgstr "" + +msgid "If -l is specified, will return warning if versions differ." +msgstr "" + +msgid "Average CPU load on last x minutes." +msgstr "" + +msgid "Request a -l parameter with the following syntax:" +msgstr "" + +msgid "-l ,,." +msgstr "" + +msgid " should be less than 24*60." +msgstr "" + +msgid "" +"Thresholds are percentage and up to 10 requests can be done in one shot." +msgstr "" + +msgid "Get the uptime of the machine." +msgstr "" + +msgid "-l " +msgstr "" + +msgid " = seconds, minutes, hours, or days. (default: minutes)" +msgstr "" + +#, fuzzy +msgid "Thresholds will use the unit specified above." +msgstr "" +"Testet den DNS Dienst auf dem angegebenen Host mit dig\n" +"\n" + +msgid "Size and percentage of disk use." +msgstr "" + +msgid "Request a -l parameter containing the drive letter only." +msgstr "" + +msgid "Warning and critical thresholds can be specified with -w and -c." +msgstr "" + +msgid "Memory use." +msgstr "" + +msgid "Check the state of one or several services." +msgstr "" + +msgid "Request a -l parameters with the following syntax:" +msgstr "" + +msgid "-l ,,,..." +msgstr "" + +msgid "You can specify -d SHOWALL in case you want to see working services" +msgstr "" + +msgid "in the returned string." +msgstr "" + +msgid "Check if one or several process are running." +msgstr "" + +msgid "Same syntax as SERVICESTATE." +msgstr "" + +msgid "Check any performance counter of Windows NT/2000." +msgstr "" + +msgid "-l \"\\\\\\\\counter\",\"" +msgstr "" + +msgid "The parameter is optional and is given to a printf " +msgstr "" + +msgid "output command which requires a float parameter." +msgstr "" + +#, c-format +msgid "If does not include \"%%\", it is used as a label." +msgstr "" + +msgid "Some examples:" +msgstr "" + +msgid "Check any performance counter object of Windows NT/2000." +msgstr "" + +msgid "" +"Syntax: check_nt -H -p -v INSTANCES -l " +msgstr "" + +msgid " is a Windows Perfmon Counter object (eg. Process)," +msgstr "" + +msgid "if it is two words, it should be enclosed in quotes" +msgstr "" + +msgid "The returned results will be a comma-separated list of instances on " +msgstr "" + +msgid " the selected computer for that object." +msgstr "" + +msgid "" +"The purpose of this is to be run from command line to determine what " +"instances" +msgstr "" + +msgid "" +" are available for monitoring without having to log onto the Windows server" +msgstr "" + +msgid " to run Perfmon directly." +msgstr "" + +msgid "" +"It can also be used in scripts that automatically create the monitoring " +"service" +msgstr "" + +msgid " configuration files." +msgstr "" + +msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process" +msgstr "" + +msgid "" +"- The NSClient service should be running on the server to get any information" +msgstr "" + +msgid "- Critical thresholds should be lower than warning thresholds" +msgstr "" + +msgid "- Default port 1248 is sometimes in use by other services. The error" +msgstr "" + +msgid "" +"output when this happens contains \"Cannot map xxxxx to protocol number\"." +msgstr "" + +msgid "One fix for this is to change the port to something else on check_nt " +msgstr "" + +msgid "and on the client service it's connecting to." +msgstr "" + +#, c-format +msgid "jitter response too large (%lu bytes)\n" +msgstr "" + +msgid "NTP CRITICAL:" +msgstr "NTP CRITICAL:" + +msgid "NTP WARNING:" +msgstr "NTP WARNING:" + +msgid "NTP OK:" +msgstr "NTP OK:" + +msgid "NTP UNKNOWN:" +msgstr "NTP UNKNOWN:" + +msgid "Offset unknown" +msgstr "" + +msgid "Offset" +msgstr "" + +#, fuzzy +msgid "This plugin checks the selected ntp server" +msgstr "" +"Testet den DNS Dienst auf dem angegebenen Host mit dig\n" +"\n" + +msgid "Offset to result in warning status (seconds)" +msgstr "" + +msgid "Offset to result in critical status (seconds)" +msgstr "" + +#, fuzzy +msgid "Warning threshold for jitter" +msgstr "Warning threshold Integer sein" + +#, fuzzy +msgid "Critical threshold for jitter" +msgstr "Critical threshold muss ein Integer sein" + +msgid "Normal offset check:" +msgstr "" + +msgid "" +"Check jitter too, avoiding critical notifications if jitter isn't available" +msgstr "" + +msgid "(See Notes above for more details on thresholds formats):" +msgstr "" + +msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or" +msgstr "" + +msgid "check_ntp_time instead." +msgstr "" + +msgid "Server not synchronized" +msgstr "" + +msgid "Server has the LI_ALARM bit set" +msgstr "" + +msgid "" +"Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized" +msgstr "" + +#, fuzzy +msgid "Warning threshold for stratum of server's synchronization peer" +msgstr "Warning threshold Integer sein" + +#, fuzzy +msgid "Critical threshold for stratum of server's synchronization peer" +msgstr "Critical threshold muss ein Integer sein" + +#, fuzzy +msgid "Warning threshold for number of usable time sources (\"truechimers\")" +msgstr "Warning threshold muss ein positiver Integer sein\n" + +#, fuzzy +msgid "Critical threshold for number of usable time sources (\"truechimers\")" +msgstr "Critical threshold muss ein positiver Integer sein\n" + +msgid "This plugin checks an NTP server independent of any commandline" +msgstr "" + +msgid "programs or external libraries." +msgstr "" + +#, fuzzy +msgid "Use this plugin to check the health of an NTP server. It supports" +msgstr "" +"Testet den DNS Dienst auf dem angegebenen Host mit dig\n" +"\n" + +msgid "checking the offset with the sync peer, the jitter and stratum. This" +msgstr "" + +msgid "plugin will not check the clock offset between the local host and NTP" +msgstr "" + +msgid "server; please use check_ntp_time for that purpose." +msgstr "" + +msgid "Simple NTP server check:" +msgstr "" + +msgid "Only check the number of usable time sources (\"truechimers\"):" +msgstr "" + +msgid "Check only stratum:" +msgstr "" + +#, fuzzy +msgid "This plugin checks the clock offset with the ntp server" +msgstr "" +"Testet den DNS Dienst auf dem angegebenen Host mit dig\n" +"\n" + +msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found" +msgstr "" + +msgid "Expected offset of the ntp server relative to local server (seconds)" +msgstr "" + +#, fuzzy +msgid "This plugin checks the clock offset between the local host and a" +msgstr "" +"Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem\n" +"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte " +"unterschritten wird.\n" +"\n" + +msgid "remote NTP server. It is independent of any commandline programs or" +msgstr "" + +msgid "external libraries." +msgstr "" + +msgid "If you'd rather want to monitor an NTP server, please use" +msgstr "" + +msgid "check_ntp_peer." +msgstr "" + +msgid "--time-offset is useful for compensating for servers with known" +msgstr "" + +msgid "and expected clock skew." +msgstr "" + +#, c-format +msgid "NetWare %s: " +msgstr "" + +#, c-format +msgid "Up %s," +msgstr "" + +#, c-format +msgid "Load %s - %s %s-min load average = %lu%%|load%s=%lu;%lu;%lu;0;100" +msgstr "" + +#, c-format +msgid "Conns %s - %lu current connections|Conns=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%s: Long term cache hits = %lu%%" +msgstr "" + +#, c-format +msgid "%s: Total cache buffers = %lu|Cachebuffers=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%s: Dirty cache buffers = %lu|Dirty-Cache-Buffers=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%s: LRU sitting time = %lu minutes" +msgstr "" + +#, c-format +msgid "CRITICAL - Volume '%s' does not exist!" +msgstr "" + +#, c-format +msgid "%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;" +msgstr "" + +msgid "Only " +msgstr "" + +#, c-format +msgid "%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "" +"%lu MB (%lu%%) free on volume %s - total %lu MB|FreeMB%s=%lu;%lu;%lu;0;100" +msgstr "" + +#, c-format +msgid "Directory Services Database is %s (DS version %s)" +msgstr "" + +#, c-format +msgid "Logins are %s" +msgstr "" + +msgid "enabled" +msgstr "" + +msgid "disabled" +msgstr "" + +#, fuzzy +msgid "CRITICAL - NRM Status is bad!" +msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden" + +msgid "Warning - NRM Status is suspect!" +msgstr "" + +msgid "OK - NRM Status is good!" +msgstr "" + +#, c-format +msgid "%lu of %lu (%lu%%) packet receive buffers used" +msgstr "" + +#, c-format +msgid "%lu entries in SAP table" +msgstr "" + +#, c-format +msgid "%lu entries in SAP table for SAP type %d" +msgstr "" + +#, c-format +msgid "%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100" +msgstr "" + +#, c-format +msgid "%s%lu KB not yet purgeable on volume %s" +msgstr "" + +#, c-format +msgid "%lu MB (%lu%%) not yet purgeable on volume %s" +msgstr "" + +#, c-format +msgid "%lu open files|Openfiles=%lu;%lu;%lu;0,0" +msgstr "" + +#, c-format +msgid "%lu abended threads|Abends=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu" +msgstr "" + +msgid "CRITICAL - Time not in sync with network!" +msgstr "" + +msgid "OK - Time in sync with network!" +msgstr "" + +#, c-format +msgid "LRU sitting time = %lu seconds" +msgstr "" + +#, c-format +msgid "Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100" +msgstr "" + +#, c-format +msgid "Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100" +msgstr "" + +#, c-format +msgid "NDS Version %s" +msgstr "" + +#, c-format +msgid "Up %s" +msgstr "" + +#, c-format +msgid "Module %s version %s is loaded" +msgstr "" + +#, c-format +msgid "Module %s is not loaded" +msgstr "" + +#, fuzzy, c-format +msgid "CRITICAL - Value '%s' does not exist!" +msgstr "%s [%s nicht gefunden]" + +#, c-format +msgid "%s is %lu|%s=%lu;%lu;%lu;;" +msgstr "" + +msgid "Nothing to check!\n" +msgstr "" + +#, fuzzy +msgid "Server port an integer\n" +msgstr "skip lines muss ein Integer sein" + +msgid "This plugin attempts to contact the MRTGEXT NLM running on a" +msgstr "" + +msgid "Novell server to gather the requested system information." +msgstr "" + +msgid "Variable to check. Valid variables include:" +msgstr "" + +msgid "LOAD1 = 1 minute average CPU load" +msgstr "" + +msgid "LOAD5 = 5 minute average CPU load" +msgstr "" + +msgid "LOAD15 = 15 minute average CPU load" +msgstr "" + +msgid "CSPROCS = number of current service processes (NW 5.x only)" +msgstr "" + +msgid "ABENDS = number of abended threads (NW 5.x only)" +msgstr "" + +msgid "UPTIME = server uptime" +msgstr "" + +msgid "LTCH = percent long term cache hits" +msgstr "" + +msgid "CBUFF = current number of cache buffers" +msgstr "" + +msgid "CDBUFF = current number of dirty cache buffers" +msgstr "" + +msgid "DCB = dirty cache buffers as a percentage of the total" +msgstr "" + +msgid "TCB = dirty cache buffers as a percentage of the original" +msgstr "" + +msgid "OFILES = number of open files" +msgstr "" + +msgid " VMF = MB of free space on Volume " +msgstr "" + +msgid " VMU = MB used space on Volume " +msgstr "" + +msgid " VMP = MB of purgeable space on Volume " +msgstr "" + +msgid " VPF = percent free space on volume " +msgstr "" + +msgid " VKF = KB of free space on volume " +msgstr "" + +msgid " VPP = percent purgeable space on volume " +msgstr "" + +msgid " VKP = KB of purgeable space on volume " +msgstr "" + +msgid " VPNP = percent not yet purgeable space on volume " +msgstr "" + +msgid " VKNP = KB of not yet purgeable space on volume " +msgstr "" + +msgid " LRUM = LRU sitting time in minutes" +msgstr "" + +msgid " LRUS = LRU sitting time in seconds" +msgstr "" + +msgid " DSDB = check to see if DS Database is open" +msgstr "" + +msgid " DSVER = NDS version" +msgstr "" + +msgid " UPRB = used packet receive buffers" +msgstr "" + +msgid " PUPRB = percent (of max) used packet receive buffers" +msgstr "" + +msgid " SAPENTRIES = number of entries in the SAP table" +msgstr "" + +msgid " SAPENTRIES = number of entries in the SAP table for SAP type " +msgstr "" + +msgid " TSYNC = timesync status" +msgstr "" + +msgid " LOGINS = check to see if logins are enabled" +msgstr "" + +msgid " CONNS = number of currently licensed connections" +msgstr "" + +msgid " NRMH\t= NRM Summary Status" +msgstr "" + +msgid " NRMP = Returns the current value for a NRM health item" +msgstr "" + +msgid " NRMM = Returns the current memory stats from NRM" +msgstr "" + +msgid " NRMS = Returns the current Swapfile stats from NRM" +msgstr "" + +msgid " NSS1 = Statistics from _Admin:Manage_NSS\\GeneralStats.xml" +msgstr "" + +msgid " NSS3 = Statistics from _Admin:Manage_NSS\\NameCache.xml" +msgstr "" + +msgid " NSS4 = Statistics from _Admin:Manage_NSS\\FileStats.xml" +msgstr "" + +msgid " NSS5 = Statistics from _Admin:Manage_NSS\\ObjectCache.xml" +msgstr "" + +msgid " NSS6 = Statistics from _Admin:Manage_NSS\\Thread.xml" +msgstr "" + +msgid "" +" NSS7 = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml" +msgstr "" + +msgid " NLM: = check if NLM is loaded and report version" +msgstr "" + +msgid " (e.g. NLM:TSANDS.NLM)" +msgstr "" + +msgid "Include server version string in results" +msgstr "" + +msgid "- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG" +msgstr "" + +msgid "" +" extension for NetWare be loaded on the Novell servers you wish to check." +msgstr "" + +msgid " (available from http://www.engr.wisc.edu/~drews/mrtg/)" +msgstr "" + +msgid "" +"- Values for critical thresholds should be lower than warning thresholds" +msgstr "" + +msgid "" +" when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, " +msgstr "" + +msgid " TCB, LRUS and LRUM." +msgstr "" + +msgid "Unknown error fetching load data\n" +msgstr "" + +msgid "Invalid response from server - no load information\n" +msgstr "" + +msgid "Invalid response from server after load 1\n" +msgstr "" + +msgid "Invalid response from server after load 5\n" +msgstr "" + +#, c-format +msgid "Load %s - %s-min load average = %0.2f" +msgstr "" + +msgid "Unknown error fetching disk data\n" +msgstr "" + +msgid "Invalid response from server\n" +msgstr "" + +msgid "Unknown error fetching network status\n" +msgstr "" + +#, c-format +msgid "Net %s - %d connection%s on port %d" +msgstr "" + +msgid "Unknown error fetching process status\n" +msgstr "" + +#, c-format +msgid "Process %s - %d instance%s of %s running" +msgstr "" + +#, c-format +msgid "Uptime %s - Up %d days %d hours %d minutes" +msgstr "" + +msgid "" +"This plugin attempts to contact the Over-CR collector daemon running on the" +msgstr "" + +msgid "remote UNIX server in order to gather the requested system information." +msgstr "" + +msgid "LOAD1 = 1 minute average CPU load" +msgstr "" + +msgid "LOAD5 = 5 minute average CPU load" +msgstr "" + +msgid "LOAD15 = 15 minute average CPU load" +msgstr "" + +msgid "DPU = percent used disk space on filesystem " +msgstr "" + +msgid "PROC = number of running processes with name " +msgstr "" + +msgid "NET = number of active connections on TCP port " +msgstr "" + +msgid "UPTIME = system uptime in seconds" +msgstr "" + +msgid "This plugin requires that Eric Molitors' Over-CR collector daemon be" +msgstr "" + +msgid "running on the remote server." +msgstr "" + +msgid "Over-CR can be downloaded from http://www.molitor.org/overcr" +msgstr "" + +msgid "This plugin was tested with version 0.99.53 of the Over-CR collector" +msgstr "" + +msgid "" +"For the available options, the critical threshold value should always be" +msgstr "" + +msgid "" +"higher than the warning threshold value, EXCEPT with the uptime variable" +msgstr "" + +#, c-format +msgid "CRITICAL - no connection to '%s' (%s).\n" +msgstr "" + +#, c-format +msgid " %s - database %s (%f sec.)|%s\n" +msgstr "" + +msgid "Critical threshold must be a positive integer" +msgstr "Critical threshold muss ein positiver Integer sein" + +msgid "Warning threshold must be a positive integer" +msgstr "Warning threshold muss ein positiver Integer sein" + +msgid "Database name exceeds the maximum length" +msgstr "" + +msgid "User name is not valid" +msgstr "" + +#, c-format +msgid "Test whether a PostgreSQL Database is accepting connections." +msgstr "" + +msgid "Database to check " +msgstr "" + +#, c-format +msgid "(default: %s)\n" +msgstr "" + +msgid "Login name of user" +msgstr "" + +msgid "Password (BIG SECURITY ISSUE)" +msgstr "" + +msgid "Connection parameters (keyword = value), see below" +msgstr "" + +msgid "SQL query to run. Only first column in first row will be read" +msgstr "" + +msgid "A name for the query, this string is used instead of the query" +msgstr "" + +msgid "in the long output of the plugin" +msgstr "" + +msgid "SQL query value to result in warning status (double)" +msgstr "" + +msgid "SQL query value to result in critical status (double)" +msgstr "" + +msgid "All parameters are optional." +msgstr "" + +msgid "" +"This plugin tests a PostgreSQL DBMS to determine whether it is active and" +msgstr "" + +msgid "accepting queries. In its current operation, it simply connects to the" +msgstr "" + +msgid "" +"specified database, and then disconnects. If no database is specified, it" +msgstr "" + +msgid "" +"connects to the template1 database, which is present in every functioning" +msgstr "" + +msgid "PostgreSQL DBMS." +msgstr "" + +msgid "If a query is specified using the -q option, it will be executed after" +msgstr "" + +msgid "connecting to the server. The result from the query has to be numeric." +msgstr "" + +msgid "" +"Multiple SQL commands, separated by semicolon, are allowed but the result " +msgstr "" + +msgid "of the last command is taken into account only. The value of the first" +msgstr "" + +msgid "" +"column in the first row is used as the check result. If a second column is" +msgstr "" + +msgid "present in the result set, this is added to the plugin output with a" +msgstr "" + +msgid "" +"prefix of \"Extra Info:\". This information can be displayed in the system" +msgstr "" + +msgid "executing the plugin." +msgstr "" + +msgid "" +"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual" +msgstr "" + +msgid "" +"for details about how to access internal statistics of the database server." +msgstr "" + +msgid "" +"For a list of available connection parameters which may be used with the -o" +msgstr "" + +msgid "" +"command line option, see the documentation for PQconnectdb() in the chapter" +msgstr "" + +msgid "" +"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be" +msgstr "" + +msgid "" +"used to specify a service name in pg_service.conf to be used for additional" +msgstr "" + +msgid "connection parameters: -o 'service=' or to specify the SSL mode:" +msgstr "" + +msgid "-o 'sslmode=require'." +msgstr "" + +msgid "" +"The plugin will connect to a local postmaster if no host is specified. To" +msgstr "" + +msgid "" +"connect to a remote host, be sure that the remote postmaster accepts TCP/IP" +msgstr "" + +msgid "connections (start the postmaster with the -i option)." +msgstr "" + +msgid "" +"Typically, the monitoring user (unless the --logname option is used) should " +"be" +msgstr "" + +msgid "" +"able to connect to the database without a password. The plugin can also send" +msgstr "" + +msgid "a password, but no effort is made to obscure or encrypt the password." +msgstr "" + +#, c-format +msgid "QUERY %s - %s: %s.\n" +msgstr "" + +msgid "Error with query" +msgstr "" + +msgid "No rows returned" +msgstr "" + +msgid "No columns returned" +msgstr "" + +#, fuzzy +msgid "No data returned" +msgstr "Keine Daten empfangen %s\n" + +msgid "Is not a numeric" +msgstr "" + +#, fuzzy, c-format +msgid "%s returned %f" +msgstr "%s hat %s zurückgegeben" + +#, fuzzy, c-format +msgid "'%s' returned %f" +msgstr "%s hat %s zurückgegeben" + +msgid "CRITICAL - Could not interpret output from ping command\n" +msgstr "" + +#, c-format +msgid "PING %s - %sPacket loss = %d%%" +msgstr "" + +#, c-format +msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms" +msgstr "" + +msgid "Could not realloc() addresses\n" +msgstr "" + +#, c-format +msgid " (%s) must be a non-negative number\n" +msgstr "" + +#, c-format +msgid " (%s) must be an integer percentage\n" +msgstr "" + +#, c-format +msgid " (%s) must be an integer percentage\n" +msgstr "" + +#, c-format +msgid " (%s) must be a non-negative number\n" +msgstr "" + +#, c-format +msgid " (%s) must be a non-negative number\n" +msgstr "" + +#, c-format +msgid "" +"%s: Warning threshold must be integer or percentage!\n" +"\n" +msgstr "" + +#, c-format +msgid " was not set\n" +msgstr "" + +#, c-format +msgid " was not set\n" +msgstr "" + +#, c-format +msgid " was not set\n" +msgstr "" + +#, c-format +msgid " was not set\n" +msgstr "" + +#, c-format +msgid " (%f) cannot be larger than (%f)\n" +msgstr "" + +#, c-format +msgid " (%d) cannot be larger than (%d)\n" +msgstr "" + +#, c-format +msgid "Cannot open stderr for %s\n" +msgstr "" + +msgid "System call sent warnings to stderr " +msgstr "" + +#, fuzzy, c-format +msgid "CRITICAL - Network Unreachable (%s)\n" +msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Host Unreachable (%s)\n" +msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n" +msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n" +msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Network Prohibited (%s)\n" +msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Host Prohibited (%s)\n" +msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Packet Filtered (%s)\n" +msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Host not found (%s)\n" +msgstr "CRITICAL - Text nicht gefunden%s|%s %s\n" + +#, fuzzy, c-format +msgid "CRITICAL - Time to live exceeded (%s)\n" +msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Destination Unreachable (%s)\n" +msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" + +msgid "Unable to realloc warn_text\n" +msgstr "" + +#, c-format +msgid "Use ping to check connection statistics for a remote host." +msgstr "" + +msgid "host to ping" +msgstr "" + +msgid "number of ICMP ECHO packets to send" +msgstr "" + +#, c-format +msgid "(Default: %d)\n" +msgstr "" + +msgid "show HTML in the plugin output (obsoleted by urlize)" +msgstr "" + +msgid "THRESHOLD is ,% where is the round trip average travel" +msgstr "" + +msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the" +msgstr "" + +msgid "percentage of packet loss to trigger an alarm state." +msgstr "" + +#, fuzzy +msgid "" +"This plugin uses the ping command to probe the specified host for packet loss" +msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." + +msgid "" +"(percentage) and round trip average (milliseconds). It can produce HTML " +"output" +msgstr "" + +msgid "" +"linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in" +msgstr "" + +msgid "the contrib area of the downloads section at http://www.nagios.org/" +msgstr "" + +#, c-format +msgid "CMD: %s\n" +msgstr "" + +msgid "System call sent warnings to stderr" +msgstr "" + +#, c-format +msgid "Not parseable: %s" +msgstr "" + +#, c-format +msgid "Unable to read output\n" +msgstr "" + +#, c-format +msgid "%d warn out of " +msgstr "" + +#, c-format +msgid "%d crit, %d warn out of " +msgstr "" + +#, c-format +msgid " with %s" +msgstr "" + +#, fuzzy +msgid "Parent Process ID must be an integer!" +msgstr "Argument für check_dummy muss ein Integer sein" + +#, c-format +msgid "%s%sSTATE = %s" +msgstr "" + +#, fuzzy +msgid "UID was not found" +msgstr "%s [%s nicht gefunden]" + +#, fuzzy +msgid "User name was not found" +msgstr "%s [%s nicht gefunden]" + +#, c-format +msgid "%s%scommand name '%s'" +msgstr "" + +#, c-format +msgid "%s%sexclude progs '%s'" +msgstr "" + +#, fuzzy +msgid "RSS must be an integer!" +msgstr "skip lines muss ein Integer sein" + +#, fuzzy +msgid "VSZ must be an integer!" +msgstr "skip lines muss ein Integer sein" + +msgid "PCPU must be a float!" +msgstr "" + +msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!" +msgstr "" + +msgid "" +"Checks all processes and generates WARNING or CRITICAL states if the " +"specified" +msgstr "" + +msgid "" +"metric is outside the required threshold ranges. The metric defaults to " +"number" +msgstr "" + +msgid "" +"of processes. Search filters can be applied to limit the processes to check." +msgstr "" + +msgid "Generate warning state if metric is outside this range" +msgstr "" + +msgid "Generate critical state if metric is outside this range" +msgstr "" + +msgid "Check thresholds against metric. Valid types:" +msgstr "" + +msgid "PROCS - number of processes (default)" +msgstr "" + +msgid "VSZ - virtual memory size" +msgstr "" + +msgid "RSS - resident set memory size" +msgstr "" + +msgid "CPU - percentage CPU" +msgstr "" + +msgid "ELAPSED - time elapsed in seconds" +msgstr "" + +msgid "Extra information. Up to 3 verbosity levels" +msgstr "" + +msgid "Filter own process the traditional way by PID instead of /proc/pid/exe" +msgstr "" + +msgid "Only scan for processes that have, in the output of `ps`, one or" +msgstr "" + +msgid "more of the status flags you specify (for example R, Z, S, RS," +msgstr "" + +msgid "RSZDT, plus others based on the output of your 'ps' command)." +msgstr "" + +msgid "Only scan for children of the parent process ID indicated." +msgstr "" + +msgid "Only scan for processes with VSZ higher than indicated." +msgstr "" + +msgid "Only scan for processes with RSS higher than indicated." +msgstr "" + +msgid "Only scan for processes with PCPU higher than indicated." +msgstr "" + +msgid "Only scan for processes with user name or ID indicated." +msgstr "" + +msgid "Only scan for processes with args that contain STRING." +msgstr "" + +msgid "Only scan for processes with args that contain the regex STRING." +msgstr "" + +msgid "Only scan for exact matches of COMMAND (without path)." +msgstr "" + +msgid "Exclude processes which match this comma separated list" +msgstr "" + +msgid "Only scan for non kernel threads (works on Linux only)." +msgstr "" + +#, c-format +msgid "" +"\n" +"RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n" +"specified 'max:min', a warning status will be generated if the\n" +"count is inside the specified range\n" +"\n" +msgstr "" + +#, c-format +msgid "" +"This plugin checks the number of currently running processes and\n" +"generates WARNING or CRITICAL states if the process count is outside\n" +"the specified threshold ranges. The process count can be filtered by\n" +"process owner, parent process PID, current state (e.g., 'Z'), or may\n" +"be the total number of running processes\n" +"\n" +msgstr "" + +msgid "Warning if not two processes with command name portsentry." +msgstr "" + +msgid "Critical if < 2 or > 1024 processes" +msgstr "" + +msgid "Critical if not at least 1 process with command sshd" +msgstr "" + +msgid "Warning if > 1024 processes with command name sshd." +msgstr "" + +msgid "Critical if < 1 processes with command name sshd." +msgstr "" + +msgid "Warning alert if > 10 processes with command arguments containing" +msgstr "" + +msgid "'/usr/local/bin/perl' and owned by root" +msgstr "" + +msgid "Alert if VSZ of any processes over 50K or 100K" +msgstr "" + +msgid "Alert if CPU of any processes over 10% or 20%" +msgstr "" + +msgid "Config file error\n" +msgstr "" + +#, fuzzy +msgid "Out of Memory?\n" +msgstr "Kein Papier" + +#, fuzzy +msgid "Invalid NAS-Identifier\n" +msgstr "Ungültige(r) Hostname/Adresse" + +#, c-format +msgid "gethostname() failed!\n" +msgstr "" + +#, fuzzy +msgid "Invalid NAS-IP-Address\n" +msgstr "Ungültige(r) Hostname/Adresse" + +msgid "Timeout\n" +msgstr "" + +msgid "Auth Error\n" +msgstr "" + +#, fuzzy +msgid "Auth Failed\n" +msgstr "Fehlgeschlagen" + +msgid "Bad Response\n" +msgstr "" + +msgid "Auth OK\n" +msgstr "" + +#, fuzzy, c-format +msgid "Unexpected result code %d" +msgstr "Erwartet: %s aber: %s erhalten" + +msgid "Number of retries must be a positive integer" +msgstr "" + +msgid "User not specified" +msgstr "" + +msgid "Password not specified" +msgstr "" + +msgid "Configuration file not specified" +msgstr "" + +#, fuzzy +msgid "Tests to see if a RADIUS server is accepting connections." +msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." + +msgid "The user to authenticate" +msgstr "" + +msgid "Password for authentication (SECURITY RISK)" +msgstr "" + +msgid "NAS identifier" +msgstr "" + +msgid "NAS IP Address" +msgstr "" + +msgid "Configuration file" +msgstr "" + +msgid "Response string to expect from the server" +msgstr "" + +msgid "Number of times to retry a failed connection" +msgstr "" + +#, fuzzy +msgid "" +"This plugin tests a RADIUS server to see if it is accepting connections." +msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." + +msgid "" +"The server to test must be specified in the invocation, as well as a user" +msgstr "" + +msgid "name and password. A configuration file must be present. The format of" +msgstr "" + +msgid "" +"the configuration file is described in the radiusclient library sources." +msgstr "" + +msgid "The password option presents a substantial security issue because the" +msgstr "" + +msgid "" +"password can possibly be determined by careful watching of the command line" +msgstr "" + +msgid "in a process listing. This risk is exacerbated because the plugin will" +msgstr "" + +msgid "" +"typically be executed at regular predictable intervals. Please be sure that" +msgstr "" + +msgid "the password used does not allow access to sensitive system resources." +msgstr "" + +#, c-format +msgid "Unable to connect to %s on port %d\n" +msgstr "" + +#, c-format +msgid "No data received from %s\n" +msgstr "" + +#, fuzzy +msgid "Invalid REAL response received from host" +msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +#, c-format +msgid "Invalid REAL response received from host on port %d\n" +msgstr "" + +#, c-format +msgid "No data received from host\n" +msgstr "" + +#, c-format +msgid "REAL %s - %d second response time\n" +msgstr "" + +msgid "Warning time must be a positive integer" +msgstr "Warnung time muss ein positiver Integer sein" + +msgid "Critical time must be a positive integer" +msgstr "Critical time muss ein positiver Integer sein" + +#, fuzzy +msgid "You must provide a server to check" +msgstr "%s: Hostname muss angegeben werden\n" + +#, fuzzy +msgid "This plugin tests the REAL service on the specified host." +msgstr "" +"Testet den DNS Dienst auf dem angegebenen Host mit dig\n" +"\n" + +msgid "Connect to this url" +msgstr "" + +#, c-format +msgid "String to expect in first line of server response (default: %s)\n" +msgstr "" + +#, fuzzy +msgid "This plugin will attempt to open an RTSP connection with the host." +msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." + +msgid "Successful connects return STATE_OK, refusals and timeouts return" +msgstr "" + +msgid "" +"STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful connects," +msgstr "" + +msgid "" +"but incorrect response messages from the host result in STATE_WARNING return" +msgstr "" + +msgid "values." +msgstr "" + +#, c-format +msgid "malloc() failed!\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Cannot create SSL context.\n" +msgstr "" + +#, c-format +msgid "recv() failed\n" +msgstr "" + +#, c-format +msgid "WARNING - TLS not supported by server\n" +msgstr "" + +#, c-format +msgid "Server does not support STARTTLS\n" +msgstr "" + +msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS." +msgstr "" + +#, c-format +msgid "sent %s" +msgstr "" + +msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS." +msgstr "" + +#, fuzzy, c-format +msgid "Invalid SMTP response received from host: %s\n" +msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +#, fuzzy, c-format +msgid "Invalid SMTP response received from host on port %d: %s\n" +msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n" + +#, c-format +msgid "Could Not Compile Regular Expression" +msgstr "" + +#, c-format +msgid "SMTP %s - Invalid response '%s' to command '%s'\n" +msgstr "" + +#, c-format +msgid "Execute Error: %s\n" +msgstr "" + +msgid "no authuser specified, " +msgstr "" + +msgid "no authpass specified, " +msgstr "" + +#, c-format +msgid "sent %s\n" +msgstr "" + +#, fuzzy +msgid "recv() failed after AUTH LOGIN, " +msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +#, fuzzy, c-format +msgid "received %s\n" +msgstr "Keine Daten empfangen %s\n" + +#, fuzzy +msgid "invalid response received after AUTH LOGIN, " +msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +msgid "recv() failed after sending authuser, " +msgstr "" + +#, fuzzy +msgid "invalid response received after authuser, " +msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +msgid "recv() failed after sending authpass, " +msgstr "" + +#, fuzzy +msgid "invalid response received after authpass, " +msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +msgid "only authtype LOGIN is supported, " +msgstr "" + +#, fuzzy, c-format +msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n" +msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" + +#, c-format +msgid "Could not realloc() units [%d]\n" +msgstr "" + +#, fuzzy +msgid "Critical time must be a positive" +msgstr "Critical time muss ein positiver Integer sein" + +#, fuzzy +msgid "Warning time must be a positive" +msgstr "Warnung time muss ein positiver Integer sein" + +msgid "SSL support not available - install OpenSSL and recompile" +msgstr "" + +msgid "Set either -s/--ssl/--tls or -S/--starttls" +msgstr "Setze entweder -s/--ssl/--tls oder -S/--starttls" + +#, c-format +msgid "Connection closed by server before sending QUIT command\n" +msgstr "" + +#, fuzzy, c-format +msgid "recv() failed after QUIT." +msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +#, c-format +msgid "Connection reset by peer." +msgstr "" + +#, fuzzy +msgid "This plugin will attempt to open an SMTP connection with the host." +msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." + +#, c-format +msgid " String to expect in first line of server response (default: '%s')\n" +msgstr "" + +msgid "SMTP command (may be used repeatedly)" +msgstr "" + +msgid "Expected response to command (may be used repeatedly)" +msgstr "" + +msgid "FROM-address to include in MAIL command, required by Exchange 2000" +msgstr "" + +msgid "FQDN used for HELO" +msgstr "" + +msgid "Use PROXY protocol prefix for the connection." +msgstr "Benutze PROXY-Protokoll-Präfix für die Verbindung." + +msgid "Minimum number of days a certificate has to be valid." +msgstr "" + +#, fuzzy +msgid "Use SSL/TLS for the connection." +msgstr "Benutze SSL/TLS für die Verbindung." + +#, c-format +msgid " Sets default port to %d.\n" +msgstr " Setze den Default-Port auf %d.\n" + +msgid "Use STARTTLS for the connection." +msgstr "Benutze STARTTLS für die Verbindung." + +msgid "SMTP AUTH type to check (default none, only LOGIN supported)" +msgstr "" + +msgid "SMTP AUTH username" +msgstr "" + +msgid "SMTP AUTH password" +msgstr "" + +msgid "Send LHLO instead of HELO/EHLO" +msgstr "" + +msgid "Ignore failure when sending QUIT command to server" +msgstr "" + +msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful" +msgstr "" + +msgid "connects, but incorrect response messages from the host result in" +msgstr "" + +msgid "STATE_WARNING return values." +msgstr "" + +msgid "Cannot malloc" +msgstr "" + +#, fuzzy, c-format +msgid "External command error: %s\n" +msgstr "Papierfehler" + +#, c-format +msgid "External command error with no output (return code: %d)\n" +msgstr "" + +#, fuzzy, c-format +msgid "No valid data returned (%s)\n" +msgstr "Keine Daten empfangen %s\n" + +msgid "Time duration between plugin calls is invalid" +msgstr "" + +msgid "Cannot asprintf()" +msgstr "" + +msgid "Cannot realloc()" +msgstr "" + +msgid "No previous data to calculate rate - assume okay" +msgstr "" + +#, fuzzy +msgid "Retries interval must be a positive integer" +msgstr "Time interval muss ein positiver Integer sein" + +#, fuzzy +msgid "Exit status must be a positive integer" +msgstr "Maxbytes muss ein positiver Integer sein" + +#, fuzzy, c-format +msgid "Could not reallocate labels[%d]" +msgstr "Konnte addr nicht zuweisen\n" + +#, fuzzy +msgid "Could not reallocate labels\n" +msgstr "Konnte·url·nicht·zuweisen\n" + +#, fuzzy, c-format +msgid "Could not reallocate units [%d]\n" +msgstr "Konnte·url·nicht·zuweisen\n" + +msgid "Could not realloc() units\n" +msgstr "" + +#, fuzzy +msgid "Rate multiplier must be a positive integer" +msgstr "Paketgröße muss ein positiver Integer sein" + +#, fuzzy +msgid "No host specified\n" +msgstr "" +"Kein Hostname angegeben\n" +"\n" + +#, fuzzy +msgid "No OIDs specified\n" +msgstr "" +"Kein Hostname angegeben\n" +"\n" + +#, c-format +msgid "Required parameter: %s\n" +msgstr "" + +msgid "Invalid seclevel" +msgstr "" + +msgid "Invalid SNMP version" +msgstr "" + +msgid "Unbalanced quotes\n" +msgstr "" + +#, c-format +msgid "multiplier set (%.1f), but input is not a number: %s" +msgstr "" + +msgid "Check status of remote machines and obtain system information via SNMP" +msgstr "" + +msgid "Use SNMP GETNEXT instead of SNMP GET" +msgstr "" + +msgid "SNMP protocol version" +msgstr "" + +msgid "SNMPv3 context" +msgstr "" + +msgid "SNMPv3 securityLevel" +msgstr "" + +msgid "SNMPv3 auth proto" +msgstr "" + +msgid "SNMPv3 priv proto (default DES)" +msgstr "" + +msgid "Optional community string for SNMP communication" +msgstr "" + +msgid "default is" +msgstr "" + +msgid "SNMPv3 username" +msgstr "" + +msgid "SNMPv3 authentication password" +msgstr "" + +msgid "SNMPv3 privacy password" +msgstr "" + +msgid "Object identifier(s) or SNMP variables whose value you wish to query" +msgstr "" + +msgid "" +"List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'" +msgstr "" + +msgid "for symbolic OIDs.)" +msgstr "" + +msgid "Delimiter to use when parsing returned data. Default is" +msgstr "" + +msgid "Any data on the right hand side of the delimiter is considered" +msgstr "" + +msgid "to be the data that should be used in the evaluation." +msgstr "" + +msgid "If the check returns a 0 length string or NULL value" +msgstr "" + +msgid "This option allows you to choose what status you want it to exit" +msgstr "" + +msgid "Excluding this option renders the default exit of 3(STATE_UNKNOWN)" +msgstr "" + +msgid "0 = OK" +msgstr "" + +#, fuzzy +msgid "1 = WARNING" +msgstr "WARNING" + +#, fuzzy +msgid "2 = CRITICAL" +msgstr "CRITICAL" + +#, fuzzy +msgid "3 = UNKNOWN" +msgstr "UNKNOWN" + +#, fuzzy +msgid "Warning threshold range(s)" +msgstr "Warning threshold Integer sein" + +#, fuzzy +msgid "Critical threshold range(s)" +msgstr "Critical threshold muss ein Integer sein" + +msgid "Enable rate calculation. See 'Rate Calculation' below" +msgstr "" + +msgid "" +"Converts rate per second. For example, set to 60 to convert to per minute" +msgstr "" + +msgid "Add/subtract the specified OFFSET to numeric sensor data" +msgstr "" + +msgid "Return OK state (for that OID) if STRING is an exact match" +msgstr "" + +msgid "" +"Return OK state (for that OID) if extended regular expression REGEX matches" +msgstr "" + +msgid "" +"Return OK state (for that OID) if case-insensitive extended REGEX matches" +msgstr "" + +msgid "Invert search result (CRITICAL if found)" +msgstr "" + +msgid "Prefix label for output from plugin" +msgstr "" + +msgid "Units label(s) for output data (e.g., 'sec.')." +msgstr "" + +msgid "Separates output on multiple OID requests" +msgstr "" + +msgid "Multiplies current value, 0 < n < 1 works as divider, defaults to 1" +msgstr "" + +msgid "C-style format string for float values (see option -M)" +msgstr "" + +msgid "" +"NOTE the final timeout value is calculated using this formula: " +"timeout_interval * retries + 5" +msgstr "" + +msgid "Number of retries to be used in the requests, default: " +msgstr "" + +msgid "Label performance data with OIDs instead of --label's" +msgstr "" + +msgid "Tell snmpget to not print errors encountered when parsing MIB files" +msgstr "" + +msgid "" +"This plugin uses the 'snmpget' command included with the NET-SNMP package." +msgstr "" + +msgid "" +"if you don't have the package installed, you will need to download it from" +msgstr "" + +msgid "http://net-snmp.sourceforge.net before you can use this plugin." +msgstr "" + +msgid "" +"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited " +msgstr "" + +msgid "list (lists with internal spaces must be quoted)." +msgstr "" + +msgid "" +"- When checking multiple OIDs, separate ranges by commas like '-w " +"1:10,1:,:20'" +msgstr "" + +msgid "- Note that only one string and one regex may be checked at present" +msgstr "" + +msgid "" +"- All evaluation methods other than PR, STR, and SUBSTR expect that the value" +msgstr "" + +msgid "returned from the SNMP query is an unsigned integer." +msgstr "" + +msgid "Rate Calculation:" +msgstr "" + +msgid "In many places, SNMP returns counters that are only meaningful when" +msgstr "" + +msgid "calculating the counter difference since the last check. check_snmp" +msgstr "" + +msgid "saves the last state information in a file so that the rate per second" +msgstr "" + +msgid "can be calculated. Use the --rate option to save state information." +msgstr "" + +msgid "" +"On the first run, there will be no prior state - this will return with OK." +msgstr "" + +msgid "The state is uniquely determined by the arguments to the plugin, so" +msgstr "" + +msgid "changing the arguments will create a new state file." +msgstr "" + +#, fuzzy +msgid "Port number must be a positive integer" +msgstr "Port muss ein positiver Integer sein" + +#, c-format +msgid "Server answer: %s" +msgstr "" + +#, c-format +msgid "SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n" +msgstr "" + +#, c-format +msgid "" +"SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n" +msgstr "" + +#, c-format +msgid "SSH OK - %s (protocol %s) | %s\n" +msgstr "" + +msgid "Try to connect to an SSH server at specified server and port" +msgstr "" + +msgid "" +"Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)" +msgstr "" + +msgid "Alert if protocol doesn't match expected protocol version (ex: 2.0)" +msgstr "" + +#, c-format +msgid "Command: %s\n" +msgstr "" + +#, c-format +msgid "Format: %s\n" +msgstr "" + +#, c-format +msgid "total=%.0f, used=%.0f, free=%.0f\n" +msgstr "" + +#, c-format +msgid "total=%.0f, free=%.0f\n" +msgstr "" + +msgid "Error getting swap devices\n" +msgstr "" + +msgid "SWAP OK: No swap devices defined\n" +msgstr "" + +msgid "swapctl failed: " +msgstr "" + +msgid "Error in swapctl call\n" +msgstr "" + +#, c-format +msgid "SWAP %s - %d%% free (%dMB out of %dMB) %s|" +msgstr "" + +#, fuzzy +msgid "Warning threshold percentage must be <= 100!" +msgstr "Warning threshold Integer sein" + +#, fuzzy +msgid "Warning threshold be positive integer or percentage!" +msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein" + +#, fuzzy +msgid "Critical threshold percentage must be <= 100!" +msgstr "Critical threshold muss ein Integer sein" + +#, fuzzy +msgid "Critical threshold be positive integer or percentage!" +msgstr "Critical threshold muss ein Integer oder ein Prozentwert sein!" + +msgid "" +"no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " +"or integer (0-3)." +msgstr "" + +#, fuzzy +msgid "Warning should be more than critical" +msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein" + +msgid "Check swap space on local machine." +msgstr "" + +msgid "" +"Exit with WARNING status if less than INTEGER bytes of swap space are free" +msgstr "" + +msgid "Exit with WARNING status if less than PERCENT of swap space is free" +msgstr "" + +msgid "" +"Exit with CRITICAL status if less than INTEGER bytes of swap space are free" +msgstr "" + +msgid "Exit with CRITICAL status if less than PERCENT of swap space is free" +msgstr "" + +msgid "Conduct comparisons for all swap partitions, one by one" +msgstr "" + +msgid "" +"Resulting state when there is no swap regardless of thresholds. Default:" +msgstr "" + +msgid "" +"Both INTEGER and PERCENT thresholds can be specified, they are all checked." +msgstr "" + +msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s." +msgstr "" + +msgid "CRITICAL - Generic check_tcp called with unknown service\n" +msgstr "" + +msgid "With UDP checks, a send/expect string must be specified." +msgstr "" + +msgid "No arguments found" +msgstr "" + +msgid "Maxbytes must be a positive integer" +msgstr "Maxbytes muss ein positiver Integer sein" + +msgid "Refuse must be one of ok, warn, crit" +msgstr "" + +msgid "Mismatch must be one of ok, warn, crit" +msgstr "" + +msgid "Delay must be a positive integer" +msgstr "Delay muss ein positiver Integer sein" + +#, fuzzy +msgid "You must provide a server address" +msgstr "%s: Hostname muss angegeben werden\n" + +#, fuzzy +msgid "Invalid hostname, address or socket" +msgstr "Ungültige(r) Hostname/Adresse" + +#, fuzzy, c-format +msgid "" +"This plugin tests %s connections with the specified host (or unix socket).\n" +"\n" +msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." + +msgid "" +"Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send " +"or quit option" +msgstr "" + +msgid "Default: nothing added to send, \\r\\n added to end of quit" +msgstr "" + +msgid "String to send to the server" +msgstr "" + +msgid "String to expect in server response" +msgstr "" + +msgid "(may be repeated)" +msgstr "" + +msgid "All expect strings need to occur in server response. Default is any" +msgstr "" + +msgid "String to send server to initiate a clean close of the connection" +msgstr "" + +msgid "Accept TCP refusals with states ok, warn, crit (default: crit)" +msgstr "" + +msgid "" +"Accept expected string mismatches with states ok, warn, crit (default: warn)" +msgstr "" + +#, fuzzy +msgid "Hide output from TCP socket" +msgstr "Konnte TCP socket nicht öffnen\n" + +msgid "Close connection once more than this number of bytes are received" +msgstr "" + +msgid "Seconds to wait between sending string and polling for response" +msgstr "" + +msgid "1st is #days for warning, 2nd is critical (if not specified - 0)." +msgstr "" + +msgid "Use SSL for the connection." +msgstr "" + +msgid "SSL server_name" +msgstr "" + +#, c-format +msgid "TIME UNKNOWN - could not connect to server %s, port %d\n" +msgstr "" + +#, c-format +msgid "TIME UNKNOWN - could not send UDP request to server %s, port %d\n" +msgstr "" + +#, c-format +msgid "TIME UNKNOWN - no data received from server %s, port %d\n" +msgstr "" + +#, c-format +msgid "TIME %s - %d second response time|%s\n" +msgstr "" + +#, c-format +msgid "TIME %s - %lu second time difference|%s %s\n" +msgstr "" + +msgid "Warning thresholds must be a positive integer" +msgstr "Warning thresholds muss ein positiver Integer sein" + +msgid "Critical thresholds must be a positive integer" +msgstr "Critical thresholds muss ein positiver Integer sein" + +#, fuzzy +msgid "This plugin will check the time on the specified host." +msgstr "" +"Testet den DNS Dienst auf dem angegebenen Host mit dig\n" +"\n" + +msgid "Use UDP to connect, not TCP" +msgstr "" + +msgid "Time difference (sec.) necessary to result in a warning status" +msgstr "" + +msgid "Time difference (sec.) necessary to result in a critical status" +msgstr "" + +msgid "Response time (sec.) necessary to result in warning status" +msgstr "" + +msgid "Response time (sec.) necessary to result in critical status" +msgstr "" + +msgid "On Battery, Low Battery" +msgstr "" + +msgid "Online" +msgstr "" + +msgid "On Battery" +msgstr "" + +msgid ", Low Battery" +msgstr "" + +msgid ", Calibrating" +msgstr "" + +msgid ", Replace Battery" +msgstr "" + +msgid ", On Bypass" +msgstr "" + +msgid ", Overload" +msgstr "" + +msgid ", Trimming" +msgstr "" + +msgid ", Boosting" +msgstr "" + +msgid ", Charging" +msgstr "" + +msgid ", Discharging" +msgstr "" + +msgid ", Unknown" +msgstr "" + +#, fuzzy +msgid "UPS does not support any available options\n" +msgstr "IPv6 Unterstützung nicht vorhanden" + +#, fuzzy +msgid "Invalid response received from host" +msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +msgid "UPS name to long for buffer" +msgstr "" + +#, fuzzy, c-format +msgid "CRITICAL - no such UPS '%s' on that host\n" +msgstr "%s [%s nicht gefunden]" + +#, fuzzy +msgid "CRITICAL - UPS data is stale" +msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden" + +#, fuzzy, c-format +msgid "Unknown error: %s\n" +msgstr "Papierfehler" + +msgid "Error: unable to parse variable" +msgstr "" + +msgid "Unrecognized UPS variable" +msgstr "" + +msgid "Error : no UPS indicated" +msgstr "" + +#, fuzzy +msgid "" +"This plugin tests the UPS service on the specified host. Network UPS Tools" +msgstr "" +"Testet den DNS Dienst auf dem angegebenen Host mit dig\n" +"\n" + +msgid "from www.networkupstools.org must be running for this plugin to work." +msgstr "" + +msgid "Name of UPS" +msgstr "" + +msgid "Output of temperatures in Celsius" +msgstr "" + +msgid "Valid values for STRING are" +msgstr "" + +msgid "" +"This plugin attempts to determine the status of a UPS (Uninterruptible Power" +msgstr "" + +msgid "" +"Supply) on a local or remote host. If the UPS is online or calibrating, the" +msgstr "" + +msgid "" +"plugin will return an OK state. If the battery is on it will return a WARNING" +msgstr "" + +msgid "" +"state. If the UPS is off or has a low battery the plugin will return a " +"CRITICAL" +msgstr "" + +msgid "" +"You may also specify a variable to check (such as temperature, utility " +"voltage," +msgstr "" + +msgid "" +"battery load, etc.) as well as warning and critical thresholds for the value" +msgstr "" + +msgid "" +"of that variable. If the remote host has multiple UPS that are being " +"monitored" +msgstr "" + +msgid "you will have to use the --ups option to specify which UPS to check." +msgstr "" + +msgid "" +"This plugin requires that the UPSD daemon distributed with Russell Kroll's" +msgstr "" + +msgid "" +"Network UPS Tools be installed on the remote host. If you do not have the" +msgstr "" + +msgid "package installed on your system, you can download it from" +msgstr "" + +msgid "http://www.networkupstools.org" +msgstr "" + +#, fuzzy, c-format +msgid "Could not enumerate RD sessions: %d\n" +msgstr "Konnte·url·nicht·zuweisen\n" + +#, c-format +msgid "# users=%d" +msgstr "" + +msgid "Unable to read output" +msgstr "" + +#, c-format +msgid "USERS %s - %d users currently logged in |%s\n" +msgstr "" + +#, fuzzy +msgid "This plugin checks the number of users currently logged in on the local" +msgstr "" +"Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem\n" +"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte " +"unterschritten wird.\n" +"\n" + +msgid "" +"system and generates an error if the number exceeds the thresholds specified." +msgstr "" + +msgid "Set WARNING status if more than INTEGER users are logged in" +msgstr "" + +msgid "Set CRITICAL status if more than INTEGER users are logged in" +msgstr "" + +msgid "" +"DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"." +msgstr "" + +msgid "Nagios-compatible output is now always returned." +msgstr "" + +msgid "SMART commands are broken and have been disabled (See Notes in --help)." +msgstr "" + +msgid "" +"DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the" +msgstr "" + +msgid "default and will be removed from future releases." +msgstr "" + +#, fuzzy, c-format +msgid "CRITICAL - Couldn't open device %s: %s\n" +msgstr "CRITICAL - Device konnte nicht geöffnet werden: %s\n" + +#, c-format +msgid "CRITICAL - SMART_CMD_ENABLE\n" +msgstr "" + +#, c-format +msgid "CRITICAL - SMART_READ_VALUES: %s\n" +msgstr "" + +#, c-format +msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n" +msgstr "" + +#, c-format +msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n" +msgstr "" + +#, c-format +msgid "OK - Operational (%d/%d tests passed)\n" +msgstr "" + +#, c-format +msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n" +msgstr "" + +#, c-format +msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n" +msgstr "" + +#, c-format +msgid "OffLineCapability=%d {%s %s %s}\n" +msgstr "" + +#, c-format +msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n" +msgstr "" + +#, c-format +msgid "CRITICAL - %s: %s\n" +msgstr "" + +#, c-format +msgid "OK - Command sent (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n" +msgstr "" + +#, c-format +msgid "" +"This plugin checks a local hard drive with the (Linux specific) SMART " +"interface [http://smartlinux.sourceforge.net/smart/index.php]." +msgstr "" + +msgid "Select device DEVICE" +msgstr "" + +msgid "" +"Note: if the device is specified without this option, any further option will" +msgstr "" + +msgid "be ignored." +msgstr "" + +msgid "" +"The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were" +msgstr "" + +msgid "" +"broken in an underhand manner and have been disabled. You can use smartctl" +msgstr "" + +msgid "instead:" +msgstr "" + +msgid "-0/--auto-off: use \"smartctl --offlineauto=off\"" +msgstr "" + +msgid "-1/--auto-on: use \"smartctl --offlineauto=on\"" +msgstr "" + +msgid "-i/--immediate: use \"smartctl --test=offline\"" +msgstr "" + +#, fuzzy +msgid "No data returned from command\n" +msgstr "Keine Daten empfangen %s\n" + +msgid "" +"Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " +"or integer (0-3)." +msgstr "" + +msgid "" +"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer " +"(0-3)." +msgstr "" + +msgid "" +"Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +msgid "" +"Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +msgid "" +"Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +msgid "Require path to command" +msgstr "" + +msgid "" +"Negates the status of a plugin (returns OK for CRITICAL and vice-versa)." +msgstr "" + +msgid "Additional switches can be used to control which state becomes what." +msgstr "" + +msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status." +msgstr "" + +msgid "Custom result on Negate timeouts; see below for STATUS definition\n" +msgstr "" + +#, c-format +msgid "" +" STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n" +msgstr "" + +#, c-format +msgid "" +" quotes. Numeric values are accepted. If nothing is specified, permutes\n" +msgstr "" + +#, c-format +msgid " OK and CRITICAL.\n" +msgstr "" + +#, c-format +msgid "" +" Substitute output text as well. Will only substitute text in CAPITALS\n" +msgstr "" + +msgid "Run check_ping and invert result. Must use full path to plugin" +msgstr "" + +msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL" +msgstr "" + +msgid "" +"This plugin is a wrapper to take the output of another plugin and invert it." +msgstr "" + +msgid "The full path of the plugin must be provided." +msgstr "" + +msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL." +msgstr "" + +msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK." +msgstr "" + +msgid "Otherwise, the output state of the wrapped plugin is unchanged." +msgstr "" + +msgid "" +"Using timeout-result, it is possible to override the timeout behaviour or a" +msgstr "" + +msgid "plugin by setting the negate timeout a bit lower." +msgstr "" + +#, fuzzy, c-format +msgid "%s - Socket timeout after %d seconds\n" +msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" + +#, fuzzy, c-format +msgid "%s - Abnormal timeout after %d seconds\n" +msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" + +msgid "Send failed" +msgstr "" + +#, fuzzy +msgid "No data was received from host!" +msgstr "Keine Daten empfangen %s\n" + +msgid "Socket creation failed" +msgstr "" + +msgid "Supplied path too long unix domain socket" +msgstr "" + +msgid "Receive failed" +msgstr "" + +#, fuzzy, c-format +msgid "Invalid hostname/address - %s" +msgstr "" +"Ungültige(r) Name/Adresse: %s\n" +"\n" + +#, fuzzy +msgid "Could not malloc argv array in popen()" +msgstr "Konnte addr nicht zuweisen\n" + +#, fuzzy +msgid "CRITICAL - You need more args!!!" +msgstr "CRITICAL - Fehler: %s\n" + +#, fuzzy +msgid "Cannot catch SIGCHLD" +msgstr "Konnte SIGALRM nicht erhalten" + +#, fuzzy, c-format +msgid "CRITICAL - Plugin timed out after %d seconds\n" +msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" + +msgid "CRITICAL - popen timeout received, but no child process" +msgstr "" + +#, c-format +msgid "" +"%s UNKNOWN - No data received from host\n" +"CMD: %s\n" +msgstr "" + +msgid "" +"This plugin wraps the text output of another command (plugin) in HTML " +msgstr "" + +msgid "" +"tags, thus displaying the child plugin's output as a clickable link in " +"compatible" +msgstr "" + +msgid "" +"monitoring status screen. This plugin returns the status of the invoked " +"plugin." +msgstr "" + +msgid "" +"Pay close attention to quoting to ensure that the shell passes the expected" +msgstr "" + +msgid "data to the plugin. For example, in:" +msgstr "" + +msgid "urlize http://example.com/ check_http -H example.com -r 'two words'" +msgstr "" + +msgid "the shell will remove the single quotes and urlize will see:" +msgstr "" + +msgid "urlize http://example.com/ check_http -H example.com -r two words" +msgstr "" + +msgid "You probably want:" +msgstr "" + +msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" +msgstr "" + +#, fuzzy +msgid "failed realloc in strpcpy\n" +msgstr "konnte keinen Speicher für '%s' reservieren\n" + +#, fuzzy +msgid "failed malloc in strscat\n" +msgstr "konnte keinen Speicher für '%s' reservieren\n" + +#, fuzzy +msgid "failed malloc in xvasprintf\n" +msgstr "konnte keinen Speicher für '%s' reservieren\n" + +#, c-format +msgid "" +" %s (-h | --help) for detailed help\n" +" %s (-V | --version) for version information\n" +msgstr "" + +msgid "" +"\n" +"Options:\n" +" -h, --help\n" +" Print detailed help screen\n" +" -V, --version\n" +" Print version information\n" +msgstr "" + +#, c-format +msgid "" +" -H, --hostname=ADDRESS\n" +" Host name, IP Address, or unix socket (must be an absolute path)\n" +" -%c, --port=INTEGER\n" +" Port number (default: %s)\n" +msgstr "" + +msgid "" +" -4, --use-ipv4\n" +" Use IPv4 connection\n" +" -6, --use-ipv6\n" +" Use IPv6 connection\n" +msgstr "" + +msgid "" +" -v, --verbose\n" +" Show details for command-line debugging (output may be truncated by\n" +" the monitoring system)\n" +msgstr "" + +msgid "" +" -w, --warning=DOUBLE\n" +" Response time to result in warning status (seconds)\n" +" -c, --critical=DOUBLE\n" +" Response time to result in critical status (seconds)\n" +msgstr "" + +msgid "" +" -w, --warning=RANGE\n" +" Warning range (format: start:end). Alert if outside this range\n" +" -c, --critical=RANGE\n" +" Critical range\n" +msgstr "" + +#, c-format +msgid "" +" -t, --timeout=INTEGER\n" +" Seconds before connection times out (default: %d)\n" +msgstr "" + +#, c-format +msgid "" +" -t, --timeout=INTEGER\n" +" Seconds before plugin times out (default: %d)\n" +msgstr "" + +msgid "" +" --extra-opts=[section][@file]\n" +" Read options from an ini file. See\n" +" https://www.monitoring-plugins.org/doc/extra-opts.html\n" +" for usage and examples.\n" +msgstr "" + +msgid "" +" See:\n" +" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" +" for THRESHOLD format and examples.\n" +msgstr "" + +msgid "" +"\n" +"Send email to help@monitoring-plugins.org if you have questions regarding\n" +"use of this software. To submit patches or suggest improvements, send email\n" +"to devel@monitoring-plugins.org\n" +"\n" +msgstr "" + +msgid "" +"\n" +"The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may " +"redistribute\n" +"copies of the plugins under the terms of the GNU General Public License.\n" +"For more information about these matters, see the file named COPYING.\n" +msgstr "" + +#, c-format +msgid "Error: Could not get hardware address of interface '%s'\n" +msgstr "" + +#, c-format +msgid "Error: if_nametoindex error - %s.\n" +msgstr "" + +#, c-format +msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n" +msgstr "" + +#, c-format +msgid "" +"Error: Couldn't get hardware address from interface %s. malloc error - %s.\n" +msgstr "" + +#, c-format +msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n" +msgstr "" + +#, c-format +msgid "" +"Error: can't find unit number in interface_name (%s) - expecting TypeNumber " +"eg lnc0.\n" +msgstr "" + +#, c-format +msgid "" +"Error: can't read MAC address from DLPI streams interface for device %s unit " +"%d.\n" +msgstr "" + +#, c-format +msgid "" +"Error: can't get MAC address for this architecture. Use the --mac option.\n" +msgstr "" + +#, c-format +msgid "Error: Cannot determine IP address of interface %s\n" +msgstr "" + +#, c-format +msgid "Error: Cannot get interface IP address on this platform.\n" +msgstr "" + +#, c-format +msgid "Pretending to be relay client %s\n" +msgstr "" + +#, c-format +msgid "DHCPDISCOVER to %s port %d\n" +msgstr "" + +#, c-format +msgid "Result=ERROR\n" +msgstr "" + +#, c-format +msgid "Result=OK\n" +msgstr "" + +#, c-format +msgid "DHCPOFFER from IP address %s" +msgstr "" + +#, c-format +msgid " via %s\n" +msgstr "" + +#, c-format +msgid "" +"DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n" +msgstr "" + +#, c-format +msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n" +msgstr "" + +#, c-format +msgid "Total responses seen on the wire: %d\n" +msgstr "" + +#, fuzzy, c-format +msgid "Valid responses for this machine: %d\n" +msgstr "Keine Antwort vom Host \n" + +#, c-format +msgid "send_dhcp_packet result: %d\n" +msgstr "" + +#, fuzzy, c-format +msgid "No (more) data received (nfound: %d)\n" +msgstr "Keine Daten empfangen %s\n" + +#, c-format +msgid "recvfrom() failed, " +msgstr "" + +#, c-format +msgid "receive_dhcp_packet() result: %d\n" +msgstr "" + +#, c-format +msgid "receive_dhcp_packet() source: %s\n" +msgstr "" + +#, c-format +msgid "Error: Could not create socket!\n" +msgstr "" + +#, c-format +msgid "Error: Could not set reuse address option on DHCP socket!\n" +msgstr "" + +#, c-format +msgid "Error: Could not set broadcast option on DHCP socket!\n" +msgstr "" + +#, c-format +msgid "" +"Error: Could not bind socket to interface %s. Check your privileges...\n" +msgstr "" + +#, c-format +msgid "" +"Error: Could not bind to DHCP socket (port %d)! Check your privileges...\n" +msgstr "" + +#, c-format +msgid "Requested server address: %s\n" +msgstr "" + +#, c-format +msgid "Lease Time: Infinite\n" +msgstr "" + +#, c-format +msgid "Lease Time: %lu seconds\n" +msgstr "" + +#, c-format +msgid "Renewal Time: Infinite\n" +msgstr "" + +#, c-format +msgid "Renewal Time: %lu seconds\n" +msgstr "" + +#, c-format +msgid "Rebinding Time: Infinite\n" +msgstr "" + +#, c-format +msgid "Rebinding Time: %lu seconds\n" +msgstr "" + +#, c-format +msgid "Added offer from server @ %s" +msgstr "" + +#, c-format +msgid " of IP address %s\n" +msgstr "" + +#, c-format +msgid "DHCP Server Match: Offerer=%s" +msgstr "" + +#, c-format +msgid " Requested=%s" +msgstr "" + +#, c-format +msgid " (duplicate)" +msgstr "" + +#, c-format +msgid "\n" +msgstr "" + +#, c-format +msgid "No DHCPOFFERs were received.\n" +msgstr "" + +#, c-format +msgid "Received %d DHCPOFFER(s)" +msgstr "" + +#, c-format +msgid ", Rogue DHCP Server detected! Server %s" +msgstr "" + +#, c-format +msgid " offered %s \n" +msgstr "" + +#, c-format +msgid ", %s%d of %d requested servers responded" +msgstr "" + +#, c-format +msgid ", requested address (%s) was %soffered" +msgstr "" + +msgid "not " +msgstr "" + +#, c-format +msgid ", max lease time = " +msgstr "" + +#, c-format +msgid "Infinity" +msgstr "" + +msgid "Got unexpected non-option argument" +msgstr "" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n" +msgstr "" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n" +msgstr "" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n" +msgstr "" + +#, c-format +msgid "" +"Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n" +msgstr "" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n" +msgstr "" + +#, c-format +msgid "Hardware address: " +msgstr "" + +msgid "This plugin tests the availability of DHCP servers on a network." +msgstr "" + +msgid "IP address of DHCP server that we must hear from" +msgstr "" + +msgid "IP address that should be offered by at least one DHCP server" +msgstr "" + +msgid "Seconds to wait for DHCPOFFER before timeout occurs" +msgstr "" + +msgid "Interface to to use for listening (i.e. eth0)" +msgstr "" + +msgid "MAC address to use in the DHCP request" +msgstr "" + +msgid "Unicast testing: mimic a DHCP relay, requires -s" +msgstr "" + +msgid "" +"Only requested DHCP server may response (rogue DHCP server detection), " +"requires -s" +msgstr "" + +msgid "specify a target" +msgstr "" + +msgid "Use IPv4 (default) or IPv6 to communicate with the targets" +msgstr "" + +#, fuzzy +msgid "warning threshold (currently " +msgstr "Warning threshold Integer sein" + +#, fuzzy +msgid "critical threshold (currently " +msgstr "Critical threshold muss ein Integer sein" + +msgid "" +"RTA, round trip average, mode warning,critical, ex. 100ms,200ms unit in ms" +msgstr "" + +msgid "packet loss mode, ex. 40%,50% , unit in %" +msgstr "" + +msgid "jitter mode warning,critical, ex. 40.000ms,50.000ms , unit in ms " +msgstr "" + +msgid "MOS mode, between 0 and 4.4 warning,critical, ex. 3.5,3.0" +msgstr "" + +msgid "score mode, max value 100 warning,critical, ex. 80,70 " +msgstr "" + +msgid "detect out of order ICMP packts " +msgstr "" + +#, fuzzy +msgid "specify a source IP address or device name" +msgstr "Hostname oder Serveradresse muss angegeben werden" + +msgid "number of packets to send (currently " +msgstr "" + +msgid "max packet interval (currently " +msgstr "" + +msgid "max target interval (currently " +msgstr "" + +msgid "number of alive hosts required for success" +msgstr "" + +msgid "TTL on outgoing packets (currently " +msgstr "" + +msgid "timeout value (seconds, currently " +msgstr "" + +msgid "Number of icmp data bytes to send" +msgstr "" + +msgid "Packet size will be data bytes + icmp header (currently" +msgstr "" + +msgid "verbose" +msgstr "" + +msgid "If none of R,P,J,M,S or O is specified, default behavior is -R -P" +msgstr "" + +msgid "The -H switch is optional. Naming a host (or several) to check is not." +msgstr "" + +msgid "" +"Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" +msgstr "" + +msgid "packet loss. The default values should work well for most users." +msgstr "" + +msgid "" +"You can specify different RTA factors using the standardized abbreviations" +msgstr "" + +msgid "" +"us (microseconds), ms (milliseconds, default) or just plain s for seconds." +msgstr "" + +msgid "The -v switch can be specified several times for increased verbosity." +msgstr "" + +#, fuzzy, c-format +#~ msgid "%s - Plugin timed out after %d seconds\n" +#~ msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" + +#, fuzzy +#~ msgid "Critical Process Count must be an integer!" +#~ msgstr "Critical threshold muss ein Integer sein" + +#, fuzzy +#~ msgid "Warning Process Count must be an integer!" +#~ msgstr "Warning threshold Integer sein" + +#, fuzzy +#~ msgid "CRITICAL - Cannot retrieve server certificate." +#~ msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n" + +#~ msgid "CRITICAL - Cannot retrieve server certificate.\n" +#~ msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n" + +#~ msgid "Invalid HTTP response received from host\n" +#~ msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +#~ msgid "Invalid HTTP response received from host on port %d\n" +#~ msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n" + +#~ msgid "HTTP CRITICAL: %s\n" +#~ msgstr "HTTP CRITICAL: %s\n" + +#~ msgid "HTTP WARNING: %s\n" +#~ msgstr "HTTP WARNING: %s\n" + +#~ msgid "HTTP UNKNOWN" +#~ msgstr "HTTP UNKNOWN" + +#~ msgid "HTTP OK" +#~ msgstr "HTTP OK" + +#~ msgid "HTTP WARNING" +#~ msgstr "HTTP WARNING" + +#~ msgid "HTTP CRITICAL" +#~ msgstr "HTTP CRITICAL" + +#, fuzzy +#~ msgid "HTTP OK %s - %.3f second response time %s|%s %s\n" +#~ msgstr "HTTP OK %s - %.3f Sekunde Antwortzeit %s%s|%s %s\n" + +#~ msgid "HTTP CRITICAL - string not found%s|%s %s\n" +#~ msgstr "HTTP CRITICAL - Text nicht gefunden%s|%s %s\n" + +#, fuzzy +#~ msgid "HTTP UNKNOWN - could not allocate url\n" +#~ msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n" + +#, fuzzy +#~ msgid "snmpget returned an error status" +#~ msgstr "dig hat einen Fehler zurückgegeben" + +#, fuzzy +#~ msgid "Invalid critical threshold" +#~ msgstr "Critical threshold muss ein Integer sein" + +#, fuzzy +#~ msgid "Invalid warning threshold" +#~ msgstr "Warning threshold Integer sein" + +#, fuzzy +#~ msgid "HTTP WARNING: %s - %.3f second response time %s|%s %s\n" +#~ msgstr "HTTP WARNING: %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" + +#, fuzzy +#~ msgid "%s does not exist\n" +#~ msgstr "%s [%s nicht gefunden]" + +#, fuzzy +#~ msgid "Unknown error" +#~ msgstr "Papierfehler" + +#, fuzzy +#~ msgid "Unknown argument - %s" +#~ msgstr "" +#~ "%s: Unbekanntes Argument: %s\n" +#~ "\n" + +#~ msgid "" +#~ " -1, --proto1\n" +#~ " tell ssh to use Protocol 1\n" +#~ " -2, --proto2\n" +#~ " tell ssh to use Protocol 2\n" +#~ " -S, --skiplines=n\n" +#~ " Ignore first n lines on STDERR (to suppress a logon banner)\n" +#~ " -f\n" +#~ " tells ssh to fork rather than create a tty\n" +#~ msgstr "" +#~ " -1, --proto1\n" +#~ " ssh anweisen Protokoll 1 zu verwenden\n" +#~ " -2, --proto2\n" +#~ " ssh anweisen Protokoll 2 zu verwenden\n" +#~ " -S, --skiplines=n\n" +#~ " Ignoriere die ersten n Zeilen auf STDERR (um Logon Banner zu " +#~ "unterdrücken)\n" +#~ " -f\n" +#~ " ssh anweisen fork zu nutzen statt ein tty zu erzeugen\n" + +#~ msgid "" +#~ " -C, --command='COMMAND STRING'\n" +#~ " command to execute on the remote machine\n" +#~ " -l, --logname=USERNAME\n" +#~ " SSH user name on remote host [optional]\n" +#~ " -i, --identity=KEYFILE\n" +#~ " identity of an authorized key [optional]\n" +#~ " -O, --output=FILE\n" +#~ " external command file for nagios [optional]\n" +#~ " -s, --services=LIST\n" +#~ " list of nagios service names, separated by ':' [optional]\n" +#~ " -n, --name=NAME\n" +#~ " short name of host in nagios configuration [optional]\n" +#~ msgstr "" +#~ " -C, --command='COMMAND STRING'\n" +#~ " Befehl der auf der entfernten Maschine ausgeführt werden soll\n" +#~ " -l, --logname=USERNAME\n" +#~ " SSH user name auf dem entfernten Host [optional]\n" +#~ " -i, --identity=KEYFILE\n" +#~ " zu verwendende Schlüsseldatei [optional]\n" +#~ " -O, --output=FILE\n" +#~ " externe Befehlsdatei für nagios [optional]\n" +#~ " -s, --services=LIST\n" +#~ " Liste von nagios Servicenamen, getrennt durch ':' [optional]\n" +#~ " -n, --name=NAME\n" +#~ " Shortname des Hosts in der nagios Konfiguration [optional]\n" + +#, fuzzy +#~ msgid "Warning inode threshold must be percentage!\n" +#~ msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein!\n" + +#, fuzzy +#~ msgid "Critical inode threshold must be percentage!\n" +#~ msgstr "Critical threshold muss ein Integer oder ein Prozentwert sein!\n" + +#~ msgid "INPUT ERROR: No thresholds specified" +#~ msgstr "FEHLER: Kein Schwellwert angegeben" + +#~ msgid "" +#~ "INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should " +#~ "be between zero and 100 percent, inclusive" +#~ msgstr "" +#~ "INPUT ERROR: C_DFP (%f) sollte kleiner sein als W_DFP (%.1f) und beide " +#~ "sollten zwischen 0 und 100 Prozent liegen" + +#, fuzzy +#~ msgid "" +#~ "INPUT ERROR: C_IDFP (%f) should be less than W_IDFP (%.1f) and both " +#~ "should be between zero and 100 percent, inclusive" +#~ msgstr "" +#~ "INPUT ERROR: C_DFP (%f) sollte kleiner sein als W_DFP (%.1f) und beide " +#~ "sollten zwischen 0 und 100 Prozent liegen" + +#~ msgid "" +#~ "INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be " +#~ "greater than zero" +#~ msgstr "" +#~ "INPUT ERROR: C_DF (%lu) sollte kleiner sein als W_DF (%lu) und beide " +#~ "sollten größer als 0 sein" + +#, fuzzy +#~ msgid "No response from host on port %d\n" +#~ msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n" + +#, fuzzy +#~ msgid "Invalid response received from host on port %d\n" +#~ msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n" + +#~ msgid "%.3f seconds response time (%s)" +#~ msgstr "%.3f Sekunden Antwortzeit (%s)" + +#~ msgid "" +#~ " -w, --warning=INTEGER\n" +#~ " Exit with WARNING status if less than INTEGER --units of disk are " +#~ "free\n" +#~ " -w, --warning=PERCENT%%\n" +#~ " Exit with WARNING status if less than PERCENT of disk space is free\n" +#~ " -c, --critical=INTEGER\n" +#~ " Exit with CRITICAL status if less than INTEGER --units of disk are " +#~ "free\n" +#~ " -c, --critical=PERCENT%%\n" +#~ " Exit with CRITICAL status if less than PERCENT of disk space is free\n" +#~ " -C, --clear\n" +#~ " Clear thresholds\n" +#~ msgstr "" +#~ " -w, --warning=INTEGER\n" +#~ " meldet Status WARNING, wenn weniger als INTEGER --Einheiten frei\n" +#~ " -w, --warning=PERCENT%%\n" +#~ " meldet Status WARNING, wenn weniger als PERCENT --Plattenplatz frei\n" +#~ " -c, --critical=INTEGER\n" +#~ " meldet Status CRITICAL, wenn weniger als INTEGER --Einheiten frei\n" +#~ " -c, --critical=PERCENT%%\n" +#~ " meldet Status CRITICAL, wenn weniger als PERCENT --Plattenplatz frei\n" +#~ " -C, --clear\n" +#~ " Schwellwerte löschen\n" + +#~ msgid "" +#~ "Examples:\n" +#~ " check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /\n" +#~ " Checks /tmp and /var at 10%,5% and / at 100MB, 50MB\n" +#~ msgstr "" +#~ "Beispiel:\n" +#~ " check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /\n" +#~ " Prüft /tmp und /var mit 10%,5% und / mit 100MB, 50MB\n" + +#~ msgid "" +#~ "This plugin uses the nslookup program to obtain the IP address\n" +#~ "for the given host/domain query. A optional DNS server to use may\n" +#~ "be specified. If no DNS server is specified, the default server(s)\n" +#~ "specified in /etc/resolv.conf will be used.\n" +#~ "\n" +#~ msgstr "" +#~ "Dieses Plugin nutzt nslookup, um die IP-Adresse des angegebenen\n" +#~ "Hosts zu erfragen. Optional kann ein DNS-Server angegeben werden\n" +#~ "Wenn kein DNS-Server angegeben wird, so wird der Standardserver aus\n" +#~ "/etc/resolv.conf genutzt.\n" +#~ "\n" + +#~ msgid "HTTP CRITICAL - Could not make SSL connection\n" +#~ msgstr "HTTP CRITICAL - Konnte keine SSL Verbindung herstellen\n" + +#~ msgid "Client Certificate Required\n" +#~ msgstr "Clientzertifikat benötigt\n" + +#~ msgid "CRITICAL - Cannot create SSL context.\n" +#~ msgstr "CRITICAL - Konnte SSL Kontext nicht erzeugen.\n" + +#~ msgid "CRITICAL - Cannot initiate SSL handshake.\n" +#~ msgstr "CRITICAL - Konnte SSL Handshake nicht starten.\n" + +#, fuzzy +#~ msgid "Failed to allocate memory for hostname" +#~ msgstr "konnte keinen Speicher für '%s' reservieren\n" + +#, fuzzy +#~ msgid "CRITICAL - %d of %d hosts are alive\n" +#~ msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden" + +#, fuzzy +#~ msgid "%s has no address data\n" +#~ msgstr "Nameserver %s hat keine Datensätze\n" + +#, fuzzy +#~ msgid "CRITICAL - Could not make SSL connection\n" +#~ msgstr "HTTP CRITICAL - Konnte keine SSL Verbindung herstellen\n" + +#, fuzzy +#~ msgid "Unexpected response from host: %s\n" +#~ msgstr "Keine Antwort vom Host \n" + +#, fuzzy +#~ msgid "Certificate expires today (%s).\n" +#~ msgstr "Clientzertifikat benötigt\n" + +#, fuzzy +#~ msgid "ERROR: Cannot create SSL context.\n" +#~ msgstr "CRITICAL - Konnte SSL Kontext nicht erzeugen.\n" + +#, fuzzy +#~ msgid "ERROR: Cannot retrieve server certificate.\n" +#~ msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n" + +#, fuzzy +#~ msgid "ERROR: Cannot initiate SSL handshake.\n" +#~ msgstr "CRITICAL - Konnte SSL Handshake nicht starten.\n" + +#~ msgid "" +#~ "%s: Unknown argument: %s\n" +#~ "\n" +#~ msgstr "" +#~ "%s: Unbekanntes Argument: %s\n" +#~ "\n" + +#~ msgid "Critical time must be a nonnegative integer" +#~ msgstr "Critical time muss ein positiver Integer sein" + +#~ msgid "Time interval must be a nonnegative integer" +#~ msgstr "Time interval muss ein positiver Integer sein" + +#~ msgid "check_http: invalid option - SSL is not available\n" +#~ msgstr "check_http: ungültige Option - SSL ist nicht verfügbar\n" + +#~ msgid "invalid hostname/address" +#~ msgstr "Ungültige(r) Hostname/Adresse" diff --git a/po/fr.gmo b/po/fr.gmo new file mode 100644 index 0000000..d59d6cf Binary files /dev/null and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po new file mode 100644 index 0000000..40fbb67 --- /dev/null +++ b/po/fr.po @@ -0,0 +1,5445 @@ +# translation of fr.po to +# Messages français pour Nagios Plugins +# Copyright (C) 2003-2023 Nagios Plugin Development Group +# This file is distributed under the same license as the nagiosplug package. +# +# Karl DeBisschop , 2003. +# Benoit Mortier , 2004, 2006, 2007. +# Thomas Guyot-Sionnest , 2007. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" +"POT-Creation-Date: 2023-10-01 15:10+0200\n" +"PO-Revision-Date: 2010-04-21 23:38-0400\n" +"Last-Translator: \n" +"Language-Team: Monitoring Plugin Development Team \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.4\n" + +msgid "Could not parse arguments" +msgstr "Impossible de décomposer les arguments" + +msgid "Cannot catch SIGALRM" +msgstr "Impossible d'obtenir le signal SIGALRM" + +#, fuzzy, c-format +msgid "SSH connection failed: %s\n" +msgstr "L'exécution de la commande à distance %s à échoué\n" + +#, c-format +msgid "Remote command execution failed: %s\n" +msgstr "L'exécution de la commande à distance %s à échoué\n" + +#, c-format +msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n" +msgstr "" + +#, c-format +msgid "SSH WARNING: could not open %s\n" +msgstr "SSH AVERTISSEMENT: impossible d'ouvrir %s\n" + +#, c-format +msgid "%s: Error parsing output\n" +msgstr "%s: Erreur d'analyse du résultat\n" + +msgid "Timeout interval must be a positive integer" +msgstr "Le délai d'attente doit être un entier positif" + +msgid "Port must be a positive integer" +msgstr "Le numéro du port doit être un entier positif" + +msgid "skip-stdout argument must be an integer" +msgstr "Le nombres de lignes à sauter (skip-stdout) doit être un entier" + +msgid "skip-stderr argument must be an integer" +msgstr "Le nombres de lignes à sauter (skip-stderr) doit être un entier" + +#, c-format +msgid "%s: You must provide a host name\n" +msgstr "%s: Vous devez fournir un nom d'hôte\n" + +msgid "No remotecmd" +msgstr "Pas de commande distante" + +#, c-format +msgid "%s: Argument limit of %d exceeded\n" +msgstr "" + +msgid "Can not (re)allocate 'commargv' buffer\n" +msgstr "Impossible de réallouer le tampon 'commargv'\n" + +#, c-format +msgid "" +"%s: In passive mode, you must provide a service name for each command.\n" +msgstr "" +"%s: En mode passif, vous devez fournir un service pour chaque commande.\n" + +#, fuzzy, c-format +msgid "" +"%s: In passive mode, you must provide the host short name from the " +"monitoring configs.\n" +msgstr "" +"%s: En mode passif, vous devez fournir le nom court du hôte mentionné dans " +"la configuration de nagios.\n" + +#, c-format +msgid "This plugin uses SSH to execute commands on a remote host" +msgstr "Ce plugin utilise SSH pour exécuter des commandes sur un hôte distant" + +msgid "tell ssh to use Protocol 1 [optional]" +msgstr "dire à ssh d'utiliser le protocole version 1 [optionnel]" + +msgid "tell ssh to use Protocol 2 [optional]" +msgstr "dire à ssh d'utiliser le protocole 2 [optionnel]" + +msgid "Ignore all or (if specified) first n lines on STDOUT [optional]" +msgstr "" + +msgid "Ignore all or (if specified) first n lines on STDERR [optional]" +msgstr "" + +msgid "Exit with an warning, if there is an output on STDERR" +msgstr "" + +msgid "" +"tells ssh to fork rather than create a tty [optional]. This will always " +"return OK if ssh is executed" +msgstr "" + +msgid "command to execute on the remote machine" +msgstr "commande à exécuter sur la machine distante" + +msgid "SSH user name on remote host [optional]" +msgstr "Nom d'utilisateur ssh sur la machine distante [optionnel]" + +msgid "identity of an authorized key [optional]" +msgstr "Identité de la clé autorisée [optionnel]" + +#, fuzzy +msgid "external command file for monitoring [optional]" +msgstr "commande externe pour nagios [optionnel]" + +#, fuzzy +msgid "list of monitoring service names, separated by ':' [optional]" +msgstr "liste des services nagios, séparés par ':' [optionnel] " + +#, fuzzy +msgid "short name of host in the monitoring configuration [optional]" +msgstr "nom court de l'hôte dans la configuration nagios [optionnel]" + +msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" +msgstr "" +"appelle ssh avec '-o OPTION' (peut être utilisé plusieurs fois) [optionnel]" + +#, fuzzy +msgid "Tell ssh to use this configfile [optional]" +msgstr "dire à ssh d'utiliser le protocole version 1 [optionnel]" + +msgid "Tell ssh to suppress warning and diagnostic messages [optional]" +msgstr "" +"dire à ssh de supprimer les messages d'erreurs et de diagnostic [optionnel]" + +msgid "Make connection problems return UNKNOWN instead of CRITICAL" +msgstr "" + +msgid "The most common mode of use is to refer to a local identity file with" +msgstr "" + +msgid "the '-i' option. In this mode, the identity pair should have a null" +msgstr "" + +msgid "passphrase and the public key should be listed in the authorized_keys" +msgstr "" + +msgid "file of the remote host. Usually the key will be restricted to running" +msgstr "" + +msgid "only one command on the remote server. If the remote SSH server tracks" +msgstr "" + +msgid "invocation arguments, the one remote program may be an agent that can" +msgstr "" + +msgid "execute additional commands as proxy" +msgstr "" + +msgid "To use passive mode, provide multiple '-C' options, and provide" +msgstr "Pour utiliser le mode passif, utilisez plusieurs fois l'option '-C',et" + +msgid "" +"all of -O, -s, and -n options (servicelist order must match '-C'options)" +msgstr "" +"et les options -O, -s, n (l'ordre des services doit correspondre aux " +"multiples options '-C)" + +msgid "Examples:" +msgstr "Exemples:" + +msgid "Usage:" +msgstr "Utilisation:" + +#, fuzzy, c-format +msgid "Host/Service Cluster Plugin for Monitoring" +msgstr "Plugin de Cluster d'Hôte/Service pour Nagios 2" + +msgid "Options:" +msgstr "Options:" + +msgid "Check service cluster status" +msgstr "Vérifie l'état d'un cluster de services" + +msgid "Check host cluster status" +msgstr "Vérifie l'état d'un cluster d'hôtes" + +msgid "Optional prepended text output (i.e. \"Host cluster\")" +msgstr "Texte optionnel accolé à la sortie (i.e. \"Cluster d'hôtes\")" + +msgid "Specifies the range of hosts or services in cluster that must be in a" +msgstr "Défini le nombre d'hôtes ou de services du cluster qui doivent être" + +msgid "non-OK state in order to return a WARNING status level" +msgstr "dans un état non-OK pour retourner un état AVERTISSEMENT" + +msgid "non-OK state in order to return a CRITICAL status level" +msgstr "dans un état non-OK pour retourner un état CRITIQUE" + +msgid "The status codes of the hosts or services in the cluster, separated by" +msgstr "Les codes d'état des hôtes ou des services du cluster, séparés par des" + +msgid "commas" +msgstr "virgules" + +msgid "Notes:" +msgstr "Notes:" + +msgid "" +"Will alert critical if there are 3 or more service data points in a non-OK" +msgstr "" + +msgid "state." +msgstr "" + +#, c-format +msgid "Looking for: '%s'\n" +msgstr "Recherche de: '%s'\n" + +msgid "dig returned an error status" +msgstr "dig à renvoyé un état d'erreur" + +msgid "Server not found in ANSWER SECTION" +msgstr "Le serveur n'a pas été trouvé dans l'ANSWER SECTION" + +msgid "No ANSWER SECTION found" +msgstr "Pas d' ANSWER SECTION trouvé" + +msgid "Probably a non-existent host/domain" +msgstr "Probablement un hôte/domaine inexistant" + +#, c-format +msgid "Port must be a positive integer - %s" +msgstr "Le numéro du port doit être un entier positif - %s" + +#, c-format +msgid "Warning interval must be a positive integer - %s" +msgstr "Le seuil d'avertissement doit être un entier positif - %s" + +#, c-format +msgid "Critical interval must be a positive integer - %s" +msgstr "Le seuil critique doit être un entier positif - %s" + +#, c-format +msgid "Timeout interval must be a positive integer - %s" +msgstr "Le délai d'attente doit être un entier positif - %s" + +#, fuzzy, c-format +msgid "This plugin tests the DNS service on the specified host using dig" +msgstr "Ce plugin teste le service DNS sur l'hôte spécifié en utilisant dig" + +msgid "Force dig to only use IPv4 query transport" +msgstr "" + +msgid "Force dig to only use IPv6 query transport" +msgstr "" + +msgid "Machine name to lookup" +msgstr "Nom de machine à rechercher" + +msgid "Record type to lookup (default: A)" +msgstr "Type d'enregistrement à rechercher (par défaut: A)" + +msgid "" +"An address expected to be in the answer section. If not set, uses whatever" +msgstr "" +"Une adresse qui devrait se trouver dans la section réponce. Si omit, utilise" + +msgid "was in -l" +msgstr "ce qui est passé au paramètre -l" + +msgid "Pass STRING as argument(s) to dig" +msgstr "" + +#, c-format +msgid "DISK %s: %s not found\n" +msgstr "DISK %s: %s non trouvé\n" + +#, c-format +msgid "CRITICAL" +msgstr "CRITIQUE" + +#, c-format +msgid "unit type %s not known\n" +msgstr "unité de type %s inconnue\n" + +#, c-format +msgid "failed allocating storage for '%s'\n" +msgstr "Impossible d'allouer de l'espace pour '%s'\n" + +#, c-format +msgid "UNKNOWN" +msgstr "INCONNU" + +msgid "Must set a threshold value before using -p\n" +msgstr "" + +msgid "Could not compile regular expression" +msgstr "Impossible de compiler l'expression rationnelle" + +msgid "Must set -E before selecting paths\n" +msgstr "" + +msgid "Must set group value before selecting paths\n" +msgstr "" + +msgid "" +"Paths need to be selected before using -i/-I. Use -A to select all paths " +"explicitly" +msgstr "" + +msgid "" +"Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--" +"all)\n" +msgstr "" + +msgid "Regular expression did not match any path or disk" +msgstr "" + +msgid "Unknown argument" +msgstr "Argument inconnu" + +#, c-format +msgid " for %s\n" +msgstr " pour %s\n" + +msgid "" +"This plugin checks the amount of used disk space on a mounted file system" +msgstr "Ce plugin vérifie la place utilisé sur un système de fichier monté" + +msgid "" +"and generates an alert if free space is less than one of the threshold values" +msgstr "" +"et génère une alerte si la place disponible est plus petite qu'un des seuils " +"fourni" + +msgid "Exit with WARNING status if less than INTEGER units of disk are free" +msgstr "" +"Sortir avec un résultat AVERTISSEMENT si moins de X unités de disques sont " +"libres" + +msgid "Exit with WARNING status if less than PERCENT of disk space is free" +msgstr "" +"Sortir avec un résultat AVERTISSEMENT si moins de X pour-cent du disque est " +"libre" + +msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" +msgstr "" +"Sortir avec un résultat CRITIQUE si moins de X unités du disque sont libres" + +#, fuzzy +msgid "Exit with CRITICAL status if less than PERCENT of disk space is free" +msgstr "" +"Sortir avec un résultat CRITIQUE si moins de X pour-cent du disque est libre" + +msgid "Exit with WARNING status if less than PERCENT of inode space is free" +msgstr "" +"Sortir avec un résultat AVERTISSEMENT si moins de X pour-cent des inodes " +"sont libres" + +msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" +msgstr "" +"Sortir avec un résultat CRITIQUE si moins de X pour-cent des inodes sont " +"libres" + +msgid "" +"Mount point or block device as emitted by the mount(8) command (may be " +"repeated)" +msgstr "" + +msgid "Ignore device (only works if -p unspecified)" +msgstr "Ignorer le périphérique (marche seulement lorsque -p est utilisé)" + +msgid "Clear thresholds" +msgstr "Effacer les seuils" + +msgid "For paths or partitions specified with -p, only check for exact paths" +msgstr "" + +msgid "Display only devices/mountpoints with errors" +msgstr "Afficher seulement les périphériques/point de montage avec des erreurs" + +msgid "Don't account root-reserved blocks into freespace in perfdata" +msgstr "" + +msgid "Display inode usage in perfdata" +msgstr "" + +msgid "" +"Group paths. Thresholds apply to (free-)space of all partitions together" +msgstr "" + +msgid "Same as '--units kB'" +msgstr "Pareil à '--units kB'" + +msgid "Only check local filesystems" +msgstr "Vérifier seulement les systèmes de fichiers locaux" + +msgid "" +"Only check local filesystems against thresholds. Yet call stat on remote " +"filesystems" +msgstr "" + +msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" +msgstr "" + +#, fuzzy +msgid "Display the (block) device instead of the mount point" +msgstr "Afficher le point de montage au lieu de la partition" + +msgid "Same as '--units MB'" +msgstr "Pareil à '--units MB'" + +msgid "Explicitly select all paths. This is equivalent to -R '.*'" +msgstr "" + +msgid "" +"Case insensitive regular expression for path/partition (may be repeated)" +msgstr "" +"Expression rationnelle indépendante de la case pour un répertoire ou une " +"partition (peut être utilisé plusieurs fois)" + +msgid "Regular expression for path or partition (may be repeated)" +msgstr "" +"Expression rationnelle pour un répertoire ou une partition (peut être " +"utilisé plusieurs fois)" + +msgid "" +"Regular expression to ignore selected path/partition (case insensitive) (may " +"be repeated)" +msgstr "" +"Expression rationnelle pour ignorer un répertoire ou une partition (peut " +"être utilisé plusieurs fois)" + +msgid "" +"Regular expression to ignore selected path or partition (may be repeated)" +msgstr "" +"Expression rationnelle pour ignorer un répertoire ou une partition (peut " +"être utilisé plusieurs fois)" + +msgid "" +"Return OK if no filesystem matches, filesystem does not exist or is " +"inaccessible." +msgstr "" + +msgid "(Provide this option before -p / -r / --ereg-path if used)" +msgstr "" + +msgid "Choose bytes, kB, MB, GB, TB (default: MB)" +msgstr "Choisissez octets, kb, MB, GB, TB (par défaut: MB)" + +#, fuzzy +msgid "" +"Ignore all filesystems of types matching given regex(7) (may be repeated)" +msgstr "" +"Ignorer tout les systèmes de fichiers qui correspondent au type indiqué " +"(peut être utilisé plusieurs fois)" + +#, fuzzy +msgid "" +"Check only filesystems where the type matches this given regex(7) (may be " +"repeated)" +msgstr "" +"Ignorer tout les systèmes de fichiers qui correspondent au type indiqué " +"(peut être utilisé plusieurs fois)" + +msgid "General usage hints:" +msgstr "" + +msgid "" +"- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the " +"same as" +msgstr "" + +msgid "\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\"." +msgstr "" + +msgid "" +"- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} " +"{thresholds b} ...\"" +msgstr "" + +msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" +msgstr "Vérifie /tmp à 10% et /var à 5% et / à 100MB et 50MB" + +msgid "" +"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" +"r regex" +msgstr "" + +msgid "" +"are grouped which means the freespace thresholds are applied to all disks " +"together" +msgstr "" + +msgid "" +"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " +"100M/50M" +msgstr "" + +#, c-format +msgid "%s %s: %s\n" +msgstr "" + +msgid "is not accessible" +msgstr "" + +msgid "nslookup returned an error status" +msgstr "nslookup à retourné un code d'erreur" + +msgid "Warning plugin error" +msgstr "Alerte erreur de plugin" + +#, fuzzy, c-format +msgid "DNS CRITICAL - '%s' returned empty server string\n" +msgstr "DNS CRITIQUE - '%s' à retourné un nom d'hôte vide\n" + +#, fuzzy, c-format +msgid "DNS CRITICAL - No response from DNS %s\n" +msgstr "Pas de réponse du DNS %s\n" + +#, c-format +msgid "DNS CRITICAL - '%s' returned empty host name string\n" +msgstr "DNS CRITIQUE - '%s' à retourné un nom d'hôte vide\n" + +msgid "Non-authoritative answer:" +msgstr "Réponse non autoritative:" + +#, fuzzy, c-format +msgid "Domain '%s' was not found by the server\n" +msgstr "Le domaine %s n'a pas été trouvé par le serveur\n" + +#, c-format +msgid "DNS CRITICAL - '%s' msg parsing exited with no address\n" +msgstr "DNS CRITIQUE - '%s' n'a pas retourné d'adresse\n" + +#, c-format +msgid "expected '%s' but got '%s'" +msgstr "j'attendais '%s' mais j'ai reçu '%s'" + +#, fuzzy, c-format +msgid "Domain '%s' was found by the server: '%s'\n" +msgstr "Le domaine %s n'a pas été trouvé par le serveur\n" + +#, c-format +msgid "server %s is not authoritative for %s" +msgstr "serveur %s n'est pas autoritaire pour %s" + +#, c-format +msgid "OK" +msgstr "OK" + +#, c-format +msgid "WARNING" +msgstr "AVERTISSEMENT" + +#, c-format +msgid "%.3f second response time" +msgid_plural "%.3f seconds response time" +msgstr[0] "%.3f secondes de temps de réponse " +msgstr[1] "%.3f secondes de temps de réponse " + +#, c-format +msgid ". %s returns %s" +msgstr ". %s renvoie %s" + +#, c-format +msgid "DNS WARNING - %s\n" +msgstr "DNS AVERTISSEMENT - %s\n" + +msgid " Probably a non-existent host/domain" +msgstr " Probablement un hôte/domaine inexistant" + +#, c-format +msgid "DNS CRITICAL - %s\n" +msgstr "DNS CRITIQUE - %s\n" + +#, c-format +msgid "DNS UNKNOWN - %s\n" +msgstr "DNS INCONNU - %s\n" + +msgid "Note: nslookup is deprecated and may be removed from future releases." +msgstr "" +"Note: nslookup est obsolète et pourra être retiré dans les prochaines " +"versions." + +msgid "Consider using the `dig' or `host' programs instead. Run nslookup with" +msgstr "" +"Veuillez utiliser le programme 'dig' ou 'host' à la place. Faire fonctionner " +"nslookup avec" + +msgid "the `-sil[ent]' option to prevent this message from appearing." +msgstr "L'option '-sil[ent]' empêche l'apparition de ce message." + +#, c-format +msgid "No response from DNS %s\n" +msgstr "Pas de réponse du DNS %s\n" + +#, c-format +msgid "DNS %s has no records\n" +msgstr "Le DNS %s n'a pas d'enregistrements\n" + +#, c-format +msgid "Connection to DNS %s was refused\n" +msgstr "La connexion au DNS %s à été refusée\n" + +#, c-format +msgid "Query was refused by DNS server at %s\n" +msgstr "La requête à été refusée par le serveur DNS %s\n" + +#, c-format +msgid "No information returned by DNS server at %s\n" +msgstr "Pas d'information renvoyée par le serveur DNS %s\n" + +msgid "Network is unreachable\n" +msgstr "Le réseau est inaccessible\n" + +#, c-format +msgid "DNS failure for %s\n" +msgstr "DNS à échoué pour %s\n" + +msgid "Input buffer overflow\n" +msgstr "Le tampon d'entrée a débordé\n" + +msgid "" +"This plugin uses the nslookup program to obtain the IP address for the given " +"host/domain query." +msgstr "" +"Ce plugin utilise le programme nslookup pour obtenir l'adresse IP de l'hôte/" +"domaine à interroger." + +msgid "An optional DNS server to use may be specified." +msgstr "Un serveur DNS à utiliser peut être indiqué." + +msgid "" +"If no DNS server is specified, the default server(s) specified in /etc/" +"resolv.conf will be used." +msgstr "" +"Si aucun serveur DNS n'est spécifié, les serveurs spécifiés dans /etc/resolv." +"conf seront utilisé." + +msgid "The name or address you want to query" +msgstr "Le nom ou l'adresse que vous voulez interroger" + +msgid "Optional DNS server you want to use for the lookup" +msgstr "Serveur DNS que vous voulez utiliser pour la recherche" + +#, fuzzy +msgid "" +"Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end" +msgstr "" +"Adresse IP que le serveur DNS doit retourner. Les hôtes doivent se terminer " + +#, fuzzy +msgid "" +"with a dot (.). This option can be repeated multiple times (Returns OK if any" +msgstr "avec un point (.). Cette option peut être répétée (Retourne OK si une" + +msgid "value matches)." +msgstr "" + +msgid "" +"Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)" +msgstr "" + +msgid "Cannot be used together with -a" +msgstr "" + +msgid "Optionally expect the DNS server to be authoritative for the lookup" +msgstr "Serveur DNS qui doit normalement être autoritaire pour la recherche" + +msgid "Return warning if elapsed time exceeds value. Default off" +msgstr "" +"Renvoie une alerte si le temps écoulé dépasse la valeur indiquée. Désactivé " +"par défaut" + +msgid "Return critical if elapsed time exceeds value. Default off" +msgstr "" +"Renvoie critique si le temps utilisé dépasse la valeur indiquée. Désactivé " +"par défaut" + +msgid "" +"Return critical if the list of expected addresses does not match all " +"addresses" +msgstr "" + +msgid "returned. Default off" +msgstr "" + +msgid "Arguments to check_dummy must be an integer" +msgstr "Les arguments pour check_dummy doivent être des entiers" + +#, c-format +msgid "Status %d is not a supported error state\n" +msgstr "Le résultat %d n'est pas un résultat supporté\n" + +msgid "" +"This plugin will simply return the state corresponding to the numeric value" +msgstr "" +"Ce plugin renverra simplement l'état correspondant à la valeur numérique" + +msgid "of the argument with optional text" +msgstr "du paramètre avec un texte optionnel" + +#, c-format +msgid "Could not open pipe: %s\n" +msgstr "Impossible d'ouvrir le pipe: %s\n" + +#, c-format +msgid "Could not open stderr for %s\n" +msgstr "Impossible d'ouvrir la sortie d'erreur standard pour %s\n" + +#, fuzzy +msgid "FPING UNKNOWN - IP address not found\n" +msgstr "PING INCONNU - Hôte non trouvé (%s)\n" + +msgid "FPING UNKNOWN - invalid commandline argument\n" +msgstr "" + +#, fuzzy +msgid "FPING UNKNOWN - failed system call\n" +msgstr "PING INCONNU - Hôte non trouvé (%s)\n" + +#, fuzzy, c-format +msgid "FPING %s - %s (rta=%f ms)|%s\n" +msgstr "FPING %s - %s (perte=%.0f%% )|%s\n" + +#, c-format +msgid "FPING UNKNOWN - %s not found\n" +msgstr "PING INCONNU - Hôte non trouvé (%s)\n" + +#, c-format +msgid "FPING CRITICAL - %s is unreachable\n" +msgstr "PING CRITIQUE - Hôte inaccessible (%s)\n" + +#, fuzzy, c-format +msgid "FPING UNKNOWN - %s parameter error\n" +msgstr "PING INCONNU - Hôte non trouvé (%s)\n" + +#, c-format +msgid "FPING CRITICAL - %s is down\n" +msgstr "FPING CRITIQUE - %s est en panne\n" + +#, c-format +msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n" +msgstr "FPING %s - %s (perte=%.0f%%, rta=%f ms)|%s %s\n" + +#, c-format +msgid "FPING %s - %s (loss=%.0f%% )|%s\n" +msgstr "FPING %s - %s (perte=%.0f%% )|%s\n" + +msgid "Invalid hostname/address" +msgstr "Adresse/Nom d'hôte invalide" + +msgid "IPv6 support not available\n" +msgstr "Support IPv6 non disponible\n" + +msgid "Packet size must be a positive integer" +msgstr "La taille du paquet doit être un entier positif" + +msgid "Packet count must be a positive integer" +msgstr "Le nombre de paquets doit être un entier positif" + +msgid "Target timeout must be a positive integer" +msgstr "Le seuil d'avertissement doit être un entier positif" + +msgid "Interval must be a positive integer" +msgstr "Le délai d'attente doit être un entier positif" + +msgid "Hostname was not supplied" +msgstr "Le nom de l'hôte n'a pas été spécifié" + +#, c-format +msgid "%s: Only one threshold may be packet loss (%s)\n" +msgstr "" +"%s: Seulement un seuil peut être utilisé pour les pertes de paquets (%s)\n" + +#, c-format +msgid "%s: Only one threshold must be packet loss (%s)\n" +msgstr "" +"%s: Seulement un seuil doit être utilisé pour les pertes de paquets (%s)\n" + +msgid "" +"This plugin will use the fping command to ping the specified host for a fast " +"check" +msgstr "" +"Ce plugin va utiliser la commande fping pour pinger l'hôte de manière rapide." + +msgid "Note that it is necessary to set the suid flag on fping." +msgstr "" +"Veuillez noter qu'il est nécessaire de mettre le bit suid sur le programme " +"fping." + +msgid "" +"name or IP Address of host to ping (IP Address bypasses name lookup, " +"reducing system load)" +msgstr "" +"nom ou adresse IP des hôtes à pinger (l'indication d'un adresse IP évite une " +"recherche sur le nom, ce qui réduit la charge système)" + +msgid "warning threshold pair" +msgstr "Valeurs pour le seuil d'avertissement" + +msgid "critical threshold pair" +msgstr "Valeurs pour le seuil critique" + +msgid "Return OK after first successful reply" +msgstr "" + +msgid "size of ICMP packet" +msgstr "taille du paquet ICMP" + +msgid "number of ICMP packets to send" +msgstr "nombre de paquets ICMP à envoyer" + +msgid "Target timeout (ms)" +msgstr "" + +msgid "Interval (ms) between sending packets" +msgstr "" + +msgid "name or IP Address of sourceip" +msgstr "" + +msgid "source interface name" +msgstr "" + +#, c-format +msgid "" +"THRESHOLD is ,%% where is the round trip average travel time " +"(ms)" +msgstr "" +"Le seuil est ,%% ou est le temps moyen pour l'aller retour " +"(ms)" + +msgid "" +"which triggers a WARNING or CRITICAL state, and is the percentage of" +msgstr "" +"qui déclenche résultat AVERTISSEMENT ou CRITIQUE, et est le pourcentage " +"de" + +msgid "packet loss to trigger an alarm state." +msgstr "paquets perdu pour déclencher une alarme." + +msgid "IPv4 is used by default. Specify -6 to use IPv6." +msgstr "" + +#, c-format +msgid "CRITICAL - Host type parameter incorrect!\n" +msgstr "CRITIQUE - Argument de type hôte incorrect!\n" + +#, c-format +msgid "CRITICAL - Host not found\n" +msgstr "CRITIQUE - Hôte non trouvé\n" + +#, c-format +msgid "CRITICAL - Game server down or unavailable\n" +msgstr "CRITIQUE - Serveur de jeux en panne ou non disponible\n" + +#, c-format +msgid "CRITICAL - Game server timeout\n" +msgstr "CRITIQUE - Temps d'attente pour le serveur de jeux dépassé\n" + +#, c-format +msgid "This plugin tests game server connections with the specified host." +msgstr "Le plugin teste la connexion au serveur de jeux avec l'hôte spécifié." + +msgid "Optional port of which to connect" +msgstr "" + +msgid "Field number in raw qstat output that contains game name" +msgstr "" + +msgid "Field number in raw qstat output that contains map name" +msgstr "" + +msgid "Field number in raw qstat output that contains ping time" +msgstr "" + +msgid "" +"This plugin uses the 'qstat' command, the popular game server status query " +"tool." +msgstr "" +"Ce plugin utilise la commande 'qstat', un programme répandu pour questioner " +"les serveurs de jeux." + +msgid "" +"If you don't have the package installed, you will need to download it from" +msgstr "" +"Si vous n'avez pas le programme installé, vous devrez le télécharger depuis" + +#, fuzzy +msgid "https://github.com/multiplay/qstat before you can use this plugin." +msgstr "" +"http://www.activesw.com/people/steve/qstat.html avant de pouvoir utiliser ce " +"plugin." + +msgid "Paper Jam" +msgstr "Bourrage Papier" + +msgid "Out of Paper" +msgstr "Plus de Papier" + +msgid "Printer Offline" +msgstr "Imprimante hors ligne" + +msgid "Peripheral Error" +msgstr "Erreur du périphérique" + +msgid "Intervention Required" +msgstr "Intervention Requise" + +msgid "Toner Low" +msgstr "Toner Faible" + +msgid "Insufficient Memory" +msgstr "Mémoire Insuffisante" + +msgid "A Door is Open" +msgstr "Une porte est ouverte" + +msgid "Output Tray is Full" +msgstr "Le bac de sortie est plein" + +msgid "Data too Slow for Engine" +msgstr "Le données arrivent trop lentement pour l'imprimante" + +msgid "Unknown Paper Error" +msgstr "Erreur de papier inconnue" + +#, c-format +msgid "Printer ok - (%s)\n" +msgstr "Imprimante ok - (%s)\n" + +#, fuzzy +msgid "Port must be a positive short integer" +msgstr "Le numéro du port doit être un entier positif" + +msgid "This plugin tests the STATUS of an HP printer with a JetDirect card." +msgstr "Ce plugin teste l'état d'une imprimante HP avec une carte JetDirect." + +msgid "Net-snmp must be installed on the computer running the plugin." +msgstr "Net-snmp doit être installé sur l'ordinateur qui exécute le plugin." + +msgid "The SNMP community name " +msgstr "Le nom de la communauté SNMP " + +#, c-format +msgid "(default=%s)" +msgstr "(défaut=%s)" + +#, fuzzy +msgid "Specify the port to check " +msgstr "Nom de l'hôte à vérifier" + +#, fuzzy +msgid "Disable paper check " +msgstr "Variable a vérifier" + +msgid "file does not exist or is not readable" +msgstr "" + +msgid "Invalid certificate expiration period" +msgstr "Période d'expiration du certificat invalide" + +msgid "" +"Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional " +"'+' suffix)" +msgstr "" + +msgid "Invalid option - SSL is not available" +msgstr "Option invalide - SSL n'est pas disponible" + +msgid "Invalid max_redirs count" +msgstr "" + +msgid "Invalid onredirect option" +msgstr "" + +#, c-format +msgid "option f:%d \n" +msgstr "option f:%d \n" + +msgid "Invalid port number" +msgstr "Numéro de port invalide" + +#, c-format +msgid "Could Not Compile Regular Expression: %s" +msgstr "Impossible de compiler l'expression rationnelle: %s" + +msgid "IPv6 support not available" +msgstr "Support IPv6 non disponible" + +msgid "You must specify a server address or host name" +msgstr "Vous devez spécifier une adresse ou un nom d'hôte" + +msgid "" +"If you use a client certificate you must also specify a private key file" +msgstr "" + +msgid "HTTP UNKNOWN - Memory allocation error\n" +msgstr "HTTP INCONNU - Impossible d'allouer la mémoire\n" + +#, c-format +msgid "%sServer date unknown, " +msgstr "%sDate du serveur inconnue, " + +#, c-format +msgid "%sDocument modification date unknown, " +msgstr "%sDate de modification du document inconnue, " + +#, c-format +msgid "%sServer date \"%100s\" unparsable, " +msgstr "%sDate du serveur \"%100s\" illisible, " + +#, c-format +msgid "%sDocument date \"%100s\" unparsable, " +msgstr "%sDate du document \"%100s\" illisible, " + +#, c-format +msgid "%sDocument is %d seconds in the future, " +msgstr "%sLa date du document est %d secondes dans le futur, " + +#, c-format +msgid "%sLast modified %.1f days ago, " +msgstr "%sDernière modification %.1f jours auparavant, " + +#, c-format +msgid "%sLast modified %d:%02d:%02d ago, " +msgstr "%sDernière modification %d:%02d:%02d auparavant, " + +msgid "HTTP CRITICAL - Unable to open TCP socket\n" +msgstr "HTTP CRITIQUE - Impossible d'ouvrir un socket TCP\n" + +#, fuzzy +msgid "HTTP UNKNOWN - Could not allocate memory for full_page\n" +msgstr "HTTP INCONNU - Impossible d'allouer une adresse\n" + +msgid "HTTP CRITICAL - Error on receive\n" +msgstr "HTTP CRITIQUE - Erreur dans la réception\n" + +msgid "HTTP CRITICAL - No data received from host\n" +msgstr "HTTP CRITIQUE - Pas de données reçues de l'hôte\n" + +#, c-format +msgid "Invalid HTTP response received from host: %s\n" +msgstr "Réponse HTTP reçue de l'hôte invalide: %s\n" + +#, c-format +msgid "Invalid HTTP response received from host on port %d: %s\n" +msgstr "Réponse HTTP reçue de l'hôte sur le port %d invalide: %s\n" + +#, c-format +msgid "" +"%s\n" +"%s" +msgstr "" + +#, c-format +msgid "Status line output matched \"%s\" - " +msgstr "La ligne d'état correspond à \"%s\" - " + +#, c-format +msgid "HTTP CRITICAL: Invalid Status Line (%s)\n" +msgstr "HTTP CRITIQUE: Ligne d'état non valide (%s)\n" + +#, c-format +msgid "HTTP CRITICAL: Invalid Status (%s)\n" +msgstr "HTTP CRITIQUE: Etat Invalide (%s)\n" + +#, c-format +msgid "%s - " +msgstr "" + +#, fuzzy, c-format +msgid "%sheader '%s' not found on '%s://%s:%d%s', " +msgstr "%schaîne non trouvée, " + +#, fuzzy, c-format +msgid "%sstring '%s' not found on '%s://%s:%d%s', " +msgstr "%schaîne non trouvée, " + +#, c-format +msgid "%spattern not found, " +msgstr "%sexpression non trouvée, " + +#, c-format +msgid "%spattern found, " +msgstr "%sexpression trouvée, " + +#, c-format +msgid "%sExecute Error: %s, " +msgstr "%sErreur d'exécution: %s, " + +#, c-format +msgid "%spage size %d too large, " +msgstr "%sla taille de la page est trop grande (%d), " + +#, c-format +msgid "%spage size %d too small, " +msgstr "%sla taille de la page est trop petite (%d), " + +#, fuzzy, c-format +msgid "%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s" +msgstr "%s - %d octets en %.3f secondes de temps de réponse %s|%s %s" + +#, c-format +msgid "%s - %d bytes in %.3f second response time %s|%s %s" +msgstr "%s - %d octets en %.3f secondes de temps de réponse %s|%s %s" + +msgid "HTTP UNKNOWN - Could not allocate addr\n" +msgstr "HTTP INCONNU - Impossible d'allouer une adresse\n" + +msgid "HTTP UNKNOWN - Could not allocate URL\n" +msgstr "HTTP INCONNU - Impossible d'allouer l'URL\n" + +#, c-format +msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" +msgstr "" +"HTTP INCONNU - Impossible de trouver l'endroit de la redirection - %s%s\n" + +#, c-format +msgid "HTTP UNKNOWN - Empty redirect location%s\n" +msgstr "HTTP INCONNU - endroit de redirection vide%s\n" + +#, c-format +msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" +msgstr "" +"HTTP INCONNU - Impossible de définir l'endroit de la redirection - %s%s\n" + +#, c-format +msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" +msgstr "" +"HTTP AVERTISSEMENT - le niveau maximum de redirection %d à été dépassé - " +"%s://%s:%d%s%s\n" + +#, fuzzy, c-format +msgid "HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n" +msgstr "" +"HTTP AVERTISSEMENT - la redirection crée une boucle infinie - %s://%s:%d%s" +"%s\n" + +#, c-format +msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" +msgstr "HTTP INCONNU - Redirection à un port supérieur à %d - %s://%s:%d%s%s\n" + +#, c-format +msgid "Redirection to %s://%s:%d%s\n" +msgstr "Redirection vers %s://%s:%d%s\n" + +msgid "This plugin tests the HTTP service on the specified host. It can test" +msgstr "" +"Ce plugin teste le service HTTP sur l'hôte spécifié. Il peut tester les" + +msgid "normal (http) and secure (https) servers, follow redirects, search for" +msgstr "" +"serveurs normaux (http) et sécurisés (https), suivre les redirections, " +"rechercher des" + +msgid "strings and regular expressions, check connection times, and report on" +msgstr "" +"chaînes de caractères et expressions rationnelles, vérifier le temps de " +"réponse" + +msgid "certificate expiration times." +msgstr "et rapporter la date d'expiration du certificat." + +#, c-format +msgid "In the first form, make an HTTP request." +msgstr "" + +#, c-format +msgid "" +"In the second form, connect to the server and check the TLS certificate." +msgstr "" + +#, c-format +msgid "NOTE: One or both of -H and -I must be specified" +msgstr "NOTE: les paramètres -H et -I peuvent être spécifiés" + +msgid "Host name argument for servers using host headers (virtual host)" +msgstr "" + +msgid "Append a port to include it in the header (eg: example.com:5000)" +msgstr "" + +msgid "" +"IP address or name (use numeric address if possible to bypass DNS lookup)." +msgstr "" + +msgid "Port number (default: " +msgstr "Numéro du port (défaut: " + +msgid "" +"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents" +msgstr "" + +msgid "auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1," +msgstr "" + +msgid "1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted." +msgstr "" + +msgid "Enable SSL/TLS hostname extension support (SNI)" +msgstr "" + +msgid "" +"Minimum number of days a certificate has to be valid. Port defaults to 443" +msgstr "" +"Nombre de jours minimum pour que le certificat soit valide. Port par défaut " +"443" + +msgid "" +"(when this option is used the URL is not checked by default. You can use" +msgstr "" + +msgid " --continue-after-certificate to override this behavior)" +msgstr "" + +msgid "" +"Allows the HTTP check to continue after performing the certificate check." +msgstr "" + +msgid "Does nothing unless -C is used." +msgstr "" + +msgid "Name of file that contains the client certificate (PEM format)" +msgstr "" + +msgid "to be used in establishing the SSL session" +msgstr "" + +msgid "Name of file containing the private key (PEM format)" +msgstr "" + +msgid "matching the client certificate" +msgstr "" + +msgid "Comma-delimited list of strings, at least one of them is expected in" +msgstr "" +"Liste the chaines de charactères séparées par des virgules, au moins une " +"d'elles" + +msgid "the first (status) line of the server response (default: " +msgstr "est attendue dans la première ligne de réponse du serveur (défaut: " + +msgid "" +"If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" +msgstr "" +"Si spécifié, surpasse toute autre logique de status (ex: 3xx, 4xx, 5xx)" + +#, fuzzy +msgid "String to expect in the response headers" +msgstr "Chaîne de caractères à attendre en réponse" + +msgid "String to expect in the content" +msgstr "Chaîne de caractère attendue dans le contenu" + +msgid "URL to GET or POST (default: /)" +msgstr "URL pour le GET ou le POST (défaut: /)" + +msgid "URL encoded http POST data" +msgstr "" + +msgid "Set HTTP method." +msgstr "" + +msgid "Don't wait for document body: stop reading after headers." +msgstr "" +"Ne pas attendre pour le corps du document: arrêter de lire après les entêtes" + +msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" +msgstr "(Veuillez noter qu'un HTTP GET ou POST est effectué, pas un HEAD.)" + +msgid "Warn if document is more than SECONDS old. the number can also be of" +msgstr "" + +msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." +msgstr "" + +msgid "specify Content-Type header media type when POSTing\n" +msgstr "" + +msgid "Allow regex to span newlines (must precede -r or -R)" +msgstr "" + +msgid "Search page for regex STRING" +msgstr "" + +msgid "Search page for case-insensitive regex STRING" +msgstr "" + +msgid "Return CRITICAL if found, OK if not\n" +msgstr "" + +msgid "Username:password on sites with basic authentication" +msgstr "" + +msgid "Username:password on proxy-servers with basic authentication" +msgstr "" + +msgid "String to be sent in http header as \"User Agent\"" +msgstr "" + +msgid "" +"Any other tags to be sent in http header. Use multiple times for additional " +"headers" +msgstr "" + +msgid "Print additional performance data" +msgstr "" + +msgid "Print body content below status line" +msgstr "" + +msgid "Wrap output in HTML link (obsoleted by urlize)" +msgstr "" + +msgid "How to handle redirected pages. sticky is like follow but stick to the" +msgstr "" + +msgid "specified IP address. stickyport also ensures port stays the same." +msgstr "" + +#, fuzzy +msgid "Maximal number of redirects (default: " +msgstr "PROCS - nombre de processus (défaut)" + +msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" +msgstr "" + +msgid "This plugin will attempt to open an HTTP connection with the host." +msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte." + +msgid "" +"Successful connects return STATE_OK, refusals and timeouts return " +"STATE_CRITICAL" +msgstr "" + +msgid "" +"other errors return STATE_UNKNOWN. Successful connects, but incorrect " +"response" +msgstr "" + +msgid "" +"messages from the host result in STATE_WARNING return values. If you are" +msgstr "" + +msgid "" +"checking a virtual server that uses 'host headers' you must supply the FQDN" +msgstr "" + +msgid "(fully qualified domain name) as the [host_name] argument." +msgstr "" + +msgid "This plugin can also check whether an SSL enabled web server is able to" +msgstr "" + +msgid "serve content (optionally within a specified time) or whether the X509 " +msgstr "" + +msgid "certificate is still valid for the specified number of days." +msgstr "" + +#, fuzzy +msgid "Please note that this plugin does not check if the presented server" +msgstr "Ce plugin vérifie le service ntp sur l'hôte" + +msgid "certificate matches the hostname of the server, or if the certificate" +msgstr "" + +msgid "has a valid chain of trust to one of the locally installed CAs." +msgstr "" + +msgid "" +"When the 'www.verisign.com' server returns its content within 5 seconds," +msgstr "" + +msgid "" +"a STATE_OK will be returned. When the server returns its content but exceeds" +msgstr "" + +msgid "" +"the 5-second threshold, a STATE_WARNING will be returned. When an error " +"occurs," +msgstr "" + +msgid "a STATE_CRITICAL will be returned." +msgstr "" + +msgid "" +"When the certificate of 'www.verisign.com' is valid for more than 14 days," +msgstr "" + +msgid "" +"a STATE_OK is returned. When the certificate is still valid, but for less " +"than" +msgstr "" + +msgid "" +"14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" +msgstr "" + +msgid "the certificate is expired." +msgstr "le certificat est expiré." + +msgid "" +"When the certificate of 'www.verisign.com' is valid for more than 30 days," +msgstr "" + +msgid "30 days, but more than 14 days, a STATE_WARNING is returned." +msgstr "" + +msgid "" +"A STATE_CRITICAL will be returned when certificate expires in less than 14 " +"days" +msgstr "" + +msgid "" +"check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j " +"CONNECT -H www.verisign.com " +msgstr "" + +msgid "" +"all these options are needed: -I -p -u -" +"S(sl) -j CONNECT -H " +msgstr "" + +msgid "" +"a STATE_CRITICAL will be returned. By adding a colon to the method you can " +"set the method used" +msgstr "" + +msgid "inside the proxied connection: -j CONNECT:POST" +msgstr "" + +#, c-format +msgid "Could not connect to the server at port %i\n" +msgstr "Impossible de se connecter au serveur port %i\n" + +#, c-format +msgid "Could not set protocol version %d\n" +msgstr "Impossible d'utiliser le protocole version %d\n" + +#, c-format +msgid "Could not init TLS at port %i!\n" +msgstr "Impossible d'initialiser TLS sur le port %i!\n" + +#, c-format +msgid "TLS not supported by the libraries!\n" +msgstr "TLS n'est pas supporté!\n" + +#, c-format +msgid "Could not init startTLS at port %i!\n" +msgstr "Impossible d'initialiser startTLS sur le port %i!\n" + +#, c-format +msgid "startTLS not supported by the library, needs LDAPv3!\n" +msgstr "" +"startTLS n'est pas supporté par la librairie LDAP, j'ai besoin de LDAPv3!\n" + +#, c-format +msgid "Could not bind to the LDAP server\n" +msgstr "Impossible de se connecter au serveur LDAP\n" + +#, c-format +msgid "Could not search/find objectclasses in %s\n" +msgstr "Impossible de chercher/trouver les objectclasses dans %s\n" + +#, fuzzy, c-format +msgid "LDAP %s - found %d entries in %.3f seconds|%s %s\n" +msgstr "%s - %d octets en %.3f secondes de temps de réponse %s|%s %s" + +#, c-format +msgid "LDAP %s - %.3f seconds response time|%s\n" +msgstr "LDAP %s - %.3f secondes de temps de réponse|%s\n" + +#, c-format +msgid "%s cannot be combined with %s" +msgstr "" + +msgid "Please specify the host name\n" +msgstr "Veuillez spécifier le nom de l'hôte\n" + +msgid "Please specify the LDAP base\n" +msgstr "Veuillez spécifier la base LDAP\n" + +msgid "ldap attribute to search (default: \"(objectclass=*)\"" +msgstr "" + +msgid "ldap base (eg. ou=my unit, o=my org, c=at" +msgstr "" + +msgid "ldap bind DN (if required)" +msgstr "" + +msgid "" +"ldap password (if required, or set the password through environment variable " +"'LDAP_PASSWORD')" +msgstr "" + +msgid "use starttls mechanism introduced in protocol version 3" +msgstr "utiliser le fonctionnement starttls du protocole version 3" + +msgid "use ldaps (ldap v2 ssl method). this also sets the default port to" +msgstr "" + +msgid "use ldap protocol version 2" +msgstr "utiliser le protocole ldap version 2" + +msgid "use ldap protocol version 3" +msgstr "utiliser le protocole ldap version 3" + +msgid "default protocol version:" +msgstr "version du protocole par défaut:" + +#, fuzzy +msgid "Number of found entries to result in warning status" +msgstr "Décalage résultant en un avertissement (secondes)" + +#, fuzzy +msgid "Number of found entries to result in critical status" +msgstr "Décalage résultant en un état critique (secondes)" + +msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be" +msgstr "" + +#, c-format +msgid "" +" implied (using default port %i) unless --port=636 is specified. In that " +"case\n" +msgstr "" + +msgid "'SSL on connect' will be used no matter how the plugin was called." +msgstr "" + +msgid "" +"This detection is deprecated, please use 'check_ldap' with the '--starttls' " +"or '--ssl' flags" +msgstr "" + +msgid "to define the behaviour explicitly instead." +msgstr "" + +msgid "The parameters --warn-entries and --crit-entries are optional." +msgstr "" + +msgid "Warning threshold must be float or float triplet!\n" +msgstr "Le seuil d'alerte doit être un nombre à virgule flottante!\n" + +#, c-format +msgid "Error opening %s\n" +msgstr "Erreur à l'ouverture de %s\n" + +#, fuzzy, c-format +msgid "could not parse load from uptime %s: %d\n" +msgstr "Lecture des arguments impossible\n" + +#, c-format +msgid "Error code %d returned in %s\n" +msgstr "Le code erreur %d à été retourné par %s\n" + +#, c-format +msgid "Error in getloadavg()\n" +msgstr "Erreur dans la fonction getloadavg()\n" + +#, c-format +msgid "Error processing %s\n" +msgstr "Erreur lors de l'utilisation de %s\n" + +#, c-format +msgid "load average: %.2f, %.2f, %.2f" +msgstr "Charge moyenne: %.2f, %.2f, %.2f" + +#, c-format +msgid "Critical threshold for %d-minute load average is not specified\n" +msgstr "" +"Le seuil critique pour la charge système après %d minutes n'est pas " +"spécifié\n" + +#, c-format +msgid "Warning threshold for %d-minute load average is not specified\n" +msgstr "" +"Le seuil d'avertissement pour la charge système après %d minutes n'est pas " +"spécifié\n" + +#, c-format +msgid "" +"Parameter inconsistency: %d-minute \"warning load\" is greater than " +"\"critical load\"\n" +msgstr "" +"Arguments Incorrects: %d-minute \"alerte charge système\" est plus grand que " +"\"alerte critique charge système\"\n" + +#, c-format +msgid "This plugin tests the current system load average." +msgstr "Ce plugin teste la charge système actuelle." + +msgid "Exit with WARNING status if load average exceeds WLOADn" +msgstr "" +"Sortir avec un résultat AVERTISSEMENT si la charge moyenne dépasse WLOAD" + +msgid "Exit with CRITICAL status if load average exceed CLOADn" +msgstr "Sortir avec un résultat CRITIQUE si la charge moyenne excède CLOAD" + +msgid "the load average format is the same used by \"uptime\" and \"w\"" +msgstr "" + +msgid "Divide the load averages by the number of CPUs (when possible)" +msgstr "" + +msgid "Number of processes to show when printing the top consuming processes." +msgstr "" + +msgid "NUMBER_OF_PROCS=0 disables this feature. Default value is 0" +msgstr "" + +#, c-format +msgid "'%s' exited with non-zero status.\n" +msgstr "" + +#, c-format +msgid "some error occurred getting procs list.\n" +msgstr "" + +msgid "Could not parse arguments\n" +msgstr "Lecture des arguments impossible\n" + +#, c-format +msgid "Unable to open MRTG log file\n" +msgstr "Impossible d'ouvrir le fichier de log de MRTG\n" + +#, c-format +msgid "Unable to process MRTG log file\n" +msgstr "Impossible de traiter le fichier de log de MRTG\n" + +#, c-format +msgid "MRTG data has expired (%d minutes old)\n" +msgstr "Les données de MRTG on expirées (vieilles de %d minutes)\n" + +msgid "Avg" +msgstr "Moyenne" + +msgid "Max" +msgstr "Max" + +msgid "Invalid variable number" +msgstr "Numéro de la variable invalide" + +#, c-format +msgid "" +"%s is not a valid expiration time\n" +"Use '%s -h' for additional help\n" +msgstr "" +"%s n'est pas un temps d'expiration valide\n" +"Utilisez '%s -h' pour de l'aide supplémentaire\n" + +msgid "Invalid variable number\n" +msgstr "Numéro de la variable invalide\n" + +msgid "You must supply the variable number" +msgstr "Vous devez fournir le numéro de la variable" + +msgid "" +"This plugin will check either the average or maximum value of one of the" +msgstr "Ce plugin va vérifier la moyenne ou le maximum d'une " + +msgid "two variables recorded in an MRTG log file." +msgstr "deux variables du fichier de log de MRTG." + +msgid "The MRTG log file containing the data you want to monitor" +msgstr "" + +msgid "Minutes before MRTG data is considered to be too old" +msgstr "" + +msgid "Should we check average or maximum values?" +msgstr "" + +msgid "Which variable set should we inspect? (1 or 2)" +msgstr "" + +msgid "Threshold value for data to result in WARNING status" +msgstr "" + +msgid "Threshold value for data to result in CRITICAL status" +msgstr "" + +msgid "Type label for data (Examples: Conns, \"Processor Load\", In, Out)" +msgstr "" + +msgid "Option units label for data (Example: Packets/Sec, Errors/Sec," +msgstr "" + +#, c-format +msgid "\"Bytes Per Second\", \"%% Utilization\")" +msgstr "" + +msgid "" +"If the value exceeds the threshold, a WARNING status is returned. If" +msgstr "" + +msgid "" +"the value exceeds the threshold, a CRITICAL status is returned. If" +msgstr "" + +msgid "the data in the log file is older than old, a WARNING" +msgstr "" + +msgid "status is returned and a warning message is printed." +msgstr "" + +msgid "" +"This plugin is useful for monitoring MRTG data that does not correspond to" +msgstr "" + +msgid "" +"bandwidth usage. (Use the check_mrtgtraf plugin for monitoring bandwidth)." +msgstr "" + +msgid "" +"It can be used to monitor any kind of data that MRTG is monitoring - errors," +msgstr "" + +msgid "" +"packets/sec, etc. I use MRTG in conjunction with the Novell NLM that allows" +msgstr "" + +msgid "" +"me to track processor utilization, user connections, drive space, etc and" +msgstr "" + +msgid "this plugin works well for monitoring that kind of data as well." +msgstr "" + +msgid "" +"- This plugin only monitors one of the two variables stored in the MRTG log" +msgstr "" +"- Ce plugin vérifie seulement une ou deux variables écrites dans un fichier " +"de log MRTG" + +msgid "file. If you want to monitor both values you will have to define two" +msgstr "" + +msgid "commands with different values for the argument. Of course," +msgstr "" + +msgid "you can always hack the code to make this plugin work for you..." +msgstr "" + +msgid "" +"- MRTG stands for the Multi Router Traffic Grapher. It can be downloaded " +"from" +msgstr "" + +msgid "Unable to open MRTG log file" +msgstr "Impossible d'ouvrir le fichier de log de MRTG" + +msgid "Unable to process MRTG log file" +msgstr "Impossible de traiter le fichier de log de MRTG" + +#, fuzzy, c-format +msgid "%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n" +msgstr "%s. Entrée = %0.1f %s, %s. Sortie = %0.1f %s|%s %s\n" + +#, c-format +msgid "Traffic %s - %s\n" +msgstr "Trafic %s - %s\n" + +msgid "" +"This plugin will check the incoming/outgoing transfer rates of a router," +msgstr "" +"Ce plugin va vérifier le taux de transfert en entrée/sortie d'un routeur," + +msgid "switch, etc recorded in an MRTG log. If the newest log entry is older" +msgstr "" + +msgid "than , a WARNING status is returned. If either the" +msgstr "" + +msgid "incoming or outgoing rates exceed the or thresholds (in" +msgstr "" + +msgid "Bytes/sec), a CRITICAL status results. If either of the rates exceed" +msgstr "" + +msgid "the or thresholds (in Bytes/sec), a WARNING status results." +msgstr "" + +msgid "File to read log from" +msgstr "" + +msgid "Minutes after which log expires" +msgstr "" + +msgid "Test average or maximum" +msgstr "" + +msgid "Warning threshold pair ," +msgstr "Paire de seuils d'avertissement ," + +msgid "Critical threshold pair ," +msgstr "Paire de seuils critique ," + +msgid "" +"- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from" +msgstr "" + +msgid "- While MRTG can monitor things other than traffic rates, this" +msgstr "" + +msgid " plugin probably won't work with much else without modification." +msgstr "" + +msgid "- The calculated i/o rates are a little off from what MRTG actually" +msgstr "" + +msgid " reports. I'm not sure why this is right now, but will look into it" +msgstr "" + +msgid " for future enhancements of this plugin." +msgstr "" + +#, c-format +msgid "Usage" +msgstr "Utilisation" + +#, fuzzy, c-format +msgid "status store_result error: %s\n" +msgstr "erreur slave store_result: %s\n" + +#, c-format +msgid "slave query error: %s\n" +msgstr "erreur de requête de l'esclave: %s\n" + +#, c-format +msgid "slave store_result error: %s\n" +msgstr "erreur slave store_result: %s\n" + +msgid "No slaves defined" +msgstr "Pas d'esclave spécifié" + +#, c-format +msgid "slave fetch row error: %s\n" +msgstr "erreur esclave lecture d'une ligne: %s\n" + +#, c-format +msgid "Slave running: %s" +msgstr "L'esclave fonctionne: %s" + +msgid "This program tests connections to a MySQL server" +msgstr "Ce plugin teste une connexion vers un serveur MySQL" + +msgid "Ignore authentication failure and check for mysql connectivity only" +msgstr "" + +msgid "Use the specified socket (has no effect if -H is used)" +msgstr "" + +msgid "Check database with indicated name" +msgstr "" + +msgid "Read from the specified client options file" +msgstr "" + +msgid "Use a client options group" +msgstr "" + +msgid "Connect using the indicated username" +msgstr "" + +msgid "Use the indicated password to authenticate the connection" +msgstr "" + +msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!" +msgstr "" + +msgid "Your clear-text password could be visible as a process table entry" +msgstr "" + +msgid "Check if the slave thread is running properly." +msgstr "" + +msgid "Exit with WARNING status if slave server is more than INTEGER seconds" +msgstr "" +"Sortir avec un résultat AVERTISSEMENT si le serveur esclave est plus de X " + +msgid "behind master" +msgstr "secondes en retard sur le maître" + +msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds" +msgstr "Sortir avec un résultat CRITIQUE si le serveur esclave est plus de X " + +msgid "Use ssl encryption" +msgstr "" + +msgid "Path to CA signing the cert" +msgstr "" + +msgid "Path to SSL certificate" +msgstr "" + +msgid "Path to private SSL key" +msgstr "" + +msgid "Path to CA directory" +msgstr "" + +msgid "List of valid SSL ciphers" +msgstr "" + +msgid "" +"There are no required arguments. By default, the local database is checked" +msgstr "" +"Il n'y a pas d'arguments nécessaires. Par défaut la base de donnée locale " +"est testée" + +msgid "" +"using the default unix socket. You can force TCP on localhost by using an" +msgstr "" + +msgid "IP address or FQDN ('localhost' will use the socket as well)." +msgstr "" + +msgid "You must specify -p with an empty string to force an empty password," +msgstr "" + +msgid "overriding any my.cnf settings." +msgstr "" + +msgid "Cannot open status log for reading!" +msgstr "Impossible d'ouvrir le fichier status log en lecture!" + +#, c-format +msgid "Found process: %s %s\n" +msgstr "Processus trouvé: %s %s\n" + +msgid "Could not locate a running Nagios process!" +msgstr "Impossible de trouver un processus Nagios actif!" + +msgid "Cannot parse Nagios log file for valid time" +msgstr "" +"Impossible de trouver une date/heure valide dans le fichier de log de Nagios" + +#, c-format +msgid "%d process" +msgid_plural "%d processes" +msgstr[0] "%d processus" +msgstr[1] "%d processus" + +#, c-format +msgid "status log updated %d second ago" +msgid_plural "status log updated %d seconds ago" +msgstr[0] "status log mis à jour %d secondes auparavant" +msgstr[1] "status log mis à jour %d secondes auparavant" + +msgid "Expiration time must be an integer (seconds)\n" +msgstr "Le délai d'expiration doit être un entier (en secondes)\n" + +#, fuzzy +msgid "Timeout must be an integer (seconds)\n" +msgstr "Le délai d'expiration doit être un entier (en secondes)\n" + +msgid "You must provide the status_log\n" +msgstr "Vous devez fournir le status_log\n" + +msgid "You must provide a process string\n" +msgstr "Vous devez fournir un nom de processus\n" + +msgid "" +"This plugin checks the status of the Nagios process on the local machine" +msgstr "Ce plugin vérifie l'état du processus Nagios sur la machine locale." + +msgid "" +"The plugin will check to make sure the Nagios status log is no older than" +msgstr "Ce plugin vérifie que le status log de Nagios n'est pas plus vieux que" + +msgid "the number of minutes specified by the expires option." +msgstr "le nombre de minutes spécifies par l'option expire." + +msgid "" +"It also checks the process table for a process matching the command argument." +msgstr "" + +msgid "Name of the log file to check" +msgstr "Nom du fichier log à vérifier" + +msgid "Minutes aging after which logfile is considered stale" +msgstr "" + +msgid "Substring to search for in process arguments" +msgstr "" + +msgid "Timeout for the plugin in seconds" +msgstr "" + +#, c-format +msgid "Wrong client version - running: %s, required: %s" +msgstr "Mauvaise version du client utilisée: %s, nécessaire: %s" + +msgid "missing -l parameters" +msgstr "Arguments -l manquants" + +msgid "wrong -l parameter." +msgstr "Arguments -l erronés." + +msgid "CPU Load" +msgstr "Charge CPU" + +#, c-format +msgid " %lu%% (%lu min average)" +msgstr " %lu%% (%lu moyenne minimale)" + +#, c-format +msgid " '%lu min avg Load'=%lu%%;%lu;%lu;0;100" +msgstr " '%lu Charge moyenne minimale'=%lu%%;%lu;%lu;0;100" + +msgid "not enough values for -l parameters" +msgstr "pas assez de valeur pour l'argument -l" + +msgid "wrong -l argument" +msgstr "Argument -l erroné" + +#, fuzzy, c-format +msgid "System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu" +msgstr "Système démarré - %u jour(s) %u heure(s) %u minute(s)" + +#, c-format +msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)" +msgstr "" +"%s:\\ - total: %.2f Gb - utilisé: %.2f Gb (%.0f%%) - libre %.2f Gb (%.0f%%)" + +#, c-format +msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f" +msgstr "'%s:\\ Espace Utilisé'=%.2fGb;%.2f;%.2f;0.00;%.2f" + +msgid "Free disk space : Invalid drive" +msgstr "Espace disque libre : Lecteur invalide" + +msgid "No service/process specified" +msgstr "Pas de service/processus spécifié" + +msgid "could not fetch information from server\n" +msgstr "Impossible d'obtenir l'information depuis le serveur\n" + +#, fuzzy, c-format +msgid "" +"Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)" +msgstr "" +"Mémoire utilisée: total:%.2f Mb - utilisée: %.2f Mb (%.0f%%) - libre: %.2f " +"Mb (%.0f%%)" + +#, fuzzy, c-format +msgid "'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f" +msgstr "'Mémoire utilisée'=%.2fMb;%.2f;%.2f;0.00;%.2f" + +msgid "No counter specified" +msgstr "Pas de compteur spécifié" + +msgid "Minimum value contains non-numbers" +msgstr "La valeur minimum contient des caractères non numériques" + +msgid "Maximum value contains non-numbers" +msgstr "La valeur maximum contient des caractères non numériques" + +msgid "No unit counter specified" +msgstr "Pas de compteur spécifié" + +msgid "Please specify a variable to check" +msgstr "Veuillez préciser une variable a vérifier" + +msgid "Server port must be an integer\n" +msgstr "Le port du serveur doit être un nombre entier\n" + +msgid "You must provide a server address or host name" +msgstr "Vous devez spécifier une adresse ou un nom d'hôte" + +msgid "None" +msgstr "Aucun" + +msgid "This plugin collects data from the NSClient service running on a" +msgstr "" +"Ce plugin collecte les données depuis le service NSClient tournant sur un" + +msgid "Windows NT/2000/XP/2003 server." +msgstr "Serveur Windows NT/2000/XP/2003." + +msgid "Name of the host to check" +msgstr "Nom de l'hôte à vérifier" + +msgid "Optional port number (default: " +msgstr "Numéro de port optionnel (défaut: " + +msgid "Password needed for the request" +msgstr "Mot de passe nécessaire pour la requête" + +msgid "Threshold which will result in a warning status" +msgstr "" + +msgid "Threshold which will result in a critical status" +msgstr "" + +msgid "Seconds before connection attempt times out (default: " +msgstr "" + +msgid "Parameters passed to specified check (see below)" +msgstr "" + +msgid "Display options (currently only SHOWALL works)" +msgstr "" + +msgid "Return UNKNOWN on timeouts" +msgstr "" + +msgid "Print this help screen" +msgstr "Afficher l'écran d'aide" + +msgid "Print version information" +msgstr "Afficher la version" + +msgid "Variable to check" +msgstr "Variable a vérifier" + +msgid "Valid variables are:" +msgstr "Les variables valides sont" + +msgid "Get the NSClient version" +msgstr "Obtenir la version de NSClient" + +msgid "If -l is specified, will return warning if versions differ." +msgstr "" +"si l'argument -l est spécifié, une alerte AVERTISSEMENT sera " +"renvoyée, si les versions sont différentes." + +msgid "Average CPU load on last x minutes." +msgstr "Moyenne de la charge CPU sur les dernières x minutes." + +msgid "Request a -l parameter with the following syntax:" +msgstr "Demande un paramètre -l avec la syntaxe suivante:" + +msgid "-l ,,." +msgstr "-l ,,." + +msgid " should be less than 24*60." +msgstr " devrait être inférieur à 24*60." + +msgid "" +"Thresholds are percentage and up to 10 requests can be done in one shot." +msgstr "" +"Les seuils sonts en pourcentage et un maximum de 10 requêtes peuvent être " +"effectuées à la fois." + +msgid "Get the uptime of the machine." +msgstr "Obtenir le temps de service de la machine." + +msgid "-l " +msgstr "" + +msgid " = seconds, minutes, hours, or days. (default: minutes)" +msgstr "" + +#, fuzzy +msgid "Thresholds will use the unit specified above." +msgstr "Ce plugin va vérifier l'heure sur l'hôte spécifié." + +msgid "Size and percentage of disk use." +msgstr "Taille et pourcentage de l'utilisation disque." + +msgid "Request a -l parameter containing the drive letter only." +msgstr "Demande un paramètre -l contennant uniquement la lettre du lecteur." + +msgid "Warning and critical thresholds can be specified with -w and -c." +msgstr "Les seuils d'alerte et critiques peuvent être spécifiés avec -w et -c." + +msgid "Memory use." +msgstr "Mémoire utilisée." + +msgid "Check the state of one or several services." +msgstr "Vérifier l'état d'un ou plusieurs services." + +msgid "Request a -l parameters with the following syntax:" +msgstr "Demande un paramètre -l avec la syntaxe suivante:" + +msgid "-l ,,,..." +msgstr "-l ,,,..." + +msgid "You can specify -d SHOWALL in case you want to see working services" +msgstr "Vous pouvez spécifier -d SHOWALL pour voir les services fonctionnant" + +msgid "in the returned string." +msgstr "dans la chaîne de caractère renvoyée." + +msgid "Check if one or several process are running." +msgstr "Vérifie si un ou plusieurs processus sont démarrés." + +msgid "Same syntax as SERVICESTATE." +msgstr "Même syntaxe que SERVICESTATE." + +msgid "Check any performance counter of Windows NT/2000." +msgstr "Vérifier n'importe quel compteur de performance sur Windows NT/2000." + +msgid "-l \"\\\\\\\\counter\",\"" +msgstr "-l \"\\\\\\\\compteur\",\"" + +msgid "The parameter is optional and is given to a printf " +msgstr "Le paramètre est optionnel et est passé à la fonction " + +msgid "output command which requires a float parameter." +msgstr "de sortie printf qui demande un paramètre de type float." + +#, c-format +msgid "If does not include \"%%\", it is used as a label." +msgstr "Si n'inclus pas \"%%\", il est utilisé comme étiquette." + +msgid "Some examples:" +msgstr "Exemples:" + +msgid "Check any performance counter object of Windows NT/2000." +msgstr "Vérifie n'importe quel compteur de performance de Windows NT/2000." + +msgid "" +"Syntax: check_nt -H -p -v INSTANCES -l " +msgstr "" + +msgid " is a Windows Perfmon Counter object (eg. Process)," +msgstr "" + +msgid "if it is two words, it should be enclosed in quotes" +msgstr "" + +msgid "The returned results will be a comma-separated list of instances on " +msgstr "" + +msgid " the selected computer for that object." +msgstr "" + +msgid "" +"The purpose of this is to be run from command line to determine what " +"instances" +msgstr "" + +msgid "" +" are available for monitoring without having to log onto the Windows server" +msgstr "" + +msgid " to run Perfmon directly." +msgstr "" + +msgid "" +"It can also be used in scripts that automatically create the monitoring " +"service" +msgstr "" + +msgid " configuration files." +msgstr "" + +msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process" +msgstr "" + +msgid "" +"- The NSClient service should be running on the server to get any information" +msgstr "" +"- Le service NSClient doit rouler sur le serveur pour obtenir les " +"informations" + +msgid "- Critical thresholds should be lower than warning thresholds" +msgstr "" +"- Les seuils critiques doivent être plus bas que les seuils d'avertissement" + +msgid "- Default port 1248 is sometimes in use by other services. The error" +msgstr "" +"- Le port par défaut 1248 est parfois utilisé par d'autres services. L'erreur" + +msgid "" +"output when this happens contains \"Cannot map xxxxx to protocol number\"." +msgstr "qui en résulte contiens \"Cannot map xxxxx to protocol number\"." + +msgid "One fix for this is to change the port to something else on check_nt " +msgstr "" +"Une possibilité pour corriger ce problème est de changer le port dans " +"check_nt " + +msgid "and on the client service it's connecting to." +msgstr "et dans le service auquel il se connecte." + +#, c-format +msgid "jitter response too large (%lu bytes)\n" +msgstr "" + +msgid "NTP CRITICAL:" +msgstr "NTP CRITIQUE:" + +msgid "NTP WARNING:" +msgstr "NTP AVERTISSEMENT:" + +msgid "NTP OK:" +msgstr "NTP OK:" + +msgid "NTP UNKNOWN:" +msgstr "NTP INCONNU:" + +msgid "Offset unknown" +msgstr "Décalage inconnu" + +msgid "Offset" +msgstr "Décalage" + +msgid "This plugin checks the selected ntp server" +msgstr "Ce plugin vérifie le service ntp sur l'hôte" + +msgid "Offset to result in warning status (seconds)" +msgstr "Décalage résultant en un avertissement (secondes)" + +msgid "Offset to result in critical status (seconds)" +msgstr "Décalage résultant en un état critique (secondes)" + +msgid "Warning threshold for jitter" +msgstr "Seuil d'avertissement pour la variation (jitter)" + +msgid "Critical threshold for jitter" +msgstr "Seuil critique pour la variation (jitter)" + +msgid "Normal offset check:" +msgstr "Vérification normale du décalage:" + +msgid "" +"Check jitter too, avoiding critical notifications if jitter isn't available" +msgstr "" +"Vérifier aussi la variation (jitter) en évitant les notifications s'il n'est " +"pas dispoible" + +msgid "(See Notes above for more details on thresholds formats):" +msgstr "" +"(Voir les Notes ci-dessus pour plus de détails sur le format des seuils)" + +msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or" +msgstr "ATTENTION: check_ntp est périmé, utilisez plutôt check_ntp_peer" + +msgid "check_ntp_time instead." +msgstr "ou check_ntp_time." + +msgid "Server not synchronized" +msgstr "Le serveur n'est pas synchronisé" + +msgid "Server has the LI_ALARM bit set" +msgstr "" + +msgid "" +"Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized" +msgstr "" +"Retourne INCONNU au lieu de CRITIQUE ou AVERTISSEMENT si le serveur n'est " +"pas synchronisé" + +#, fuzzy +msgid "Warning threshold for stratum of server's synchronization peer" +msgstr "Seuil d'avertissement pour le stratum" + +#, fuzzy +msgid "Critical threshold for stratum of server's synchronization peer" +msgstr "Seuil critique pour le stratum" + +msgid "Warning threshold for number of usable time sources (\"truechimers\")" +msgstr "" +"Seuil d'avertissement pour le nombre de sources de temps utilisable " +"(\"truechimers\")" + +msgid "Critical threshold for number of usable time sources (\"truechimers\")" +msgstr "" +"Seuil critique pour le nombre de sources de temps utilisable (\"truechimers" +"\")" + +msgid "This plugin checks an NTP server independent of any commandline" +msgstr "Ce plugin vérifie un serveur NTP sans recours aux programmes de" + +msgid "programs or external libraries." +msgstr "la ligne de commande ou libraries externes" + +msgid "Use this plugin to check the health of an NTP server. It supports" +msgstr "" +"Utilisez ce plugin pour vérifier le service NTP sur l'hôte. Il supporte la" + +msgid "checking the offset with the sync peer, the jitter and stratum. This" +msgstr "" +"vérification du décalage avec le pair se synchronisation, la variation " +"(jitter) et le stratum." + +msgid "plugin will not check the clock offset between the local host and NTP" +msgstr "" +"Ce plugin ne vérifie pas le décalage entre le serveur local et le serveur" + +msgid "server; please use check_ntp_time for that purpose." +msgstr "NTP; utilisez plutôt check_ntp_time à cette fin." + +msgid "Simple NTP server check:" +msgstr "Vérification simple du serveur NTP:" + +msgid "Only check the number of usable time sources (\"truechimers\"):" +msgstr "" + +msgid "Check only stratum:" +msgstr "Vérification du stratum seulement:" + +msgid "This plugin checks the clock offset with the ntp server" +msgstr "Ce plugin vérifie le décalage de l'horloge avec le serveur ntp" + +msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found" +msgstr "Retourne INCONNU au lieu de CRITIQUE si le décalage est inconnu" + +msgid "Expected offset of the ntp server relative to local server (seconds)" +msgstr "" + +msgid "This plugin checks the clock offset between the local host and a" +msgstr "Ce plugin vérifie le décalage de l'horloge entre se serveur local et" + +msgid "remote NTP server. It is independent of any commandline programs or" +msgstr "le serveur NTP distant. Il ne fait aucun recours aux programmes de" + +msgid "external libraries." +msgstr "la ligne de commande ou libraries externes." + +msgid "If you'd rather want to monitor an NTP server, please use" +msgstr "Si vous voulez plutôt surveiller un serveur NTP, veuillez" + +msgid "check_ntp_peer." +msgstr "utiliser check_ntp_peer." + +msgid "--time-offset is useful for compensating for servers with known" +msgstr "" + +msgid "and expected clock skew." +msgstr "" + +#, c-format +msgid "NetWare %s: " +msgstr "NetWare %s: " + +#, c-format +msgid "Up %s," +msgstr "Démarré %s," + +#, c-format +msgid "Load %s - %s %s-min load average = %lu%%|load%s=%lu;%lu;%lu;0;100" +msgstr "" +"Charge %s - %s %s charge système minimale = %lu%%|charge%s=%lu;%lu;%lu;0;100" + +#, c-format +msgid "Conns %s - %lu current connections|Conns=%lu;%lu;%lu;;" +msgstr "Conns %s - %lu connections actuelles|Conns=%lu;%lu;%lu;;" + +#, c-format +msgid "%s: Long term cache hits = %lu%%" +msgstr "%s: Accès cache longue durée = %lu%%" + +#, c-format +msgid "%s: Total cache buffers = %lu|Cachebuffers=%lu;%lu;%lu;;" +msgstr "%s: Total des caches tampons= %lu|Caches Tampons=%lu,%lu;%lu;;" + +#, c-format +msgid "%s: Dirty cache buffers = %lu|Dirty-Cache-Buffers=%lu;%lu;%lu;;" +msgstr "%s: cache tampons sales = %lu|caches tampons sales=%lu;%lu;%lu;;" + +#, c-format +msgid "%s: LRU sitting time = %lu minutes" +msgstr "" + +#, c-format +msgid "CRITICAL - Volume '%s' does not exist!" +msgstr "CRITIQUE: Le volume '%s' n'existe pas!" + +#, c-format +msgid "%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;" +msgstr "%s%lu KB libre sur le volume %s|KB libres%s=%lu;%lu;%lu;;" + +msgid "Only " +msgstr "Seulement" + +#, c-format +msgid "%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;" +msgstr "%s%lu MB libre sur le volume %s|MBlibre%s=%lu;%lu;%lu;;" + +#, c-format +msgid "%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "" +"%lu MB (%lu%%) free on volume %s - total %lu MB|FreeMB%s=%lu;%lu;%lu;0;100" +msgstr "" +"%lu MB (%lu%%) libre sur le volume %s - total %lu MB|MBlibre%s=%lu;%lu;" +"%lu;0;100" + +#, c-format +msgid "Directory Services Database is %s (DS version %s)" +msgstr "La base de données Directory Services est %s (DS version %s)" + +#, c-format +msgid "Logins are %s" +msgstr "Les logins sont %s" + +msgid "enabled" +msgstr "activé" + +msgid "disabled" +msgstr "désactivé" + +msgid "CRITICAL - NRM Status is bad!" +msgstr "CRITIQUE - le statut NRM est mauvais!" + +msgid "Warning - NRM Status is suspect!" +msgstr "" + +msgid "OK - NRM Status is good!" +msgstr "OK - Le status du NRM est bon!" + +#, c-format +msgid "%lu of %lu (%lu%%) packet receive buffers used" +msgstr "%lu de %lu (%lu%%) paquets du tampon de réception utilisés" + +#, c-format +msgid "%lu entries in SAP table" +msgstr "%lu entrées dans la table SAP" + +#, c-format +msgid "%lu entries in SAP table for SAP type %d" +msgstr "%lu entrées dans la table SAP pour le type SAP %d" + +#, c-format +msgid "%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;" +msgstr "%s%lu KB effaçables sur le volume %s|Purge%s=%lu;%lu;%lu;;" + +#, c-format +msgid "%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;" +msgstr "%s%lu KB effaçables sur le volume %s|Purge%s=%lu;%lu;%lu;;" + +#, c-format +msgid "%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100" +msgstr "" +"%lu MB (%lu%%) effaçables sur le volume %s|Effacable%s=%lu;%lu;%lu;0;100" + +#, c-format +msgid "%s%lu KB not yet purgeable on volume %s" +msgstr "%s%lu KB pas encore effaçables sur le volume %s" + +#, c-format +msgid "%lu MB (%lu%%) not yet purgeable on volume %s" +msgstr "%lu MB (%lu%%) pas encore effaçables sur le volume %s" + +#, c-format +msgid "%lu open files|Openfiles=%lu;%lu;%lu;0,0" +msgstr "" + +#, c-format +msgid "%lu abended threads|Abends=%lu;%lu;%lu;;" +msgstr "%lu processus avortés|Avortés=%lu;%lu;%lu;;" + +#, c-format +msgid "%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu" +msgstr "%lu processus services actuels (%lu max)|Processus=%lu;%lu;%lu;0;%lu" + +msgid "CRITICAL - Time not in sync with network!" +msgstr "CRITIQUE - Le temps n'est pas synchronisé avec le réseau!" + +msgid "OK - Time in sync with network!" +msgstr "OK - Le temps est synchronisé avec le réseau!" + +#, c-format +msgid "LRU sitting time = %lu seconds" +msgstr "LRU temps d'attente = %lu secondes" + +#, c-format +msgid "Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100" +msgstr "Buffers cache sales = %lu%% du total|DCB=%lu;%lu;%lu;0;100" + +#, c-format +msgid "Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100" +msgstr "cache tampons totaux= %lu%% de l'original|TCB=%lu;%lu;%lu;0;100" + +#, c-format +msgid "NDS Version %s" +msgstr "Version NDS %s" + +#, c-format +msgid "Up %s" +msgstr "Démarré %s" + +#, c-format +msgid "Module %s version %s is loaded" +msgstr "Le Module %s version %s est chargé" + +#, c-format +msgid "Module %s is not loaded" +msgstr "Le Module %s n'est pas chargé" + +#, c-format +msgid "CRITICAL - Value '%s' does not exist!" +msgstr "CRITIQUE: Le valeur '%s' n'existe pas!" + +#, c-format +msgid "%s is %lu|%s=%lu;%lu;%lu;;" +msgstr "%s est %lu|%s=%lu;%lu;%lu;;" + +msgid "Nothing to check!\n" +msgstr "Rien à vérifier!\n" + +msgid "Server port an integer\n" +msgstr "Le port du serveur doit être un nombre entier\n" + +msgid "This plugin attempts to contact the MRTGEXT NLM running on a" +msgstr "Ce plugin essaye de contacter le NLM MRTGEXT qui s'exécute sur" + +msgid "Novell server to gather the requested system information." +msgstr "un serveur Novell pour récupérer l'information système demandée." + +msgid "Variable to check. Valid variables include:" +msgstr "Variable à vérifier. Les variables valides sont:" + +msgid "LOAD1 = 1 minute average CPU load" +msgstr "" + +msgid "LOAD5 = 5 minute average CPU load" +msgstr "" + +msgid "LOAD15 = 15 minute average CPU load" +msgstr "" + +msgid "CSPROCS = number of current service processes (NW 5.x only)" +msgstr "CSPROCS = nombres de processus services actuels (NW 5.x seulement)" + +msgid "ABENDS = number of abended threads (NW 5.x only)" +msgstr "" + +msgid "UPTIME = server uptime" +msgstr "" + +msgid "LTCH = percent long term cache hits" +msgstr "" + +msgid "CBUFF = current number of cache buffers" +msgstr "" + +msgid "CDBUFF = current number of dirty cache buffers" +msgstr "" + +msgid "DCB = dirty cache buffers as a percentage of the total" +msgstr "" + +msgid "TCB = dirty cache buffers as a percentage of the original" +msgstr "" + +msgid "OFILES = number of open files" +msgstr "" + +msgid " VMF = MB of free space on Volume " +msgstr "" + +msgid " VMU = MB used space on Volume " +msgstr "" + +msgid " VMP = MB of purgeable space on Volume " +msgstr "" + +msgid " VPF = percent free space on volume " +msgstr "" + +msgid " VKF = KB of free space on volume " +msgstr "" + +msgid " VPP = percent purgeable space on volume " +msgstr "" + +msgid " VKP = KB of purgeable space on volume " +msgstr "" + +msgid " VPNP = percent not yet purgeable space on volume " +msgstr "" + +msgid " VKNP = KB of not yet purgeable space on volume " +msgstr "" + +msgid " LRUM = LRU sitting time in minutes" +msgstr "" + +msgid " LRUS = LRU sitting time in seconds" +msgstr " LRUS = LRU temps d'attente en secondes" + +msgid " DSDB = check to see if DS Database is open" +msgstr "" + +msgid " DSVER = NDS version" +msgstr "" + +msgid " UPRB = used packet receive buffers" +msgstr " UPRB = paquets du tampon de réception utilisés" + +msgid " PUPRB = percent (of max) used packet receive buffers" +msgstr "" + +msgid " SAPENTRIES = number of entries in the SAP table" +msgstr "" + +msgid " SAPENTRIES = number of entries in the SAP table for SAP type " +msgstr " SAPENTRIES = entrées dans la table SAP pour le type SAP " + +msgid " TSYNC = timesync status" +msgstr "" + +msgid " LOGINS = check to see if logins are enabled" +msgstr "" + +msgid " CONNS = number of currently licensed connections" +msgstr "" + +msgid " NRMH\t= NRM Summary Status" +msgstr "" + +msgid " NRMP = Returns the current value for a NRM health item" +msgstr "" + +msgid " NRMM = Returns the current memory stats from NRM" +msgstr "" + +msgid " NRMS = Returns the current Swapfile stats from NRM" +msgstr "" + +msgid " NSS1 = Statistics from _Admin:Manage_NSS\\GeneralStats.xml" +msgstr "" + +msgid " NSS3 = Statistics from _Admin:Manage_NSS\\NameCache.xml" +msgstr "" + +msgid " NSS4 = Statistics from _Admin:Manage_NSS\\FileStats.xml" +msgstr "" + +msgid " NSS5 = Statistics from _Admin:Manage_NSS\\ObjectCache.xml" +msgstr "" + +msgid " NSS6 = Statistics from _Admin:Manage_NSS\\Thread.xml" +msgstr "" + +msgid "" +" NSS7 = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml" +msgstr "" + +msgid " NLM: = check if NLM is loaded and report version" +msgstr "" + +msgid " (e.g. NLM:TSANDS.NLM)" +msgstr "" + +msgid "Include server version string in results" +msgstr "" + +msgid "- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG" +msgstr "" + +msgid "" +" extension for NetWare be loaded on the Novell servers you wish to check." +msgstr "" + +msgid " (available from http://www.engr.wisc.edu/~drews/mrtg/)" +msgstr " (disponible depuis http://www.engr.wisc.edu/~drews/mrtg/)" + +msgid "" +"- Values for critical thresholds should be lower than warning thresholds" +msgstr "" + +msgid "" +" when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, " +msgstr "" + +msgid " TCB, LRUS and LRUM." +msgstr "" + +msgid "Unknown error fetching load data\n" +msgstr "" +"Erreur inconnue lors de la récupération des données de charge système\n" + +msgid "Invalid response from server - no load information\n" +msgstr "Réponse invalide du serveur - pas d'information de charge système\n" + +msgid "Invalid response from server after load 1\n" +msgstr "Réponse invalide du serveur après charge système à 1 minute\n" + +msgid "Invalid response from server after load 5\n" +msgstr "Réponse invalide du serveur après charge système à 5 minute\n" + +#, c-format +msgid "Load %s - %s-min load average = %0.2f" +msgstr "Charge %s - %s-moyenne minimale de charge système = %0.2f" + +msgid "Unknown error fetching disk data\n" +msgstr "Erreur inconnue en récupérant les données des disques\n" + +msgid "Invalid response from server\n" +msgstr "Réponse invalide reçue du serveur\n" + +msgid "Unknown error fetching network status\n" +msgstr "Erreur inconnue lors de la réception de l'état du réseau\n" + +#, c-format +msgid "Net %s - %d connection%s on port %d" +msgstr "Net %s - %d connections%s sur le port %d" + +msgid "Unknown error fetching process status\n" +msgstr "Erreur inconnue en récupérant l'état des processus\n" + +#, c-format +msgid "Process %s - %d instance%s of %s running" +msgstr "Processus %s - %d instances%s de %s démarrées" + +#, c-format +msgid "Uptime %s - Up %d days %d hours %d minutes" +msgstr "Temps de fonctionnement %s - Up %d jours %d heures %d minutes" + +msgid "" +"This plugin attempts to contact the Over-CR collector daemon running on the" +msgstr "" +"Ce plugin essaye de joindre le service Over CR tournant sur le serveur UNIX" + +msgid "remote UNIX server in order to gather the requested system information." +msgstr "distant afin de récupérer les informations système demandées." + +msgid "LOAD1 = 1 minute average CPU load" +msgstr "" + +msgid "LOAD5 = 5 minute average CPU load" +msgstr "" + +msgid "LOAD15 = 15 minute average CPU load" +msgstr "" + +msgid "DPU = percent used disk space on filesystem " +msgstr "" + +msgid "PROC = number of running processes with name " +msgstr "" + +msgid "NET = number of active connections on TCP port " +msgstr "" + +msgid "UPTIME = system uptime in seconds" +msgstr "" + +msgid "This plugin requires that Eric Molitors' Over-CR collector daemon be" +msgstr "Ce plugin requiert que le daemon collecteur Over-CR d'Eric Molitors" + +msgid "running on the remote server." +msgstr "soit fonctionnel sur le serveur distant" + +msgid "Over-CR can be downloaded from http://www.molitor.org/overcr" +msgstr "" + +msgid "This plugin was tested with version 0.99.53 of the Over-CR collector" +msgstr "Ce plugin a été testé avec la version 0.99.53 su collecteur Over-CR" + +msgid "" +"For the available options, the critical threshold value should always be" +msgstr "" +"Pour toutes les options disponibles, le seuil critique doit toujours être" + +msgid "" +"higher than the warning threshold value, EXCEPT with the uptime variable" +msgstr "plus grand que le seuil d'alerte SAUF pour l'option uptime" + +#, c-format +msgid "CRITICAL - no connection to '%s' (%s).\n" +msgstr "CRITIQUE - pas de connexion à '%s' (%s).\n" + +#, fuzzy, c-format +msgid " %s - database %s (%f sec.)|%s\n" +msgstr " %s - base de données %s (%d sec.)|%s\n" + +msgid "Critical threshold must be a positive integer" +msgstr "Le seuil critique doit être un entier positif" + +msgid "Warning threshold must be a positive integer" +msgstr "Le seuil d'avertissement doit être un entier positif" + +#, fuzzy +msgid "Database name exceeds the maximum length" +msgstr "Le nom de la base de données est invalide" + +msgid "User name is not valid" +msgstr "Le nom de l'utilisateur est invalide" + +#, c-format +msgid "Test whether a PostgreSQL Database is accepting connections." +msgstr "Teste si une base de données Postgresql accepte les connections." + +msgid "Database to check " +msgstr "" + +#, fuzzy, c-format +msgid "(default: %s)\n" +msgstr "(Défaut: %d)\n" + +msgid "Login name of user" +msgstr "Le nom d'un utilisateur" + +msgid "Password (BIG SECURITY ISSUE)" +msgstr "" + +msgid "Connection parameters (keyword = value), see below" +msgstr "" + +msgid "SQL query to run. Only first column in first row will be read" +msgstr "" + +msgid "A name for the query, this string is used instead of the query" +msgstr "" + +msgid "in the long output of the plugin" +msgstr "" + +#, fuzzy +msgid "SQL query value to result in warning status (double)" +msgstr "Décalage résultant en un avertissement (secondes)" + +#, fuzzy +msgid "SQL query value to result in critical status (double)" +msgstr "Décalage résultant en un état critique (secondes)" + +msgid "All parameters are optional." +msgstr "" + +msgid "" +"This plugin tests a PostgreSQL DBMS to determine whether it is active and" +msgstr "" + +msgid "accepting queries. In its current operation, it simply connects to the" +msgstr "" + +msgid "" +"specified database, and then disconnects. If no database is specified, it" +msgstr "" + +msgid "" +"connects to the template1 database, which is present in every functioning" +msgstr "" + +msgid "PostgreSQL DBMS." +msgstr "" + +msgid "If a query is specified using the -q option, it will be executed after" +msgstr "" + +msgid "connecting to the server. The result from the query has to be numeric." +msgstr "" + +msgid "" +"Multiple SQL commands, separated by semicolon, are allowed but the result " +msgstr "" + +msgid "of the last command is taken into account only. The value of the first" +msgstr "" + +msgid "" +"column in the first row is used as the check result. If a second column is" +msgstr "" + +msgid "present in the result set, this is added to the plugin output with a" +msgstr "" + +msgid "" +"prefix of \"Extra Info:\". This information can be displayed in the system" +msgstr "" + +msgid "executing the plugin." +msgstr "" + +msgid "" +"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual" +msgstr "" + +msgid "" +"for details about how to access internal statistics of the database server." +msgstr "" + +msgid "" +"For a list of available connection parameters which may be used with the -o" +msgstr "" + +msgid "" +"command line option, see the documentation for PQconnectdb() in the chapter" +msgstr "" + +msgid "" +"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be" +msgstr "" + +msgid "" +"used to specify a service name in pg_service.conf to be used for additional" +msgstr "" + +msgid "connection parameters: -o 'service=' or to specify the SSL mode:" +msgstr "" + +msgid "-o 'sslmode=require'." +msgstr "" + +msgid "" +"The plugin will connect to a local postmaster if no host is specified. To" +msgstr "" +"Ce plugin va se connecter sur un postmaster local si aucun hôte n'est " +"spécifié." + +msgid "" +"connect to a remote host, be sure that the remote postmaster accepts TCP/IP" +msgstr "" + +msgid "connections (start the postmaster with the -i option)." +msgstr "" + +msgid "" +"Typically, the monitoring user (unless the --logname option is used) should " +"be" +msgstr "" + +msgid "" +"able to connect to the database without a password. The plugin can also send" +msgstr "" + +msgid "a password, but no effort is made to obscure or encrypt the password." +msgstr "" + +#, c-format +msgid "QUERY %s - %s: %s.\n" +msgstr "" + +msgid "Error with query" +msgstr "" + +#, fuzzy +msgid "No rows returned" +msgstr "Pas de données valides reçues" + +#, fuzzy +msgid "No columns returned" +msgstr "Pas de données valides reçues" + +#, fuzzy +msgid "No data returned" +msgstr "Pas de données valides reçues" + +msgid "Is not a numeric" +msgstr "" + +#, fuzzy, c-format +msgid "%s returned %f" +msgstr ". %s renvoie %s" + +#, fuzzy, c-format +msgid "'%s' returned %f" +msgstr ". %s renvoie %s" + +msgid "CRITICAL - Could not interpret output from ping command\n" +msgstr "CRITIQUE - Impossible d'interpréter le réponse de la commande ping\n" + +#, c-format +msgid "PING %s - %sPacket loss = %d%%" +msgstr "PING %s - %s Paquets perdus = %d%%" + +#, c-format +msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms" +msgstr "PING %s - %s Paquets perdus = %d%%, RTA = %2.2f ms" + +msgid "Could not realloc() addresses\n" +msgstr "Impossible de réallouer les adresses\n" + +#, c-format +msgid " (%s) must be a non-negative number\n" +msgstr " (%s) doit être un nombre positif\n" + +#, c-format +msgid " (%s) must be an integer percentage\n" +msgstr " (%s) doit être un pourcentage entier\n" + +#, c-format +msgid " (%s) must be an integer percentage\n" +msgstr " (%s) doit être un pourcentage entier\n" + +#, c-format +msgid " (%s) must be a non-negative number\n" +msgstr " (%s) doit être un nombre positif\n" + +#, c-format +msgid " (%s) must be a non-negative number\n" +msgstr " (%s) doit être un nombre positif\n" + +#, c-format +msgid "" +"%s: Warning threshold must be integer or percentage!\n" +"\n" +msgstr "%s: Le seuil d'avertissement doit être un entier ou un pourcentage!\n" + +#, c-format +msgid " was not set\n" +msgstr " n'a pas été indiqué\n" + +#, c-format +msgid " was not set\n" +msgstr " n'a pas été indiqué\n" + +#, c-format +msgid " was not set\n" +msgstr " n'a pas été indiqué\n" + +#, c-format +msgid " was not set\n" +msgstr " n'a pas été indiqué\n" + +#, c-format +msgid " (%f) cannot be larger than (%f)\n" +msgstr " (%f) ne peut pas être plus large que (%f)\n" + +#, c-format +msgid " (%d) cannot be larger than (%d)\n" +msgstr " (%d) ne peut pas être plus large que (%d)\n" + +#, c-format +msgid "Cannot open stderr for %s\n" +msgstr "Impossible d'ouvrir le canal d'erreur standard pour %s\n" + +msgid "System call sent warnings to stderr " +msgstr "" +"Les appel système enverront leurs messages d'avertissement vers le canal " +"d'erreur standard" + +#, fuzzy, c-format +msgid "CRITICAL - Network Unreachable (%s)\n" +msgstr "CRITIQUE - Le réseau est inaccessible (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Host Unreachable (%s)\n" +msgstr "CRITIQUE - Hôte inaccessible (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n" +msgstr "CRITIQUE - Paquet ICMP incorrect: Port inaccessible (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n" +msgstr "CRITIQUE - Paquet ICMP incorrect: Protocole inaccessible (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Network Prohibited (%s)\n" +msgstr "CRITIQUE - L'accès au réseau est interdit (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Host Prohibited (%s)\n" +msgstr "CRITIQUE - L'accès a l'hôte est interdit (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Packet Filtered (%s)\n" +msgstr "CRITIQUE - Paquet filtré (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Host not found (%s)\n" +msgstr "CRITIQUE - Hôte non trouvé (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Time to live exceeded (%s)\n" +msgstr "CRITIQUE - La durée de vie du paquet est dépassée (%s)" + +#, fuzzy, c-format +msgid "CRITICAL - Destination Unreachable (%s)\n" +msgstr "CRITIQUE - Hôte inaccessible (%s)" + +#, fuzzy +msgid "Unable to realloc warn_text\n" +msgstr "Impossible de réattribuer le texte d'avertissement" + +#, c-format +msgid "Use ping to check connection statistics for a remote host." +msgstr "" +"Utilise ping pour vérifier les statistiques de connections d'un hôte distant." + +msgid "host to ping" +msgstr "hôte à tester" + +msgid "number of ICMP ECHO packets to send" +msgstr "nombre de paquets ICMP à envoyer" + +#, c-format +msgid "(Default: %d)\n" +msgstr "(Défaut: %d)\n" + +msgid "show HTML in the plugin output (obsoleted by urlize)" +msgstr "" + +msgid "THRESHOLD is ,% where is the round trip average travel" +msgstr "" +"Le seuil est ,% où est le temps moyen pour l'aller retour (ms)" + +msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the" +msgstr "qui déclenche un résultat AVERTISSEMENT ou CRITIQUE, et est le " + +msgid "percentage of packet loss to trigger an alarm state." +msgstr "pourcentage de paquets perdus pour déclencher une alarme." + +msgid "" +"This plugin uses the ping command to probe the specified host for packet loss" +msgstr "" +"Ce plugin utilise la commande ping pour vérifier l'hôte spécifié pour les " +"pertes de paquets" + +msgid "" +"(percentage) and round trip average (milliseconds). It can produce HTML " +"output" +msgstr "" + +msgid "" +"linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in" +msgstr "" + +msgid "the contrib area of the downloads section at http://www.nagios.org/" +msgstr "" + +#, c-format +msgid "CMD: %s\n" +msgstr "Commande: %s\n" + +msgid "System call sent warnings to stderr" +msgstr "" +"L'appel système à retourné des avertissement vers le canal d'erreur standard" + +#, c-format +msgid "Not parseable: %s" +msgstr "Impossible de parcourir les arguments: %s" + +#, c-format +msgid "Unable to read output\n" +msgstr "Impossible de lire les données en entrée\n" + +#, c-format +msgid "%d warn out of " +msgstr "%d avertissements sur" + +#, c-format +msgid "%d crit, %d warn out of " +msgstr "%d crit, %d alertes sur " + +#, c-format +msgid " with %s" +msgstr " avec %s" + +msgid "Parent Process ID must be an integer!" +msgstr "L'identifiant du processus parent doit être un entier!" + +#, c-format +msgid "%s%sSTATE = %s" +msgstr "%s%sETAT = %s" + +msgid "UID was not found" +msgstr "L'UID n'a pas été trouvé" + +msgid "User name was not found" +msgstr "L'utilisateur n'a pas été trouvé" + +#, c-format +msgid "%s%scommand name '%s'" +msgstr "%s%snom de la commande '%s'" + +#, c-format +msgid "%s%sexclude progs '%s'" +msgstr "" + +msgid "RSS must be an integer!" +msgstr "RSS doit être un entier!" + +msgid "VSZ must be an integer!" +msgstr "VSZ doit être un entier!" + +msgid "PCPU must be a float!" +msgstr "PCPU doit être un nombre en virgule flottante!" + +msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!" +msgstr "Metric doit être l'un des PROCS, VSZ, RSS, CPU, ELAPSED!" + +msgid "" +"Checks all processes and generates WARNING or CRITICAL states if the " +"specified" +msgstr "" + +msgid "" +"metric is outside the required threshold ranges. The metric defaults to " +"number" +msgstr "" + +msgid "" +"of processes. Search filters can be applied to limit the processes to check." +msgstr "" + +msgid "Generate warning state if metric is outside this range" +msgstr "" + +msgid "Generate critical state if metric is outside this range" +msgstr "" + +msgid "Check thresholds against metric. Valid types:" +msgstr "" + +msgid "PROCS - number of processes (default)" +msgstr "PROCS - nombre de processus (défaut)" + +msgid "VSZ - virtual memory size" +msgstr "VSZ - taille mémoire virtuelle" + +msgid "RSS - resident set memory size" +msgstr "" + +msgid "CPU - percentage CPU" +msgstr "CPU - pourcentage du processeur" + +msgid "ELAPSED - time elapsed in seconds" +msgstr "ELAPSED - temps écoulé en secondes" + +msgid "Extra information. Up to 3 verbosity levels" +msgstr "informations supplémentaires. Jusqu'à 3 niveaux de verbosité" + +msgid "Filter own process the traditional way by PID instead of /proc/pid/exe" +msgstr "" + +msgid "Only scan for processes that have, in the output of `ps`, one or" +msgstr "" + +msgid "more of the status flags you specify (for example R, Z, S, RS," +msgstr "" + +msgid "RSZDT, plus others based on the output of your 'ps' command)." +msgstr "" + +msgid "Only scan for children of the parent process ID indicated." +msgstr "" + +msgid "Only scan for processes with VSZ higher than indicated." +msgstr "" + +msgid "Only scan for processes with RSS higher than indicated." +msgstr "" + +msgid "Only scan for processes with PCPU higher than indicated." +msgstr "" + +msgid "Only scan for processes with user name or ID indicated." +msgstr "" + +msgid "Only scan for processes with args that contain STRING." +msgstr "" + +msgid "Only scan for processes with args that contain the regex STRING." +msgstr "" + +msgid "Only scan for exact matches of COMMAND (without path)." +msgstr "" + +msgid "Exclude processes which match this comma separated list" +msgstr "" + +msgid "Only scan for non kernel threads (works on Linux only)." +msgstr "" + +#, c-format +msgid "" +"\n" +"RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n" +"specified 'max:min', a warning status will be generated if the\n" +"count is inside the specified range\n" +"\n" +msgstr "" +"\n" +"Les seuils sont spécifiés 'min:max' or 'min:' or ':max' (or 'max').\n" +"Si spécifié 'max:min', un avertissement sera généré si le nombre\n" +"est à l'intérieur du seuil\n" +"\n" + +#, c-format +msgid "" +"This plugin checks the number of currently running processes and\n" +"generates WARNING or CRITICAL states if the process count is outside\n" +"the specified threshold ranges. The process count can be filtered by\n" +"process owner, parent process PID, current state (e.g., 'Z'), or may\n" +"be the total number of running processes\n" +"\n" +msgstr "" +"Ce plugin vérifie le nombre de processus actifs et génère un résultat \n" +"AVERTISSEMENT ou CRITIQUE si le nombre de processus est au dessus du seuil\n" +"spécifié. Le total des processus peut être filtré par propriétaire, " +"processus parent,\n" +"état actuel (ex: 'Z'), ou par le nombre de processus en cours d'exécution\n" +"\n" + +msgid "Warning if not two processes with command name portsentry." +msgstr "" + +msgid "Critical if < 2 or > 1024 processes" +msgstr "" + +msgid "Critical if not at least 1 process with command sshd" +msgstr "" + +msgid "Warning if > 1024 processes with command name sshd." +msgstr "" + +msgid "Critical if < 1 processes with command name sshd." +msgstr "" + +msgid "Warning alert if > 10 processes with command arguments containing" +msgstr "" + +msgid "'/usr/local/bin/perl' and owned by root" +msgstr "" + +msgid "Alert if VSZ of any processes over 50K or 100K" +msgstr "" + +msgid "Alert if CPU of any processes over 10% or 20%" +msgstr "" + +#, fuzzy +msgid "Config file error\n" +msgstr "Erreur dans le fichier de configuration" + +#, fuzzy +msgid "Out of Memory?\n" +msgstr "Manque de Mémoire?" + +#, fuzzy +msgid "Invalid NAS-Identifier\n" +msgstr "NAS-Identifier invalide" + +#, c-format +msgid "gethostname() failed!\n" +msgstr "La commande gethostname() à échoué\n" + +#, fuzzy +msgid "Invalid NAS-IP-Address\n" +msgstr "NAS-IP-Address invalide" + +#, fuzzy +msgid "Timeout\n" +msgstr "Temps dépassé" + +#, fuzzy +msgid "Auth Error\n" +msgstr "Erreur d'authentification" + +#, fuzzy +msgid "Auth Failed\n" +msgstr "L'authentification à échoué" + +#, fuzzy +msgid "Bad Response\n" +msgstr "Réponse invalide" + +#, fuzzy +msgid "Auth OK\n" +msgstr "L'authentification à réussi" + +#, c-format +msgid "Unexpected result code %d" +msgstr "Résultat inattendu: %d" + +msgid "Number of retries must be a positive integer" +msgstr "Le nombre d'essai doit être un entier positif" + +msgid "User not specified" +msgstr "L'utilisateur n'a pas été spécifié" + +msgid "Password not specified" +msgstr "Le mot de passe n'a pas été spécifié" + +msgid "Configuration file not specified" +msgstr "Le fichier de configuration n'a pas été spécifié" + +msgid "Tests to see if a RADIUS server is accepting connections." +msgstr "Teste si un serveur RADIUS accepte les connections." + +msgid "The user to authenticate" +msgstr "" + +msgid "Password for authentication (SECURITY RISK)" +msgstr "" + +msgid "NAS identifier" +msgstr "" + +msgid "NAS IP Address" +msgstr "Adresse IP NAS" + +msgid "Configuration file" +msgstr "Fichier de configuration" + +msgid "Response string to expect from the server" +msgstr "" + +msgid "Number of times to retry a failed connection" +msgstr "" + +msgid "" +"This plugin tests a RADIUS server to see if it is accepting connections." +msgstr "" +"Ce plugin teste un serveur RADIUS afin de vérifier si il accepte les " +"connections." + +msgid "" +"The server to test must be specified in the invocation, as well as a user" +msgstr "" + +msgid "name and password. A configuration file must be present. The format of" +msgstr "" + +msgid "" +"the configuration file is described in the radiusclient library sources." +msgstr "" + +msgid "The password option presents a substantial security issue because the" +msgstr "" + +msgid "" +"password can possibly be determined by careful watching of the command line" +msgstr "" + +msgid "in a process listing. This risk is exacerbated because the plugin will" +msgstr "" + +msgid "" +"typically be executed at regular predictable intervals. Please be sure that" +msgstr "" + +msgid "the password used does not allow access to sensitive system resources." +msgstr "" + +#, c-format +msgid "Unable to connect to %s on port %d\n" +msgstr "Impossible de se connecter à %s sur le port %d\n" + +#, c-format +msgid "No data received from %s\n" +msgstr "Pas de données reçues de %s\n" + +msgid "Invalid REAL response received from host" +msgstr "Réponses REAL invalide reçue de l'hôte" + +#, c-format +msgid "Invalid REAL response received from host on port %d\n" +msgstr "Réponses REAL invalide reçue de l'hôte sur le port %d\n" + +#, c-format +msgid "No data received from host\n" +msgstr "Pas de données reçues de l'hôte\n" + +#, c-format +msgid "REAL %s - %d second response time\n" +msgstr "REAL %s - %d secondes de temps de réponse\n" + +msgid "Warning time must be a positive integer" +msgstr "Le seuil d'avertissement doit être un entier positif" + +msgid "Critical time must be a positive integer" +msgstr "Le seuil critique doit être un entier positif" + +msgid "You must provide a server to check" +msgstr "Vous devez fournir un serveur à vérifier" + +msgid "This plugin tests the REAL service on the specified host." +msgstr "Ce plugin teste le service REAL sur l'hôte spécifié." + +msgid "Connect to this url" +msgstr "" + +#, c-format +msgid "String to expect in first line of server response (default: %s)\n" +msgstr "" +"Texte attendu dans la première ligne de réponse du serveur (défaut: %s)\n" + +msgid "This plugin will attempt to open an RTSP connection with the host." +msgstr "Ce plugin va essayer d'ouvrir un connexion RTSP avec l'hôte." + +msgid "Successful connects return STATE_OK, refusals and timeouts return" +msgstr "" + +msgid "" +"STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful connects," +msgstr "" + +msgid "" +"but incorrect response messages from the host result in STATE_WARNING return" +msgstr "" + +msgid "values." +msgstr "" + +#, c-format +msgid "malloc() failed!\n" +msgstr "l'allocation mémoire à échoué!\n" + +#, c-format +msgid "CRITICAL - Cannot create SSL context.\n" +msgstr "CRITIQUE - Impossible de créer le contexte SSL.\n" + +#, c-format +msgid "recv() failed\n" +msgstr "La commande recv() à échoué\n" + +#, c-format +msgid "WARNING - TLS not supported by server\n" +msgstr "AVERTISSEMENT: - TLS n'est pas supporté par ce serveur\n" + +#, c-format +msgid "Server does not support STARTTLS\n" +msgstr "Le serveur ne supporte pas STARTTLS\n" + +msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS." +msgstr "" + +#, c-format +msgid "sent %s" +msgstr "envoyé %s" + +msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS." +msgstr "" + +#, c-format +msgid "Invalid SMTP response received from host: %s\n" +msgstr "Réponse SMTP reçue de l'hôte invalide: %s\n" + +#, c-format +msgid "Invalid SMTP response received from host on port %d: %s\n" +msgstr "Réponse SMTP reçue de l'hôte sur le port %d invalide: %s\n" + +#, c-format +msgid "Could Not Compile Regular Expression" +msgstr "Impossible de compiler l'expression rationnelle" + +#, c-format +msgid "SMTP %s - Invalid response '%s' to command '%s'\n" +msgstr "SMTP %s - réponse invalide de '%s' à la commande '%s'\n" + +#, c-format +msgid "Execute Error: %s\n" +msgstr "Erreur d'exécution: %s\n" + +msgid "no authuser specified, " +msgstr "Pas d'utilisateur pour l'authentification spécifié, " + +msgid "no authpass specified, " +msgstr "pas de mot de passe spécifié, " + +#, c-format +msgid "sent %s\n" +msgstr "envoyé %s\n" + +msgid "recv() failed after AUTH LOGIN, " +msgstr "recv() à échoué après AUTH LOGIN, " + +#, c-format +msgid "received %s\n" +msgstr "reçu %s\n" + +msgid "invalid response received after AUTH LOGIN, " +msgstr "Réponse invalide reçue après AUTH LOGIN, " + +msgid "recv() failed after sending authuser, " +msgstr "La commande recv() a échoué après authuser, " + +msgid "invalid response received after authuser, " +msgstr "Réponse invalide reçue après authuser, " + +msgid "recv() failed after sending authpass, " +msgstr "la commande recv() à échoué après authpass, " + +msgid "invalid response received after authpass, " +msgstr "Réponse invalide reçue après authpass, " + +msgid "only authtype LOGIN is supported, " +msgstr "seul la méthode d'authentification LOGIN est supportée, " + +#, c-format +msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n" +msgstr "SMTP %s - %s%.3f sec. de temps de réponse%s%s|%s\n" + +#, c-format +msgid "Could not realloc() units [%d]\n" +msgstr "Impossible de réallouer des unités [%d]\n" + +#, fuzzy +msgid "Critical time must be a positive" +msgstr "Le seuil critique doit être un entier positif" + +#, fuzzy +msgid "Warning time must be a positive" +msgstr "Le seuil d'avertissement doit être un entier positif" + +msgid "SSL support not available - install OpenSSL and recompile" +msgstr "SSL n'est pas disponible - installer OpenSSL et recompilez" + +msgid "Set either -s/--ssl/--tls or -S/--starttls" +msgstr "Définissez -s/--ssl/--tls ou -S/--starttls" + +#, c-format +msgid "Connection closed by server before sending QUIT command\n" +msgstr "" + +#, c-format +msgid "recv() failed after QUIT." +msgstr "recv() à échoué après QUIT." + +#, c-format +msgid "Connection reset by peer." +msgstr "" + +msgid "This plugin will attempt to open an SMTP connection with the host." +msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte." + +#, c-format +msgid " String to expect in first line of server response (default: '%s')\n" +msgstr "" +" Texte attendu dans la première ligne de réponse du serveur (défaut: " +"'%s')\n" + +msgid "SMTP command (may be used repeatedly)" +msgstr "Commande SMTP (peut être utilisé plusieurs fois)" + +msgid "Expected response to command (may be used repeatedly)" +msgstr "" + +msgid "FROM-address to include in MAIL command, required by Exchange 2000" +msgstr "" + +msgid "FQDN used for HELO" +msgstr "" + +msgid "Use PROXY protocol prefix for the connection." +msgstr "Utiliser le préfixe du protocole PROXY pour la connexion." + +msgid "Minimum number of days a certificate has to be valid." +msgstr "Nombre de jours minimum pour que le certificat soit valide." + +#, fuzzy +msgid "Use SSL/TLS for the connection." +msgstr "Utiliser SSL/TLS pour la connexion." + +#, c-format +msgid " Sets default port to %d.\n" +msgstr " Définit le port par défaut à %d.\n" + +msgid "Use STARTTLS for the connection." +msgstr "Utiliser STARTTLS pour la connexion." + +msgid "SMTP AUTH type to check (default none, only LOGIN supported)" +msgstr "" + +msgid "SMTP AUTH username" +msgstr "" + +msgid "SMTP AUTH password" +msgstr "" + +msgid "Send LHLO instead of HELO/EHLO" +msgstr "" + +msgid "Ignore failure when sending QUIT command to server" +msgstr "" + +msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful" +msgstr "" + +msgid "connects, but incorrect response messages from the host result in" +msgstr "" + +msgid "STATE_WARNING return values." +msgstr "" + +msgid "Cannot malloc" +msgstr "" + +#, c-format +msgid "External command error: %s\n" +msgstr "Erreur d'exécution de commande externe: %s\n" + +#, c-format +msgid "External command error with no output (return code: %d)\n" +msgstr "" + +#, fuzzy, c-format +msgid "No valid data returned (%s)\n" +msgstr "Pas de données valides reçues" + +msgid "Time duration between plugin calls is invalid" +msgstr "" + +msgid "Cannot asprintf()" +msgstr "" + +#, fuzzy +msgid "Cannot realloc()" +msgstr "Impossible de réallouer des unités\n" + +msgid "No previous data to calculate rate - assume okay" +msgstr "" + +msgid "Retries interval must be a positive integer" +msgstr "L'intervalle pour les essais doit être un entier positif" + +#, fuzzy +msgid "Exit status must be a positive integer" +msgstr "Maxbytes doit être un entier positif" + +#, c-format +msgid "Could not reallocate labels[%d]" +msgstr "Impossible de réallouer des labels[%d]" + +msgid "Could not reallocate labels\n" +msgstr "Impossible de réallouer des labels\n" + +#, c-format +msgid "Could not reallocate units [%d]\n" +msgstr "Impossible de réallouer des unités [%d]\n" + +msgid "Could not realloc() units\n" +msgstr "Impossible de réallouer des unités\n" + +#, fuzzy +msgid "Rate multiplier must be a positive integer" +msgstr "La taille du paquet doit être un entier positif" + +msgid "No host specified\n" +msgstr "Pas d'hôte spécifié\n" + +msgid "No OIDs specified\n" +msgstr "Pas de compteur spécifié\n" + +#, c-format +msgid "Required parameter: %s\n" +msgstr "" + +msgid "Invalid seclevel" +msgstr "" + +msgid "Invalid SNMP version" +msgstr "Version de SNMP invalide" + +msgid "Unbalanced quotes\n" +msgstr "Guillemets manquants\n" + +#, c-format +msgid "multiplier set (%.1f), but input is not a number: %s" +msgstr "" + +msgid "Check status of remote machines and obtain system information via SNMP" +msgstr "" +"Vérifie l'état des machines distantes et obtient l'information système via " +"SNMP" + +msgid "Use SNMP GETNEXT instead of SNMP GET" +msgstr "Utiliser SNMP GETNEXT au lieu de SNMP GET" + +msgid "SNMP protocol version" +msgstr "Version du protocole SNMP" + +#, fuzzy +msgid "SNMPv3 context" +msgstr "Nom d'utilisateur SNMPv3" + +msgid "SNMPv3 securityLevel" +msgstr "Niveau de sécurité SNMPv3 (securityLevel)" + +msgid "SNMPv3 auth proto" +msgstr "Protocole d'authentification SNMPv3" + +msgid "SNMPv3 priv proto (default DES)" +msgstr "" + +msgid "Optional community string for SNMP communication" +msgstr "Communauté optionnelle pour la communication SNMP" + +msgid "default is" +msgstr "défaut:" + +msgid "SNMPv3 username" +msgstr "Nom d'utilisateur SNMPv3" + +msgid "SNMPv3 authentication password" +msgstr "Mot de passe d'authentification SNMPv3" + +msgid "SNMPv3 privacy password" +msgstr "Mot de passe de confidentialité SNMPv3" + +msgid "Object identifier(s) or SNMP variables whose value you wish to query" +msgstr "" + +msgid "" +"List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'" +msgstr "" + +msgid "for symbolic OIDs.)" +msgstr "" + +msgid "Delimiter to use when parsing returned data. Default is" +msgstr "" + +msgid "Any data on the right hand side of the delimiter is considered" +msgstr "" + +msgid "to be the data that should be used in the evaluation." +msgstr "" + +msgid "If the check returns a 0 length string or NULL value" +msgstr "" + +msgid "This option allows you to choose what status you want it to exit" +msgstr "" + +msgid "Excluding this option renders the default exit of 3(STATE_UNKNOWN)" +msgstr "" + +msgid "0 = OK" +msgstr "" + +#, fuzzy +msgid "1 = WARNING" +msgstr "AVERTISSEMENT" + +#, fuzzy +msgid "2 = CRITICAL" +msgstr "CRITIQUE" + +#, fuzzy +msgid "3 = UNKNOWN" +msgstr "INCONNU" + +msgid "Warning threshold range(s)" +msgstr "Valeurs pour le seuil d'avertissement" + +msgid "Critical threshold range(s)" +msgstr "Valeurs pour le seuil critique" + +msgid "Enable rate calculation. See 'Rate Calculation' below" +msgstr "" + +msgid "" +"Converts rate per second. For example, set to 60 to convert to per minute" +msgstr "" + +msgid "Add/subtract the specified OFFSET to numeric sensor data" +msgstr "" + +msgid "Return OK state (for that OID) if STRING is an exact match" +msgstr "" + +msgid "" +"Return OK state (for that OID) if extended regular expression REGEX matches" +msgstr "" + +msgid "" +"Return OK state (for that OID) if case-insensitive extended REGEX matches" +msgstr "" + +msgid "Invert search result (CRITICAL if found)" +msgstr "" + +msgid "Prefix label for output from plugin" +msgstr "" + +msgid "Units label(s) for output data (e.g., 'sec.')." +msgstr "" + +msgid "Separates output on multiple OID requests" +msgstr "" + +msgid "Multiplies current value, 0 < n < 1 works as divider, defaults to 1" +msgstr "" + +msgid "C-style format string for float values (see option -M)" +msgstr "" + +msgid "" +"NOTE the final timeout value is calculated using this formula: " +"timeout_interval * retries + 5" +msgstr "" + +#, fuzzy +msgid "Number of retries to be used in the requests, default: " +msgstr "Le nombre d'essai pour les requêtes" + +msgid "Label performance data with OIDs instead of --label's" +msgstr "" + +msgid "Tell snmpget to not print errors encountered when parsing MIB files" +msgstr "" + +msgid "" +"This plugin uses the 'snmpget' command included with the NET-SNMP package." +msgstr "" + +msgid "" +"if you don't have the package installed, you will need to download it from" +msgstr "" +"Si vous n'avez pas le programme installé, vous devrez le télécharger depuis" + +msgid "http://net-snmp.sourceforge.net before you can use this plugin." +msgstr "http://net-snmp.sourceforge.net avant de pouvoir utiliser ce plugin." + +#, fuzzy +msgid "" +"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited " +msgstr "" +"- Des OIDs multiples peuvent être séparées par des virgules ou des espaces" + +#, fuzzy +msgid "list (lists with internal spaces must be quoted)." +msgstr "(Les liste avec espaces doivent être entre guillemets). Max:" + +msgid "" +"- When checking multiple OIDs, separate ranges by commas like '-w " +"1:10,1:,:20'" +msgstr "" + +msgid "- Note that only one string and one regex may be checked at present" +msgstr "" + +msgid "" +"- All evaluation methods other than PR, STR, and SUBSTR expect that the value" +msgstr "" + +msgid "returned from the SNMP query is an unsigned integer." +msgstr "" + +msgid "Rate Calculation:" +msgstr "" + +msgid "In many places, SNMP returns counters that are only meaningful when" +msgstr "" + +msgid "calculating the counter difference since the last check. check_snmp" +msgstr "" + +msgid "saves the last state information in a file so that the rate per second" +msgstr "" + +msgid "can be calculated. Use the --rate option to save state information." +msgstr "" + +msgid "" +"On the first run, there will be no prior state - this will return with OK." +msgstr "" + +msgid "The state is uniquely determined by the arguments to the plugin, so" +msgstr "" + +msgid "changing the arguments will create a new state file." +msgstr "" + +msgid "Port number must be a positive integer" +msgstr "Le numéro du port doit être un nombre entier positif" + +#, c-format +msgid "Server answer: %s" +msgstr "Réponse du serveur: %s" + +#, fuzzy, c-format +msgid "SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n" +msgstr "" +"SSH AVERTISSEMENT - %s (protocole %s) différence de version, attendu'%s'\n" + +#, fuzzy, c-format +msgid "" +"SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n" +msgstr "" +"SSH AVERTISSEMENT - %s (protocole %s) différence de version, attendu'%s'\n" + +#, fuzzy, c-format +msgid "SSH OK - %s (protocol %s) | %s\n" +msgstr "SSH OK - %s (protocole %s)\n" + +msgid "Try to connect to an SSH server at specified server and port" +msgstr "Essaye de se connecter à un serveur SSH précisé à un port précis" + +#, fuzzy +msgid "" +"Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)" +msgstr "" +"AVERTISSEMENT si la chaîne ne correspond pas à la version précisée (ex: " +"OpenSSH_3.9p1)" + +#, fuzzy +msgid "Alert if protocol doesn't match expected protocol version (ex: 2.0)" +msgstr "" +"AVERTISSEMENT si la chaîne ne correspond pas à la version précisée (ex: " +"OpenSSH_3.9p1)" + +#, c-format +msgid "Command: %s\n" +msgstr "Commande: %s\n" + +#, c-format +msgid "Format: %s\n" +msgstr "Format: %s\n" + +#, c-format +msgid "total=%.0f, used=%.0f, free=%.0f\n" +msgstr "total=%.0f, utilisé=%.0f, libre=%.0ff\n" + +#, c-format +msgid "total=%.0f, free=%.0f\n" +msgstr "total=%.0f, libre=%.0f\n" + +msgid "Error getting swap devices\n" +msgstr "" + +msgid "SWAP OK: No swap devices defined\n" +msgstr "SWAP OK: Pas de périphériques swap définis\n" + +msgid "swapctl failed: " +msgstr "swapctl à échoué:" + +msgid "Error in swapctl call\n" +msgstr "" + +#, fuzzy, c-format +msgid "SWAP %s - %d%% free (%dMB out of %dMB) %s|" +msgstr "SWAP %s - %d%% libre (%d MB sur un total de %d MB) %s|" + +#, fuzzy +msgid "Warning threshold percentage must be <= 100!" +msgstr "Le seuil d'avertissement doit être un entier positif" + +#, fuzzy +msgid "Warning threshold be positive integer or percentage!" +msgstr "Le seuil d'avertissement doit être un entier ou un pourcentage!" + +#, fuzzy +msgid "Critical threshold percentage must be <= 100!" +msgstr "le seuil critique doit être un entier positif" + +#, fuzzy +msgid "Critical threshold be positive integer or percentage!" +msgstr "Le seuil critique doit être un entier ou un pourcentage!" + +#, fuzzy +msgid "" +"no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " +"or integer (0-3)." +msgstr "" +"Le résultat de temps dépassé doit être un nom d'état valide (OK, WARNING, " +"CRITICAL, UNKNOWN) ou un nombre entier (0-3)." + +#, fuzzy +msgid "Warning should be more than critical" +msgstr "" +"Le pourcentage d'avertissement doit être plus important que le pourcentage " +"critique" + +msgid "Check swap space on local machine." +msgstr "Vérifie l'espace swap sur la machine locale." + +msgid "" +"Exit with WARNING status if less than INTEGER bytes of swap space are free" +msgstr "" +"Sortir avec un résultat AVERTISSEMENT si moins de X octets de mémoire " +"virtuelle sont libres" + +msgid "Exit with WARNING status if less than PERCENT of swap space is free" +msgstr "" +"Sortir avec un résultat AVERTISSEMENT si moins de X pour cent de mémoire " +"virtuelle est libre" + +msgid "" +"Exit with CRITICAL status if less than INTEGER bytes of swap space are free" +msgstr "" +"Sortir avec un résultat CRITIQUE si moins de X octets de mémoire virtuelle " +"sont libres" + +msgid "Exit with CRITICAL status if less than PERCENT of swap space is free" +msgstr "" +"Sortir avec un résultat CRITIQUE si moins de X pour cent de mémoire " +"virtuelle est libre" + +msgid "Conduct comparisons for all swap partitions, one by one" +msgstr "Vérifier chacune des partitions de mémoire virtuelle séparément" + +msgid "" +"Resulting state when there is no swap regardless of thresholds. Default:" +msgstr "" + +#, fuzzy +msgid "" +"Both INTEGER and PERCENT thresholds can be specified, they are all checked." +msgstr "Les seuils d'alerte et critiques peuvent être spécifiés avec -w et -c." + +msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s." +msgstr "" +"Sur AIX, si -a est spécifié, le plugin utilise lsps -a, sinon il utilise " +"lsps -s." + +msgid "CRITICAL - Generic check_tcp called with unknown service\n" +msgstr "" +"CRITIQUE -check_tcp version générique utilisé avec un service inconnu\n" + +msgid "With UDP checks, a send/expect string must be specified." +msgstr "" +"Avec la surveillance UDP, une chaîne d'envoi et un chaîne de réponse doit " +"être spécifiée." + +msgid "No arguments found" +msgstr "Pas de paramètres" + +msgid "Maxbytes must be a positive integer" +msgstr "Maxbytes doit être un entier positif" + +msgid "Refuse must be one of ok, warn, crit" +msgstr "Refuse doit être parmis ok, warn, crit" + +msgid "Mismatch must be one of ok, warn, crit" +msgstr "Mismatch doit être parmis ok, warn, crit" + +msgid "Delay must be a positive integer" +msgstr "Delay doit être un entier positif" + +msgid "You must provide a server address" +msgstr "Vous devez fournir une adresse serveur" + +msgid "Invalid hostname, address or socket" +msgstr "Adresse/Nom/Socket invalide" + +#, c-format +msgid "" +"This plugin tests %s connections with the specified host (or unix socket).\n" +"\n" +msgstr "" +"Ce plugin teste %s connections avec l'hôte spécifié (ou socket unix).\n" +"\n" + +#, fuzzy +msgid "" +"Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send " +"or quit option" +msgstr "" +"Permet d'utiliser \\n, \\r, \\t ou \\ dans la chaîne de caractères send ou " +"quit. Doit être placé avant ces dernières." + +msgid "Default: nothing added to send, \\r\\n added to end of quit" +msgstr "" +"Par défaut: Rien n'est ajouté à send, \\r\\n est ajouté à la fin de quit" + +msgid "String to send to the server" +msgstr "Chaîne de caractères à envoyer au serveur" + +msgid "String to expect in server response" +msgstr "Chaîne de caractères à attendre en réponse" + +msgid "(may be repeated)" +msgstr "(peut être utilisé plusieurs fois)" + +msgid "All expect strings need to occur in server response. Default is any" +msgstr "" +"Toutes les chaînes attendus (expect) doivent être repérés dans la réponse. " +"Par défaut, n'importe laquelle suffit." + +msgid "String to send server to initiate a clean close of the connection" +msgstr "Chaîne de caractères à envoyer pour fermer gracieusement la connection" + +msgid "Accept TCP refusals with states ok, warn, crit (default: crit)" +msgstr "" + +msgid "" +"Accept expected string mismatches with states ok, warn, crit (default: warn)" +msgstr "" + +msgid "Hide output from TCP socket" +msgstr "Cacher la réponse provenant du socket TCP" + +msgid "Close connection once more than this number of bytes are received" +msgstr "" + +msgid "Seconds to wait between sending string and polling for response" +msgstr "" + +msgid "1st is #days for warning, 2nd is critical (if not specified - 0)." +msgstr "" + +msgid "Use SSL for the connection." +msgstr "" + +#, fuzzy +msgid "SSL server_name" +msgstr "Nom d'utilisateur SNMPv3" + +#, c-format +msgid "TIME UNKNOWN - could not connect to server %s, port %d\n" +msgstr "TEMPS INCONNU - impossible de se connecter au serveur %s, au port %d\n" + +#, c-format +msgid "TIME UNKNOWN - could not send UDP request to server %s, port %d\n" +msgstr "" +"TEMPS INCONNU - impossible d'envoyer une requête UDP au serveur %s, au port " +"%d\n" + +#, c-format +msgid "TIME UNKNOWN - no data received from server %s, port %d\n" +msgstr "TEMPS INCONNU - pas de données reçues du serveur %s, du port %d\n" + +#, c-format +msgid "TIME %s - %d second response time|%s\n" +msgstr "TEMPS %s - %d secondes de temps de réponse|%s\n" + +#, c-format +msgid "TIME %s - %lu second time difference|%s %s\n" +msgstr "TEMPS %s - %lu secondes de différence|%s %s\n" + +msgid "Warning thresholds must be a positive integer" +msgstr "Les seuils d'avertissement doivent être un entier positif" + +msgid "Critical thresholds must be a positive integer" +msgstr "Les seuils critiques doivent être un entier positif" + +msgid "This plugin will check the time on the specified host." +msgstr "Ce plugin va vérifier l'heure sur l'hôte spécifié." + +msgid "Use UDP to connect, not TCP" +msgstr "" + +msgid "Time difference (sec.) necessary to result in a warning status" +msgstr "" + +msgid "Time difference (sec.) necessary to result in a critical status" +msgstr "" + +msgid "Response time (sec.) necessary to result in warning status" +msgstr "" + +msgid "Response time (sec.) necessary to result in critical status" +msgstr "" + +msgid "On Battery, Low Battery" +msgstr "Sur Batterie, Batterie faible" + +msgid "Online" +msgstr "En marche" + +msgid "On Battery" +msgstr "Sur Batterie" + +msgid ", Low Battery" +msgstr ", Batterie faible" + +msgid ", Calibrating" +msgstr ", Calibration" + +msgid ", Replace Battery" +msgstr ", Remplacer la batterie" + +msgid ", On Bypass" +msgstr ", Sur Secteur" + +msgid ", Overload" +msgstr ", Surcharge" + +msgid ", Trimming" +msgstr ", En Test" + +msgid ", Boosting" +msgstr "" + +msgid ", Charging" +msgstr ", En charge" + +msgid ", Discharging" +msgstr ", Déchargement" + +msgid ", Unknown" +msgstr ", Inconnu" + +msgid "UPS does not support any available options\n" +msgstr "L'UPS ne supporte aucune des options disponibles\n" + +msgid "Invalid response received from host" +msgstr "Réponse invalide reçue de l'hôte" + +msgid "UPS name to long for buffer" +msgstr "" + +#, c-format +msgid "CRITICAL - no such UPS '%s' on that host\n" +msgstr "CRITIQUE - pas d'UPS '%s' sur cet hôte\n" + +msgid "CRITICAL - UPS data is stale" +msgstr "CRITIQUE - les données de l'ups ne sont plus valables" + +#, c-format +msgid "Unknown error: %s\n" +msgstr "Erreur inconnue: %s\n" + +msgid "Error: unable to parse variable" +msgstr "Erreur: impossible de lire la variable" + +msgid "Unrecognized UPS variable" +msgstr "Variable d'UPS non reconnue" + +msgid "Error : no UPS indicated" +msgstr "Erreur: pas d'UPS indiqué" + +msgid "" +"This plugin tests the UPS service on the specified host. Network UPS Tools" +msgstr "Ce plugin teste le service UPS sur l'hôte spécifié. Network UPS Tools" + +msgid "from www.networkupstools.org must be running for this plugin to work." +msgstr "" +"de www.networkupstools.org doit s'exécuter sur l'hôte pour que ce plugin " +"fonctionne." + +msgid "Name of UPS" +msgstr "" + +msgid "Output of temperatures in Celsius" +msgstr "Affichage des températures en Celsius" + +msgid "Valid values for STRING are" +msgstr "Les variables valides pour STRING sont" + +msgid "" +"This plugin attempts to determine the status of a UPS (Uninterruptible Power" +msgstr "" + +msgid "" +"Supply) on a local or remote host. If the UPS is online or calibrating, the" +msgstr "" + +msgid "" +"plugin will return an OK state. If the battery is on it will return a WARNING" +msgstr "" + +msgid "" +"state. If the UPS is off or has a low battery the plugin will return a " +"CRITICAL" +msgstr "" + +msgid "" +"You may also specify a variable to check (such as temperature, utility " +"voltage," +msgstr "" + +msgid "" +"battery load, etc.) as well as warning and critical thresholds for the value" +msgstr "" + +msgid "" +"of that variable. If the remote host has multiple UPS that are being " +"monitored" +msgstr "" + +msgid "you will have to use the --ups option to specify which UPS to check." +msgstr "" + +msgid "" +"This plugin requires that the UPSD daemon distributed with Russell Kroll's" +msgstr "" + +msgid "" +"Network UPS Tools be installed on the remote host. If you do not have the" +msgstr "" + +msgid "package installed on your system, you can download it from" +msgstr "" + +msgid "http://www.networkupstools.org" +msgstr "" + +#, fuzzy, c-format +msgid "Could not enumerate RD sessions: %d\n" +msgstr "Impossible d'utiliser le protocole version %d\n" + +#, c-format +msgid "# users=%d" +msgstr "# utilisateurs=%d" + +msgid "Unable to read output" +msgstr "Impossible de lire les données en entrée" + +#, c-format +msgid "USERS %s - %d users currently logged in |%s\n" +msgstr "UTILISATEURS %s - %d utilisateurs actuellement connectés sur |%s\n" + +msgid "This plugin checks the number of users currently logged in on the local" +msgstr "" +"Ce plugin vérifie le nombre d'utilisateurs actuellement connecté sur le " +"système local" + +msgid "" +"system and generates an error if the number exceeds the thresholds specified." +msgstr "et génère une erreur si le nombre excède le seuil spécifié." + +msgid "Set WARNING status if more than INTEGER users are logged in" +msgstr "" +"Sortir avec un résultat AVERTISSEMENT si plus de INTEGER utilisateurs sont " +"connectés" + +msgid "Set CRITICAL status if more than INTEGER users are logged in" +msgstr "" +"Sortir avec un résultat CRITIQUE si plus de INTEGER utilisateurs sont " +"connectés" + +msgid "" +"DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"." +msgstr "" + +msgid "Nagios-compatible output is now always returned." +msgstr "" + +msgid "SMART commands are broken and have been disabled (See Notes in --help)." +msgstr "" + +msgid "" +"DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the" +msgstr "" + +#, fuzzy +msgid "default and will be removed from future releases." +msgstr "" +"Note: nslookup est obsolète et pourra être retiré dans les prochaines " +"versions." + +#, c-format +msgid "CRITICAL - Couldn't open device %s: %s\n" +msgstr "Critique - Impossible d'ouvrir le périphérique %s: %s\n" + +#, c-format +msgid "CRITICAL - SMART_CMD_ENABLE\n" +msgstr "CRITIQUE - SMART_CMD_ENABLE\n" + +#, c-format +msgid "CRITICAL - SMART_READ_VALUES: %s\n" +msgstr "CRITIQUE - SMART_READ_VALUES: %s\n" + +#, c-format +msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n" +msgstr "" +"CRITIQUE - %d État de pré-panne %c Détecté! %d/%d les tests on échoués.\n" + +#, c-format +msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n" +msgstr "" +"AVERTISSEMENT - %d État de pré-panne %s Détecté! %d/%d les tests on " +"échoués.\n" + +#, c-format +msgid "OK - Operational (%d/%d tests passed)\n" +msgstr "OK - En fonctionnement (%d/%d les tests on été réussi)\n" + +#, c-format +msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n" +msgstr "ERREUR - État '%d' inconnu. %d/%d les tests on réussi\n" + +#, c-format +msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n" +msgstr "" +"Etat Hors Ligne=%d {%s}, Hors Ligne Auto=%s, Temps avant arrêt=%d minutes\n" + +#, c-format +msgid "OffLineCapability=%d {%s %s %s}\n" +msgstr "Capacité Hors Ligne=%d {%s %s %s}\n" + +#, c-format +msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n" +msgstr "Révision Smart=%d, Somme de contrôle=%d, Capacité Smart=%d {%s %s}\n" + +#, c-format +msgid "CRITICAL - %s: %s\n" +msgstr "CRITIQUE - %s: %s\n" + +#, fuzzy, c-format +msgid "OK - Command sent (%s)\n" +msgstr "Commande: %s\n" + +#, c-format +msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n" +msgstr "CRITIQUE - SMART_READ_THRESHOLDS: %s\n" + +#, c-format +msgid "" +"This plugin checks a local hard drive with the (Linux specific) SMART " +"interface [http://smartlinux.sourceforge.net/smart/index.php]." +msgstr "" +"Ce plugin vérifie un disque dur local à l'aide de l'interface SMART (pour " +"Linux) [http://smartlinux.sourceforge.net/smart/index.php]." + +msgid "Select device DEVICE" +msgstr "" + +msgid "" +"Note: if the device is specified without this option, any further option will" +msgstr "" + +msgid "be ignored." +msgstr "" + +msgid "" +"The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were" +msgstr "" + +msgid "" +"broken in an underhand manner and have been disabled. You can use smartctl" +msgstr "" + +msgid "instead:" +msgstr "" + +msgid "-0/--auto-off: use \"smartctl --offlineauto=off\"" +msgstr "" + +msgid "-1/--auto-on: use \"smartctl --offlineauto=on\"" +msgstr "" + +msgid "-i/--immediate: use \"smartctl --test=offline\"" +msgstr "" + +msgid "No data returned from command\n" +msgstr "Pas de données reçues de la commande\n" + +msgid "" +"Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " +"or integer (0-3)." +msgstr "" +"Le résultat de temps dépassé doit être un nom d'état valide (OK, WARNING, " +"CRITICAL, UNKNOWN) ou un nombre entier (0-3)." + +msgid "" +"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer " +"(0-3)." +msgstr "" +"Ok doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou un " +"nombre entier (0-3)." + +msgid "" +"Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" +"Warning doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou " +"un nombre entier (0-3)." + +msgid "" +"Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" +"Critical doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou " +"un nombre entier (0-3)." + +msgid "" +"Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" +"Unknown doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou " +"un nombre entier (0-3)." + +msgid "Require path to command" +msgstr "Chemin vers la commande requis" + +msgid "" +"Negates the status of a plugin (returns OK for CRITICAL and vice-versa)." +msgstr "" +"Inverse le statut d'un plugin (retourne OK pour CRITIQUE et vice-versa)." + +msgid "Additional switches can be used to control which state becomes what." +msgstr "" +"Des options additionnelles peuvent être utilisées pour contrôler quel état " +"devient quoi." + +msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status." +msgstr "" +"Utilisez un délai de réponse plus long que celui du plugin afin de conserver " +"les résultats CRITIQUE" + +msgid "Custom result on Negate timeouts; see below for STATUS definition\n" +msgstr "" + +#, c-format +msgid "" +" STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n" +msgstr "" +" STATUS peut être 'OK', 'WARNING', 'CRITICAL' ou 'UNKNOWN' sans les " +"simple\n" + +#, c-format +msgid "" +" quotes. Numeric values are accepted. If nothing is specified, permutes\n" +msgstr " quotes. Les valeurs numériques sont acceptées. Si rien n'est\n" + +#, c-format +msgid " OK and CRITICAL.\n" +msgstr " spécifié, inverse OK et CRITIQUE.\n" + +#, c-format +msgid "" +" Substitute output text as well. Will only substitute text in CAPITALS\n" +msgstr "" + +msgid "Run check_ping and invert result. Must use full path to plugin" +msgstr "" +"Execute check_ping et inverse le résultat. Le chemin complet du plug-in doit " +"être spécifié" + +msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL" +msgstr "" +"Ceci retournera OK au lieu de AVERTISSEMENT et INCONNU au lieu de CRITIQUE" + +msgid "" +"This plugin is a wrapper to take the output of another plugin and invert it." +msgstr "" +"Ce plugin est un adaptateur qui prends l'état d'un autre plug-in et " +"l'inverse." + +msgid "The full path of the plugin must be provided." +msgstr "Le chemin complet du plugin doit être spécifié." + +msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL." +msgstr "Si le plugin executé retourne OK, l'adaptateur retournera CRITIQUE." + +msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK." +msgstr "Si le plugin executé retourne CRITIQUE, l'adaptateur retournera OK." + +msgid "Otherwise, the output state of the wrapped plugin is unchanged." +msgstr "Autrement, l'état du plugin executé reste inchangé." + +msgid "" +"Using timeout-result, it is possible to override the timeout behaviour or a" +msgstr "" + +msgid "plugin by setting the negate timeout a bit lower." +msgstr "" + +#, c-format +msgid "%s - Socket timeout after %d seconds\n" +msgstr "%s - Le socket n'a pas répondu dans les %d secondes\n" + +#, c-format +msgid "%s - Abnormal timeout after %d seconds\n" +msgstr "%s - Dépassement anormal du temps de réponse après %d secondes\n" + +msgid "Send failed" +msgstr "L'envoi à échoué" + +msgid "No data was received from host!" +msgstr "Pas de données reçues de l'hôte!" + +msgid "Socket creation failed" +msgstr "La création du socket à échoué " + +msgid "Supplied path too long unix domain socket" +msgstr "Le chemin fourni est trop long pour un socket unix" + +msgid "Receive failed" +msgstr "La réception à échoué" + +#, c-format +msgid "Invalid hostname/address - %s" +msgstr "Adresse/Nom invalide - %s" + +msgid "Could not malloc argv array in popen()" +msgstr "Impossible de réallouer un tableau pour les paramètres dans popen()" + +msgid "CRITICAL - You need more args!!!" +msgstr "CRITIQUE - Vous devez spécifier plus d'arguments!!!" + +msgid "Cannot catch SIGCHLD" +msgstr "impossible d'obtenir le signal SIGCHLD" + +#, c-format +msgid "CRITICAL - Plugin timed out after %d seconds\n" +msgstr "CRITIQUE - Le plugin n'as pas répondu dans les %d secondes\n" + +msgid "CRITICAL - popen timeout received, but no child process" +msgstr "" +"CRITIQUE - le temps d'attente à été dépassé dans la fonction popen, mais il " +"n'y a pas de processus fils" + +#, c-format +msgid "" +"%s UNKNOWN - No data received from host\n" +"CMD: %s\n" +msgstr "" +"%s INCONNU - Pas de données reçues de l'hôte\n" +"Commande: %s\n" + +#, fuzzy +msgid "" +"This plugin wraps the text output of another command (plugin) in HTML " +msgstr "" +"Ce plugin est un adaptateur qui prends l'état d'un autre plug-in et " +"l'inverse." + +msgid "" +"tags, thus displaying the child plugin's output as a clickable link in " +"compatible" +msgstr "" + +msgid "" +"monitoring status screen. This plugin returns the status of the invoked " +"plugin." +msgstr "" + +msgid "" +"Pay close attention to quoting to ensure that the shell passes the expected" +msgstr "" + +msgid "data to the plugin. For example, in:" +msgstr "" + +msgid "urlize http://example.com/ check_http -H example.com -r 'two words'" +msgstr "" + +msgid "the shell will remove the single quotes and urlize will see:" +msgstr "" + +msgid "urlize http://example.com/ check_http -H example.com -r two words" +msgstr "" + +msgid "You probably want:" +msgstr "" + +msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" +msgstr "" + +msgid "failed realloc in strpcpy\n" +msgstr "La fonction realloc à échoué dans strpcpy\n" + +msgid "failed malloc in strscat\n" +msgstr "La fonction malloc à échoué dans strscat\n" + +#, fuzzy +msgid "failed malloc in xvasprintf\n" +msgstr "La fonction malloc à échoué dans strscat\n" + +#, c-format +msgid "" +" %s (-h | --help) for detailed help\n" +" %s (-V | --version) for version information\n" +msgstr "" +" %s (-h | --help) pour l'aide détaillée\n" +" %s (-V | --version) pour les informations relative à la version\n" + +msgid "" +"\n" +"Options:\n" +" -h, --help\n" +" Print detailed help screen\n" +" -V, --version\n" +" Print version information\n" +msgstr "" +"\n" +"Options:\n" +" -h, --help\n" +" Afficher l'aide détaillée\n" +" -V, --version\n" +" Afficher les informations relative à la version\n" + +#, c-format +msgid "" +" -H, --hostname=ADDRESS\n" +" Host name, IP Address, or unix socket (must be an absolute path)\n" +" -%c, --port=INTEGER\n" +" Port number (default: %s)\n" +msgstr "" +" -H, --hostname=ADDRESS\n" +" Nom d'hôte, Adresse IP, ou socket UNIX (doit être un chemin absolu)\n" +" -%c, --port=INTEGER\n" +" Numéro de port (défaut: %s)\n" + +msgid "" +" -4, --use-ipv4\n" +" Use IPv4 connection\n" +" -6, --use-ipv6\n" +" Use IPv6 connection\n" +msgstr "" +" -4, --use-ipv4\n" +" Utiliser une connection IPv4\n" +" -6, --use-ipv6\n" +" Utiliser une connection IPv6\n" + +#, fuzzy +msgid "" +" -v, --verbose\n" +" Show details for command-line debugging (output may be truncated by\n" +" the monitoring system)\n" +msgstr "" +" -v, --verbose\n" +" Affiche les informations de déboguage en ligne de commande (Nagios peut " +"tronquer la sortie)\n" + +msgid "" +" -w, --warning=DOUBLE\n" +" Response time to result in warning status (seconds)\n" +" -c, --critical=DOUBLE\n" +" Response time to result in critical status (seconds)\n" +msgstr "" +" -w, --warning=DOUBLE\n" +" Temps de réponse résultant en un état d'avertissement (secondes)\n" +" -c, --critical=DOUBLE\n" +" Temps de réponse résultant en un état critique (secondes)\n" + +msgid "" +" -w, --warning=RANGE\n" +" Warning range (format: start:end). Alert if outside this range\n" +" -c, --critical=RANGE\n" +" Critical range\n" +msgstr "" +" -w, --warning=RANGE\n" +" Seuil d'avertissement (format: début:fin). Alerte à l'extérieur de la " +"plage\n" +" -c, --critical=RANGE\n" +" Seuil critique\n" + +#, c-format +msgid "" +" -t, --timeout=INTEGER\n" +" Seconds before connection times out (default: %d)\n" +msgstr "" +" -t, --timeout=INTEGER\n" +" Délais de connection en secondes (défaut: %d)\n" + +#, fuzzy, c-format +msgid "" +" -t, --timeout=INTEGER\n" +" Seconds before plugin times out (default: %d)\n" +msgstr "" +" -t, --timeout=INTEGER\n" +" Délais de connection en secondes (défaut: %d)\n" + +#, fuzzy +msgid "" +" --extra-opts=[section][@file]\n" +" Read options from an ini file. See\n" +" https://www.monitoring-plugins.org/doc/extra-opts.html\n" +" for usage and examples.\n" +msgstr "" +" --extra-opts=[section][@file]\n" +" Lire les options d'un fichier ini. Voir\n" +" https://www.monitoring-plugins.org/doc/extra-opts.html\n" +" pour les instructions et examples.\n" + +#, fuzzy +msgid "" +" See:\n" +" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" +" for THRESHOLD format and examples.\n" +msgstr "" +" Voir:\n" +" https://www.monitoring-plugins.org/doc/guidelines.html." +"html#THRESHOLDFORMAT\n" +" pour le format et examples des seuils (THRESHOLD).\n" + +#, fuzzy +msgid "" +"\n" +"Send email to help@monitoring-plugins.org if you have questions regarding\n" +"use of this software. To submit patches or suggest improvements, send email\n" +"to devel@monitoring-plugins.org\n" +"\n" +msgstr "" +"\n" +"Envoyez un email à help@monitoring-plugins.org si vous avez des questions\n" +"reliées à l'utilisation de ce logiciel. Pour envoyer des patches ou suggérer " +"des\n" +"améliorations, envoyez un email à devel@monitoring-plugins.org\n" +"\n" + +#, fuzzy +msgid "" +"\n" +"The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may " +"redistribute\n" +"copies of the plugins under the terms of the GNU General Public License.\n" +"For more information about these matters, see the file named COPYING.\n" +msgstr "" +"\n" +"Les plugins de Nagios ne portent AUCUNE GARANTIE. Vous pouvez redistribuer\n" +"des copies des plugins selon les termes de la GNU General Public License.\n" +"Pour de plus ample informations, voir le fichier COPYING.\n" + +#, c-format +msgid "Error: Could not get hardware address of interface '%s'\n" +msgstr "" +"Erreur: Impossible d'obtenir l'adresse matérielle pour l'interface '%s'\n" + +#, c-format +msgid "Error: if_nametoindex error - %s.\n" +msgstr "Erreur: if_nametoindex erreur - %s.\n" + +#, c-format +msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n" +msgstr "" +"Erreur: Impossible d'obtenir l'adresse matérielle depuis %s. erreur sysctl 1 " +"- %s.\n" + +#, c-format +msgid "" +"Error: Couldn't get hardware address from interface %s. malloc error - %s.\n" +msgstr "" +"Erreur: Impossible d'obtenir l'adresse matérielle depuis l'interface %s\n" +" erreur malloc - %s.\n" + +#, c-format +msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n" +msgstr "" +"Erreur: Impossible d'obtenir l'adresse matérielle depuis %s erreur sysctl 2 " +"- %s.\n" + +#, c-format +msgid "" +"Error: can't find unit number in interface_name (%s) - expecting TypeNumber " +"eg lnc0.\n" +msgstr "" +"Erreur: impossible de trouver le numéro dans le nom de l'interface (%s).\n" +"J'attendais le nom suivi du type ex lnc0.\n" + +#, c-format +msgid "" +"Error: can't read MAC address from DLPI streams interface for device %s unit " +"%d.\n" +msgstr "" +"Erreur: impossible de lire l'adresse MAC depuis l'interface DLPI pour le \n" +"périphérique %s numéro %d.\n" + +#, c-format +msgid "" +"Error: can't get MAC address for this architecture. Use the --mac option.\n" +msgstr "" +"Erreur: impossible d'obtenir l'adresse MAC sur cette architecture. Utilisez " +"l'option --mac.\n" + +#, c-format +msgid "Error: Cannot determine IP address of interface %s\n" +msgstr "Erreur: Impossible d'obtenir l'adresse IP de l'interface %s\n" + +#, c-format +msgid "Error: Cannot get interface IP address on this platform.\n" +msgstr "Erreur: Impossible d'obtenir l'adresse IP sur cette architecture.\n" + +#, c-format +msgid "Pretending to be relay client %s\n" +msgstr "" + +#, c-format +msgid "DHCPDISCOVER to %s port %d\n" +msgstr "DHCPDISCOVER vers %s port %d\n" + +#, c-format +msgid "Result=ERROR\n" +msgstr "Résultat=ERREUR\n" + +#, c-format +msgid "Result=OK\n" +msgstr "Résultat=OK\n" + +#, c-format +msgid "DHCPOFFER from IP address %s" +msgstr "DHCPOFFER depuis l'adresse IP %s" + +#, c-format +msgid " via %s\n" +msgstr " depuis %s\n" + +#, c-format +msgid "" +"DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n" +msgstr "" +"DHCPOFFER XID (%u) ne correspond pas au DHCPDISCOVER XID (%u) - paquet " +"ignoré\n" + +#, c-format +msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n" +msgstr "" +"l'adresse matérielle du DHCPOFFER ne correspond pas à la notre paquet " +"ignoré\n" + +#, c-format +msgid "Total responses seen on the wire: %d\n" +msgstr "Nombre total de réponses vues: %d\n" + +#, c-format +msgid "Valid responses for this machine: %d\n" +msgstr "Nombre de réponse valides pour cette machine: %d\n" + +#, c-format +msgid "send_dhcp_packet result: %d\n" +msgstr "résultat de send_dchp_packet: %d\n" + +#, c-format +msgid "No (more) data received (nfound: %d)\n" +msgstr "Plus de données reçues (nfound: %d)\n" + +#, c-format +msgid "recvfrom() failed, " +msgstr "recvfrom() a échoué, " + +#, c-format +msgid "receive_dhcp_packet() result: %d\n" +msgstr "résultat de receive_dchp_packet(): %d\n" + +#, c-format +msgid "receive_dhcp_packet() source: %s\n" +msgstr "source de receive_dchp_packet(): %s\n" + +#, c-format +msgid "Error: Could not create socket!\n" +msgstr "Erreur: Impossible de créer un socket!\n" + +#, c-format +msgid "Error: Could not set reuse address option on DHCP socket!\n" +msgstr "" +"Erreur: Impossible de configurer l'option de réutilisation de l'adresse sur\n" +"le socket DHCP!\n" + +#, c-format +msgid "Error: Could not set broadcast option on DHCP socket!\n" +msgstr "" +"Erreur: Impossible de configurer l'option broadcast sur le socket DHCP!\n" + +#, c-format +msgid "" +"Error: Could not bind socket to interface %s. Check your privileges...\n" +msgstr "" +"Erreur: Impossible de connecter le socket à l'interface %s.\n" +"Vérifiez vos droits...\n" + +#, c-format +msgid "" +"Error: Could not bind to DHCP socket (port %d)! Check your privileges...\n" +msgstr "" +"Erreur: Impossible de se connecter au socket (port %d)! Vérifiez vos " +"droits..\n" + +#, c-format +msgid "Requested server address: %s\n" +msgstr "Adresse serveur demandée: %s\n" + +#, c-format +msgid "Lease Time: Infinite\n" +msgstr "Durée du Bail: Infini\n" + +#, c-format +msgid "Lease Time: %lu seconds\n" +msgstr "Durée du Bail: %lu secondes\n" + +#, c-format +msgid "Renewal Time: Infinite\n" +msgstr "Renouvellement du bail: Infini\n" + +#, c-format +msgid "Renewal Time: %lu seconds\n" +msgstr "Durée du renouvellement = %lu secondes\n" + +#, c-format +msgid "Rebinding Time: Infinite\n" +msgstr "Délai de nouvelle demande: Infini\n" + +#, c-format +msgid "Rebinding Time: %lu seconds\n" +msgstr "Délai de nouvelle demande: %lu secondes\n" + +#, c-format +msgid "Added offer from server @ %s" +msgstr "Rajouté offre du serveur @ %s" + +#, c-format +msgid " of IP address %s\n" +msgstr "de l'adresse IP %s\n" + +#, c-format +msgid "DHCP Server Match: Offerer=%s" +msgstr "Correspondance du serveur DHCP: Offrant=%s" + +#, c-format +msgid " Requested=%s" +msgstr " Demandé=%s" + +#, c-format +msgid " (duplicate)" +msgstr "" + +#, c-format +msgid "\n" +msgstr "" + +#, c-format +msgid "No DHCPOFFERs were received.\n" +msgstr "Pas de DHCPOFFERs reçus.\n" + +#, c-format +msgid "Received %d DHCPOFFER(s)" +msgstr "Reçu %d DHCPOFFER(s)" + +#, fuzzy, c-format +msgid ", Rogue DHCP Server detected! Server %s" +msgstr "Correspondance du serveur DHCP: Offrant=%s" + +#, c-format +msgid " offered %s \n" +msgstr "" + +#, c-format +msgid ", %s%d of %d requested servers responded" +msgstr ", %s%d de %d serveurs ont répondus" + +#, c-format +msgid ", requested address (%s) was %soffered" +msgstr ", l'adresse demandée (%s) %s été offerte" + +msgid "not " +msgstr "" + +#, c-format +msgid ", max lease time = " +msgstr ", bail maximum = " + +#, c-format +msgid "Infinity" +msgstr "Infini" + +msgid "Got unexpected non-option argument" +msgstr "" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n" +msgstr "" +"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans check_ctrl: %s.\n" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n" +msgstr "" +"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans put_ctrl/putmsg(): " +"%s.\n" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n" +msgstr "" +"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans put_both/putmsg().\n" + +#, c-format +msgid "" +"Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n" +msgstr "" +"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_attach_req/" +"open(%s..): %s.\n" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n" +msgstr "" +"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_bind/" +"check_ctrl(): %s.\n" + +#, c-format +msgid "Hardware address: " +msgstr "Adresse matérielle: " + +msgid "This plugin tests the availability of DHCP servers on a network." +msgstr "Ce plugin teste la disponibilité de serveurs DHCP dans un réseau." + +msgid "IP address of DHCP server that we must hear from" +msgstr "" + +msgid "IP address that should be offered by at least one DHCP server" +msgstr "" + +msgid "Seconds to wait for DHCPOFFER before timeout occurs" +msgstr "" + +msgid "Interface to to use for listening (i.e. eth0)" +msgstr "" + +msgid "MAC address to use in the DHCP request" +msgstr "" + +msgid "Unicast testing: mimic a DHCP relay, requires -s" +msgstr "" + +msgid "" +"Only requested DHCP server may response (rogue DHCP server detection), " +"requires -s" +msgstr "" + +msgid "specify a target" +msgstr "" + +msgid "Use IPv4 (default) or IPv6 to communicate with the targets" +msgstr "" + +msgid "warning threshold (currently " +msgstr "Valeurs pour le seuil d'avertissement (actuellement " + +msgid "critical threshold (currently " +msgstr "Valeurs pour le seuil critique (actuellement " + +msgid "" +"RTA, round trip average, mode warning,critical, ex. 100ms,200ms unit in ms" +msgstr "" + +msgid "packet loss mode, ex. 40%,50% , unit in %" +msgstr "" + +msgid "jitter mode warning,critical, ex. 40.000ms,50.000ms , unit in ms " +msgstr "" + +msgid "MOS mode, between 0 and 4.4 warning,critical, ex. 3.5,3.0" +msgstr "" + +msgid "score mode, max value 100 warning,critical, ex. 80,70 " +msgstr "" + +msgid "detect out of order ICMP packts " +msgstr "" + +msgid "specify a source IP address or device name" +msgstr "spécifiez une adresse ou un nom d'hôte" + +msgid "number of packets to send (currently " +msgstr "nombre de paquets à envoyer (actuellement " + +msgid "max packet interval (currently " +msgstr "" + +msgid "max target interval (currently " +msgstr "" + +msgid "number of alive hosts required for success" +msgstr "nombre d'hôtes vivants requis pour réussite" + +msgid "TTL on outgoing packets (currently " +msgstr "" + +msgid "timeout value (seconds, currently " +msgstr "" + +msgid "Number of icmp data bytes to send" +msgstr "Nombre de paquets ICMP à envoyer" + +msgid "Packet size will be data bytes + icmp header (currently" +msgstr "" + +msgid "verbose" +msgstr "" + +msgid "If none of R,P,J,M,S or O is specified, default behavior is -R -P" +msgstr "" + +msgid "The -H switch is optional. Naming a host (or several) to check is not." +msgstr "" + +msgid "" +"Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" +msgstr "" + +msgid "packet loss. The default values should work well for most users." +msgstr "" + +msgid "" +"You can specify different RTA factors using the standardized abbreviations" +msgstr "" + +msgid "" +"us (microseconds), ms (milliseconds, default) or just plain s for seconds." +msgstr "" + +msgid "The -v switch can be specified several times for increased verbosity." +msgstr "" + +#, fuzzy +#~ msgid "Check only filesystems of indicated type (may be repeated)" +#~ msgstr "" +#~ "Ignorer tout les systèmes de fichiers qui correspondent au type indiqué " +#~ "(peut être utilisé plusieurs fois)" + +#~ msgid "Path or partition (may be repeated)" +#~ msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" + +#~ msgid "" +#~ "value match). If multiple addresses are returned at once, you have to " +#~ "match" +#~ msgstr "" +#~ "valeur correspond). Si plusieurs adresses sont retournées en même temps," + +#~ msgid "" +#~ "the whole string of addresses separated with commas (sorted " +#~ "alphabetically)." +#~ msgstr "" +#~ "vous devrez toutes les inscrire séparées pas des virgules (en ordre " +#~ "alphabétique)" + +#~ msgid "No specific parameters. No warning or critical threshold" +#~ msgstr "Pas d'argument spécifique. Pas de seuil d'avertissement ou critique" + +#~ msgid "Can't find local IP for NAS-IP-Address" +#~ msgstr "Impossible de trouver une addresse IP locale pour le NAS-IP-Address" + +#~ msgid "Warning free space should be more than critical free space" +#~ msgstr "" +#~ "Le seuil d'avertissement pour la place libre doit être plus grand que le " +#~ "seuil critique" + +#, c-format +#~ msgid "%s - Plugin timed out after %d seconds\n" +#~ msgstr "%s - Le plugin n'as pas répondu dans les %d secondes\n" + +#~ msgid "Critical Process Count must be an integer!" +#~ msgstr "Critique Le total des processus doit être un nombre entier!" + +#~ msgid "Warning Process Count must be an integer!" +#~ msgstr "Avertissement Le total des processus doit être un nombre entier!" + +#~ msgid "wmax (%d) cannot be greater than cmax (%d)\n" +#~ msgstr "wmax (%d) ne peut pas être plus grand que cmax (%d)\n" + +#~ msgid "wmin (%d) cannot be less than cmin (%d)\n" +#~ msgstr "wmin (%d) ne peut pas être plus petit que cmin (%d)\n" + +#~ msgid "CRITICAL - Cannot retrieve server certificate." +#~ msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur" + +#~ msgid "OIDs." +#~ msgstr "OIDs." + +#~ msgid "CRITICAL - Cannot retrieve server certificate.\n" +#~ msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur.\n" + +#~ msgid "Usage: " +#~ msgstr "Utilisation: " + +#~ msgid "" +#~ " See: http://nagiosplugins.org/extra-opts for --extra-opts usage and " +#~ "examples.\n" +#~ msgstr "" +#~ " Voir: http://nagiosplugins.org/extra-opts pour le format et examples de " +#~ "--extra-opts.\n" diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot new file mode 100644 index 0000000..6b63fd9 --- /dev/null +++ b/po/monitoring-plugins.pot @@ -0,0 +1,4982 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Monitoring Plugins Development Team +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" +"POT-Creation-Date: 2023-10-01 15:10+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +msgid "Could not parse arguments" +msgstr "" + +msgid "Cannot catch SIGALRM" +msgstr "" + +#, c-format +msgid "SSH connection failed: %s\n" +msgstr "" + +#, c-format +msgid "Remote command execution failed: %s\n" +msgstr "" + +#, c-format +msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n" +msgstr "" + +#, c-format +msgid "SSH WARNING: could not open %s\n" +msgstr "" + +#, c-format +msgid "%s: Error parsing output\n" +msgstr "" + +msgid "Timeout interval must be a positive integer" +msgstr "" + +msgid "Port must be a positive integer" +msgstr "" + +msgid "skip-stdout argument must be an integer" +msgstr "" + +msgid "skip-stderr argument must be an integer" +msgstr "" + +#, c-format +msgid "%s: You must provide a host name\n" +msgstr "" + +msgid "No remotecmd" +msgstr "" + +#, c-format +msgid "%s: Argument limit of %d exceeded\n" +msgstr "" + +msgid "Can not (re)allocate 'commargv' buffer\n" +msgstr "" + +#, c-format +msgid "" +"%s: In passive mode, you must provide a service name for each command.\n" +msgstr "" + +#, c-format +msgid "" +"%s: In passive mode, you must provide the host short name from the " +"monitoring configs.\n" +msgstr "" + +#, c-format +msgid "This plugin uses SSH to execute commands on a remote host" +msgstr "" + +msgid "tell ssh to use Protocol 1 [optional]" +msgstr "" + +msgid "tell ssh to use Protocol 2 [optional]" +msgstr "" + +msgid "Ignore all or (if specified) first n lines on STDOUT [optional]" +msgstr "" + +msgid "Ignore all or (if specified) first n lines on STDERR [optional]" +msgstr "" + +msgid "Exit with an warning, if there is an output on STDERR" +msgstr "" + +msgid "" +"tells ssh to fork rather than create a tty [optional]. This will always " +"return OK if ssh is executed" +msgstr "" + +msgid "command to execute on the remote machine" +msgstr "" + +msgid "SSH user name on remote host [optional]" +msgstr "" + +msgid "identity of an authorized key [optional]" +msgstr "" + +msgid "external command file for monitoring [optional]" +msgstr "" + +msgid "list of monitoring service names, separated by ':' [optional]" +msgstr "" + +msgid "short name of host in the monitoring configuration [optional]" +msgstr "" + +msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" +msgstr "" + +msgid "Tell ssh to use this configfile [optional]" +msgstr "" + +msgid "Tell ssh to suppress warning and diagnostic messages [optional]" +msgstr "" + +msgid "Make connection problems return UNKNOWN instead of CRITICAL" +msgstr "" + +msgid "The most common mode of use is to refer to a local identity file with" +msgstr "" + +msgid "the '-i' option. In this mode, the identity pair should have a null" +msgstr "" + +msgid "passphrase and the public key should be listed in the authorized_keys" +msgstr "" + +msgid "file of the remote host. Usually the key will be restricted to running" +msgstr "" + +msgid "only one command on the remote server. If the remote SSH server tracks" +msgstr "" + +msgid "invocation arguments, the one remote program may be an agent that can" +msgstr "" + +msgid "execute additional commands as proxy" +msgstr "" + +msgid "To use passive mode, provide multiple '-C' options, and provide" +msgstr "" + +msgid "" +"all of -O, -s, and -n options (servicelist order must match '-C'options)" +msgstr "" + +msgid "Examples:" +msgstr "" + +msgid "Usage:" +msgstr "" + +#, c-format +msgid "Host/Service Cluster Plugin for Monitoring" +msgstr "" + +msgid "Options:" +msgstr "" + +msgid "Check service cluster status" +msgstr "" + +msgid "Check host cluster status" +msgstr "" + +msgid "Optional prepended text output (i.e. \"Host cluster\")" +msgstr "" + +msgid "Specifies the range of hosts or services in cluster that must be in a" +msgstr "" + +msgid "non-OK state in order to return a WARNING status level" +msgstr "" + +msgid "non-OK state in order to return a CRITICAL status level" +msgstr "" + +msgid "The status codes of the hosts or services in the cluster, separated by" +msgstr "" + +msgid "commas" +msgstr "" + +msgid "Notes:" +msgstr "" + +msgid "" +"Will alert critical if there are 3 or more service data points in a non-OK" +msgstr "" + +msgid "state." +msgstr "" + +#, c-format +msgid "Looking for: '%s'\n" +msgstr "" + +msgid "dig returned an error status" +msgstr "" + +msgid "Server not found in ANSWER SECTION" +msgstr "" + +msgid "No ANSWER SECTION found" +msgstr "" + +msgid "Probably a non-existent host/domain" +msgstr "" + +#, c-format +msgid "Port must be a positive integer - %s" +msgstr "" + +#, c-format +msgid "Warning interval must be a positive integer - %s" +msgstr "" + +#, c-format +msgid "Critical interval must be a positive integer - %s" +msgstr "" + +#, c-format +msgid "Timeout interval must be a positive integer - %s" +msgstr "" + +#, c-format +msgid "This plugin tests the DNS service on the specified host using dig" +msgstr "" + +msgid "Force dig to only use IPv4 query transport" +msgstr "" + +msgid "Force dig to only use IPv6 query transport" +msgstr "" + +msgid "Machine name to lookup" +msgstr "" + +msgid "Record type to lookup (default: A)" +msgstr "" + +msgid "" +"An address expected to be in the answer section. If not set, uses whatever" +msgstr "" + +msgid "was in -l" +msgstr "" + +msgid "Pass STRING as argument(s) to dig" +msgstr "" + +#, c-format +msgid "DISK %s: %s not found\n" +msgstr "" + +#, c-format +msgid "CRITICAL" +msgstr "" + +#, c-format +msgid "unit type %s not known\n" +msgstr "" + +#, c-format +msgid "failed allocating storage for '%s'\n" +msgstr "" + +#, c-format +msgid "UNKNOWN" +msgstr "" + +msgid "Must set a threshold value before using -p\n" +msgstr "" + +msgid "Could not compile regular expression" +msgstr "" + +msgid "Must set -E before selecting paths\n" +msgstr "" + +msgid "Must set group value before selecting paths\n" +msgstr "" + +msgid "" +"Paths need to be selected before using -i/-I. Use -A to select all paths " +"explicitly" +msgstr "" + +msgid "" +"Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--" +"all)\n" +msgstr "" + +msgid "Regular expression did not match any path or disk" +msgstr "" + +msgid "Unknown argument" +msgstr "" + +#, c-format +msgid " for %s\n" +msgstr "" + +msgid "" +"This plugin checks the amount of used disk space on a mounted file system" +msgstr "" + +msgid "" +"and generates an alert if free space is less than one of the threshold values" +msgstr "" + +msgid "Exit with WARNING status if less than INTEGER units of disk are free" +msgstr "" + +msgid "Exit with WARNING status if less than PERCENT of disk space is free" +msgstr "" + +msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" +msgstr "" + +msgid "Exit with CRITICAL status if less than PERCENT of disk space is free" +msgstr "" + +msgid "Exit with WARNING status if less than PERCENT of inode space is free" +msgstr "" + +msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" +msgstr "" + +msgid "" +"Mount point or block device as emitted by the mount(8) command (may be " +"repeated)" +msgstr "" + +msgid "Ignore device (only works if -p unspecified)" +msgstr "" + +msgid "Clear thresholds" +msgstr "" + +msgid "For paths or partitions specified with -p, only check for exact paths" +msgstr "" + +msgid "Display only devices/mountpoints with errors" +msgstr "" + +msgid "Don't account root-reserved blocks into freespace in perfdata" +msgstr "" + +msgid "Display inode usage in perfdata" +msgstr "" + +msgid "" +"Group paths. Thresholds apply to (free-)space of all partitions together" +msgstr "" + +msgid "Same as '--units kB'" +msgstr "" + +msgid "Only check local filesystems" +msgstr "" + +msgid "" +"Only check local filesystems against thresholds. Yet call stat on remote " +"filesystems" +msgstr "" + +msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" +msgstr "" + +msgid "Display the (block) device instead of the mount point" +msgstr "" + +msgid "Same as '--units MB'" +msgstr "" + +msgid "Explicitly select all paths. This is equivalent to -R '.*'" +msgstr "" + +msgid "" +"Case insensitive regular expression for path/partition (may be repeated)" +msgstr "" + +msgid "Regular expression for path or partition (may be repeated)" +msgstr "" + +msgid "" +"Regular expression to ignore selected path/partition (case insensitive) (may " +"be repeated)" +msgstr "" + +msgid "" +"Regular expression to ignore selected path or partition (may be repeated)" +msgstr "" + +msgid "" +"Return OK if no filesystem matches, filesystem does not exist or is " +"inaccessible." +msgstr "" + +msgid "(Provide this option before -p / -r / --ereg-path if used)" +msgstr "" + +msgid "Choose bytes, kB, MB, GB, TB (default: MB)" +msgstr "" + +msgid "" +"Ignore all filesystems of types matching given regex(7) (may be repeated)" +msgstr "" + +msgid "" +"Check only filesystems where the type matches this given regex(7) (may be " +"repeated)" +msgstr "" + +msgid "General usage hints:" +msgstr "" + +msgid "" +"- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the " +"same as" +msgstr "" + +msgid "\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\"." +msgstr "" + +msgid "" +"- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} " +"{thresholds b} ...\"" +msgstr "" + +msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" +msgstr "" + +msgid "" +"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" +"r regex" +msgstr "" + +msgid "" +"are grouped which means the freespace thresholds are applied to all disks " +"together" +msgstr "" + +msgid "" +"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " +"100M/50M" +msgstr "" + +#, c-format +msgid "%s %s: %s\n" +msgstr "" + +msgid "is not accessible" +msgstr "" + +msgid "nslookup returned an error status" +msgstr "" + +msgid "Warning plugin error" +msgstr "" + +#, c-format +msgid "DNS CRITICAL - '%s' returned empty server string\n" +msgstr "" + +#, c-format +msgid "DNS CRITICAL - No response from DNS %s\n" +msgstr "" + +#, c-format +msgid "DNS CRITICAL - '%s' returned empty host name string\n" +msgstr "" + +msgid "Non-authoritative answer:" +msgstr "" + +#, c-format +msgid "Domain '%s' was not found by the server\n" +msgstr "" + +#, c-format +msgid "DNS CRITICAL - '%s' msg parsing exited with no address\n" +msgstr "" + +#, c-format +msgid "expected '%s' but got '%s'" +msgstr "" + +#, c-format +msgid "Domain '%s' was found by the server: '%s'\n" +msgstr "" + +#, c-format +msgid "server %s is not authoritative for %s" +msgstr "" + +#, c-format +msgid "OK" +msgstr "" + +#, c-format +msgid "WARNING" +msgstr "" + +#, c-format +msgid "%.3f second response time" +msgid_plural "%.3f seconds response time" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid ". %s returns %s" +msgstr "" + +#, c-format +msgid "DNS WARNING - %s\n" +msgstr "" + +msgid " Probably a non-existent host/domain" +msgstr "" + +#, c-format +msgid "DNS CRITICAL - %s\n" +msgstr "" + +#, c-format +msgid "DNS UNKNOWN - %s\n" +msgstr "" + +msgid "Note: nslookup is deprecated and may be removed from future releases." +msgstr "" + +msgid "Consider using the `dig' or `host' programs instead. Run nslookup with" +msgstr "" + +msgid "the `-sil[ent]' option to prevent this message from appearing." +msgstr "" + +#, c-format +msgid "No response from DNS %s\n" +msgstr "" + +#, c-format +msgid "DNS %s has no records\n" +msgstr "" + +#, c-format +msgid "Connection to DNS %s was refused\n" +msgstr "" + +#, c-format +msgid "Query was refused by DNS server at %s\n" +msgstr "" + +#, c-format +msgid "No information returned by DNS server at %s\n" +msgstr "" + +msgid "Network is unreachable\n" +msgstr "" + +#, c-format +msgid "DNS failure for %s\n" +msgstr "" + +msgid "Input buffer overflow\n" +msgstr "" + +msgid "" +"This plugin uses the nslookup program to obtain the IP address for the given " +"host/domain query." +msgstr "" + +msgid "An optional DNS server to use may be specified." +msgstr "" + +msgid "" +"If no DNS server is specified, the default server(s) specified in /etc/" +"resolv.conf will be used." +msgstr "" + +msgid "The name or address you want to query" +msgstr "" + +msgid "Optional DNS server you want to use for the lookup" +msgstr "" + +msgid "" +"Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end" +msgstr "" + +msgid "" +"with a dot (.). This option can be repeated multiple times (Returns OK if any" +msgstr "" + +msgid "value matches)." +msgstr "" + +msgid "" +"Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)" +msgstr "" + +msgid "Cannot be used together with -a" +msgstr "" + +msgid "Optionally expect the DNS server to be authoritative for the lookup" +msgstr "" + +msgid "Return warning if elapsed time exceeds value. Default off" +msgstr "" + +msgid "Return critical if elapsed time exceeds value. Default off" +msgstr "" + +msgid "" +"Return critical if the list of expected addresses does not match all " +"addresses" +msgstr "" + +msgid "returned. Default off" +msgstr "" + +msgid "Arguments to check_dummy must be an integer" +msgstr "" + +#, c-format +msgid "Status %d is not a supported error state\n" +msgstr "" + +msgid "" +"This plugin will simply return the state corresponding to the numeric value" +msgstr "" + +msgid "of the argument with optional text" +msgstr "" + +#, c-format +msgid "Could not open pipe: %s\n" +msgstr "" + +#, c-format +msgid "Could not open stderr for %s\n" +msgstr "" + +msgid "FPING UNKNOWN - IP address not found\n" +msgstr "" + +msgid "FPING UNKNOWN - invalid commandline argument\n" +msgstr "" + +msgid "FPING UNKNOWN - failed system call\n" +msgstr "" + +#, c-format +msgid "FPING %s - %s (rta=%f ms)|%s\n" +msgstr "" + +#, c-format +msgid "FPING UNKNOWN - %s not found\n" +msgstr "" + +#, c-format +msgid "FPING CRITICAL - %s is unreachable\n" +msgstr "" + +#, c-format +msgid "FPING UNKNOWN - %s parameter error\n" +msgstr "" + +#, c-format +msgid "FPING CRITICAL - %s is down\n" +msgstr "" + +#, c-format +msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n" +msgstr "" + +#, c-format +msgid "FPING %s - %s (loss=%.0f%% )|%s\n" +msgstr "" + +msgid "Invalid hostname/address" +msgstr "" + +msgid "IPv6 support not available\n" +msgstr "" + +msgid "Packet size must be a positive integer" +msgstr "" + +msgid "Packet count must be a positive integer" +msgstr "" + +msgid "Target timeout must be a positive integer" +msgstr "" + +msgid "Interval must be a positive integer" +msgstr "" + +msgid "Hostname was not supplied" +msgstr "" + +#, c-format +msgid "%s: Only one threshold may be packet loss (%s)\n" +msgstr "" + +#, c-format +msgid "%s: Only one threshold must be packet loss (%s)\n" +msgstr "" + +msgid "" +"This plugin will use the fping command to ping the specified host for a fast " +"check" +msgstr "" + +msgid "Note that it is necessary to set the suid flag on fping." +msgstr "" + +msgid "" +"name or IP Address of host to ping (IP Address bypasses name lookup, " +"reducing system load)" +msgstr "" + +msgid "warning threshold pair" +msgstr "" + +msgid "critical threshold pair" +msgstr "" + +msgid "Return OK after first successful reply" +msgstr "" + +msgid "size of ICMP packet" +msgstr "" + +msgid "number of ICMP packets to send" +msgstr "" + +msgid "Target timeout (ms)" +msgstr "" + +msgid "Interval (ms) between sending packets" +msgstr "" + +msgid "name or IP Address of sourceip" +msgstr "" + +msgid "source interface name" +msgstr "" + +#, c-format +msgid "" +"THRESHOLD is ,%% where is the round trip average travel time " +"(ms)" +msgstr "" + +msgid "" +"which triggers a WARNING or CRITICAL state, and is the percentage of" +msgstr "" + +msgid "packet loss to trigger an alarm state." +msgstr "" + +msgid "IPv4 is used by default. Specify -6 to use IPv6." +msgstr "" + +#, c-format +msgid "CRITICAL - Host type parameter incorrect!\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Host not found\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Game server down or unavailable\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Game server timeout\n" +msgstr "" + +#, c-format +msgid "This plugin tests game server connections with the specified host." +msgstr "" + +msgid "Optional port of which to connect" +msgstr "" + +msgid "Field number in raw qstat output that contains game name" +msgstr "" + +msgid "Field number in raw qstat output that contains map name" +msgstr "" + +msgid "Field number in raw qstat output that contains ping time" +msgstr "" + +msgid "" +"This plugin uses the 'qstat' command, the popular game server status query " +"tool." +msgstr "" + +msgid "" +"If you don't have the package installed, you will need to download it from" +msgstr "" + +msgid "https://github.com/multiplay/qstat before you can use this plugin." +msgstr "" + +msgid "Paper Jam" +msgstr "" + +msgid "Out of Paper" +msgstr "" + +msgid "Printer Offline" +msgstr "" + +msgid "Peripheral Error" +msgstr "" + +msgid "Intervention Required" +msgstr "" + +msgid "Toner Low" +msgstr "" + +msgid "Insufficient Memory" +msgstr "" + +msgid "A Door is Open" +msgstr "" + +msgid "Output Tray is Full" +msgstr "" + +msgid "Data too Slow for Engine" +msgstr "" + +msgid "Unknown Paper Error" +msgstr "" + +#, c-format +msgid "Printer ok - (%s)\n" +msgstr "" + +msgid "Port must be a positive short integer" +msgstr "" + +msgid "This plugin tests the STATUS of an HP printer with a JetDirect card." +msgstr "" + +msgid "Net-snmp must be installed on the computer running the plugin." +msgstr "" + +msgid "The SNMP community name " +msgstr "" + +#, c-format +msgid "(default=%s)" +msgstr "" + +msgid "Specify the port to check " +msgstr "" + +msgid "Disable paper check " +msgstr "" + +msgid "file does not exist or is not readable" +msgstr "" + +msgid "Invalid certificate expiration period" +msgstr "" + +msgid "" +"Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional " +"'+' suffix)" +msgstr "" + +msgid "Invalid option - SSL is not available" +msgstr "" + +msgid "Invalid max_redirs count" +msgstr "" + +msgid "Invalid onredirect option" +msgstr "" + +#, c-format +msgid "option f:%d \n" +msgstr "" + +msgid "Invalid port number" +msgstr "" + +#, c-format +msgid "Could Not Compile Regular Expression: %s" +msgstr "" + +msgid "IPv6 support not available" +msgstr "" + +msgid "You must specify a server address or host name" +msgstr "" + +msgid "" +"If you use a client certificate you must also specify a private key file" +msgstr "" + +msgid "HTTP UNKNOWN - Memory allocation error\n" +msgstr "" + +#, c-format +msgid "%sServer date unknown, " +msgstr "" + +#, c-format +msgid "%sDocument modification date unknown, " +msgstr "" + +#, c-format +msgid "%sServer date \"%100s\" unparsable, " +msgstr "" + +#, c-format +msgid "%sDocument date \"%100s\" unparsable, " +msgstr "" + +#, c-format +msgid "%sDocument is %d seconds in the future, " +msgstr "" + +#, c-format +msgid "%sLast modified %.1f days ago, " +msgstr "" + +#, c-format +msgid "%sLast modified %d:%02d:%02d ago, " +msgstr "" + +msgid "HTTP CRITICAL - Unable to open TCP socket\n" +msgstr "" + +msgid "HTTP UNKNOWN - Could not allocate memory for full_page\n" +msgstr "" + +msgid "HTTP CRITICAL - Error on receive\n" +msgstr "" + +msgid "HTTP CRITICAL - No data received from host\n" +msgstr "" + +#, c-format +msgid "Invalid HTTP response received from host: %s\n" +msgstr "" + +#, c-format +msgid "Invalid HTTP response received from host on port %d: %s\n" +msgstr "" + +#, c-format +msgid "" +"%s\n" +"%s" +msgstr "" + +#, c-format +msgid "Status line output matched \"%s\" - " +msgstr "" + +#, c-format +msgid "HTTP CRITICAL: Invalid Status Line (%s)\n" +msgstr "" + +#, c-format +msgid "HTTP CRITICAL: Invalid Status (%s)\n" +msgstr "" + +#, c-format +msgid "%s - " +msgstr "" + +#, c-format +msgid "%sheader '%s' not found on '%s://%s:%d%s', " +msgstr "" + +#, c-format +msgid "%sstring '%s' not found on '%s://%s:%d%s', " +msgstr "" + +#, c-format +msgid "%spattern not found, " +msgstr "" + +#, c-format +msgid "%spattern found, " +msgstr "" + +#, c-format +msgid "%sExecute Error: %s, " +msgstr "" + +#, c-format +msgid "%spage size %d too large, " +msgstr "" + +#, c-format +msgid "%spage size %d too small, " +msgstr "" + +#, c-format +msgid "%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s" +msgstr "" + +#, c-format +msgid "%s - %d bytes in %.3f second response time %s|%s %s" +msgstr "" + +msgid "HTTP UNKNOWN - Could not allocate addr\n" +msgstr "" + +msgid "HTTP UNKNOWN - Could not allocate URL\n" +msgstr "" + +#, c-format +msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" +msgstr "" + +#, c-format +msgid "HTTP UNKNOWN - Empty redirect location%s\n" +msgstr "" + +#, c-format +msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" +msgstr "" + +#, c-format +msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" +msgstr "" + +#, c-format +msgid "HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n" +msgstr "" + +#, c-format +msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" +msgstr "" + +#, c-format +msgid "Redirection to %s://%s:%d%s\n" +msgstr "" + +msgid "This plugin tests the HTTP service on the specified host. It can test" +msgstr "" + +msgid "normal (http) and secure (https) servers, follow redirects, search for" +msgstr "" + +msgid "strings and regular expressions, check connection times, and report on" +msgstr "" + +msgid "certificate expiration times." +msgstr "" + +#, c-format +msgid "In the first form, make an HTTP request." +msgstr "" + +#, c-format +msgid "" +"In the second form, connect to the server and check the TLS certificate." +msgstr "" + +#, c-format +msgid "NOTE: One or both of -H and -I must be specified" +msgstr "" + +msgid "Host name argument for servers using host headers (virtual host)" +msgstr "" + +msgid "Append a port to include it in the header (eg: example.com:5000)" +msgstr "" + +msgid "" +"IP address or name (use numeric address if possible to bypass DNS lookup)." +msgstr "" + +msgid "Port number (default: " +msgstr "" + +msgid "" +"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents" +msgstr "" + +msgid "auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1," +msgstr "" + +msgid "1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted." +msgstr "" + +msgid "Enable SSL/TLS hostname extension support (SNI)" +msgstr "" + +msgid "" +"Minimum number of days a certificate has to be valid. Port defaults to 443" +msgstr "" + +msgid "" +"(when this option is used the URL is not checked by default. You can use" +msgstr "" + +msgid " --continue-after-certificate to override this behavior)" +msgstr "" + +msgid "" +"Allows the HTTP check to continue after performing the certificate check." +msgstr "" + +msgid "Does nothing unless -C is used." +msgstr "" + +msgid "Name of file that contains the client certificate (PEM format)" +msgstr "" + +msgid "to be used in establishing the SSL session" +msgstr "" + +msgid "Name of file containing the private key (PEM format)" +msgstr "" + +msgid "matching the client certificate" +msgstr "" + +msgid "Comma-delimited list of strings, at least one of them is expected in" +msgstr "" + +msgid "the first (status) line of the server response (default: " +msgstr "" + +msgid "" +"If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" +msgstr "" + +msgid "String to expect in the response headers" +msgstr "" + +msgid "String to expect in the content" +msgstr "" + +msgid "URL to GET or POST (default: /)" +msgstr "" + +msgid "URL encoded http POST data" +msgstr "" + +msgid "Set HTTP method." +msgstr "" + +msgid "Don't wait for document body: stop reading after headers." +msgstr "" + +msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" +msgstr "" + +msgid "Warn if document is more than SECONDS old. the number can also be of" +msgstr "" + +msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." +msgstr "" + +msgid "specify Content-Type header media type when POSTing\n" +msgstr "" + +msgid "Allow regex to span newlines (must precede -r or -R)" +msgstr "" + +msgid "Search page for regex STRING" +msgstr "" + +msgid "Search page for case-insensitive regex STRING" +msgstr "" + +msgid "Return CRITICAL if found, OK if not\n" +msgstr "" + +msgid "Username:password on sites with basic authentication" +msgstr "" + +msgid "Username:password on proxy-servers with basic authentication" +msgstr "" + +msgid "String to be sent in http header as \"User Agent\"" +msgstr "" + +msgid "" +"Any other tags to be sent in http header. Use multiple times for additional " +"headers" +msgstr "" + +msgid "Print additional performance data" +msgstr "" + +msgid "Print body content below status line" +msgstr "" + +msgid "Wrap output in HTML link (obsoleted by urlize)" +msgstr "" + +msgid "How to handle redirected pages. sticky is like follow but stick to the" +msgstr "" + +msgid "specified IP address. stickyport also ensures port stays the same." +msgstr "" + +msgid "Maximal number of redirects (default: " +msgstr "" + +msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" +msgstr "" + +msgid "This plugin will attempt to open an HTTP connection with the host." +msgstr "" + +msgid "" +"Successful connects return STATE_OK, refusals and timeouts return " +"STATE_CRITICAL" +msgstr "" + +msgid "" +"other errors return STATE_UNKNOWN. Successful connects, but incorrect " +"response" +msgstr "" + +msgid "" +"messages from the host result in STATE_WARNING return values. If you are" +msgstr "" + +msgid "" +"checking a virtual server that uses 'host headers' you must supply the FQDN" +msgstr "" + +msgid "(fully qualified domain name) as the [host_name] argument." +msgstr "" + +msgid "This plugin can also check whether an SSL enabled web server is able to" +msgstr "" + +msgid "serve content (optionally within a specified time) or whether the X509 " +msgstr "" + +msgid "certificate is still valid for the specified number of days." +msgstr "" + +msgid "Please note that this plugin does not check if the presented server" +msgstr "" + +msgid "certificate matches the hostname of the server, or if the certificate" +msgstr "" + +msgid "has a valid chain of trust to one of the locally installed CAs." +msgstr "" + +msgid "" +"When the 'www.verisign.com' server returns its content within 5 seconds," +msgstr "" + +msgid "" +"a STATE_OK will be returned. When the server returns its content but exceeds" +msgstr "" + +msgid "" +"the 5-second threshold, a STATE_WARNING will be returned. When an error " +"occurs," +msgstr "" + +msgid "a STATE_CRITICAL will be returned." +msgstr "" + +msgid "" +"When the certificate of 'www.verisign.com' is valid for more than 14 days," +msgstr "" + +msgid "" +"a STATE_OK is returned. When the certificate is still valid, but for less " +"than" +msgstr "" + +msgid "" +"14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" +msgstr "" + +msgid "the certificate is expired." +msgstr "" + +msgid "" +"When the certificate of 'www.verisign.com' is valid for more than 30 days," +msgstr "" + +msgid "30 days, but more than 14 days, a STATE_WARNING is returned." +msgstr "" + +msgid "" +"A STATE_CRITICAL will be returned when certificate expires in less than 14 " +"days" +msgstr "" + +msgid "" +"check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j " +"CONNECT -H www.verisign.com " +msgstr "" + +msgid "" +"all these options are needed: -I -p -u -" +"S(sl) -j CONNECT -H " +msgstr "" + +msgid "" +"a STATE_CRITICAL will be returned. By adding a colon to the method you can " +"set the method used" +msgstr "" + +msgid "inside the proxied connection: -j CONNECT:POST" +msgstr "" + +#, c-format +msgid "Could not connect to the server at port %i\n" +msgstr "" + +#, c-format +msgid "Could not set protocol version %d\n" +msgstr "" + +#, c-format +msgid "Could not init TLS at port %i!\n" +msgstr "" + +#, c-format +msgid "TLS not supported by the libraries!\n" +msgstr "" + +#, c-format +msgid "Could not init startTLS at port %i!\n" +msgstr "" + +#, c-format +msgid "startTLS not supported by the library, needs LDAPv3!\n" +msgstr "" + +#, c-format +msgid "Could not bind to the LDAP server\n" +msgstr "" + +#, c-format +msgid "Could not search/find objectclasses in %s\n" +msgstr "" + +#, c-format +msgid "LDAP %s - found %d entries in %.3f seconds|%s %s\n" +msgstr "" + +#, c-format +msgid "LDAP %s - %.3f seconds response time|%s\n" +msgstr "" + +#, c-format +msgid "%s cannot be combined with %s" +msgstr "" + +msgid "Please specify the host name\n" +msgstr "" + +msgid "Please specify the LDAP base\n" +msgstr "" + +msgid "ldap attribute to search (default: \"(objectclass=*)\"" +msgstr "" + +msgid "ldap base (eg. ou=my unit, o=my org, c=at" +msgstr "" + +msgid "ldap bind DN (if required)" +msgstr "" + +msgid "" +"ldap password (if required, or set the password through environment variable " +"'LDAP_PASSWORD')" +msgstr "" + +msgid "use starttls mechanism introduced in protocol version 3" +msgstr "" + +msgid "use ldaps (ldap v2 ssl method). this also sets the default port to" +msgstr "" + +msgid "use ldap protocol version 2" +msgstr "" + +msgid "use ldap protocol version 3" +msgstr "" + +msgid "default protocol version:" +msgstr "" + +msgid "Number of found entries to result in warning status" +msgstr "" + +msgid "Number of found entries to result in critical status" +msgstr "" + +msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be" +msgstr "" + +#, c-format +msgid "" +" implied (using default port %i) unless --port=636 is specified. In that " +"case\n" +msgstr "" + +msgid "'SSL on connect' will be used no matter how the plugin was called." +msgstr "" + +msgid "" +"This detection is deprecated, please use 'check_ldap' with the '--starttls' " +"or '--ssl' flags" +msgstr "" + +msgid "to define the behaviour explicitly instead." +msgstr "" + +msgid "The parameters --warn-entries and --crit-entries are optional." +msgstr "" + +msgid "Warning threshold must be float or float triplet!\n" +msgstr "" + +#, c-format +msgid "Error opening %s\n" +msgstr "" + +#, c-format +msgid "could not parse load from uptime %s: %d\n" +msgstr "" + +#, c-format +msgid "Error code %d returned in %s\n" +msgstr "" + +#, c-format +msgid "Error in getloadavg()\n" +msgstr "" + +#, c-format +msgid "Error processing %s\n" +msgstr "" + +#, c-format +msgid "load average: %.2f, %.2f, %.2f" +msgstr "" + +#, c-format +msgid "Critical threshold for %d-minute load average is not specified\n" +msgstr "" + +#, c-format +msgid "Warning threshold for %d-minute load average is not specified\n" +msgstr "" + +#, c-format +msgid "" +"Parameter inconsistency: %d-minute \"warning load\" is greater than " +"\"critical load\"\n" +msgstr "" + +#, c-format +msgid "This plugin tests the current system load average." +msgstr "" + +msgid "Exit with WARNING status if load average exceeds WLOADn" +msgstr "" + +msgid "Exit with CRITICAL status if load average exceed CLOADn" +msgstr "" + +msgid "the load average format is the same used by \"uptime\" and \"w\"" +msgstr "" + +msgid "Divide the load averages by the number of CPUs (when possible)" +msgstr "" + +msgid "Number of processes to show when printing the top consuming processes." +msgstr "" + +msgid "NUMBER_OF_PROCS=0 disables this feature. Default value is 0" +msgstr "" + +#, c-format +msgid "'%s' exited with non-zero status.\n" +msgstr "" + +#, c-format +msgid "some error occurred getting procs list.\n" +msgstr "" + +msgid "Could not parse arguments\n" +msgstr "" + +#, c-format +msgid "Unable to open MRTG log file\n" +msgstr "" + +#, c-format +msgid "Unable to process MRTG log file\n" +msgstr "" + +#, c-format +msgid "MRTG data has expired (%d minutes old)\n" +msgstr "" + +msgid "Avg" +msgstr "" + +msgid "Max" +msgstr "" + +msgid "Invalid variable number" +msgstr "" + +#, c-format +msgid "" +"%s is not a valid expiration time\n" +"Use '%s -h' for additional help\n" +msgstr "" + +msgid "Invalid variable number\n" +msgstr "" + +msgid "You must supply the variable number" +msgstr "" + +msgid "" +"This plugin will check either the average or maximum value of one of the" +msgstr "" + +msgid "two variables recorded in an MRTG log file." +msgstr "" + +msgid "The MRTG log file containing the data you want to monitor" +msgstr "" + +msgid "Minutes before MRTG data is considered to be too old" +msgstr "" + +msgid "Should we check average or maximum values?" +msgstr "" + +msgid "Which variable set should we inspect? (1 or 2)" +msgstr "" + +msgid "Threshold value for data to result in WARNING status" +msgstr "" + +msgid "Threshold value for data to result in CRITICAL status" +msgstr "" + +msgid "Type label for data (Examples: Conns, \"Processor Load\", In, Out)" +msgstr "" + +msgid "Option units label for data (Example: Packets/Sec, Errors/Sec," +msgstr "" + +#, c-format +msgid "\"Bytes Per Second\", \"%% Utilization\")" +msgstr "" + +msgid "" +"If the value exceeds the threshold, a WARNING status is returned. If" +msgstr "" + +msgid "" +"the value exceeds the threshold, a CRITICAL status is returned. If" +msgstr "" + +msgid "the data in the log file is older than old, a WARNING" +msgstr "" + +msgid "status is returned and a warning message is printed." +msgstr "" + +msgid "" +"This plugin is useful for monitoring MRTG data that does not correspond to" +msgstr "" + +msgid "" +"bandwidth usage. (Use the check_mrtgtraf plugin for monitoring bandwidth)." +msgstr "" + +msgid "" +"It can be used to monitor any kind of data that MRTG is monitoring - errors," +msgstr "" + +msgid "" +"packets/sec, etc. I use MRTG in conjunction with the Novell NLM that allows" +msgstr "" + +msgid "" +"me to track processor utilization, user connections, drive space, etc and" +msgstr "" + +msgid "this plugin works well for monitoring that kind of data as well." +msgstr "" + +msgid "" +"- This plugin only monitors one of the two variables stored in the MRTG log" +msgstr "" + +msgid "file. If you want to monitor both values you will have to define two" +msgstr "" + +msgid "commands with different values for the argument. Of course," +msgstr "" + +msgid "you can always hack the code to make this plugin work for you..." +msgstr "" + +msgid "" +"- MRTG stands for the Multi Router Traffic Grapher. It can be downloaded " +"from" +msgstr "" + +msgid "Unable to open MRTG log file" +msgstr "" + +msgid "Unable to process MRTG log file" +msgstr "" + +#, c-format +msgid "%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n" +msgstr "" + +#, c-format +msgid "Traffic %s - %s\n" +msgstr "" + +msgid "" +"This plugin will check the incoming/outgoing transfer rates of a router," +msgstr "" + +msgid "switch, etc recorded in an MRTG log. If the newest log entry is older" +msgstr "" + +msgid "than , a WARNING status is returned. If either the" +msgstr "" + +msgid "incoming or outgoing rates exceed the or thresholds (in" +msgstr "" + +msgid "Bytes/sec), a CRITICAL status results. If either of the rates exceed" +msgstr "" + +msgid "the or thresholds (in Bytes/sec), a WARNING status results." +msgstr "" + +msgid "File to read log from" +msgstr "" + +msgid "Minutes after which log expires" +msgstr "" + +msgid "Test average or maximum" +msgstr "" + +msgid "Warning threshold pair ," +msgstr "" + +msgid "Critical threshold pair ," +msgstr "" + +msgid "" +"- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from" +msgstr "" + +msgid "- While MRTG can monitor things other than traffic rates, this" +msgstr "" + +msgid " plugin probably won't work with much else without modification." +msgstr "" + +msgid "- The calculated i/o rates are a little off from what MRTG actually" +msgstr "" + +msgid " reports. I'm not sure why this is right now, but will look into it" +msgstr "" + +msgid " for future enhancements of this plugin." +msgstr "" + +#, c-format +msgid "Usage" +msgstr "" + +#, c-format +msgid "status store_result error: %s\n" +msgstr "" + +#, c-format +msgid "slave query error: %s\n" +msgstr "" + +#, c-format +msgid "slave store_result error: %s\n" +msgstr "" + +msgid "No slaves defined" +msgstr "" + +#, c-format +msgid "slave fetch row error: %s\n" +msgstr "" + +#, c-format +msgid "Slave running: %s" +msgstr "" + +msgid "This program tests connections to a MySQL server" +msgstr "" + +msgid "Ignore authentication failure and check for mysql connectivity only" +msgstr "" + +msgid "Use the specified socket (has no effect if -H is used)" +msgstr "" + +msgid "Check database with indicated name" +msgstr "" + +msgid "Read from the specified client options file" +msgstr "" + +msgid "Use a client options group" +msgstr "" + +msgid "Connect using the indicated username" +msgstr "" + +msgid "Use the indicated password to authenticate the connection" +msgstr "" + +msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!" +msgstr "" + +msgid "Your clear-text password could be visible as a process table entry" +msgstr "" + +msgid "Check if the slave thread is running properly." +msgstr "" + +msgid "Exit with WARNING status if slave server is more than INTEGER seconds" +msgstr "" + +msgid "behind master" +msgstr "" + +msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds" +msgstr "" + +msgid "Use ssl encryption" +msgstr "" + +msgid "Path to CA signing the cert" +msgstr "" + +msgid "Path to SSL certificate" +msgstr "" + +msgid "Path to private SSL key" +msgstr "" + +msgid "Path to CA directory" +msgstr "" + +msgid "List of valid SSL ciphers" +msgstr "" + +msgid "" +"There are no required arguments. By default, the local database is checked" +msgstr "" + +msgid "" +"using the default unix socket. You can force TCP on localhost by using an" +msgstr "" + +msgid "IP address or FQDN ('localhost' will use the socket as well)." +msgstr "" + +msgid "You must specify -p with an empty string to force an empty password," +msgstr "" + +msgid "overriding any my.cnf settings." +msgstr "" + +msgid "Cannot open status log for reading!" +msgstr "" + +#, c-format +msgid "Found process: %s %s\n" +msgstr "" + +msgid "Could not locate a running Nagios process!" +msgstr "" + +msgid "Cannot parse Nagios log file for valid time" +msgstr "" + +#, c-format +msgid "%d process" +msgid_plural "%d processes" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "status log updated %d second ago" +msgid_plural "status log updated %d seconds ago" +msgstr[0] "" +msgstr[1] "" + +msgid "Expiration time must be an integer (seconds)\n" +msgstr "" + +msgid "Timeout must be an integer (seconds)\n" +msgstr "" + +msgid "You must provide the status_log\n" +msgstr "" + +msgid "You must provide a process string\n" +msgstr "" + +msgid "" +"This plugin checks the status of the Nagios process on the local machine" +msgstr "" + +msgid "" +"The plugin will check to make sure the Nagios status log is no older than" +msgstr "" + +msgid "the number of minutes specified by the expires option." +msgstr "" + +msgid "" +"It also checks the process table for a process matching the command argument." +msgstr "" + +msgid "Name of the log file to check" +msgstr "" + +msgid "Minutes aging after which logfile is considered stale" +msgstr "" + +msgid "Substring to search for in process arguments" +msgstr "" + +msgid "Timeout for the plugin in seconds" +msgstr "" + +#, c-format +msgid "Wrong client version - running: %s, required: %s" +msgstr "" + +msgid "missing -l parameters" +msgstr "" + +msgid "wrong -l parameter." +msgstr "" + +msgid "CPU Load" +msgstr "" + +#, c-format +msgid " %lu%% (%lu min average)" +msgstr "" + +#, c-format +msgid " '%lu min avg Load'=%lu%%;%lu;%lu;0;100" +msgstr "" + +msgid "not enough values for -l parameters" +msgstr "" + +msgid "wrong -l argument" +msgstr "" + +#, c-format +msgid "System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu" +msgstr "" + +#, c-format +msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)" +msgstr "" + +#, c-format +msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f" +msgstr "" + +msgid "Free disk space : Invalid drive" +msgstr "" + +msgid "No service/process specified" +msgstr "" + +msgid "could not fetch information from server\n" +msgstr "" + +#, c-format +msgid "" +"Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)" +msgstr "" + +#, c-format +msgid "'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f" +msgstr "" + +msgid "No counter specified" +msgstr "" + +msgid "Minimum value contains non-numbers" +msgstr "" + +msgid "Maximum value contains non-numbers" +msgstr "" + +msgid "No unit counter specified" +msgstr "" + +msgid "Please specify a variable to check" +msgstr "" + +msgid "Server port must be an integer\n" +msgstr "" + +msgid "You must provide a server address or host name" +msgstr "" + +msgid "None" +msgstr "" + +msgid "This plugin collects data from the NSClient service running on a" +msgstr "" + +msgid "Windows NT/2000/XP/2003 server." +msgstr "" + +msgid "Name of the host to check" +msgstr "" + +msgid "Optional port number (default: " +msgstr "" + +msgid "Password needed for the request" +msgstr "" + +msgid "Threshold which will result in a warning status" +msgstr "" + +msgid "Threshold which will result in a critical status" +msgstr "" + +msgid "Seconds before connection attempt times out (default: " +msgstr "" + +msgid "Parameters passed to specified check (see below)" +msgstr "" + +msgid "Display options (currently only SHOWALL works)" +msgstr "" + +msgid "Return UNKNOWN on timeouts" +msgstr "" + +msgid "Print this help screen" +msgstr "" + +msgid "Print version information" +msgstr "" + +msgid "Variable to check" +msgstr "" + +msgid "Valid variables are:" +msgstr "" + +msgid "Get the NSClient version" +msgstr "" + +msgid "If -l is specified, will return warning if versions differ." +msgstr "" + +msgid "Average CPU load on last x minutes." +msgstr "" + +msgid "Request a -l parameter with the following syntax:" +msgstr "" + +msgid "-l ,,." +msgstr "" + +msgid " should be less than 24*60." +msgstr "" + +msgid "" +"Thresholds are percentage and up to 10 requests can be done in one shot." +msgstr "" + +msgid "Get the uptime of the machine." +msgstr "" + +msgid "-l " +msgstr "" + +msgid " = seconds, minutes, hours, or days. (default: minutes)" +msgstr "" + +msgid "Thresholds will use the unit specified above." +msgstr "" + +msgid "Size and percentage of disk use." +msgstr "" + +msgid "Request a -l parameter containing the drive letter only." +msgstr "" + +msgid "Warning and critical thresholds can be specified with -w and -c." +msgstr "" + +msgid "Memory use." +msgstr "" + +msgid "Check the state of one or several services." +msgstr "" + +msgid "Request a -l parameters with the following syntax:" +msgstr "" + +msgid "-l ,,,..." +msgstr "" + +msgid "You can specify -d SHOWALL in case you want to see working services" +msgstr "" + +msgid "in the returned string." +msgstr "" + +msgid "Check if one or several process are running." +msgstr "" + +msgid "Same syntax as SERVICESTATE." +msgstr "" + +msgid "Check any performance counter of Windows NT/2000." +msgstr "" + +msgid "-l \"\\\\\\\\counter\",\"" +msgstr "" + +msgid "The parameter is optional and is given to a printf " +msgstr "" + +msgid "output command which requires a float parameter." +msgstr "" + +#, c-format +msgid "If does not include \"%%\", it is used as a label." +msgstr "" + +msgid "Some examples:" +msgstr "" + +msgid "Check any performance counter object of Windows NT/2000." +msgstr "" + +msgid "" +"Syntax: check_nt -H -p -v INSTANCES -l " +msgstr "" + +msgid " is a Windows Perfmon Counter object (eg. Process)," +msgstr "" + +msgid "if it is two words, it should be enclosed in quotes" +msgstr "" + +msgid "The returned results will be a comma-separated list of instances on " +msgstr "" + +msgid " the selected computer for that object." +msgstr "" + +msgid "" +"The purpose of this is to be run from command line to determine what " +"instances" +msgstr "" + +msgid "" +" are available for monitoring without having to log onto the Windows server" +msgstr "" + +msgid " to run Perfmon directly." +msgstr "" + +msgid "" +"It can also be used in scripts that automatically create the monitoring " +"service" +msgstr "" + +msgid " configuration files." +msgstr "" + +msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process" +msgstr "" + +msgid "" +"- The NSClient service should be running on the server to get any information" +msgstr "" + +msgid "- Critical thresholds should be lower than warning thresholds" +msgstr "" + +msgid "- Default port 1248 is sometimes in use by other services. The error" +msgstr "" + +msgid "" +"output when this happens contains \"Cannot map xxxxx to protocol number\"." +msgstr "" + +msgid "One fix for this is to change the port to something else on check_nt " +msgstr "" + +msgid "and on the client service it's connecting to." +msgstr "" + +#, c-format +msgid "jitter response too large (%lu bytes)\n" +msgstr "" + +msgid "NTP CRITICAL:" +msgstr "" + +msgid "NTP WARNING:" +msgstr "" + +msgid "NTP OK:" +msgstr "" + +msgid "NTP UNKNOWN:" +msgstr "" + +msgid "Offset unknown" +msgstr "" + +msgid "Offset" +msgstr "" + +msgid "This plugin checks the selected ntp server" +msgstr "" + +msgid "Offset to result in warning status (seconds)" +msgstr "" + +msgid "Offset to result in critical status (seconds)" +msgstr "" + +msgid "Warning threshold for jitter" +msgstr "" + +msgid "Critical threshold for jitter" +msgstr "" + +msgid "Normal offset check:" +msgstr "" + +msgid "" +"Check jitter too, avoiding critical notifications if jitter isn't available" +msgstr "" + +msgid "(See Notes above for more details on thresholds formats):" +msgstr "" + +msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or" +msgstr "" + +msgid "check_ntp_time instead." +msgstr "" + +msgid "Server not synchronized" +msgstr "" + +msgid "Server has the LI_ALARM bit set" +msgstr "" + +msgid "" +"Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized" +msgstr "" + +msgid "Warning threshold for stratum of server's synchronization peer" +msgstr "" + +msgid "Critical threshold for stratum of server's synchronization peer" +msgstr "" + +msgid "Warning threshold for number of usable time sources (\"truechimers\")" +msgstr "" + +msgid "Critical threshold for number of usable time sources (\"truechimers\")" +msgstr "" + +msgid "This plugin checks an NTP server independent of any commandline" +msgstr "" + +msgid "programs or external libraries." +msgstr "" + +msgid "Use this plugin to check the health of an NTP server. It supports" +msgstr "" + +msgid "checking the offset with the sync peer, the jitter and stratum. This" +msgstr "" + +msgid "plugin will not check the clock offset between the local host and NTP" +msgstr "" + +msgid "server; please use check_ntp_time for that purpose." +msgstr "" + +msgid "Simple NTP server check:" +msgstr "" + +msgid "Only check the number of usable time sources (\"truechimers\"):" +msgstr "" + +msgid "Check only stratum:" +msgstr "" + +msgid "This plugin checks the clock offset with the ntp server" +msgstr "" + +msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found" +msgstr "" + +msgid "Expected offset of the ntp server relative to local server (seconds)" +msgstr "" + +msgid "This plugin checks the clock offset between the local host and a" +msgstr "" + +msgid "remote NTP server. It is independent of any commandline programs or" +msgstr "" + +msgid "external libraries." +msgstr "" + +msgid "If you'd rather want to monitor an NTP server, please use" +msgstr "" + +msgid "check_ntp_peer." +msgstr "" + +msgid "--time-offset is useful for compensating for servers with known" +msgstr "" + +msgid "and expected clock skew." +msgstr "" + +#, c-format +msgid "NetWare %s: " +msgstr "" + +#, c-format +msgid "Up %s," +msgstr "" + +#, c-format +msgid "Load %s - %s %s-min load average = %lu%%|load%s=%lu;%lu;%lu;0;100" +msgstr "" + +#, c-format +msgid "Conns %s - %lu current connections|Conns=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%s: Long term cache hits = %lu%%" +msgstr "" + +#, c-format +msgid "%s: Total cache buffers = %lu|Cachebuffers=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%s: Dirty cache buffers = %lu|Dirty-Cache-Buffers=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%s: LRU sitting time = %lu minutes" +msgstr "" + +#, c-format +msgid "CRITICAL - Volume '%s' does not exist!" +msgstr "" + +#, c-format +msgid "%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;" +msgstr "" + +msgid "Only " +msgstr "" + +#, c-format +msgid "%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "" +"%lu MB (%lu%%) free on volume %s - total %lu MB|FreeMB%s=%lu;%lu;%lu;0;100" +msgstr "" + +#, c-format +msgid "Directory Services Database is %s (DS version %s)" +msgstr "" + +#, c-format +msgid "Logins are %s" +msgstr "" + +msgid "enabled" +msgstr "" + +msgid "disabled" +msgstr "" + +msgid "CRITICAL - NRM Status is bad!" +msgstr "" + +msgid "Warning - NRM Status is suspect!" +msgstr "" + +msgid "OK - NRM Status is good!" +msgstr "" + +#, c-format +msgid "%lu of %lu (%lu%%) packet receive buffers used" +msgstr "" + +#, c-format +msgid "%lu entries in SAP table" +msgstr "" + +#, c-format +msgid "%lu entries in SAP table for SAP type %d" +msgstr "" + +#, c-format +msgid "%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100" +msgstr "" + +#, c-format +msgid "%s%lu KB not yet purgeable on volume %s" +msgstr "" + +#, c-format +msgid "%lu MB (%lu%%) not yet purgeable on volume %s" +msgstr "" + +#, c-format +msgid "%lu open files|Openfiles=%lu;%lu;%lu;0,0" +msgstr "" + +#, c-format +msgid "%lu abended threads|Abends=%lu;%lu;%lu;;" +msgstr "" + +#, c-format +msgid "%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu" +msgstr "" + +msgid "CRITICAL - Time not in sync with network!" +msgstr "" + +msgid "OK - Time in sync with network!" +msgstr "" + +#, c-format +msgid "LRU sitting time = %lu seconds" +msgstr "" + +#, c-format +msgid "Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100" +msgstr "" + +#, c-format +msgid "Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100" +msgstr "" + +#, c-format +msgid "NDS Version %s" +msgstr "" + +#, c-format +msgid "Up %s" +msgstr "" + +#, c-format +msgid "Module %s version %s is loaded" +msgstr "" + +#, c-format +msgid "Module %s is not loaded" +msgstr "" + +#, c-format +msgid "CRITICAL - Value '%s' does not exist!" +msgstr "" + +#, c-format +msgid "%s is %lu|%s=%lu;%lu;%lu;;" +msgstr "" + +msgid "Nothing to check!\n" +msgstr "" + +msgid "Server port an integer\n" +msgstr "" + +msgid "This plugin attempts to contact the MRTGEXT NLM running on a" +msgstr "" + +msgid "Novell server to gather the requested system information." +msgstr "" + +msgid "Variable to check. Valid variables include:" +msgstr "" + +msgid "LOAD1 = 1 minute average CPU load" +msgstr "" + +msgid "LOAD5 = 5 minute average CPU load" +msgstr "" + +msgid "LOAD15 = 15 minute average CPU load" +msgstr "" + +msgid "CSPROCS = number of current service processes (NW 5.x only)" +msgstr "" + +msgid "ABENDS = number of abended threads (NW 5.x only)" +msgstr "" + +msgid "UPTIME = server uptime" +msgstr "" + +msgid "LTCH = percent long term cache hits" +msgstr "" + +msgid "CBUFF = current number of cache buffers" +msgstr "" + +msgid "CDBUFF = current number of dirty cache buffers" +msgstr "" + +msgid "DCB = dirty cache buffers as a percentage of the total" +msgstr "" + +msgid "TCB = dirty cache buffers as a percentage of the original" +msgstr "" + +msgid "OFILES = number of open files" +msgstr "" + +msgid " VMF = MB of free space on Volume " +msgstr "" + +msgid " VMU = MB used space on Volume " +msgstr "" + +msgid " VMP = MB of purgeable space on Volume " +msgstr "" + +msgid " VPF = percent free space on volume " +msgstr "" + +msgid " VKF = KB of free space on volume " +msgstr "" + +msgid " VPP = percent purgeable space on volume " +msgstr "" + +msgid " VKP = KB of purgeable space on volume " +msgstr "" + +msgid " VPNP = percent not yet purgeable space on volume " +msgstr "" + +msgid " VKNP = KB of not yet purgeable space on volume " +msgstr "" + +msgid " LRUM = LRU sitting time in minutes" +msgstr "" + +msgid " LRUS = LRU sitting time in seconds" +msgstr "" + +msgid " DSDB = check to see if DS Database is open" +msgstr "" + +msgid " DSVER = NDS version" +msgstr "" + +msgid " UPRB = used packet receive buffers" +msgstr "" + +msgid " PUPRB = percent (of max) used packet receive buffers" +msgstr "" + +msgid " SAPENTRIES = number of entries in the SAP table" +msgstr "" + +msgid " SAPENTRIES = number of entries in the SAP table for SAP type " +msgstr "" + +msgid " TSYNC = timesync status" +msgstr "" + +msgid " LOGINS = check to see if logins are enabled" +msgstr "" + +msgid " CONNS = number of currently licensed connections" +msgstr "" + +msgid " NRMH\t= NRM Summary Status" +msgstr "" + +msgid " NRMP = Returns the current value for a NRM health item" +msgstr "" + +msgid " NRMM = Returns the current memory stats from NRM" +msgstr "" + +msgid " NRMS = Returns the current Swapfile stats from NRM" +msgstr "" + +msgid " NSS1 = Statistics from _Admin:Manage_NSS\\GeneralStats.xml" +msgstr "" + +msgid " NSS3 = Statistics from _Admin:Manage_NSS\\NameCache.xml" +msgstr "" + +msgid " NSS4 = Statistics from _Admin:Manage_NSS\\FileStats.xml" +msgstr "" + +msgid " NSS5 = Statistics from _Admin:Manage_NSS\\ObjectCache.xml" +msgstr "" + +msgid " NSS6 = Statistics from _Admin:Manage_NSS\\Thread.xml" +msgstr "" + +msgid "" +" NSS7 = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml" +msgstr "" + +msgid " NLM: = check if NLM is loaded and report version" +msgstr "" + +msgid " (e.g. NLM:TSANDS.NLM)" +msgstr "" + +msgid "Include server version string in results" +msgstr "" + +msgid "- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG" +msgstr "" + +msgid "" +" extension for NetWare be loaded on the Novell servers you wish to check." +msgstr "" + +msgid " (available from http://www.engr.wisc.edu/~drews/mrtg/)" +msgstr "" + +msgid "" +"- Values for critical thresholds should be lower than warning thresholds" +msgstr "" + +msgid "" +" when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, " +msgstr "" + +msgid " TCB, LRUS and LRUM." +msgstr "" + +msgid "Unknown error fetching load data\n" +msgstr "" + +msgid "Invalid response from server - no load information\n" +msgstr "" + +msgid "Invalid response from server after load 1\n" +msgstr "" + +msgid "Invalid response from server after load 5\n" +msgstr "" + +#, c-format +msgid "Load %s - %s-min load average = %0.2f" +msgstr "" + +msgid "Unknown error fetching disk data\n" +msgstr "" + +msgid "Invalid response from server\n" +msgstr "" + +msgid "Unknown error fetching network status\n" +msgstr "" + +#, c-format +msgid "Net %s - %d connection%s on port %d" +msgstr "" + +msgid "Unknown error fetching process status\n" +msgstr "" + +#, c-format +msgid "Process %s - %d instance%s of %s running" +msgstr "" + +#, c-format +msgid "Uptime %s - Up %d days %d hours %d minutes" +msgstr "" + +msgid "" +"This plugin attempts to contact the Over-CR collector daemon running on the" +msgstr "" + +msgid "remote UNIX server in order to gather the requested system information." +msgstr "" + +msgid "LOAD1 = 1 minute average CPU load" +msgstr "" + +msgid "LOAD5 = 5 minute average CPU load" +msgstr "" + +msgid "LOAD15 = 15 minute average CPU load" +msgstr "" + +msgid "DPU = percent used disk space on filesystem " +msgstr "" + +msgid "PROC = number of running processes with name " +msgstr "" + +msgid "NET = number of active connections on TCP port " +msgstr "" + +msgid "UPTIME = system uptime in seconds" +msgstr "" + +msgid "This plugin requires that Eric Molitors' Over-CR collector daemon be" +msgstr "" + +msgid "running on the remote server." +msgstr "" + +msgid "Over-CR can be downloaded from http://www.molitor.org/overcr" +msgstr "" + +msgid "This plugin was tested with version 0.99.53 of the Over-CR collector" +msgstr "" + +msgid "" +"For the available options, the critical threshold value should always be" +msgstr "" + +msgid "" +"higher than the warning threshold value, EXCEPT with the uptime variable" +msgstr "" + +#, c-format +msgid "CRITICAL - no connection to '%s' (%s).\n" +msgstr "" + +#, c-format +msgid " %s - database %s (%f sec.)|%s\n" +msgstr "" + +msgid "Critical threshold must be a positive integer" +msgstr "" + +msgid "Warning threshold must be a positive integer" +msgstr "" + +msgid "Database name exceeds the maximum length" +msgstr "" + +msgid "User name is not valid" +msgstr "" + +#, c-format +msgid "Test whether a PostgreSQL Database is accepting connections." +msgstr "" + +msgid "Database to check " +msgstr "" + +#, c-format +msgid "(default: %s)\n" +msgstr "" + +msgid "Login name of user" +msgstr "" + +msgid "Password (BIG SECURITY ISSUE)" +msgstr "" + +msgid "Connection parameters (keyword = value), see below" +msgstr "" + +msgid "SQL query to run. Only first column in first row will be read" +msgstr "" + +msgid "A name for the query, this string is used instead of the query" +msgstr "" + +msgid "in the long output of the plugin" +msgstr "" + +msgid "SQL query value to result in warning status (double)" +msgstr "" + +msgid "SQL query value to result in critical status (double)" +msgstr "" + +msgid "All parameters are optional." +msgstr "" + +msgid "" +"This plugin tests a PostgreSQL DBMS to determine whether it is active and" +msgstr "" + +msgid "accepting queries. In its current operation, it simply connects to the" +msgstr "" + +msgid "" +"specified database, and then disconnects. If no database is specified, it" +msgstr "" + +msgid "" +"connects to the template1 database, which is present in every functioning" +msgstr "" + +msgid "PostgreSQL DBMS." +msgstr "" + +msgid "If a query is specified using the -q option, it will be executed after" +msgstr "" + +msgid "connecting to the server. The result from the query has to be numeric." +msgstr "" + +msgid "" +"Multiple SQL commands, separated by semicolon, are allowed but the result " +msgstr "" + +msgid "of the last command is taken into account only. The value of the first" +msgstr "" + +msgid "" +"column in the first row is used as the check result. If a second column is" +msgstr "" + +msgid "present in the result set, this is added to the plugin output with a" +msgstr "" + +msgid "" +"prefix of \"Extra Info:\". This information can be displayed in the system" +msgstr "" + +msgid "executing the plugin." +msgstr "" + +msgid "" +"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual" +msgstr "" + +msgid "" +"for details about how to access internal statistics of the database server." +msgstr "" + +msgid "" +"For a list of available connection parameters which may be used with the -o" +msgstr "" + +msgid "" +"command line option, see the documentation for PQconnectdb() in the chapter" +msgstr "" + +msgid "" +"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be" +msgstr "" + +msgid "" +"used to specify a service name in pg_service.conf to be used for additional" +msgstr "" + +msgid "connection parameters: -o 'service=' or to specify the SSL mode:" +msgstr "" + +msgid "-o 'sslmode=require'." +msgstr "" + +msgid "" +"The plugin will connect to a local postmaster if no host is specified. To" +msgstr "" + +msgid "" +"connect to a remote host, be sure that the remote postmaster accepts TCP/IP" +msgstr "" + +msgid "connections (start the postmaster with the -i option)." +msgstr "" + +msgid "" +"Typically, the monitoring user (unless the --logname option is used) should " +"be" +msgstr "" + +msgid "" +"able to connect to the database without a password. The plugin can also send" +msgstr "" + +msgid "a password, but no effort is made to obscure or encrypt the password." +msgstr "" + +#, c-format +msgid "QUERY %s - %s: %s.\n" +msgstr "" + +msgid "Error with query" +msgstr "" + +msgid "No rows returned" +msgstr "" + +msgid "No columns returned" +msgstr "" + +msgid "No data returned" +msgstr "" + +msgid "Is not a numeric" +msgstr "" + +#, c-format +msgid "%s returned %f" +msgstr "" + +#, c-format +msgid "'%s' returned %f" +msgstr "" + +msgid "CRITICAL - Could not interpret output from ping command\n" +msgstr "" + +#, c-format +msgid "PING %s - %sPacket loss = %d%%" +msgstr "" + +#, c-format +msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms" +msgstr "" + +msgid "Could not realloc() addresses\n" +msgstr "" + +#, c-format +msgid " (%s) must be a non-negative number\n" +msgstr "" + +#, c-format +msgid " (%s) must be an integer percentage\n" +msgstr "" + +#, c-format +msgid " (%s) must be an integer percentage\n" +msgstr "" + +#, c-format +msgid " (%s) must be a non-negative number\n" +msgstr "" + +#, c-format +msgid " (%s) must be a non-negative number\n" +msgstr "" + +#, c-format +msgid "" +"%s: Warning threshold must be integer or percentage!\n" +"\n" +msgstr "" + +#, c-format +msgid " was not set\n" +msgstr "" + +#, c-format +msgid " was not set\n" +msgstr "" + +#, c-format +msgid " was not set\n" +msgstr "" + +#, c-format +msgid " was not set\n" +msgstr "" + +#, c-format +msgid " (%f) cannot be larger than (%f)\n" +msgstr "" + +#, c-format +msgid " (%d) cannot be larger than (%d)\n" +msgstr "" + +#, c-format +msgid "Cannot open stderr for %s\n" +msgstr "" + +msgid "System call sent warnings to stderr " +msgstr "" + +#, c-format +msgid "CRITICAL - Network Unreachable (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Host Unreachable (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Network Prohibited (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Host Prohibited (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Packet Filtered (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Host not found (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Time to live exceeded (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Destination Unreachable (%s)\n" +msgstr "" + +msgid "Unable to realloc warn_text\n" +msgstr "" + +#, c-format +msgid "Use ping to check connection statistics for a remote host." +msgstr "" + +msgid "host to ping" +msgstr "" + +msgid "number of ICMP ECHO packets to send" +msgstr "" + +#, c-format +msgid "(Default: %d)\n" +msgstr "" + +msgid "show HTML in the plugin output (obsoleted by urlize)" +msgstr "" + +msgid "THRESHOLD is ,% where is the round trip average travel" +msgstr "" + +msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the" +msgstr "" + +msgid "percentage of packet loss to trigger an alarm state." +msgstr "" + +msgid "" +"This plugin uses the ping command to probe the specified host for packet loss" +msgstr "" + +msgid "" +"(percentage) and round trip average (milliseconds). It can produce HTML " +"output" +msgstr "" + +msgid "" +"linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in" +msgstr "" + +msgid "the contrib area of the downloads section at http://www.nagios.org/" +msgstr "" + +#, c-format +msgid "CMD: %s\n" +msgstr "" + +msgid "System call sent warnings to stderr" +msgstr "" + +#, c-format +msgid "Not parseable: %s" +msgstr "" + +#, c-format +msgid "Unable to read output\n" +msgstr "" + +#, c-format +msgid "%d warn out of " +msgstr "" + +#, c-format +msgid "%d crit, %d warn out of " +msgstr "" + +#, c-format +msgid " with %s" +msgstr "" + +msgid "Parent Process ID must be an integer!" +msgstr "" + +#, c-format +msgid "%s%sSTATE = %s" +msgstr "" + +msgid "UID was not found" +msgstr "" + +msgid "User name was not found" +msgstr "" + +#, c-format +msgid "%s%scommand name '%s'" +msgstr "" + +#, c-format +msgid "%s%sexclude progs '%s'" +msgstr "" + +msgid "RSS must be an integer!" +msgstr "" + +msgid "VSZ must be an integer!" +msgstr "" + +msgid "PCPU must be a float!" +msgstr "" + +msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!" +msgstr "" + +msgid "" +"Checks all processes and generates WARNING or CRITICAL states if the " +"specified" +msgstr "" + +msgid "" +"metric is outside the required threshold ranges. The metric defaults to " +"number" +msgstr "" + +msgid "" +"of processes. Search filters can be applied to limit the processes to check." +msgstr "" + +msgid "Generate warning state if metric is outside this range" +msgstr "" + +msgid "Generate critical state if metric is outside this range" +msgstr "" + +msgid "Check thresholds against metric. Valid types:" +msgstr "" + +msgid "PROCS - number of processes (default)" +msgstr "" + +msgid "VSZ - virtual memory size" +msgstr "" + +msgid "RSS - resident set memory size" +msgstr "" + +msgid "CPU - percentage CPU" +msgstr "" + +msgid "ELAPSED - time elapsed in seconds" +msgstr "" + +msgid "Extra information. Up to 3 verbosity levels" +msgstr "" + +msgid "Filter own process the traditional way by PID instead of /proc/pid/exe" +msgstr "" + +msgid "Only scan for processes that have, in the output of `ps`, one or" +msgstr "" + +msgid "more of the status flags you specify (for example R, Z, S, RS," +msgstr "" + +msgid "RSZDT, plus others based on the output of your 'ps' command)." +msgstr "" + +msgid "Only scan for children of the parent process ID indicated." +msgstr "" + +msgid "Only scan for processes with VSZ higher than indicated." +msgstr "" + +msgid "Only scan for processes with RSS higher than indicated." +msgstr "" + +msgid "Only scan for processes with PCPU higher than indicated." +msgstr "" + +msgid "Only scan for processes with user name or ID indicated." +msgstr "" + +msgid "Only scan for processes with args that contain STRING." +msgstr "" + +msgid "Only scan for processes with args that contain the regex STRING." +msgstr "" + +msgid "Only scan for exact matches of COMMAND (without path)." +msgstr "" + +msgid "Exclude processes which match this comma separated list" +msgstr "" + +msgid "Only scan for non kernel threads (works on Linux only)." +msgstr "" + +#, c-format +msgid "" +"\n" +"RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n" +"specified 'max:min', a warning status will be generated if the\n" +"count is inside the specified range\n" +"\n" +msgstr "" + +#, c-format +msgid "" +"This plugin checks the number of currently running processes and\n" +"generates WARNING or CRITICAL states if the process count is outside\n" +"the specified threshold ranges. The process count can be filtered by\n" +"process owner, parent process PID, current state (e.g., 'Z'), or may\n" +"be the total number of running processes\n" +"\n" +msgstr "" + +msgid "Warning if not two processes with command name portsentry." +msgstr "" + +msgid "Critical if < 2 or > 1024 processes" +msgstr "" + +msgid "Critical if not at least 1 process with command sshd" +msgstr "" + +msgid "Warning if > 1024 processes with command name sshd." +msgstr "" + +msgid "Critical if < 1 processes with command name sshd." +msgstr "" + +msgid "Warning alert if > 10 processes with command arguments containing" +msgstr "" + +msgid "'/usr/local/bin/perl' and owned by root" +msgstr "" + +msgid "Alert if VSZ of any processes over 50K or 100K" +msgstr "" + +msgid "Alert if CPU of any processes over 10% or 20%" +msgstr "" + +msgid "Config file error\n" +msgstr "" + +msgid "Out of Memory?\n" +msgstr "" + +msgid "Invalid NAS-Identifier\n" +msgstr "" + +#, c-format +msgid "gethostname() failed!\n" +msgstr "" + +msgid "Invalid NAS-IP-Address\n" +msgstr "" + +msgid "Timeout\n" +msgstr "" + +msgid "Auth Error\n" +msgstr "" + +msgid "Auth Failed\n" +msgstr "" + +msgid "Bad Response\n" +msgstr "" + +msgid "Auth OK\n" +msgstr "" + +#, c-format +msgid "Unexpected result code %d" +msgstr "" + +msgid "Number of retries must be a positive integer" +msgstr "" + +msgid "User not specified" +msgstr "" + +msgid "Password not specified" +msgstr "" + +msgid "Configuration file not specified" +msgstr "" + +msgid "Tests to see if a RADIUS server is accepting connections." +msgstr "" + +msgid "The user to authenticate" +msgstr "" + +msgid "Password for authentication (SECURITY RISK)" +msgstr "" + +msgid "NAS identifier" +msgstr "" + +msgid "NAS IP Address" +msgstr "" + +msgid "Configuration file" +msgstr "" + +msgid "Response string to expect from the server" +msgstr "" + +msgid "Number of times to retry a failed connection" +msgstr "" + +msgid "" +"This plugin tests a RADIUS server to see if it is accepting connections." +msgstr "" + +msgid "" +"The server to test must be specified in the invocation, as well as a user" +msgstr "" + +msgid "name and password. A configuration file must be present. The format of" +msgstr "" + +msgid "" +"the configuration file is described in the radiusclient library sources." +msgstr "" + +msgid "The password option presents a substantial security issue because the" +msgstr "" + +msgid "" +"password can possibly be determined by careful watching of the command line" +msgstr "" + +msgid "in a process listing. This risk is exacerbated because the plugin will" +msgstr "" + +msgid "" +"typically be executed at regular predictable intervals. Please be sure that" +msgstr "" + +msgid "the password used does not allow access to sensitive system resources." +msgstr "" + +#, c-format +msgid "Unable to connect to %s on port %d\n" +msgstr "" + +#, c-format +msgid "No data received from %s\n" +msgstr "" + +msgid "Invalid REAL response received from host" +msgstr "" + +#, c-format +msgid "Invalid REAL response received from host on port %d\n" +msgstr "" + +#, c-format +msgid "No data received from host\n" +msgstr "" + +#, c-format +msgid "REAL %s - %d second response time\n" +msgstr "" + +msgid "Warning time must be a positive integer" +msgstr "" + +msgid "Critical time must be a positive integer" +msgstr "" + +msgid "You must provide a server to check" +msgstr "" + +msgid "This plugin tests the REAL service on the specified host." +msgstr "" + +msgid "Connect to this url" +msgstr "" + +#, c-format +msgid "String to expect in first line of server response (default: %s)\n" +msgstr "" + +msgid "This plugin will attempt to open an RTSP connection with the host." +msgstr "" + +msgid "Successful connects return STATE_OK, refusals and timeouts return" +msgstr "" + +msgid "" +"STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful connects," +msgstr "" + +msgid "" +"but incorrect response messages from the host result in STATE_WARNING return" +msgstr "" + +msgid "values." +msgstr "" + +#, c-format +msgid "malloc() failed!\n" +msgstr "" + +#, c-format +msgid "CRITICAL - Cannot create SSL context.\n" +msgstr "" + +#, c-format +msgid "recv() failed\n" +msgstr "" + +#, c-format +msgid "WARNING - TLS not supported by server\n" +msgstr "" + +#, c-format +msgid "Server does not support STARTTLS\n" +msgstr "" + +msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS." +msgstr "" + +#, c-format +msgid "sent %s" +msgstr "" + +msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS." +msgstr "" + +#, c-format +msgid "Invalid SMTP response received from host: %s\n" +msgstr "" + +#, c-format +msgid "Invalid SMTP response received from host on port %d: %s\n" +msgstr "" + +#, c-format +msgid "Could Not Compile Regular Expression" +msgstr "" + +#, c-format +msgid "SMTP %s - Invalid response '%s' to command '%s'\n" +msgstr "" + +#, c-format +msgid "Execute Error: %s\n" +msgstr "" + +msgid "no authuser specified, " +msgstr "" + +msgid "no authpass specified, " +msgstr "" + +#, c-format +msgid "sent %s\n" +msgstr "" + +msgid "recv() failed after AUTH LOGIN, " +msgstr "" + +#, c-format +msgid "received %s\n" +msgstr "" + +msgid "invalid response received after AUTH LOGIN, " +msgstr "" + +msgid "recv() failed after sending authuser, " +msgstr "" + +msgid "invalid response received after authuser, " +msgstr "" + +msgid "recv() failed after sending authpass, " +msgstr "" + +msgid "invalid response received after authpass, " +msgstr "" + +msgid "only authtype LOGIN is supported, " +msgstr "" + +#, c-format +msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n" +msgstr "" + +#, c-format +msgid "Could not realloc() units [%d]\n" +msgstr "" + +msgid "Critical time must be a positive" +msgstr "" + +msgid "Warning time must be a positive" +msgstr "" + +msgid "SSL support not available - install OpenSSL and recompile" +msgstr "" + +msgid "Set either -s/--ssl/--tls or -S/--starttls" +msgstr "" + +#, c-format +msgid "Connection closed by server before sending QUIT command\n" +msgstr "" + +#, c-format +msgid "recv() failed after QUIT." +msgstr "" + +#, c-format +msgid "Connection reset by peer." +msgstr "" + +msgid "This plugin will attempt to open an SMTP connection with the host." +msgstr "" + +#, c-format +msgid " String to expect in first line of server response (default: '%s')\n" +msgstr "" + +msgid "SMTP command (may be used repeatedly)" +msgstr "" + +msgid "Expected response to command (may be used repeatedly)" +msgstr "" + +msgid "FROM-address to include in MAIL command, required by Exchange 2000" +msgstr "" + +msgid "FQDN used for HELO" +msgstr "" + +msgid "Use PROXY protocol prefix for the connection." +msgstr "" + +msgid "Minimum number of days a certificate has to be valid." +msgstr "" + +msgid "Use SSL/TLS for the connection." +msgstr "" + +#, c-format +msgid " Sets default port to %d.\n" +msgstr "" + +msgid "Use STARTTLS for the connection." +msgstr "" + +msgid "SMTP AUTH type to check (default none, only LOGIN supported)" +msgstr "" + +msgid "SMTP AUTH username" +msgstr "" + +msgid "SMTP AUTH password" +msgstr "" + +msgid "Send LHLO instead of HELO/EHLO" +msgstr "" + +msgid "Ignore failure when sending QUIT command to server" +msgstr "" + +msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful" +msgstr "" + +msgid "connects, but incorrect response messages from the host result in" +msgstr "" + +msgid "STATE_WARNING return values." +msgstr "" + +msgid "Cannot malloc" +msgstr "" + +#, c-format +msgid "External command error: %s\n" +msgstr "" + +#, c-format +msgid "External command error with no output (return code: %d)\n" +msgstr "" + +#, c-format +msgid "No valid data returned (%s)\n" +msgstr "" + +msgid "Time duration between plugin calls is invalid" +msgstr "" + +msgid "Cannot asprintf()" +msgstr "" + +msgid "Cannot realloc()" +msgstr "" + +msgid "No previous data to calculate rate - assume okay" +msgstr "" + +msgid "Retries interval must be a positive integer" +msgstr "" + +msgid "Exit status must be a positive integer" +msgstr "" + +#, c-format +msgid "Could not reallocate labels[%d]" +msgstr "" + +msgid "Could not reallocate labels\n" +msgstr "" + +#, c-format +msgid "Could not reallocate units [%d]\n" +msgstr "" + +msgid "Could not realloc() units\n" +msgstr "" + +msgid "Rate multiplier must be a positive integer" +msgstr "" + +msgid "No host specified\n" +msgstr "" + +msgid "No OIDs specified\n" +msgstr "" + +#, c-format +msgid "Required parameter: %s\n" +msgstr "" + +msgid "Invalid seclevel" +msgstr "" + +msgid "Invalid SNMP version" +msgstr "" + +msgid "Unbalanced quotes\n" +msgstr "" + +#, c-format +msgid "multiplier set (%.1f), but input is not a number: %s" +msgstr "" + +msgid "Check status of remote machines and obtain system information via SNMP" +msgstr "" + +msgid "Use SNMP GETNEXT instead of SNMP GET" +msgstr "" + +msgid "SNMP protocol version" +msgstr "" + +msgid "SNMPv3 context" +msgstr "" + +msgid "SNMPv3 securityLevel" +msgstr "" + +msgid "SNMPv3 auth proto" +msgstr "" + +msgid "SNMPv3 priv proto (default DES)" +msgstr "" + +msgid "Optional community string for SNMP communication" +msgstr "" + +msgid "default is" +msgstr "" + +msgid "SNMPv3 username" +msgstr "" + +msgid "SNMPv3 authentication password" +msgstr "" + +msgid "SNMPv3 privacy password" +msgstr "" + +msgid "Object identifier(s) or SNMP variables whose value you wish to query" +msgstr "" + +msgid "" +"List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'" +msgstr "" + +msgid "for symbolic OIDs.)" +msgstr "" + +msgid "Delimiter to use when parsing returned data. Default is" +msgstr "" + +msgid "Any data on the right hand side of the delimiter is considered" +msgstr "" + +msgid "to be the data that should be used in the evaluation." +msgstr "" + +msgid "If the check returns a 0 length string or NULL value" +msgstr "" + +msgid "This option allows you to choose what status you want it to exit" +msgstr "" + +msgid "Excluding this option renders the default exit of 3(STATE_UNKNOWN)" +msgstr "" + +msgid "0 = OK" +msgstr "" + +msgid "1 = WARNING" +msgstr "" + +msgid "2 = CRITICAL" +msgstr "" + +msgid "3 = UNKNOWN" +msgstr "" + +msgid "Warning threshold range(s)" +msgstr "" + +msgid "Critical threshold range(s)" +msgstr "" + +msgid "Enable rate calculation. See 'Rate Calculation' below" +msgstr "" + +msgid "" +"Converts rate per second. For example, set to 60 to convert to per minute" +msgstr "" + +msgid "Add/subtract the specified OFFSET to numeric sensor data" +msgstr "" + +msgid "Return OK state (for that OID) if STRING is an exact match" +msgstr "" + +msgid "" +"Return OK state (for that OID) if extended regular expression REGEX matches" +msgstr "" + +msgid "" +"Return OK state (for that OID) if case-insensitive extended REGEX matches" +msgstr "" + +msgid "Invert search result (CRITICAL if found)" +msgstr "" + +msgid "Prefix label for output from plugin" +msgstr "" + +msgid "Units label(s) for output data (e.g., 'sec.')." +msgstr "" + +msgid "Separates output on multiple OID requests" +msgstr "" + +msgid "Multiplies current value, 0 < n < 1 works as divider, defaults to 1" +msgstr "" + +msgid "C-style format string for float values (see option -M)" +msgstr "" + +msgid "" +"NOTE the final timeout value is calculated using this formula: " +"timeout_interval * retries + 5" +msgstr "" + +msgid "Number of retries to be used in the requests, default: " +msgstr "" + +msgid "Label performance data with OIDs instead of --label's" +msgstr "" + +msgid "Tell snmpget to not print errors encountered when parsing MIB files" +msgstr "" + +msgid "" +"This plugin uses the 'snmpget' command included with the NET-SNMP package." +msgstr "" + +msgid "" +"if you don't have the package installed, you will need to download it from" +msgstr "" + +msgid "http://net-snmp.sourceforge.net before you can use this plugin." +msgstr "" + +msgid "" +"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited " +msgstr "" + +msgid "list (lists with internal spaces must be quoted)." +msgstr "" + +msgid "" +"- When checking multiple OIDs, separate ranges by commas like '-w " +"1:10,1:,:20'" +msgstr "" + +msgid "- Note that only one string and one regex may be checked at present" +msgstr "" + +msgid "" +"- All evaluation methods other than PR, STR, and SUBSTR expect that the value" +msgstr "" + +msgid "returned from the SNMP query is an unsigned integer." +msgstr "" + +msgid "Rate Calculation:" +msgstr "" + +msgid "In many places, SNMP returns counters that are only meaningful when" +msgstr "" + +msgid "calculating the counter difference since the last check. check_snmp" +msgstr "" + +msgid "saves the last state information in a file so that the rate per second" +msgstr "" + +msgid "can be calculated. Use the --rate option to save state information." +msgstr "" + +msgid "" +"On the first run, there will be no prior state - this will return with OK." +msgstr "" + +msgid "The state is uniquely determined by the arguments to the plugin, so" +msgstr "" + +msgid "changing the arguments will create a new state file." +msgstr "" + +msgid "Port number must be a positive integer" +msgstr "" + +#, c-format +msgid "Server answer: %s" +msgstr "" + +#, c-format +msgid "SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n" +msgstr "" + +#, c-format +msgid "" +"SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n" +msgstr "" + +#, c-format +msgid "SSH OK - %s (protocol %s) | %s\n" +msgstr "" + +msgid "Try to connect to an SSH server at specified server and port" +msgstr "" + +msgid "" +"Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)" +msgstr "" + +msgid "Alert if protocol doesn't match expected protocol version (ex: 2.0)" +msgstr "" + +#, c-format +msgid "Command: %s\n" +msgstr "" + +#, c-format +msgid "Format: %s\n" +msgstr "" + +#, c-format +msgid "total=%.0f, used=%.0f, free=%.0f\n" +msgstr "" + +#, c-format +msgid "total=%.0f, free=%.0f\n" +msgstr "" + +msgid "Error getting swap devices\n" +msgstr "" + +msgid "SWAP OK: No swap devices defined\n" +msgstr "" + +msgid "swapctl failed: " +msgstr "" + +msgid "Error in swapctl call\n" +msgstr "" + +#, c-format +msgid "SWAP %s - %d%% free (%dMB out of %dMB) %s|" +msgstr "" + +msgid "Warning threshold percentage must be <= 100!" +msgstr "" + +msgid "Warning threshold be positive integer or percentage!" +msgstr "" + +msgid "Critical threshold percentage must be <= 100!" +msgstr "" + +msgid "Critical threshold be positive integer or percentage!" +msgstr "" + +msgid "" +"no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " +"or integer (0-3)." +msgstr "" + +msgid "Warning should be more than critical" +msgstr "" + +msgid "Check swap space on local machine." +msgstr "" + +msgid "" +"Exit with WARNING status if less than INTEGER bytes of swap space are free" +msgstr "" + +msgid "Exit with WARNING status if less than PERCENT of swap space is free" +msgstr "" + +msgid "" +"Exit with CRITICAL status if less than INTEGER bytes of swap space are free" +msgstr "" + +msgid "Exit with CRITICAL status if less than PERCENT of swap space is free" +msgstr "" + +msgid "Conduct comparisons for all swap partitions, one by one" +msgstr "" + +msgid "" +"Resulting state when there is no swap regardless of thresholds. Default:" +msgstr "" + +msgid "" +"Both INTEGER and PERCENT thresholds can be specified, they are all checked." +msgstr "" + +msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s." +msgstr "" + +msgid "CRITICAL - Generic check_tcp called with unknown service\n" +msgstr "" + +msgid "With UDP checks, a send/expect string must be specified." +msgstr "" + +msgid "No arguments found" +msgstr "" + +msgid "Maxbytes must be a positive integer" +msgstr "" + +msgid "Refuse must be one of ok, warn, crit" +msgstr "" + +msgid "Mismatch must be one of ok, warn, crit" +msgstr "" + +msgid "Delay must be a positive integer" +msgstr "" + +msgid "You must provide a server address" +msgstr "" + +msgid "Invalid hostname, address or socket" +msgstr "" + +#, c-format +msgid "" +"This plugin tests %s connections with the specified host (or unix socket).\n" +"\n" +msgstr "" + +msgid "" +"Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send " +"or quit option" +msgstr "" + +msgid "Default: nothing added to send, \\r\\n added to end of quit" +msgstr "" + +msgid "String to send to the server" +msgstr "" + +msgid "String to expect in server response" +msgstr "" + +msgid "(may be repeated)" +msgstr "" + +msgid "All expect strings need to occur in server response. Default is any" +msgstr "" + +msgid "String to send server to initiate a clean close of the connection" +msgstr "" + +msgid "Accept TCP refusals with states ok, warn, crit (default: crit)" +msgstr "" + +msgid "" +"Accept expected string mismatches with states ok, warn, crit (default: warn)" +msgstr "" + +msgid "Hide output from TCP socket" +msgstr "" + +msgid "Close connection once more than this number of bytes are received" +msgstr "" + +msgid "Seconds to wait between sending string and polling for response" +msgstr "" + +msgid "1st is #days for warning, 2nd is critical (if not specified - 0)." +msgstr "" + +msgid "Use SSL for the connection." +msgstr "" + +msgid "SSL server_name" +msgstr "" + +#, c-format +msgid "TIME UNKNOWN - could not connect to server %s, port %d\n" +msgstr "" + +#, c-format +msgid "TIME UNKNOWN - could not send UDP request to server %s, port %d\n" +msgstr "" + +#, c-format +msgid "TIME UNKNOWN - no data received from server %s, port %d\n" +msgstr "" + +#, c-format +msgid "TIME %s - %d second response time|%s\n" +msgstr "" + +#, c-format +msgid "TIME %s - %lu second time difference|%s %s\n" +msgstr "" + +msgid "Warning thresholds must be a positive integer" +msgstr "" + +msgid "Critical thresholds must be a positive integer" +msgstr "" + +msgid "This plugin will check the time on the specified host." +msgstr "" + +msgid "Use UDP to connect, not TCP" +msgstr "" + +msgid "Time difference (sec.) necessary to result in a warning status" +msgstr "" + +msgid "Time difference (sec.) necessary to result in a critical status" +msgstr "" + +msgid "Response time (sec.) necessary to result in warning status" +msgstr "" + +msgid "Response time (sec.) necessary to result in critical status" +msgstr "" + +msgid "On Battery, Low Battery" +msgstr "" + +msgid "Online" +msgstr "" + +msgid "On Battery" +msgstr "" + +msgid ", Low Battery" +msgstr "" + +msgid ", Calibrating" +msgstr "" + +msgid ", Replace Battery" +msgstr "" + +msgid ", On Bypass" +msgstr "" + +msgid ", Overload" +msgstr "" + +msgid ", Trimming" +msgstr "" + +msgid ", Boosting" +msgstr "" + +msgid ", Charging" +msgstr "" + +msgid ", Discharging" +msgstr "" + +msgid ", Unknown" +msgstr "" + +msgid "UPS does not support any available options\n" +msgstr "" + +msgid "Invalid response received from host" +msgstr "" + +msgid "UPS name to long for buffer" +msgstr "" + +#, c-format +msgid "CRITICAL - no such UPS '%s' on that host\n" +msgstr "" + +msgid "CRITICAL - UPS data is stale" +msgstr "" + +#, c-format +msgid "Unknown error: %s\n" +msgstr "" + +msgid "Error: unable to parse variable" +msgstr "" + +msgid "Unrecognized UPS variable" +msgstr "" + +msgid "Error : no UPS indicated" +msgstr "" + +msgid "" +"This plugin tests the UPS service on the specified host. Network UPS Tools" +msgstr "" + +msgid "from www.networkupstools.org must be running for this plugin to work." +msgstr "" + +msgid "Name of UPS" +msgstr "" + +msgid "Output of temperatures in Celsius" +msgstr "" + +msgid "Valid values for STRING are" +msgstr "" + +msgid "" +"This plugin attempts to determine the status of a UPS (Uninterruptible Power" +msgstr "" + +msgid "" +"Supply) on a local or remote host. If the UPS is online or calibrating, the" +msgstr "" + +msgid "" +"plugin will return an OK state. If the battery is on it will return a WARNING" +msgstr "" + +msgid "" +"state. If the UPS is off or has a low battery the plugin will return a " +"CRITICAL" +msgstr "" + +msgid "" +"You may also specify a variable to check (such as temperature, utility " +"voltage," +msgstr "" + +msgid "" +"battery load, etc.) as well as warning and critical thresholds for the value" +msgstr "" + +msgid "" +"of that variable. If the remote host has multiple UPS that are being " +"monitored" +msgstr "" + +msgid "you will have to use the --ups option to specify which UPS to check." +msgstr "" + +msgid "" +"This plugin requires that the UPSD daemon distributed with Russell Kroll's" +msgstr "" + +msgid "" +"Network UPS Tools be installed on the remote host. If you do not have the" +msgstr "" + +msgid "package installed on your system, you can download it from" +msgstr "" + +msgid "http://www.networkupstools.org" +msgstr "" + +#, c-format +msgid "Could not enumerate RD sessions: %d\n" +msgstr "" + +#, c-format +msgid "# users=%d" +msgstr "" + +msgid "Unable to read output" +msgstr "" + +#, c-format +msgid "USERS %s - %d users currently logged in |%s\n" +msgstr "" + +msgid "This plugin checks the number of users currently logged in on the local" +msgstr "" + +msgid "" +"system and generates an error if the number exceeds the thresholds specified." +msgstr "" + +msgid "Set WARNING status if more than INTEGER users are logged in" +msgstr "" + +msgid "Set CRITICAL status if more than INTEGER users are logged in" +msgstr "" + +msgid "" +"DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"." +msgstr "" + +msgid "Nagios-compatible output is now always returned." +msgstr "" + +msgid "SMART commands are broken and have been disabled (See Notes in --help)." +msgstr "" + +msgid "" +"DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the" +msgstr "" + +msgid "default and will be removed from future releases." +msgstr "" + +#, c-format +msgid "CRITICAL - Couldn't open device %s: %s\n" +msgstr "" + +#, c-format +msgid "CRITICAL - SMART_CMD_ENABLE\n" +msgstr "" + +#, c-format +msgid "CRITICAL - SMART_READ_VALUES: %s\n" +msgstr "" + +#, c-format +msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n" +msgstr "" + +#, c-format +msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n" +msgstr "" + +#, c-format +msgid "OK - Operational (%d/%d tests passed)\n" +msgstr "" + +#, c-format +msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n" +msgstr "" + +#, c-format +msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n" +msgstr "" + +#, c-format +msgid "OffLineCapability=%d {%s %s %s}\n" +msgstr "" + +#, c-format +msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n" +msgstr "" + +#, c-format +msgid "CRITICAL - %s: %s\n" +msgstr "" + +#, c-format +msgid "OK - Command sent (%s)\n" +msgstr "" + +#, c-format +msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n" +msgstr "" + +#, c-format +msgid "" +"This plugin checks a local hard drive with the (Linux specific) SMART " +"interface [http://smartlinux.sourceforge.net/smart/index.php]." +msgstr "" + +msgid "Select device DEVICE" +msgstr "" + +msgid "" +"Note: if the device is specified without this option, any further option will" +msgstr "" + +msgid "be ignored." +msgstr "" + +msgid "" +"The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were" +msgstr "" + +msgid "" +"broken in an underhand manner and have been disabled. You can use smartctl" +msgstr "" + +msgid "instead:" +msgstr "" + +msgid "-0/--auto-off: use \"smartctl --offlineauto=off\"" +msgstr "" + +msgid "-1/--auto-on: use \"smartctl --offlineauto=on\"" +msgstr "" + +msgid "-i/--immediate: use \"smartctl --test=offline\"" +msgstr "" + +msgid "No data returned from command\n" +msgstr "" + +msgid "" +"Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " +"or integer (0-3)." +msgstr "" + +msgid "" +"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer " +"(0-3)." +msgstr "" + +msgid "" +"Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +msgid "" +"Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +msgid "" +"Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +msgid "Require path to command" +msgstr "" + +msgid "" +"Negates the status of a plugin (returns OK for CRITICAL and vice-versa)." +msgstr "" + +msgid "Additional switches can be used to control which state becomes what." +msgstr "" + +msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status." +msgstr "" + +msgid "Custom result on Negate timeouts; see below for STATUS definition\n" +msgstr "" + +#, c-format +msgid "" +" STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n" +msgstr "" + +#, c-format +msgid "" +" quotes. Numeric values are accepted. If nothing is specified, permutes\n" +msgstr "" + +#, c-format +msgid " OK and CRITICAL.\n" +msgstr "" + +#, c-format +msgid "" +" Substitute output text as well. Will only substitute text in CAPITALS\n" +msgstr "" + +msgid "Run check_ping and invert result. Must use full path to plugin" +msgstr "" + +msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL" +msgstr "" + +msgid "" +"This plugin is a wrapper to take the output of another plugin and invert it." +msgstr "" + +msgid "The full path of the plugin must be provided." +msgstr "" + +msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL." +msgstr "" + +msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK." +msgstr "" + +msgid "Otherwise, the output state of the wrapped plugin is unchanged." +msgstr "" + +msgid "" +"Using timeout-result, it is possible to override the timeout behaviour or a" +msgstr "" + +msgid "plugin by setting the negate timeout a bit lower." +msgstr "" + +#, c-format +msgid "%s - Socket timeout after %d seconds\n" +msgstr "" + +#, c-format +msgid "%s - Abnormal timeout after %d seconds\n" +msgstr "" + +msgid "Send failed" +msgstr "" + +msgid "No data was received from host!" +msgstr "" + +msgid "Socket creation failed" +msgstr "" + +msgid "Supplied path too long unix domain socket" +msgstr "" + +msgid "Receive failed" +msgstr "" + +#, c-format +msgid "Invalid hostname/address - %s" +msgstr "" + +msgid "Could not malloc argv array in popen()" +msgstr "" + +msgid "CRITICAL - You need more args!!!" +msgstr "" + +msgid "Cannot catch SIGCHLD" +msgstr "" + +#, c-format +msgid "CRITICAL - Plugin timed out after %d seconds\n" +msgstr "" + +msgid "CRITICAL - popen timeout received, but no child process" +msgstr "" + +#, c-format +msgid "" +"%s UNKNOWN - No data received from host\n" +"CMD: %s\n" +msgstr "" + +msgid "" +"This plugin wraps the text output of another command (plugin) in HTML " +msgstr "" + +msgid "" +"tags, thus displaying the child plugin's output as a clickable link in " +"compatible" +msgstr "" + +msgid "" +"monitoring status screen. This plugin returns the status of the invoked " +"plugin." +msgstr "" + +msgid "" +"Pay close attention to quoting to ensure that the shell passes the expected" +msgstr "" + +msgid "data to the plugin. For example, in:" +msgstr "" + +msgid "urlize http://example.com/ check_http -H example.com -r 'two words'" +msgstr "" + +msgid "the shell will remove the single quotes and urlize will see:" +msgstr "" + +msgid "urlize http://example.com/ check_http -H example.com -r two words" +msgstr "" + +msgid "You probably want:" +msgstr "" + +msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" +msgstr "" + +msgid "failed realloc in strpcpy\n" +msgstr "" + +msgid "failed malloc in strscat\n" +msgstr "" + +msgid "failed malloc in xvasprintf\n" +msgstr "" + +#, c-format +msgid "" +" %s (-h | --help) for detailed help\n" +" %s (-V | --version) for version information\n" +msgstr "" + +msgid "" +"\n" +"Options:\n" +" -h, --help\n" +" Print detailed help screen\n" +" -V, --version\n" +" Print version information\n" +msgstr "" + +#, c-format +msgid "" +" -H, --hostname=ADDRESS\n" +" Host name, IP Address, or unix socket (must be an absolute path)\n" +" -%c, --port=INTEGER\n" +" Port number (default: %s)\n" +msgstr "" + +msgid "" +" -4, --use-ipv4\n" +" Use IPv4 connection\n" +" -6, --use-ipv6\n" +" Use IPv6 connection\n" +msgstr "" + +msgid "" +" -v, --verbose\n" +" Show details for command-line debugging (output may be truncated by\n" +" the monitoring system)\n" +msgstr "" + +msgid "" +" -w, --warning=DOUBLE\n" +" Response time to result in warning status (seconds)\n" +" -c, --critical=DOUBLE\n" +" Response time to result in critical status (seconds)\n" +msgstr "" + +msgid "" +" -w, --warning=RANGE\n" +" Warning range (format: start:end). Alert if outside this range\n" +" -c, --critical=RANGE\n" +" Critical range\n" +msgstr "" + +#, c-format +msgid "" +" -t, --timeout=INTEGER\n" +" Seconds before connection times out (default: %d)\n" +msgstr "" + +#, c-format +msgid "" +" -t, --timeout=INTEGER\n" +" Seconds before plugin times out (default: %d)\n" +msgstr "" + +msgid "" +" --extra-opts=[section][@file]\n" +" Read options from an ini file. See\n" +" https://www.monitoring-plugins.org/doc/extra-opts.html\n" +" for usage and examples.\n" +msgstr "" + +msgid "" +" See:\n" +" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" +" for THRESHOLD format and examples.\n" +msgstr "" + +msgid "" +"\n" +"Send email to help@monitoring-plugins.org if you have questions regarding\n" +"use of this software. To submit patches or suggest improvements, send email\n" +"to devel@monitoring-plugins.org\n" +"\n" +msgstr "" + +msgid "" +"\n" +"The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may " +"redistribute\n" +"copies of the plugins under the terms of the GNU General Public License.\n" +"For more information about these matters, see the file named COPYING.\n" +msgstr "" + +#, c-format +msgid "Error: Could not get hardware address of interface '%s'\n" +msgstr "" + +#, c-format +msgid "Error: if_nametoindex error - %s.\n" +msgstr "" + +#, c-format +msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n" +msgstr "" + +#, c-format +msgid "" +"Error: Couldn't get hardware address from interface %s. malloc error - %s.\n" +msgstr "" + +#, c-format +msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n" +msgstr "" + +#, c-format +msgid "" +"Error: can't find unit number in interface_name (%s) - expecting TypeNumber " +"eg lnc0.\n" +msgstr "" + +#, c-format +msgid "" +"Error: can't read MAC address from DLPI streams interface for device %s unit " +"%d.\n" +msgstr "" + +#, c-format +msgid "" +"Error: can't get MAC address for this architecture. Use the --mac option.\n" +msgstr "" + +#, c-format +msgid "Error: Cannot determine IP address of interface %s\n" +msgstr "" + +#, c-format +msgid "Error: Cannot get interface IP address on this platform.\n" +msgstr "" + +#, c-format +msgid "Pretending to be relay client %s\n" +msgstr "" + +#, c-format +msgid "DHCPDISCOVER to %s port %d\n" +msgstr "" + +#, c-format +msgid "Result=ERROR\n" +msgstr "" + +#, c-format +msgid "Result=OK\n" +msgstr "" + +#, c-format +msgid "DHCPOFFER from IP address %s" +msgstr "" + +#, c-format +msgid " via %s\n" +msgstr "" + +#, c-format +msgid "" +"DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n" +msgstr "" + +#, c-format +msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n" +msgstr "" + +#, c-format +msgid "Total responses seen on the wire: %d\n" +msgstr "" + +#, c-format +msgid "Valid responses for this machine: %d\n" +msgstr "" + +#, c-format +msgid "send_dhcp_packet result: %d\n" +msgstr "" + +#, c-format +msgid "No (more) data received (nfound: %d)\n" +msgstr "" + +#, c-format +msgid "recvfrom() failed, " +msgstr "" + +#, c-format +msgid "receive_dhcp_packet() result: %d\n" +msgstr "" + +#, c-format +msgid "receive_dhcp_packet() source: %s\n" +msgstr "" + +#, c-format +msgid "Error: Could not create socket!\n" +msgstr "" + +#, c-format +msgid "Error: Could not set reuse address option on DHCP socket!\n" +msgstr "" + +#, c-format +msgid "Error: Could not set broadcast option on DHCP socket!\n" +msgstr "" + +#, c-format +msgid "" +"Error: Could not bind socket to interface %s. Check your privileges...\n" +msgstr "" + +#, c-format +msgid "" +"Error: Could not bind to DHCP socket (port %d)! Check your privileges...\n" +msgstr "" + +#, c-format +msgid "Requested server address: %s\n" +msgstr "" + +#, c-format +msgid "Lease Time: Infinite\n" +msgstr "" + +#, c-format +msgid "Lease Time: %lu seconds\n" +msgstr "" + +#, c-format +msgid "Renewal Time: Infinite\n" +msgstr "" + +#, c-format +msgid "Renewal Time: %lu seconds\n" +msgstr "" + +#, c-format +msgid "Rebinding Time: Infinite\n" +msgstr "" + +#, c-format +msgid "Rebinding Time: %lu seconds\n" +msgstr "" + +#, c-format +msgid "Added offer from server @ %s" +msgstr "" + +#, c-format +msgid " of IP address %s\n" +msgstr "" + +#, c-format +msgid "DHCP Server Match: Offerer=%s" +msgstr "" + +#, c-format +msgid " Requested=%s" +msgstr "" + +#, c-format +msgid " (duplicate)" +msgstr "" + +#, c-format +msgid "\n" +msgstr "" + +#, c-format +msgid "No DHCPOFFERs were received.\n" +msgstr "" + +#, c-format +msgid "Received %d DHCPOFFER(s)" +msgstr "" + +#, c-format +msgid ", Rogue DHCP Server detected! Server %s" +msgstr "" + +#, c-format +msgid " offered %s \n" +msgstr "" + +#, c-format +msgid ", %s%d of %d requested servers responded" +msgstr "" + +#, c-format +msgid ", requested address (%s) was %soffered" +msgstr "" + +msgid "not " +msgstr "" + +#, c-format +msgid ", max lease time = " +msgstr "" + +#, c-format +msgid "Infinity" +msgstr "" + +msgid "Got unexpected non-option argument" +msgstr "" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n" +msgstr "" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n" +msgstr "" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n" +msgstr "" + +#, c-format +msgid "" +"Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n" +msgstr "" + +#, c-format +msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n" +msgstr "" + +#, c-format +msgid "Hardware address: " +msgstr "" + +msgid "This plugin tests the availability of DHCP servers on a network." +msgstr "" + +msgid "IP address of DHCP server that we must hear from" +msgstr "" + +msgid "IP address that should be offered by at least one DHCP server" +msgstr "" + +msgid "Seconds to wait for DHCPOFFER before timeout occurs" +msgstr "" + +msgid "Interface to to use for listening (i.e. eth0)" +msgstr "" + +msgid "MAC address to use in the DHCP request" +msgstr "" + +msgid "Unicast testing: mimic a DHCP relay, requires -s" +msgstr "" + +msgid "" +"Only requested DHCP server may response (rogue DHCP server detection), " +"requires -s" +msgstr "" + +msgid "specify a target" +msgstr "" + +msgid "Use IPv4 (default) or IPv6 to communicate with the targets" +msgstr "" + +msgid "warning threshold (currently " +msgstr "" + +msgid "critical threshold (currently " +msgstr "" + +msgid "" +"RTA, round trip average, mode warning,critical, ex. 100ms,200ms unit in ms" +msgstr "" + +msgid "packet loss mode, ex. 40%,50% , unit in %" +msgstr "" + +msgid "jitter mode warning,critical, ex. 40.000ms,50.000ms , unit in ms " +msgstr "" + +msgid "MOS mode, between 0 and 4.4 warning,critical, ex. 3.5,3.0" +msgstr "" + +msgid "score mode, max value 100 warning,critical, ex. 80,70 " +msgstr "" + +msgid "detect out of order ICMP packts " +msgstr "" + +msgid "specify a source IP address or device name" +msgstr "" + +msgid "number of packets to send (currently " +msgstr "" + +msgid "max packet interval (currently " +msgstr "" + +msgid "max target interval (currently " +msgstr "" + +msgid "number of alive hosts required for success" +msgstr "" + +msgid "TTL on outgoing packets (currently " +msgstr "" + +msgid "timeout value (seconds, currently " +msgstr "" + +msgid "Number of icmp data bytes to send" +msgstr "" + +msgid "Packet size will be data bytes + icmp header (currently" +msgstr "" + +msgid "verbose" +msgstr "" + +msgid "If none of R,P,J,M,S or O is specified, default behavior is -R -P" +msgstr "" + +msgid "The -H switch is optional. Naming a host (or several) to check is not." +msgstr "" + +msgid "" +"Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" +msgstr "" + +msgid "packet loss. The default values should work well for most users." +msgstr "" + +msgid "" +"You can specify different RTA factors using the standardized abbreviations" +msgstr "" + +msgid "" +"us (microseconds), ms (milliseconds, default) or just plain s for seconds." +msgstr "" + +msgid "The -v switch can be specified several times for increased verbosity." +msgstr "" diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin new file mode 100644 index 0000000..2436c49 --- /dev/null +++ b/po/remove-potcdate.sin @@ -0,0 +1,19 @@ +# Sed script that remove the POT-Creation-Date line in the header entry +# from a POT file. +# +# The distinction between the first and the following occurrences of the +# pattern is achieved by looking at the hold space. +/^"POT-Creation-Date: .*"$/{ +x +# Test if the hold space is empty. +s/P/P/ +ta +# Yes it was empty. First occurrence. Remove the line. +g +d +bb +:a +# The hold space was nonempty. Following occurrences. Do nothing. +x +:b +} diff --git a/po/stamp-po b/po/stamp-po new file mode 100644 index 0000000..9788f70 --- /dev/null +++ b/po/stamp-po @@ -0,0 +1 @@ +timestamp diff --git a/release b/release index 197c4d5..cc6c9a4 100644 --- a/release +++ b/release @@ -1 +1 @@ -2.4.0 +2.3.5 diff --git a/tap/Makefile.in b/tap/Makefile.in index da7f4c6..281f3ce 100644 --- a/tap/Makefile.in +++ b/tap/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,7 +168,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \ $(top_srcdir)/gl/m4/open-cloexec.m4 \ $(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \ - $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/printf.m4 \ + $(top_srcdir)/gl/m4/pathmax.m4 $(top_srcdir)/gl/m4/pid_t.m4 \ + $(top_srcdir)/gl/m4/printf.m4 \ $(top_srcdir)/gl/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ @@ -181,6 +182,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ + $(top_srcdir)/gl/m4/std-gnu11.m4 \ $(top_srcdir)/gl/m4/stdalign.m4 \ $(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \ $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \ @@ -198,6 +200,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/gl/m4/time_r.m4 $(top_srcdir)/gl/m4/timegm.m4 \ $(top_srcdir)/gl/m4/ungetc.m4 $(top_srcdir)/gl/m4/unistd_h.m4 \ $(top_srcdir)/gl/m4/unlocked-io.m4 \ + $(top_srcdir)/gl/m4/vararrays.m4 \ $(top_srcdir)/gl/m4/vasnprintf.m4 \ $(top_srcdir)/gl/m4/vasprintf.m4 \ $(top_srcdir)/gl/m4/visibility.m4 \ @@ -315,6 +318,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp \ $(top_srcdir)/build-aux/mkinstalldirs README @@ -345,8 +350,6 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DBILIBS = @DBILIBS@ DEFS = @DEFS@ @@ -366,7 +369,6 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ EXTRAS = @EXTRAS@ EXTRAS_ROOT = @EXTRAS_ROOT@ @@ -1738,8 +1740,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ -localedir_c = @localedir_c@ -localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -1923,6 +1923,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am