now that gnulib provides uname...

[Jim Meyering]

FYI, just pushed:

>From 4f1a3eda10608fe444e199477e730d434579f0f7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 10 Oct 2009 08:58:43 +0200
Subject: [PATCH 1/2] maint: list program names one per line

* src/Makefile.am (EXTRA_PROGRAMS): List them one per line.
(build_if_possible__progs): Likewise.
---
 src/Makefile.am |  143 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 116 insertions(+), 27 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index aee904f..681c393 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,25 +24,114 @@ no_install__progs = \
   arch hostname su

 build_if_possible__progs = \
-  chroot df hostid nice pinky stdbuf libstdbuf.so stty su uname uptime users 
who
+  chroot       \
+  df           \
+  hostid       \
+  libstdbuf.so \
+  nice         \
+  pinky                \
+  stdbuf       \
+  stty         \
+  su           \
+  uname                \
+  uptime       \
+  users                \
+  who

 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)

 EXTRA_PROGRAMS = \
   $(no_install__progs) \
   $(build_if_possible__progs) \
-  [ chcon chgrp chown chmod cp dd dircolors du \
-  ginstall link ln dir vdir ls mkdir \
-  mkfifo mknod mktemp \
-  mv nohup readlink rm rmdir shred stat sync touch unlink \
-  cat cksum comm csplit cut expand fmt fold head join groups md5sum \
-  nl od paste pr ptx sha1sum sha224sum sha256sum sha384sum sha512sum \
-  shuf sort split sum tac tail tr tsort unexpand uniq wc \
-  basename date dirname echo env expr factor false \
-  id kill logname pathchk printenv printf pwd \
-  runcon seq sleep tee \
-  test timeout true truncate tty whoami yes \
-  base64
+  [            \
+  base64       \
+  basename     \
+  cat          \
+  chcon                \
+  chgrp                \
+  chmod                \
+  chown                \
+  cksum                \
+  comm         \
+  cp           \
+  csplit       \
+  cut          \
+  date         \
+  dd           \
+  dir          \
+  dircolors    \
+  dirname      \
+  du           \
+  echo         \
+  env          \
+  expand       \
+  expr         \
+  factor       \
+  false                \
+  fmt          \
+  fold         \
+  ginstall     \
+  groups       \
+  head         \
+  id           \
+  join         \
+  kill         \
+  link         \
+  ln           \
+  logname      \
+  ls           \
+  md5sum       \
+  mkdir                \
+  mkfifo       \
+  mknod                \
+  mktemp       \
+  mv           \
+  nl           \
+  nohup                \
+  od           \
+  paste                \
+  pathchk      \
+  pr           \
+  printenv     \
+  printf       \
+  ptx          \
+  pwd          \
+  readlink     \
+  rm           \
+  rmdir                \
+  runcon       \
+  seq          \
+  sha1sum      \
+  sha224sum    \
+  sha256sum    \
+  sha384sum    \
+  sha512sum    \
+  shred                \
+  shuf         \
+  sleep                \
+  sort         \
+  split                \
+  stat         \
+  sum          \
+  sync         \
+  tac          \
+  tail         \
+  tee          \
+  test         \
+  timeout      \
+  touch                \
+  tr           \
+  true         \
+  truncate     \
+  tsort                \
+  tty          \
+  unexpand     \
+  uniq         \
+  unlink       \
+  vdir         \
+  wc           \
+  whoami       \
+  yes

 bin_PROGRAMS = $(OPTIONAL_BIN_PROGS)

@@ -50,20 +139,20 @@ noinst_PROGRAMS = setuidgid getlimits

 pkglib_PROGRAMS = $(OPTIONAL_PKGLIB_PROGS)

-noinst_HEADERS = \
-  chown-core.h \
-  copy.h \
-  cp-hash.h \
-  dircolors.h \
-  fs.h \
-  group-list.h \
-  ls.h \
-  operand2sig.h \
-  prog-fprintf.h \
-  remove.h \
-  system.h \
-  wheel-size.h \
-  wheel.h \
+noinst_HEADERS =       \
+  chown-core.h         \
+  copy.h               \
+  cp-hash.h            \
+  dircolors.h          \
+  fs.h                 \
+  group-list.h         \
+  ls.h                 \
+  operand2sig.h                \
+  prog-fprintf.h       \
+  remove.h             \
+  system.h             \
+  wheel-size.h         \
+  wheel.h              \
   uname.h

 EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \
--
1.6.5.rc3.206.g54797


>From d74a1b005ca09ea8ac08b3f9f16a5176e240ff28 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 10 Oct 2009 09:02:26 +0200
Subject: [PATCH 2/2] build: build uname(1) unconditionally

Before, on a system without the uname function, the build
system would detect that and not build/install a uname program.
Now that gnulib guarantees a uname function, ...
* configure.ac: Don't check for the uname function.
* src/Makefile.am (build_if_possible__progs): Move uname...
(EXTRA_PROGRAMS): ...to this list.
---
 configure.ac    |    2 --
 src/Makefile.am |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index fa82b4c..4902fea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,8 +118,6 @@ fi
 AC_FUNC_FORK

 optional_bin_progs=
-AC_CHECK_FUNCS([uname],
-        gl_ADD_PROG([optional_bin_progs], [uname]))
 AC_CHECK_FUNCS([chroot],
         gl_ADD_PROG([optional_bin_progs], [chroot]))
 AC_CHECK_FUNCS([gethostid],
diff --git a/src/Makefile.am b/src/Makefile.am
index 681c393..b4ff8da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,7 +33,6 @@ build_if_possible__progs = \
   stdbuf       \
   stty         \
   su           \
-  uname                \
   uptime       \
   users                \
   who
@@ -125,6 +124,7 @@ EXTRA_PROGRAMS = \
   truncate     \
   tsort                \
   tty          \
+  uname                \
   unexpand     \
   uniq         \
   unlink       \
--
1.6.5.rc3.206.g54797