build: avoid AM_CONDITIONAL in conditional execution.
authorDiego Elio Pettenò <flameeyes@flameeyes.eu>
Tue, 29 May 2012 18:15:32 +0000 (14:15 -0400)
committerSteve Dickson <steved@redhat.com>
Tue, 29 May 2012 18:44:17 +0000 (14:44 -0400)
commitddb095f82becc94c8e3a2429cc755dee5d1808c9
tree28d3186a1d733096e71e5a98c542042c465023e6
parent7e9c0f760397d7e8fa78bdeefffc14eb8269925b
build: avoid AM_CONDITIONAL in conditional execution.

Automake does not support conditional AM_CONDITIONAL calls; what that
means is that you always have to execute AM_CONDITIONAL one way or the
other. Both the libsqlite3.m4 file and the nfsdcld conditionals are
executed only when NFSv4 is enabled, which breaks building with
--disable-nfsv4.

Remove the SQLite3 conditional altogether as it's never used, and move
the nfsdcld conditional outside of the conditional code.

Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Steve Dickson <steved@redhat.com>
aclocal/libsqlite3.m4
configure.ac