Removed all references to sysinfo().

6 files changed, 7 insertions, 74 deletions

diff --git a/ChangeLog b/ChangeLog
index 702aaffd5..48dd3b200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Dec 26 03:43:17 CST 2000 Adam Heath <doogie@debian.org>
+
+  * acconfig.h, config.h.bot, configure.in, main/filesdb.c,
+    automake/sysinfo.m4(removed): Removed all references to
+    sysinfo().
+
 Tue Dec 26 03:24:38 CST 2000 Adam Heath <doogie@debian.org>
 
   * main/main.c, main/files.c: Removed --smallmem code.
diff --git a/acconfig.h b/acconfig.h
index e5716f6f3..67de6784d 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -9,12 +9,6 @@
 /* Define if inline functions a la GCC are available.  */
 #undef HAVE_INLINE
 
-/* Define if sysinfo is available.  */
-#undef HAVE_SYSINFO
-
-/* Define if __NR_sysinfo is available.  */
-#undef HAVE_NRSYSINFO
-
 /* Define if inline functions a la GCC are available.  */
 #undef HAVE_ALPHASORT_DECLARATION
 
@@ -63,12 +57,6 @@
 /* Defined to the $(libdir) location */
 #undef LLIBDIR
 
-/* Is sysinfo() persent */
-#undef HAVE_SYSINFO
-
-/* Do we have proper memory information in struct sysinfo */
-#undef MEMINFO_IN_SYSINFO
-
 /* Define the ptrdiff_t type if your system doesn't have it */
 #undef ptrdiff_t
 
diff --git a/automake/sysinfo.m4 b/automake/sysinfo.m4
deleted file mode 100644
index 2c67dab32..000000000
--- a/automake/sysinfo.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-dnl Bunch of extra macros to make dpkg more portable
-dnl Copyright (C) 1999 Wichert Akkerman <wakkerma@debian.org>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-
-AC_DEFUN(AC_HAVE_SYSINFO,
-[AC_CACHE_CHECK(whether sysinfo is available,
- ac_cv_func_sysinfo,
-[ AC_CHECK_FUNC(sysinfo,ac_cv_func_sysinfo=yes,ac_cv_func_sysinfo=no)])
-if test "$ac_cv_func_sysinfo" = "yes" ; then
-  AC_DEFINE(HAVE_SYSINFO)
-fi
-])
-
-AC_DEFUN(AC_MEMINFO_IN_SYSINFO,
-[AC_REQUIRE([AC_HAVE_SYSINFO])dnl
- if test "$ac_cv_header_sys_sysinfo" = "" ; then
-   AC_CHECK_HEADERS(sys/sysinfo.h)
- fi
- AC_CACHE_CHECK(whether struct sysinfo contains memory information,
- ac_cv_meminfo_in_sysinfo,
-[AC_TRY_COMPILE([
-#ifdef HAVE_SYS_SYSINFO_H
-#include <sys/sysinfo.h>
-#endif
-], [struct sysinfo si ; si.freeram;si.sharedram;si.bufferram;],
-  ac_cv_meminfo_in_sysinfo=yes, ac_cv_meminfo_in_sysinfo=no)])
- if test "$ac_cv_have_sysinfo_meminfo" = yes ; then
-   AC_DEFINE(MEMINFO_IN_SYSINFO)
- fi
-])
-
-
diff --git a/config.h.bot b/config.h.bot
index 9c6e9ec55..8289a8551 100644
--- a/config.h.bot
+++ b/config.h.bot
@@ -112,14 +112,6 @@ void unsetenv(const char *x);
 #define strtoul strtol
 #endif
 
-/* Sort out sysinfo */
-#if !defined(HAVE_SYSINFO) && defined(HAVE_NRSYSINFO)
-#include <linux/sys.h>
-#include <linux/kernel.h>
-#include <linux/unistd.h>
-static inline _syscall1(int,sysinfo,struct sysinfo*,info)
-#endif
-
 /* Define WCOREDUMP if we don't have it already - coredumps won't be
  * detected, though.
  */
diff --git a/configure.in b/configure.in
index fd3b4d9f4..7196f5985 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ AC_CHECK_SIZEOF(unsigned int)
 AC_CHECK_TYPE(ptrdiff_t,int)
 AC_CHECK_FUNCS(unsetenv alphasort scandir strerror strsignal strtoul)
 AC_CHECK_FUNCS(vsnprintf lchown snprintf)
-AC_CHECK_HEADERS(sys/cdefs.h sys/sysinfo.h syslog.h stddef.h)
+AC_CHECK_HEADERS(sys/cdefs.h syslog.h stddef.h)
 AC_CHECK_HEADERS(error.h)
 AC_SYS_SIGLIST_DECLARED
 
@@ -146,9 +146,6 @@ fi
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)
 
-AC_HAVE_SYSINFO
-AC_MEMINFO_IN_SYSINFO
-
 AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/main/filesdb.c b/main/filesdb.c
index 7eef47d6c..4e1661ad7 100644
--- a/main/filesdb.c
+++ b/main/filesdb.c
@@ -38,10 +38,6 @@
 #include "filesdb.h"
 #include "main.h"
 
-#ifdef HAVE_SYS_SYSINFO_H
-#include <sys/sysinfo.h>
-#endif
-
 /*** Generic data structures and routines ***/
 
 static int allpackagesdone= 0;