From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 17 Apr 2002 19:39:00 +0000 (+0000)
Subject: (HAVE_LIBKSTAT): Define only if not already defined.
X-Git-Tag: ttn-vms-21-2-B4~15559
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a4140b0b4c980ac326a55425f41d26ff265d32c;p=emacs.git

(HAVE_LIBKSTAT): Define only if not already defined.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0604df403fe..b4c33417732 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-17  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* s/sol2.h (HAVE_LIBKSTAT): Define only if not already defined.
+
 2002-04-17  Juanma Barranquero  <lektu@terra.es>
 
 	* indent.c (Fmove_to_column): Remove unused local variable
diff --git a/src/s/sol2.h b/src/s/sol2.h
index be6edf0aa94..ed82812bc67 100644
--- a/src/s/sol2.h
+++ b/src/s/sol2.h
@@ -27,8 +27,11 @@
 #define LIBS_SYSTEM -lsocket -lnsl -lkstat
 
 /* Prefer kstat over kvm in getloadavg.c, kstat doesn't require root.
-   ghazi@caip.rutgers.edu, 7/21/97. */
+   ghazi@caip.rutgers.edu, 7/21/97.  Don't redefine if already defined
+   (e.g., by config.h). */
+#ifndef HAVE_LIBKSTAT
 #define HAVE_LIBKSTAT
+#endif
 
 /* eggert thinks all versions of SunPro C allowed this.  */
 #ifndef __GNUC__