.

diff --git a/aclocal.m4 b/aclocal.m4
index 1b1433fbb19b9217b40ac791e228b09f059d5ccb..c457a5de39af4ee5bb3c282b9dd0b242970c02e0 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1239,8 +1239,10 @@ AC_DEFUN([UTILS_HOST_OS],
        openbsd*)       os='OpenBSD';;
        nsk*)           os='NonStop Kernel';;
        nonstopux*)     os='NonStop-UX';;
-       netbsd*-gnu*)   os='GNU/NetBSD';;
+       netbsd*-gnu*)   os='GNU/NetBSD';; # NetBSD kernel+libc, GNU userland
        netbsd*)                os='NetBSD';;
+       knetbsd*-gnu)   os='GNU/KNetBSD';; # NetBSD kernel, GNU libc+userland
+       kfreebsd*-gnu)  os='GNU/KFreeBSD';; # FreeBSD kernel, GNU libc+userland
        msdosdjgpp*)    os='DJGPP';;
        mpeix*)         os='MPE/iX';;
        mint*)          os='MiNT';;
@@ -1250,7 +1252,6 @@ AC_DEFUN([UTILS_HOST_OS],
        hpux*)          os='HP-UX';;
        hiux*)          os='HI-UX';;
        gnu*)           os='GNU';;
-       freebsd*-gnu*)  os='GNU/FreeBSD';;
        freebsd*)       os='FreeBSD';;
        dgux*)          os='DG/UX';;
        bsdi*)          os='BSD/OS';;
@@ -5595,7 +5596,7 @@ main ()
   fi
 ])
 
-# xalloc.m4 serial 4
+# xalloc.m4 serial 6
 dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General

diff --git a/lib/.gdb-history b/lib/.gdb-history
index c62f69706ddfd86ac67bd759dcc6e97919d0b667..ee1c4446614f27521d0a4bdade7cd7e8353a4fc2 100644 (file)
--- a/lib/.gdb-history
+++ b/lib/.gdb-history
@@ -302,3 +302,20 @@ p arg
 n
 p result
 q
+complete b vasnp
+b vasnprintf 
+r
+n 30
+n
+p buf
+p result
+complete p alloc
+p allocated
+n
+n
+n
+n
+p count
+p maxlen
+n
+n

diff --git a/src/Makefile.in b/src/Makefile.in
index 989b084d2cd8a2972499143765363a4573b9b46f..4c30ab79881787a39645c6b9f452b0d01fd49c06 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -873,7 +873,7 @@ uninstall-binPROGRAMS:
        done
 
 clean-binPROGRAMS:
-       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
        bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \

diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index 4e83ba338cbfd60c10ddf2e91195a1bbedd16f46..fbf4c073899d02debf0863fecf4fb78b44652456 100644 (file)
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -157,6 +157,7 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
+  PACKAGE_VERSION=$(PACKAGE_VERSION) \
   PERL="$(PERL)" \
   PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=$$tst