From 943db9eb6417433fd2dd82521933b21f4bf211b8 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 4 Jan 2006 06:26:39 +0000
Subject: [PATCH] * configure.in (HAVE_LIBAUDIT): Check

	audit_log_user_avc_message instead of audit_log_avc.

2006-01-04  Joseph S. Myers  <joseph@codesourcery.com>

	* sysdeps/ieee754/bits/nan.h: Fix typo.
---
 ChangeLog                  |  9 +++++++++
 configure.in               |  8 ++++----
 sysdeps/ieee754/bits/nan.h | 10 +++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53365ed395..c86fc3d9f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in (HAVE_LIBAUDIT): Check
+	audit_log_user_avc_message instead of audit_log_avc.
+
+2006-01-04  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* sysdeps/ieee754/bits/nan.h: Fix typo.
+
 2006-01-03  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/m68k/fchownat.c: Include string.h.
diff --git a/configure.in b/configure.in
index 4ae30ae2c9..1199ac00ea 100644
--- a/configure.in
+++ b/configure.in
@@ -1956,13 +1956,13 @@ else
 fi
 # Check if we're building with SELinux support.
 if test "x$have_selinux" = xyes; then
-  AC_DEFINE(HAVE_SELINUX,1,[SELinux support])
+  AC_DEFINE(HAVE_SELINUX, 1, [SELinux support])
 
   # See if we have the libaudit library
-  AC_CHECK_LIB(audit, audit_log_avc,
-              have_libaudit=yes, have_libaudit=no)
+  AC_CHECK_LIB(audit, audit_log_user_avc_message,
+               have_libaudit=yes, have_libaudit=no)
   if test "x$have_libaudit" = xyes; then
-    AC_DEFINE(HAVE_LIBAUDIT,1,[SELinux libaudit support])
+    AC_DEFINE(HAVE_LIBAUDIT, 1, [SELinux libaudit support])
   fi
   AC_SUBST(have_libaudit)
 fi
diff --git a/sysdeps/ieee754/bits/nan.h b/sysdeps/ieee754/bits/nan.h
index 4d4062cfcb..bae97f2165 100644
--- a/sysdeps/ieee754/bits/nan.h
+++ b/sysdeps/ieee754/bits/nan.h
@@ -1,5 +1,5 @@
 /* `NAN' constant for IEEE 754 machines.
-   Copyright (C) 1992, 1996, 1997, 1999, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1992,1996,1997,1999,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,13 +26,13 @@
 
 #if __GNUC_PREREQ(3,3)
 
-# define NAN	(__builtin_nanf(""))
+# define NAN	(__builtin_nanf (""))
 
-#elif defined__GNUC__
+#elif defined __GNUC__
 
 # define NAN \
-  (__extension__                                                            \
-   ((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; })  \
+  (__extension__							      \
+   ((union { unsigned __l __attribute__ ((__mode__ (__SI__))); float __d; })  \
     { __l: 0x7fc00000UL }).__d)
 
 #else