[GETLOADAVG_PRIVILEGED] [POSIX]: Don't test [HAVE_SETUID] and [HAVE_SETGID].

Every system has those, and configure doesn't check for them.

GNUmakefile

@@ -49,13 +49,10 @@ extras := $(filter-out getloadavg.o @%@,$(extras)) getloadavg.o
 LOADLIBES := $(filter-out @%@,$(LOADLIBES))
 ALLOCA := $(filter-out @%@,$(ALLOCA))
 
-# Tell autoconf/autoheader to use m4 files from the master source.
-ifndef AC_MACRODIR
-AC_MACRODIR = /home/gd/gnu/autoconf
-endif
-ACFLAGS := -m $(AC_MACRODIR)
+ifdef AC_MACRODIR
 configure config.h.in: $(patsubst %,$(AC_MACRODIR)/%.m4,acspecific acgeneral)
 config.h.in: $(AC_MACRODIR)/acconfig.h
+endif
 configure: configure.in; autoconf $(ACFLAGS)
 config.h.in: configure.in; autoheader $(ACFLAGS)
 

compatMakefile

@@ -229,9 +229,14 @@ $(mandir)/$(manprefix)make.$(manext): make.man
 	$(INSTALL_DATA) $(srcdir)/make.man $@
 
 
-loadavg: getloadavg.c config.h
+loadavg: loadavg.c config.h
 	$(CC) $(defines) -DTEST -I. -I$(srcdir) $(CFLAGS) $(LDFLAGS) \
-	      $(srcdir)/getloadavg.c $(LOADLIBES) -o $@
+	      loadavg.c $(LOADLIBES) -o $@
+# We copy getloadavg.c into a different file rather than compiling it
+# directly because some compilers clobber getloadavg.o in the process.
+loadavg.c: getloadavg.c
+	ln $(srcdir)/getloadavg.c loadavg.c || \
+	cp $(srcdir)/getloadavg.c loadavg.c
 check-loadavg: loadavg
 	@echo The system uptime program believes the load average to be:
 	-uptime
@@ -247,6 +252,7 @@ distclean: clean glob-realclean
 	-rm -f Makefile config.h config.status build.sh stamp-config
 	-rm -f TAGS tags
 	-rm -f make.?? make.??s make.log make.toc make.*aux
+	-rm -f loadavg.c
 realclean: distclean
 mostlyclean: clean
 

make.h

@@ -59,7 +59,9 @@ extern int errno;
 
 #ifdef	HAVE_UNISTD_H
 #include <unistd.h>
-#ifdef	_POSIX_VERSION
+/* Ultrix's unistd.h always defines _POSIX_VERSION, but you only get
+   POSIX.1 behavior with `cc -YPOSIX', which predefines POSIX itself!  */
+#if defined (_POSIX_VERSION) && !defined (ultrix)
 #define	POSIX
 #endif
 #endif

misc.c

@@ -461,10 +461,10 @@ dep_name (dep)
    setregid functions, but they don't work as in BSD and only the POSIX.1
    way works.  */
 
-#if defined (HAVE_SETREUID) && defined (HAVE_SETUID)
+#ifndef HAVE_SETREUID
 #undef HAVE_SETREUID
 #endif
-#if defined (HAVE_SETREGID) && defined (HAVE_SETGID)
+#ifndef HAVE_SETREGID
 #undef HAVE_SETREGID
 #endif