Final update to ports ChangeLog.

[glibc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 43bd8a53031b1e4cb6d0fae8ad56282958b9d72c..97a959114dc740c1fa01f742b29f536d3d77119c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1945,22 +1945,9 @@ else
   # See if we have the SELinux library
   AC_CHECK_LIB(selinux, is_selinux_enabled,
               have_selinux=yes, have_selinux=no)
-  # See if we have the SELinux header with the NSCD permissions in it.
-  if test x$have_selinux = xyes ; then
-    AC_MSG_CHECKING([for NSCD Flask permissions in selinux/av_permissions.h])
-    AC_TRY_COMPILE([#include <selinux/av_permissions.h>],
-                   [#ifdef NSCD__SHMEMHOST
-                    return 0;
-                    #else
-                    #error NSCD__SHMEMHOST not defined
-                    #endif],
-                   have_selinux=yes, have_selinux=no)
-    AC_MSG_RESULT($have_selinux)
-  fi
-
   if test x$with_selinux = xyes ; then
     if test x$have_selinux = xno ; then
-      AC_MSG_ERROR([SELinux explicitly required, but sufficiently recent SELinux library not found])
+      AC_MSG_ERROR([SELinux explicitly required, but SELinux library not found])
     fi
   fi
 fi
@@ -2042,9 +2029,9 @@ esac],
 ])
 libc_extra_cflags=
 if test $libc_cv_predef_stack_protector = yes; then
-  libc_extra_cflags=-fno-stack-protector
+  libc_extra_cflags="$libc_extra_cflags -fno-stack-protector"
 fi
-AC_SUBST(libc_extra_cflags)
+libc_extra_cppflags=
 
 AC_CACHE_CHECK([whether the linker provides __ehdr_start],
               libc_cv_ehdr_start, [
@@ -2091,6 +2078,9 @@ for dir in $sysnames; do
   fi
 done
 
+AC_SUBST(libc_extra_cflags)
+AC_SUBST(libc_extra_cppflags)
+
 if test x$libc_cv_gcc_unwind_find_fde = xyes; then
   AC_DEFINE(EXPORT_UNWIND_FIND_FDE)
 fi