* [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional execution.
@ 2012-05-17 23:34 Diego Elio Pettenò
2012-05-18 0:00 ` Chuck Lever
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Diego Elio Pettenò @ 2012-05-17 23:34 UTC (permalink / raw)
To: linux-nfs; +Cc: Diego Elio Pettenò
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.
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
---
aclocal/libsqlite3.m4 | 1 -
configure.ac | 3 +--
2 files changed, 1 insertions(+), 3 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
diff --git a/configure.ac b/configure.ac
index 9ba53e2..b408f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
fi
fi
- AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
-
dnl librpcsecgss already has a dependency on libgssapi,
dnl but we need to make sure we get the right version
if test "$enable_gss" = yes; then
@@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
fi
dnl enable nfsidmap when its support by libnfsidmap
+AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
--
1.7.8.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional execution.
2012-05-17 23:34 [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional execution Diego Elio Pettenò
@ 2012-05-18 0:00 ` Chuck Lever
2012-05-18 0:01 ` Diego Elio Pettenò
2012-05-18 15:05 ` Jeff Layton
2012-05-29 19:16 ` Steve Dickson
2 siblings, 1 reply; 6+ messages in thread
From: Chuck Lever @ 2012-05-18 0:00 UTC (permalink / raw)
To: Diego Elio Pettenò; +Cc: linux-nfs
Hi-
On May 17, 2012, at 7:34 PM, Diego Elio Pettenò wrote:
> 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
Are we using sqlite3 at all at this point?
> the nfsdcld conditional outside of the conditional code.
>
> Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
> ---
> aclocal/libsqlite3.m4 | 1 -
> configure.ac | 3 +--
> 2 files changed, 1 insertions(+), 3 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
> diff --git a/configure.ac b/configure.ac
> index 9ba53e2..b408f1b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
> fi
> fi
>
> - AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
> -
> dnl librpcsecgss already has a dependency on libgssapi,
> dnl but we need to make sure we get the right version
> if test "$enable_gss" = yes; then
> @@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
> fi
>
> dnl enable nfsidmap when its support by libnfsidmap
> +AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
> AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
>
>
> --
> 1.7.8.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional execution.
2012-05-18 0:00 ` Chuck Lever
@ 2012-05-18 0:01 ` Diego Elio Pettenò
2012-05-18 0:03 ` Chuck Lever
0 siblings, 1 reply; 6+ messages in thread
From: Diego Elio Pettenò @ 2012-05-18 0:01 UTC (permalink / raw)
To: Chuck Lever; +Cc: linux-nfs
Il 17/05/2012 17:00, Chuck Lever ha scritto:
> Are we using sqlite3 at all at this point?
As far as I can tell it's still a requisite for nfsdcld... I honestly
haven't looked at the code yet simply because I don't use NFSv4 at all
(which is why I found this build failure).
--
Diego Elio Pettenò — Flameeyes
flameeyes@flameeyes.eu — http://blog.flameeyes.eu/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional execution.
2012-05-18 0:01 ` Diego Elio Pettenò
@ 2012-05-18 0:03 ` Chuck Lever
0 siblings, 0 replies; 6+ messages in thread
From: Chuck Lever @ 2012-05-18 0:03 UTC (permalink / raw)
To: Diego Elio Pettenò; +Cc: linux-nfs
On May 17, 2012, at 8:01 PM, Diego Elio Pettenò wrote:
> Il 17/05/2012 17:00, Chuck Lever ha scritto:
>> Are we using sqlite3 at all at this point?
>
> As far as I can tell it's still a requisite for nfsdcld...
OK, I forgot about that. Never mind.
> I honestly
> haven't looked at the code yet simply because I don't use NFSv4 at all
> (which is why I found this build failure).
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional execution.
2012-05-17 23:34 [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional execution Diego Elio Pettenò
2012-05-18 0:00 ` Chuck Lever
@ 2012-05-18 15:05 ` Jeff Layton
2012-05-29 19:16 ` Steve Dickson
2 siblings, 0 replies; 6+ messages in thread
From: Jeff Layton @ 2012-05-18 15:05 UTC (permalink / raw)
To: Diego Elio Pettenò; +Cc: linux-nfs
On Thu, 17 May 2012 16:34:31 -0700
Diego Elio Pettenò <flameeyes@flameeyes.eu> wrote:
> 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.
>
> Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
> ---
> aclocal/libsqlite3.m4 | 1 -
> configure.ac | 3 +--
> 2 files changed, 1 insertions(+), 3 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
> diff --git a/configure.ac b/configure.ac
> index 9ba53e2..b408f1b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
> fi
> fi
>
> - AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
> -
> dnl librpcsecgss already has a dependency on libgssapi,
> dnl but we need to make sure we get the right version
> if test "$enable_gss" = yes; then
> @@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
> fi
>
> dnl enable nfsidmap when its support by libnfsidmap
> +AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
> AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
>
>
Seems to do the right thing. Thanks for fixing this up.
I'll note too that on my machine the build also fails if you
--disable-nfsv4 and --disable-nfsv41, but do not --disable-gss. That's
an entirely separate bug however and has probably been there a long
time.
In any case..
Acked-by: Jeff Layton <jlayton@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional execution.
2012-05-17 23:34 [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional execution Diego Elio Pettenò
2012-05-18 0:00 ` Chuck Lever
2012-05-18 15:05 ` Jeff Layton
@ 2012-05-29 19:16 ` Steve Dickson
2 siblings, 0 replies; 6+ messages in thread
From: Steve Dickson @ 2012-05-29 19:16 UTC (permalink / raw)
To: Diego Elio Pettenò; +Cc: linux-nfs
On 05/17/2012 07:34 PM, Diego Elio Pettenò wrote:
> 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.
>
> Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Committed...
steved.
> ---
> aclocal/libsqlite3.m4 | 1 -
> configure.ac | 3 +--
> 2 files changed, 1 insertions(+), 3 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
> diff --git a/configure.ac b/configure.ac
> index 9ba53e2..b408f1b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
> fi
> fi
>
> - AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
> -
> dnl librpcsecgss already has a dependency on libgssapi,
> dnl but we need to make sure we get the right version
> if test "$enable_gss" = yes; then
> @@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
> fi
>
> dnl enable nfsidmap when its support by libnfsidmap
> +AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
> AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-29 19:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-17 23:34 [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional execution Diego Elio Pettenò
2012-05-18 0:00 ` Chuck Lever
2012-05-18 0:01 ` Diego Elio Pettenò
2012-05-18 0:03 ` Chuck Lever
2012-05-18 15:05 ` Jeff Layton
2012-05-29 19:16 ` Steve Dickson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).