2009-11-24 Herton Ronaldo Krzesinski <herton@mandriva.com.br> * configure.in: Allow libcap to be used without selinux. diff --git a/configure b/configure index ce76653..0f6ac12 100755 --- a/configure +++ b/configure @@ -7815,9 +7815,11 @@ _ACEOF fi +fi + - # See if we have the libcap library - { $as_echo "$as_me:$LINENO: checking for cap_init in -lcap" >&5 +# See if we have the libcap library +{ $as_echo "$as_me:$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 @@ -7888,18 +7890,15 @@ else have_libcap=no fi - if test "x$have_libcap" = xyes; then +if test "x$have_libcap" = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_LIBCAP 1 _ACEOF - fi - fi - { $as_echo "$as_me:$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 --git a/configure.in b/configure.in index 182c683..cfc074c 100644 --- a/configure.in +++ b/configure.in @@ -2155,16 +2155,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