# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1384741909 18000
# Node ID a4bc3ad4c703fedccd492fca0a7545d2b4f49dca
# Parent  265f9186e543aa02c05d52bbc2f4979d2d2ba2a4
Use gnulib uname

* configure.ac: remove check for uname and sys/utsname.h.

* liboctave/system/oct-uname.cc (octave_uname::init):
  remove #ifdef HAVE_SYS_UTSNAME_H from uname function.

* bootstrap.conf: add uname to gnulib_modules.

diff -r 265f9186e543 -r a4bc3ad4c703 bootstrap.conf
--- a/bootstrap.conf	Thu Nov 14 22:31:43 2013 +0530
+++ b/bootstrap.conf	Sun Nov 17 21:31:49 2013 -0500
@@ -92,6 +92,7 @@
   tmpfile
   trunc
   truncf
+  uname
   unistd
   unlink
   vasprintf
diff -r 265f9186e543 -r a4bc3ad4c703 configure.ac
--- a/configure.ac	Thu Nov 14 22:31:43 2013 +0530
+++ b/configure.ac	Sun Nov 17 21:31:49 2013 -0500
@@ -2024,7 +2024,7 @@
 AC_CHECK_HEADERS([grp.h ieeefp.h inttypes.h locale.h memory.h ncurses.h])
 AC_CHECK_HEADERS([poll.h pthread.h pwd.h sunmath.h sys/ioctl.h])
 AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/resource.h])
-AC_CHECK_HEADERS([sys/select.h sys/utsname.h termcap.h])
+AC_CHECK_HEADERS([sys/select.h termcap.h])
 
 ## C++ headers
 
@@ -2145,7 +2145,7 @@
 AC_CHECK_FUNCS([realpath resolvepath roundl])
 AC_CHECK_FUNCS([select setgrent setpwent siglongjmp strsignal])
 AC_CHECK_FUNCS([tempnam tgammaf toascii])
-AC_CHECK_FUNCS([umask uname waitpid])
+AC_CHECK_FUNCS([umask waitpid])
 AC_CHECK_FUNCS([_kbhit])
 
 dnl There are no workarounds in the code for missing these functions.
diff -r 265f9186e543 -r a4bc3ad4c703 liboctave/system/oct-uname.cc
--- a/liboctave/system/oct-uname.cc	Thu Nov 14 22:31:43 2013 +0530
+++ b/liboctave/system/oct-uname.cc	Sun Nov 17 21:31:49 2013 -0500
@@ -27,16 +27,13 @@
 #include <cerrno>
 #include <cstring>
 
-#ifdef HAVE_SYS_UTSNAME_H
 #include <sys/utsname.h>
-#endif
 
 #include "oct-uname.h"
 
 void
 octave_uname::init (void)
 {
-#if defined (HAVE_UNAME) && defined (HAVE_SYS_UTSNAME_H)
   struct utsname unm;
 
   err = ::uname (&unm);
@@ -51,5 +48,4 @@
       utsname_version = unm.version;
       utsname_machine = unm.machine;
     }
-#endif
 }