From d87b6121327418a15aebe652865d434f74c6263b Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Wed, 5 Nov 2003 14:55:33 +0000
Subject: .

---
 aclocal.m4             |  7 ++++---
 lib/.gdb-history       | 17 +++++++++++++++++
 src/Makefile.in        |  2 +-
 tests/misc/Makefile.in |  1 +
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 1b1433fbb..c457a5de3 100644
--- 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 c62f69706..ee1c44466 100644
--- 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 989b084d2..4c30ab798 100644
--- 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 4e83ba338..fbf4c0738 100644
--- 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
-- 
cgit v1.2.3-54-g00ecf