From: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Date: Tue, 29 May 2012 18:15:32 +0000 (-0400)
Subject: build: avoid AM_CONDITIONAL in conditional execution.
X-Git-Tag: debian/1%1.2.8-1~11^2^2~115
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ddb095f82becc94c8e3a2429cc755dee5d1808c9;hp=ddb095f82becc94c8e3a2429cc755dee5d1808c9;p=nfs-utils.git

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>
---