diff options
| author | Diego Elio Pettenò <flameeyes@flameeyes.eu> | 2012-05-29 14:15:32 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2012-05-29 14:44:17 -0400 |
| commit | ddb095f82becc94c8e3a2429cc755dee5d1808c9 (patch) | |
| tree | 28d3186a1d733096e71e5a98c542042c465023e6 /aclocal | |
| parent | 7e9c0f760397d7e8fa78bdeefffc14eb8269925b (diff) | |
| download | nfs-utils-ddb095f82becc94c8e3a2429cc755dee5d1808c9.tar.gz nfs-utils-ddb095f82becc94c8e3a2429cc755dee5d1808c9.tar.xz nfs-utils-ddb095f82becc94c8e3a2429cc755dee5d1808c9.zip | |
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>
Diffstat (limited to 'aclocal')
| -rw-r--r-- | aclocal/libsqlite3.m4 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4 index 73d1e46..8c38993 100644 --- a/aclocal/libsqlite3.m4 +++ b/aclocal/libsqlite3.m4 @@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [ LIBS="$saved_LIBS"]) AC_MSG_RESULT($libsqlite3_cv_is_recent) - AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"]) ])dnl |