summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACKNOWLEDGEMENTS4
-rw-r--r--NEWS (renamed from CHANGES)1
-rwxr-xr-xconfig.rpath660
-rw-r--r--configure.in1
-rw-r--r--doc/developer-guidelines.sgml18
-rw-r--r--gl/.cvsignore5
-rw-r--r--plugins/Makefile.am3
-rw-r--r--plugins/check_procs.c1
-rw-r--r--po/POTFILES.in2
9 files changed, 676 insertions, 19 deletions
diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS
index bd0b1a9..d14830c 100644
--- a/ACKNOWLEDGEMENTS
+++ b/ACKNOWLEDGEMENTS
@@ -27,3 +27,7 @@ Copyright (C) 91, 1995-2004 Free Software Foundation, Inc.
27http://www.gnu.org/software/coreutils/ 27http://www.gnu.org/software/coreutils/
28Use of macros and lib files in m4/np_coreutils.m4 and lib/. Setuid installs in plugins-root 28Use of macros and lib files in m4/np_coreutils.m4 and lib/. Setuid installs in plugins-root
29 29
30Gnulib team
31Copyright (C) 2201, 2003, 2004, 2006 Free Software Foundation, Inc
32http://www.gnu.org/software/gnulib/
33Use of lib files that originally were used from coreutils
diff --git a/CHANGES b/NEWS
index 05d3ba2..0ff54e0 100644
--- a/CHANGES
+++ b/NEWS
@@ -9,6 +9,7 @@ This file documents the major additions and syntax changes between releases.
9 Fixed crit/warn for check_disk perf data 9 Fixed crit/warn for check_disk perf data
10 Fixed buffer overflow in check_procs 10 Fixed buffer overflow in check_procs
11 Fixed error handling for UNIX sockets in netutils.c 11 Fixed error handling for UNIX sockets in netutils.c
12 Synced with latest GNUlib
12 13
131.4.5 141.4.5
14 Fixed bug in perl's is_hostname routine 15 Fixed bug in perl's is_hostname routine
diff --git a/config.rpath b/config.rpath
new file mode 100755
index 0000000..e082db6
--- /dev/null
+++ b/config.rpath
@@ -0,0 +1,660 @@
1#! /bin/sh
2# Output a system dependent set of variables, describing how to set the
3# run time search path of shared libraries in an executable.
4#
5# Copyright 1996-2006 Free Software Foundation, Inc.
6# Taken from GNU libtool, 2001
7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
8#
9# This file is free software; the Free Software Foundation gives
10# unlimited permission to copy and/or distribute it, with or without
11# modifications, as long as this notice is preserved.
12#
13# The first argument passed to this file is the canonical host specification,
14# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
15# or
16# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
17# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
18# should be set by the caller.
19#
20# The set of defined variables is at the end of this script.
21
22# Known limitations:
23# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
24# than 256 bytes, otherwise the compiler driver will dump core. The only
25# known workaround is to choose shorter directory names for the build
26# directory and/or the installation directory.
27
28# All known linkers require a `.a' archive for static linking (except MSVC,
29# which needs '.lib').
30libext=a
31shrext=.so
32
33host="$1"
34host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
35host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
36host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
37
38# Code taken from libtool.m4's _LT_CC_BASENAME.
39
40for cc_temp in $CC""; do
41 case $cc_temp in
42 compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
43 distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
44 \-*) ;;
45 *) break;;
46 esac
47done
48cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
49
50# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
51
52wl=
53if test "$GCC" = yes; then
54 wl='-Wl,'
55else
56 case "$host_os" in
57 aix*)
58 wl='-Wl,'
59 ;;
60 darwin*)
61 case $cc_basename in
62 xlc*)
63 wl='-Wl,'
64 ;;
65 esac
66 ;;
67 mingw* | pw32* | os2*)
68 ;;
69 hpux9* | hpux10* | hpux11*)
70 wl='-Wl,'
71 ;;
72 irix5* | irix6* | nonstopux*)
73 wl='-Wl,'
74 ;;
75 newsos6)
76 ;;
77 linux*)
78 case $cc_basename in
79 icc* | ecc*)
80 wl='-Wl,'
81 ;;
82 pgcc | pgf77 | pgf90)
83 wl='-Wl,'
84 ;;
85 ccc*)
86 wl='-Wl,'
87 ;;
88 como)
89 wl='-lopt='
90 ;;
91 *)
92 case `$CC -V 2>&1 | sed 5q` in
93 *Sun\ C*)
94 wl='-Wl,'
95 ;;
96 esac
97 ;;
98 esac
99 ;;
100 osf3* | osf4* | osf5*)
101 wl='-Wl,'
102 ;;
103 sco3.2v5*)
104 ;;
105 solaris*)
106 wl='-Wl,'
107 ;;
108 sunos4*)
109 wl='-Qoption ld '
110 ;;
111 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
112 wl='-Wl,'
113 ;;
114 sysv4*MP*)
115 ;;
116 unicos*)
117 wl='-Wl,'
118 ;;
119 uts4*)
120 ;;
121 esac
122fi
123
124# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
125
126hardcode_libdir_flag_spec=
127hardcode_libdir_separator=
128hardcode_direct=no
129hardcode_minus_L=no
130
131case "$host_os" in
132 cygwin* | mingw* | pw32*)
133 # FIXME: the MSVC++ port hasn't been tested in a loooong time
134 # When not using gcc, we currently assume that we are using
135 # Microsoft Visual C++.
136 if test "$GCC" != yes; then
137 with_gnu_ld=no
138 fi
139 ;;
140 interix*)
141 # we just hope/assume this is gcc and not c89 (= MSVC++)
142 with_gnu_ld=yes
143 ;;
144 openbsd*)
145 with_gnu_ld=no
146 ;;
147esac
148
149ld_shlibs=yes
150if test "$with_gnu_ld" = yes; then
151 # Set some defaults for GNU ld with shared library support. These
152 # are reset later if shared libraries are not supported. Putting them
153 # here allows them to be overridden if necessary.
154 # Unlike libtool, we use -rpath here, not --rpath, since the documented
155 # option of GNU ld is called -rpath, not --rpath.
156 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
157 case "$host_os" in
158 aix3* | aix4* | aix5*)
159 # On AIX/PPC, the GNU linker is very broken
160 if test "$host_cpu" != ia64; then
161 ld_shlibs=no
162 fi
163 ;;
164 amigaos*)
165 hardcode_libdir_flag_spec='-L$libdir'
166 hardcode_minus_L=yes
167 # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
168 # that the semantics of dynamic libraries on AmigaOS, at least up
169 # to version 4, is to share data among multiple programs linked
170 # with the same dynamic library. Since this doesn't match the
171 # behavior of shared libraries on other platforms, we cannot use
172 # them.
173 ld_shlibs=no
174 ;;
175 beos*)
176 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
177 :
178 else
179 ld_shlibs=no
180 fi
181 ;;
182 cygwin* | mingw* | pw32*)
183 # hardcode_libdir_flag_spec is actually meaningless, as there is
184 # no search path for DLLs.
185 hardcode_libdir_flag_spec='-L$libdir'
186 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
187 :
188 else
189 ld_shlibs=no
190 fi
191 ;;
192 interix3*)
193 hardcode_direct=no
194 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
195 ;;
196 linux*)
197 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
198 :
199 else
200 ld_shlibs=no
201 fi
202 ;;
203 netbsd*)
204 ;;
205 solaris*)
206 if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
207 ld_shlibs=no
208 elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
209 :
210 else
211 ld_shlibs=no
212 fi
213 ;;
214 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
215 case `$LD -v 2>&1` in
216 *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
217 ld_shlibs=no
218 ;;
219 *)
220 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
221 hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
222 else
223 ld_shlibs=no
224 fi
225 ;;
226 esac
227 ;;
228 sunos4*)
229 hardcode_direct=yes
230 ;;
231 *)
232 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
233 :
234 else
235 ld_shlibs=no
236 fi
237 ;;
238 esac
239 if test "$ld_shlibs" = no; then
240 hardcode_libdir_flag_spec=
241 fi
242else
243 case "$host_os" in
244 aix3*)
245 # Note: this linker hardcodes the directories in LIBPATH if there
246 # are no directories specified by -L.
247 hardcode_minus_L=yes
248 if test "$GCC" = yes; then
249 # Neither direct hardcoding nor static linking is supported with a
250 # broken collect2.
251 hardcode_direct=unsupported
252 fi
253 ;;
254 aix4* | aix5*)
255 if test "$host_cpu" = ia64; then
256 # On IA64, the linker does run time linking by default, so we don't
257 # have to do anything special.
258 aix_use_runtimelinking=no
259 else
260 aix_use_runtimelinking=no
261 # Test if we are trying to use run time linking or normal
262 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
263 # need to do runtime linking.
264 case $host_os in aix4.[23]|aix4.[23].*|aix5*)
265 for ld_flag in $LDFLAGS; do
266 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
267 aix_use_runtimelinking=yes
268 break
269 fi
270 done
271 ;;
272 esac
273 fi
274 hardcode_direct=yes
275 hardcode_libdir_separator=':'
276 if test "$GCC" = yes; then
277 case $host_os in aix4.[012]|aix4.[012].*)
278 collect2name=`${CC} -print-prog-name=collect2`
279 if test -f "$collect2name" && \
280 strings "$collect2name" | grep resolve_lib_name >/dev/null
281 then
282 # We have reworked collect2
283 hardcode_direct=yes
284 else
285 # We have old collect2
286 hardcode_direct=unsupported
287 hardcode_minus_L=yes
288 hardcode_libdir_flag_spec='-L$libdir'
289 hardcode_libdir_separator=
290 fi
291 ;;
292 esac
293 fi
294 # Begin _LT_AC_SYS_LIBPATH_AIX.
295 echo 'int main () { return 0; }' > conftest.c
296 ${CC} ${LDFLAGS} conftest.c -o conftest
297 aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
298}'`
299 if test -z "$aix_libpath"; then
300 aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
301}'`
302 fi
303 if test -z "$aix_libpath"; then
304 aix_libpath="/usr/lib:/lib"
305 fi
306 rm -f conftest.c conftest
307 # End _LT_AC_SYS_LIBPATH_AIX.
308 if test "$aix_use_runtimelinking" = yes; then
309 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
310 else
311 if test "$host_cpu" = ia64; then
312 hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
313 else
314 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
315 fi
316 fi
317 ;;
318 amigaos*)
319 hardcode_libdir_flag_spec='-L$libdir'
320 hardcode_minus_L=yes
321 # see comment about different semantics on the GNU ld section
322 ld_shlibs=no
323 ;;
324 bsdi[45]*)
325 ;;
326 cygwin* | mingw* | pw32*)
327 # When not using gcc, we currently assume that we are using
328 # Microsoft Visual C++.
329 # hardcode_libdir_flag_spec is actually meaningless, as there is
330 # no search path for DLLs.
331 hardcode_libdir_flag_spec=' '
332 libext=lib
333 ;;
334 darwin* | rhapsody*)
335 hardcode_direct=no
336 if test "$GCC" = yes ; then
337 :
338 else
339 case $cc_basename in
340 xlc*)
341 ;;
342 *)
343 ld_shlibs=no
344 ;;
345 esac
346 fi
347 ;;
348 dgux*)
349 hardcode_libdir_flag_spec='-L$libdir'
350 ;;
351 freebsd1*)
352 ld_shlibs=no
353 ;;
354 freebsd2.2*)
355 hardcode_libdir_flag_spec='-R$libdir'
356 hardcode_direct=yes
357 ;;
358 freebsd2*)
359 hardcode_direct=yes
360 hardcode_minus_L=yes
361 ;;
362 freebsd* | kfreebsd*-gnu | dragonfly*)
363 hardcode_libdir_flag_spec='-R$libdir'
364 hardcode_direct=yes
365 ;;
366 hpux9*)
367 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
368 hardcode_libdir_separator=:
369 hardcode_direct=yes
370 # hardcode_minus_L: Not really in the search PATH,
371 # but as the default location of the library.
372 hardcode_minus_L=yes
373 ;;
374 hpux10*)
375 if test "$with_gnu_ld" = no; then
376 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
377 hardcode_libdir_separator=:
378 hardcode_direct=yes
379 # hardcode_minus_L: Not really in the search PATH,
380 # but as the default location of the library.
381 hardcode_minus_L=yes
382 fi
383 ;;
384 hpux11*)
385 if test "$with_gnu_ld" = no; then
386 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
387 hardcode_libdir_separator=:
388 case $host_cpu in
389 hppa*64*|ia64*)
390 hardcode_direct=no
391 ;;
392 *)
393 hardcode_direct=yes
394 # hardcode_minus_L: Not really in the search PATH,
395 # but as the default location of the library.
396 hardcode_minus_L=yes
397 ;;
398 esac
399 fi
400 ;;
401 irix5* | irix6* | nonstopux*)
402 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
403 hardcode_libdir_separator=:
404 ;;
405 netbsd*)
406 hardcode_libdir_flag_spec='-R$libdir'
407 hardcode_direct=yes
408 ;;
409 newsos6)
410 hardcode_direct=yes
411 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
412 hardcode_libdir_separator=:
413 ;;
414 openbsd*)
415 hardcode_direct=yes
416 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
417 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
418 else
419 case "$host_os" in
420 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
421 hardcode_libdir_flag_spec='-R$libdir'
422 ;;
423 *)
424 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
425 ;;
426 esac
427 fi
428 ;;
429 os2*)
430 hardcode_libdir_flag_spec='-L$libdir'
431 hardcode_minus_L=yes
432 ;;
433 osf3*)
434 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
435 hardcode_libdir_separator=:
436 ;;
437 osf4* | osf5*)
438 if test "$GCC" = yes; then
439 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
440 else
441 # Both cc and cxx compiler support -rpath directly
442 hardcode_libdir_flag_spec='-rpath $libdir'
443 fi
444 hardcode_libdir_separator=:
445 ;;
446 solaris*)
447 hardcode_libdir_flag_spec='-R$libdir'
448 ;;
449 sunos4*)
450 hardcode_libdir_flag_spec='-L$libdir'
451 hardcode_direct=yes
452 hardcode_minus_L=yes
453 ;;
454 sysv4)
455 case $host_vendor in
456 sni)
457 hardcode_direct=yes # is this really true???
458 ;;
459 siemens)
460 hardcode_direct=no
461 ;;
462 motorola)
463 hardcode_direct=no #Motorola manual says yes, but my tests say they lie
464 ;;
465 esac
466 ;;
467 sysv4.3*)
468 ;;
469 sysv4*MP*)
470 if test -d /usr/nec; then
471 ld_shlibs=yes
472 fi
473 ;;
474 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
475 ;;
476 sysv5* | sco3.2v5* | sco5v6*)
477 hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
478 hardcode_libdir_separator=':'
479 ;;
480 uts4*)
481 hardcode_libdir_flag_spec='-L$libdir'
482 ;;
483 *)
484 ld_shlibs=no
485 ;;
486 esac
487fi
488
489# Check dynamic linker characteristics
490# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
491# Unlike libtool.m4, here we don't care about _all_ names of the library, but
492# only about the one the linker finds when passed -lNAME. This is the last
493# element of library_names_spec in libtool.m4, or possibly two of them if the
494# linker has special search rules.
495library_names_spec= # the last element of library_names_spec in libtool.m4
496libname_spec='lib$name'
497case "$host_os" in
498 aix3*)
499 library_names_spec='$libname.a'
500 ;;
501 aix4* | aix5*)
502 library_names_spec='$libname$shrext'
503 ;;
504 amigaos*)
505 library_names_spec='$libname.a'
506 ;;
507 beos*)
508 library_names_spec='$libname$shrext'
509 ;;
510 bsdi[45]*)
511 library_names_spec='$libname$shrext'
512 ;;
513 cygwin* | mingw* | pw32*)
514 shrext=.dll
515 library_names_spec='$libname.dll.a $libname.lib'
516 ;;
517 darwin* | rhapsody*)
518 shrext=.dylib
519 library_names_spec='$libname$shrext'
520 ;;
521 dgux*)
522 library_names_spec='$libname$shrext'
523 ;;
524 freebsd1*)
525 ;;
526 kfreebsd*-gnu)
527 library_names_spec='$libname$shrext'
528 ;;
529 freebsd* | dragonfly*)
530 case "$host_os" in
531 freebsd[123]*)
532 library_names_spec='$libname$shrext$versuffix' ;;
533 *)
534 library_names_spec='$libname$shrext' ;;
535 esac
536 ;;
537 gnu*)
538 library_names_spec='$libname$shrext'
539 ;;
540 hpux9* | hpux10* | hpux11*)
541 case $host_cpu in
542 ia64*)
543 shrext=.so
544 ;;
545 hppa*64*)
546 shrext=.sl
547 ;;
548 *)
549 shrext=.sl
550 ;;
551 esac
552 library_names_spec='$libname$shrext'
553 ;;
554 interix3*)
555 library_names_spec='$libname$shrext'
556 ;;
557 irix5* | irix6* | nonstopux*)
558 library_names_spec='$libname$shrext'
559 case "$host_os" in
560 irix5* | nonstopux*)
561 libsuff= shlibsuff=
562 ;;
563 *)
564 case $LD in
565 *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
566 *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
567 *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
568 *) libsuff= shlibsuff= ;;
569 esac
570 ;;
571 esac
572 ;;
573 linux*oldld* | linux*aout* | linux*coff*)
574 ;;
575 linux*)
576 library_names_spec='$libname$shrext'
577 ;;
578 knetbsd*-gnu)
579 library_names_spec='$libname$shrext'
580 ;;
581 netbsd*)
582 library_names_spec='$libname$shrext'
583 ;;
584 newsos6)
585 library_names_spec='$libname$shrext'
586 ;;
587 nto-qnx*)
588 library_names_spec='$libname$shrext'
589 ;;
590 openbsd*)
591 library_names_spec='$libname$shrext$versuffix'
592 ;;
593 os2*)
594 libname_spec='$name'
595 shrext=.dll
596 library_names_spec='$libname.a'
597 ;;
598 osf3* | osf4* | osf5*)
599 library_names_spec='$libname$shrext'
600 ;;
601 solaris*)
602 library_names_spec='$libname$shrext'
603 ;;
604 sunos4*)
605 library_names_spec='$libname$shrext$versuffix'
606 ;;
607 sysv4 | sysv4.3*)
608 library_names_spec='$libname$shrext'
609 ;;
610 sysv4*MP*)
611 library_names_spec='$libname$shrext'
612 ;;
613 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
614 library_names_spec='$libname$shrext'
615 ;;
616 uts4*)
617 library_names_spec='$libname$shrext'
618 ;;
619esac
620
621sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
622escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
623shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
624escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
625escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
626escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
627
628LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
629
630# How to pass a linker flag through the compiler.
631wl="$escaped_wl"
632
633# Static library suffix (normally "a").
634libext="$libext"
635
636# Shared library suffix (normally "so").
637shlibext="$shlibext"
638
639# Format of library name prefix.
640libname_spec="$escaped_libname_spec"
641
642# Library names that the linker finds when passed -lNAME.
643library_names_spec="$escaped_library_names_spec"
644
645# Flag to hardcode \$libdir into a binary during linking.
646# This must work even if \$libdir does not exist.
647hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
648
649# Whether we need a single -rpath flag with a separated argument.
650hardcode_libdir_separator="$hardcode_libdir_separator"
651
652# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
653# resulting binary.
654hardcode_direct="$hardcode_direct"
655
656# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
657# resulting binary.
658hardcode_minus_L="$hardcode_minus_L"
659
660EOF
diff --git a/configure.in b/configure.in
index 228a841..52156fa 100644
--- a/configure.in
+++ b/configure.in
@@ -1552,7 +1552,6 @@ dnl ACX_FEATURE([with],[ps-format])
1552dnl ACX_FEATURE([with],[ps-cols]) 1552dnl ACX_FEATURE([with],[ps-cols])
1553dnl ACX_FEATURE([with],[ps-varlist]) 1553dnl ACX_FEATURE([with],[ps-varlist])
1554 1554
1555ACX_FEATURE([with],[lwres])
1556ACX_FEATURE([with],[ipv6]) 1555ACX_FEATURE([with],[ipv6])
1557ACX_FEATURE([with],[mysql]) 1556ACX_FEATURE([with],[mysql])
1558ACX_FEATURE([with],[openssl]) 1557ACX_FEATURE([with],[openssl])
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 21b85c3..44fca24 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -743,23 +743,13 @@ setup the tests. Run "make test" to run all the tests.
743 </section> 743 </section>
744 744
745 <section><title>CVS comments</title> 745 <section><title>CVS comments</title>
746 <para>When adding CVS comments at commit time, you can use the following prefixes:
747 <variablelist>
748 <varlistentry><term>- comment</term>
749 <listitem>
750 <para>for a comment that can be removed from the Changelog</para>
751 </listitem>
752 </varlistentry>
753 <varlistentry><term>* comment</term>
754 <listitem>
755 <para>for an important amendment to be included into a features list</para>
756 </listitem>
757 </varlistentry>
758 </variablelist>
759 </para>
760 <para>If the change is due to a contribution, please quote the contributor's name 746 <para>If the change is due to a contribution, please quote the contributor's name
761 and, if applicable, add the SourceForge Tracker number. Don't forget to 747 and, if applicable, add the SourceForge Tracker number. Don't forget to
762update the THANKS.in file.</para> 748update the THANKS.in file.</para>
749 <para>If you have a change that is useful for noting in the next release, please
750 update the NEWS file.</para>
751 <para>All CVS commit comments will be written to a ChangeLog at release time.
752 </para>
763 </section> 753 </section>
764 754
765 <section id="translationsdevelopers"><title>Translations for developers</title> 755 <section id="translationsdevelopers"><title>Translations for developers</title>
diff --git a/gl/.cvsignore b/gl/.cvsignore
new file mode 100644
index 0000000..9094515
--- /dev/null
+++ b/gl/.cvsignore
@@ -0,0 +1,5 @@
1.deps
2Makefile
3Makefile.in
4alloca.h
5stdint.h
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 4d1fbf3..7ee2910 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -28,8 +28,7 @@ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
28 check_procs check_mysql_query check_apt 28 check_procs check_mysql_query check_apt
29 29
30EXTRA_DIST = t utils.c netutils.c sslutils.c popen.c utils.h netutils.h \ 30EXTRA_DIST = t utils.c netutils.c sslutils.c popen.c utils.h netutils.h \
31 popen.h common.h getaddrinfo.c getaddrinfo.h \ 31 popen.h common.h runcmd.c runcmd.h
32 gethostbyname.c gethostbyname.h runcmd.c runcmd.h
33 32
34PLUGINHDRS = common.h 33PLUGINHDRS = common.h
35 34
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 87f0024..d9e2a67 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -36,6 +36,7 @@
36******************************************************************************/ 36******************************************************************************/
37 37
38const char *progname = "check_procs"; 38const char *progname = "check_procs";
39const char *program_name = "check_procs"; /* Required for coreutils libs */
39const char *revision = "$Revision$"; 40const char *revision = "$Revision$";
40const char *copyright = "2000-2006"; 41const char *copyright = "2000-2006";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 42const char *email = "nagiosplug-devel@lists.sourceforge.net";
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5a90074..6fef857 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -30,8 +30,6 @@ plugins/check_time.c
30plugins/check_ups.c 30plugins/check_ups.c
31plugins/check_users.c 31plugins/check_users.c
32plugins/check_ide_smart.c 32plugins/check_ide_smart.c
33plugins/getaddrinfo.c
34plugins/gethostbyname.c
35plugins/negate.c 33plugins/negate.c
36plugins/netutils.c 34plugins/netutils.c
37plugins/popen.c 35plugins/popen.c