diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-09-03 15:31:01 -0400 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-09-04 08:48:03 +0200 |
| commit | 370fa0fa4241d2c9f1319412d381138d53a5f4fd (patch) | |
| tree | 8d3c907367979cfd32e96fcd365e1904dba76af4 | |
| parent | e0e8429c2433bd9820f42250236badc585bd9dd7 (diff) | |
| download | coreutils-370fa0fa4241d2c9f1319412d381138d53a5f4fd.tar.xz | |
build: fix libcap configure flag handling
* m4/jm-macros.m4 (coreutils_MACROS): The code to handle configure-time
enabling or disabling of libcap support was broken. It would treat any
libcap configure option as --disable-libcap because it doesn't check
$enableval at all. This change makes sure we do the sane thing:
--disable-libcap -> disable and don't run any tests
--enable-libcap -> run tests and fail if not found
default -> run tests and warn if not found
| -rw-r--r-- | m4/jm-macros.m4 | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index 416a0af25..f4d43f1dd 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -105,17 +105,25 @@ AC_DEFUN([coreutils_MACROS], LIBS=$coreutils_saved_libs # Check whether libcap is usable -- for ls --color support + LIB_CAP= AC_ARG_ENABLE([libcap], - AC_HELP_STRING([--disable-libcap], [disable libcap support]), - AC_MSG_WARN([libcap support disabled by user]), - [AC_CHECK_LIB([cap], [cap_get_file], + AC_HELP_STRING([--disable-libcap], [disable libcap support])) + if test "X$enable_libcap" != "Xno"; then + AC_CHECK_LIB([cap], [cap_get_file], [AC_CHECK_HEADER([sys/capability.h], [LIB_CAP=-lcap - AC_DEFINE([HAVE_CAP], [1], [libcap usability])], - [AC_MSG_WARN([header sys/capability.h was not found, support for libcap will not be built])] - )], - [AC_MSG_WARN([libcap library was not found or not usable, support for libcap will not be built])]) - ]) + AC_DEFINE([HAVE_CAP], [1], [libcap usability])] + )]) + if test "X$LIB_CAP" = "X"; then + if test "X$enable_libcap" = "Xyes"; then + AC_MSG_ERROR([libcap library was not found or not usable]) + else + AC_MSG_WARN([libcap library was not found or not usable, support for libcap will not be built]) + fi + fi + else + AC_MSG_WARN([libcap support disabled by user]) + fi AC_SUBST([LIB_CAP]) # See if linking `seq' requires -lm. |