priv-set: Don't assume that priv.h exists merely because getppriv does.

See Jan Andersen's bug report about AIX 5L in
http://lists.gnu.org/archive/html/bug-tar/2010-06/msg00019.html
* m4/priv-set.m4 (gl_PRIV_SET): Check for priv.h.
* lib/priv-set.c: Do nothing unless HAVE_PRIV_H.
* lib/priv-set.h: Likewise.
* tests/test-priv-set.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index dfcc99abd7d6c0bea0a654738afdac59a424fd1e..7cfad41f28f5bd2e808e3a7aa90c84388932a7b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+       priv-set: Don't assume that priv.h exists merely because getppriv does.
+       See Jan Andersen's bug report about AIX 5L in
+       http://lists.gnu.org/archive/html/bug-tar/2010-06/msg00019.html
+       * m4/priv-set.m4 (gl_PRIV_SET): Check for priv.h.
+       * lib/priv-set.c: Do nothing unless HAVE_PRIV_H.
+       * lib/priv-set.h: Likewise.
+       * tests/test-priv-set.c: Likewise.
+
 2010-06-13  Bruno Haible  <bruno@clisp.org>
 
        relocatable: Make it easier to test whether to install wrappers.

diff --git a/lib/priv-set.c b/lib/priv-set.c
index 911c28000f5053b387105cdee1ddc7205f923118..0ac1b977e269da7d8a03b86a9901691145051b0c 100644 (file)
--- a/lib/priv-set.c
+++ b/lib/priv-set.c
@@ -20,7 +20,7 @@
 #include <config.h>
 #include "priv-set.h"
 
-#if HAVE_GETPPRIV
+#if HAVE_GETPPRIV && HAVE_PRIV_H
 
 # include <errno.h>
 # include <stdbool.h>

diff --git a/lib/priv-set.h b/lib/priv-set.h
index b8f8b7272329bd615f3ed4c2945ccd1f96139d4a..5cac9cedec8be9b43ca0d6f313501b8a2c9cc8da 100644 (file)
--- a/lib/priv-set.h
+++ b/lib/priv-set.h
@@ -17,7 +17,7 @@
 
    Written by David Bartley.  */
 
-#if HAVE_GETPPRIV
+#if HAVE_GETPPRIV && HAVE_PRIV_H
 
 # include <priv.h>
 

diff --git a/m4/priv-set.m4 b/m4/priv-set.m4
index 205b00c6c1d11e5949b818fb0f76c1e5fc5b99d6..aaa18961899a6e3c7c64055a7102ca284b500313 100644 (file)
--- a/m4/priv-set.m4
+++ b/m4/priv-set.m4
@@ -1,4 +1,4 @@
-# serial 6
+# serial 7
 
 # Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
@@ -12,4 +12,5 @@ AC_DEFUN([gl_PRIV_SET],
 [
   AC_REQUIRE([AC_C_INLINE])
   AC_CHECK_FUNCS([getppriv])
+  AC_CHECK_HEADERS_ONCE([priv.h])
 ])

diff --git a/tests/test-priv-set.c b/tests/test-priv-set.c
index 49ad388f1f4f512e171352d197fa1a9dede8c6af..4b17f0c194c7bb69ee1c0b04aa4b51f3f254f4b8 100644 (file)
--- a/tests/test-priv-set.c
+++ b/tests/test-priv-set.c
@@ -20,7 +20,7 @@
 
 #include "priv-set.h"
 
-#if HAVE_GETPPRIV
+#if HAVE_GETPPRIV && HAVE_PRIV_H
 # include <priv.h>
 #endif
 #include <unistd.h>
@@ -32,7 +32,7 @@
 int
 main (void)
 {
-#if HAVE_GETPPRIV
+#if HAVE_GETPPRIV && HAVE_PRIV_H
     priv_set_t *set;
 
     ASSERT (set = priv_allocset ());