1 From 2a44ed7558f981e15db58dcda799ff7cd3827a6e Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
3 Date: Thu, 17 May 2012 16:26:44 -0700
4 Subject: [PATCH] build: avoid AM_CONDITIONAL in conditional execution.
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Automake does not support conditional AM_CONDITIONAL calls; what that
10 means is that you always have to execute AM_CONDITIONAL one way or the
11 other. Both the libsqlite3.m4 file and the nfsdcld conditionals are
12 executed only when NFSv4 is enabled, which breaks building with
15 Remove the SQLite3 conditional altogether as it's never used, and move
16 the nfsdcld conditional outside of the conditional code.
18 Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
20 aclocal/libsqlite3.m4 | 1 -
22 2 files changed, 1 insertion(+), 3 deletions(-)
24 diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4
25 index 73d1e46..8c38993 100644
26 --- a/aclocal/libsqlite3.m4
27 +++ b/aclocal/libsqlite3.m4
28 @@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [
31 AC_MSG_RESULT($libsqlite3_cv_is_recent)
32 - AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"])
34 diff --git a/configure.ac b/configure.ac
35 index 9ba53e2..b408f1b 100644
38 @@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
42 - AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
44 dnl librpcsecgss already has a dependency on libgssapi,
45 dnl but we need to make sure we get the right version
46 if test "$enable_gss" = yes; then
47 @@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
50 dnl enable nfsidmap when its support by libnfsidmap
51 +AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
52 AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])