2009-11-24  Herton Ronaldo Krzesinski  <herton@mandriva.com.br>

         * configure.in: Allow libcap to be used without selinux.

Rediff for 2.14.1

Signed-off-by: Thomas Backlund <tmb@mageia.org>

diff -Nurp glibc-2.14.1.orig/configure glibc-2.14.1/configure
--- glibc-2.14.1.orig/configure	2011-10-07 12:48:55.000000000 +0300
+++ glibc-2.14.1/configure	2011-10-17 21:38:39.225357550 +0300
@@ -7269,9 +7269,10 @@ $as_echo "#define HAVE_LIBAUDIT 1" >>con
 
   fi
 
+fi
 
-  # See if we have the libcap library
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_init in -lcap" >&5
+# See if we have the libcap library
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_init in -lcap" >&5
 $as_echo_n "checking for cap_init in -lcap... " >&6; }
 if test "${ac_cv_lib_cap_cap_init+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -7313,16 +7314,13 @@ else
   have_libcap=no
 fi
 
-  if test "x$have_libcap" = xyes; then
+if test "x$have_libcap" = xyes; then
 
 $as_echo "#define HAVE_LIBCAP 1" >>confdefs.h
 
-  fi
-
 fi
 
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then :
diff -Nurp glibc-2.14.1.orig/configure.in glibc-2.14.1/configure.in
--- glibc-2.14.1.orig/configure.in	2011-10-07 12:48:55.000000000 +0300
+++ glibc-2.14.1/configure.in	2011-10-17 21:24:57.321619402 +0300
@@ -2150,16 +2150,16 @@ if test "x$have_selinux" = xyes; then
     AC_DEFINE(HAVE_LIBAUDIT, 1, [SELinux libaudit support])
   fi
   AC_SUBST(have_libaudit)
-
-  # See if we have the libcap library
-  AC_CHECK_LIB(cap, cap_init, have_libcap=yes, have_libcap=no)
-  if test "x$have_libcap" = xyes; then
-    AC_DEFINE(HAVE_LIBCAP, 1, [SELinux libcap support])
-  fi
-  AC_SUBST(have_libcap)
 fi
 AC_SUBST(have_selinux)
 
+# See if we have the libcap library
+AC_CHECK_LIB(cap, cap_init, have_libcap=yes, have_libcap=no)
+if test "x$have_libcap" = xyes; then
+  AC_DEFINE(HAVE_LIBCAP, 1, [libcap support])
+fi
+AC_SUBST(have_libcap)
+
 dnl check for the size of 'long double'.
 AC_CHECK_SIZEOF(long double, 0)
 sizeof_long_double=$ac_cv_sizeof_long_double