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

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

Rediff for 2.19

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

diff -Nurp glibc-2.19/configure glibc-2.19-selinux/configure
--- glibc-2.19/configure	2014-02-07 11:04:38.000000000 +0200
+++ glibc-2.19-selinux/configure	2014-02-08 02:17:44.095043097 +0200
@@ -7092,9 +7092,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 ${ac_cv_lib_cap_cap_init+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -7136,16 +7137,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
 
 
-
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
diff -Nurp glibc-2.19/configure.ac glibc-2.19-selinux/configure.ac
--- glibc-2.19/configure.ac	2014-02-07 11:04:38.000000000 +0200
+++ glibc-2.19-selinux/configure.ac	2014-02-08 02:17:44.095043097 +0200
@@ -1998,16 +1998,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