Mercurial > hg > octave-nkf
changeset 17946:a4bc3ad4c703
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.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 17 Nov 2013 21:31:49 -0500 |
parents | 265f9186e543 |
children | 92b3343e28c4 |
files | bootstrap.conf configure.ac liboctave/system/oct-uname.cc |
diffstat | 3 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/bootstrap.conf +++ b/bootstrap.conf @@ -92,6 +92,7 @@ tmpfile trunc truncf + uname unistd unlink vasprintf
--- a/configure.ac +++ b/configure.ac @@ -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.
--- a/liboctave/system/oct-uname.cc +++ b/liboctave/system/oct-uname.cc @@ -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 }