STABLE14-aix51-pag-header-20090320

LICENSE IPL10
FIXES 124522

no sys/pag.h until 5.2

(cherry picked from commit 3e034dcb6cbb82ef78853a342bd2c459250e0bcd)

diff --git a/acinclude.m4 b/acinclude.m4
index 33a0f3e22c02a49ef5fed234751051a3935e8537..9402d8592e45fdf4ffa46fda83dafd67cd438af5 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1326,7 +1326,7 @@ AC_HEADER_DIRENT
 AC_CHECK_HEADERS(stdlib.h string.h unistd.h fcntl.h sys/time.h sys/file.h)
 AC_CHECK_HEADERS(netinet/in.h netdb.h sys/fcntl.h sys/mnttab.h sys/mntent.h)
 AC_CHECK_HEADERS(mntent.h sys/vfs.h sys/param.h sys/fs_types.h sys/fstyp.h)
-AC_CHECK_HEADERS(sys/mount.h strings.h termios.h signal.h poll.h)
+AC_CHECK_HEADERS(sys/mount.h strings.h termios.h signal.h poll.h sys/pag.h)
 AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h sys/user.h)
 AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h regex.h)
 

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index b2d1831ef477e585a6240677200c860c390402bd..8c4360d7a597858923479384f90703cbffee05b0 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -56,9 +56,11 @@ RCSID
 #include <sys/lockf.h>
 #ifdef AFS_AIX51_ENV
 #include <sys/cred.h>
+#ifdef HAVE_SYS_PAG_H
 #include <sys/pag.h>
 #endif
 #endif
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/pam/afs_util.c b/src/pam/afs_util.c
index 6a28cf309ae83a19bcb0d5ae9d722944cdc2f062..a5ffdd23dd619e0335b4f312b6255cdbec51ba27 100644 (file)
--- a/src/pam/afs_util.c
+++ b/src/pam/afs_util.c
@@ -21,8 +21,10 @@
 #include <stdlib.h>
 #ifdef AFS_AIX51_ENV
 #include <sys/cred.h>
+#ifdef HAVE_SYS_PAG_H
 #include <sys/pag.h>
 #endif
+#endif
 
 RCSID
     ("$Header$");

diff --git a/src/sys/pagsh.c b/src/sys/pagsh.c
index 4ab86362370208b238bb27b48dd1d5d460e05261..39bcde566cd881c5dd590f4170557991720cf4b7 100644 (file)
--- a/src/sys/pagsh.c
+++ b/src/sys/pagsh.c
@@ -17,7 +17,9 @@ RCSID
 #include <signal.h>
 #ifdef AFS_AIX51_ENV
 #include <sys/cred.h>
+#ifdef HAVE_SYS_PAG_H
 #include <sys/pag.h>
+#endif
 #include <errno.h>
 #endif
 #endif

diff --git a/src/tsm41/aix_aklog.c b/src/tsm41/aix_aklog.c
index ffad8550f355cacba063ac127db9f607e2d82f11..457ed8e795213b3362067e5aea954d35db6638f9 100644 (file)
--- a/src/tsm41/aix_aklog.c
+++ b/src/tsm41/aix_aklog.c
@@ -24,7 +24,9 @@ RCSID
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/file.h>
+#ifdef HAVE_SYS_PAG_H
 #include <sys/pag.h>
+#endif
 #include <errno.h>
 #include <usersec.h>
 #include <syslog.h>