diff options
| author | Jeff Layton <jlayton@samba.org> | 2012-01-24 08:34:09 -0500 |
|---|---|---|
| committer | Jeff Layton <jlayton@samba.org> | 2012-01-24 08:34:09 -0500 |
| commit | 221c67dd114be2a33ecbc18797d43898e513b659 (patch) | |
| tree | 3604c7d36234ed0ae975f2325b1fe12435cc737c | |
| parent | 569c33567c65723d60bac30bd5bfe4a9a310258a (diff) | |
| download | cifs-utils-221c67dd114be2a33ecbc18797d43898e513b659.tar.gz cifs-utils-221c67dd114be2a33ecbc18797d43898e513b659.tar.bz2 cifs-utils-221c67dd114be2a33ecbc18797d43898e513b659.zip | |
cifscreds: build it by default
...but either error out or disable it if keyutils.h isn't present.
Signed-off-by: Jeff Layton <jlayton@samba.org>
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 8476f94..ebea5c1 100644 --- a/configure.ac +++ b/configure.ac @@ -18,9 +18,9 @@ AC_ARG_ENABLE(cifsupcall, AC_ARG_ENABLE(cifscreds, [AC_HELP_STRING([--enable-cifscreds], - [Create cifscreds utility @<:@default=no@:>@])], + [Create cifscreds utility @<:@default=yes@:>@])], enable_cifscreds=$enableval, - enable_cifscreds="no") + enable_cifscreds="maybe") AC_ARG_ENABLE(cifsidmap, [AC_HELP_STRING([--enable-cifsidmap], @@ -152,8 +152,16 @@ fi # checks for wbclient.h and libwbclient.so library AC_TEST_WBCHL -if test $enable_cifscreds = "yes"; then - AC_CHECK_HEADERS([keyutils.h], , [AC_MSG_ERROR([keyutils.h not found, consider installing keyutils-libs-devel.])]) +if test $enable_cifscreds != "no"; then + AC_CHECK_HEADERS([keyutils.h], , [ + + if test $enable_cifscreds = "yes"; then + AC_MSG_ERROR([keyutils.h not found, consider installing keyutils-libs-devel.]) + else + AC_MSG_WARN([keyutils.h not found, consider installing keyutils-libs-devel. Disabling cifscreds.]) + enable_cifscreds="no" + fi + ]) fi @@ -175,7 +183,7 @@ fi LIBS=$cu_saved_libs AM_CONDITIONAL(CONFIG_CIFSUPCALL, [test "$enable_cifsupcall" != "no"]) -AM_CONDITIONAL(CONFIG_CIFSCREDS, [test "$enable_cifscreds" = "yes"]) +AM_CONDITIONAL(CONFIG_CIFSCREDS, [test "$enable_cifscreds" != "no"]) AM_CONDITIONAL(CONFIG_CIFSIDMAP, [test "$enable_cifsidmap" != "no"]) AM_CONDITIONAL(CONFIG_CIFSACL, [test "$enable_cifsacl" != "no"]) |