Skip to contentSkip to conversation

configure.ac: clean up.

PATCH In review Steve Dickson 1 participant 5 messages Sep 22, 2011 – Sep 23, 2011

Subsystems (2)
NFS client NFS server
lore
Share & tools
lore

Steve Dickson

author
#0 lore raw

cover configure.ac: clean up.

Steve Dickson (3):
configure.ac: Remove the NFS v3 enable flag configure.ac: Removed unused defines in config.h configure.ac: Added a v4.1 dependency on v4.0

 configure.ac |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)
Signature · 1 line
1.7.6.2
author
#1 lore raw

PATCH 1/3 configure.ac: Remove the NFS v3 enable flag

Removed the unused macros that enable and disable V3.

Signed-off-by Steve Dickson <[email protected]>
---
 configure.ac |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)
configure.ac +0 -11
index d85ab21..7f4b88c 100644
@@ -55,17 +55,6 @@ AC_ARG_WITH(start-statd,
 	)
 	AC_SUBST(startstatd)
 	AC_DEFINE_UNQUOTED(START_STATD, "$startstatd", [Define this to a script which can start statd on mount])
-AC_ARG_ENABLE(nfsv3,
-	[AC_HELP_STRING([--enable-nfsv3],
-                        [enable support for NFSv3 @<:@default=yes@:>@])],
-	enable_nfsv3=$enableval,
-	enable_nfsv3=yes)
-	if test "$enable_nfsv3" = yes; then
-		AC_DEFINE(NFS3_SUPPORTED, 1, [Define this if you want NFSv3 support compiled in])
-	else
-		enable_nfsv3=
-	fi
-	AC_SUBST(enable_nfsv3)
 AC_ARG_ENABLE(nfsv4,
 	[AC_HELP_STRING([--enable-nfsv4],
                         [enable support for NFSv4 @<:@default=yes@:>@])],
Signature · 1 line
1.7.6.2
author
#2 lore raw

PATCH 2/3 configure.ac: Removed unused defines in config.h

In reply to Steve Dickson

Cleaned out 3 unused defines from config.h

Signed-off-by Steve Dickson <[email protected]>
---
 configure.ac |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
configure.ac +0 -3
index 7f4b88c..61b9c00 100644
@@ -61,7 +61,6 @@ AC_ARG_ENABLE(nfsv4,
 	enable_nfsv4=$enableval,
 	enable_nfsv4=yes)
 	if test "$enable_nfsv4" = yes; then
-		AC_DEFINE(NFS4_SUPPORTED, 1, [Define this if you want NFSv4 support compiled in])
 		IDMAPD=idmapd
 	else
 		enable_nfsv4=

@@ -78,7 +77,6 @@ AC_ARG_ENABLE(nfsv41,
 	enable_nfsv41=yes)
 	if test "$enable_nfsv41" = yes; then
 		BLKMAPD=blkmapd
-		AC_DEFINE(NFS41_SUPPORTED, 1, [Define this if you want NFSv41 support compiled in])
 	else
 		enable_nfsv41=
 		BLKMAPD=

@@ -92,7 +90,6 @@ AC_ARG_ENABLE(gss,
 	enable_gss=$enableval,
 	enable_gss=yes)
 	if test "$enable_gss" = yes; then
-		AC_DEFINE(GSS_SUPPORTED, 1, [Define this if you want rpcsec_gss support compiled in])
 		GSSD=gssd
 		SVCGSSD=svcgssd
 	else
Signature · 1 line
1.7.6.2
author
#3 lore raw

PATCH 3/3 configure.ac: Added a v4.1 dependency on v4.0

In reply to Steve Dickson

Make sure v4.0 is enabled when v4.1 is enabled.

Signed-off-by Steve Dickson <[email protected]>
---
 configure.ac |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
configure.ac +3 -0
index 61b9c00..a7b418d 100644
@@ -76,6 +76,9 @@ AC_ARG_ENABLE(nfsv41,
 	enable_nfsv41=$enableval,
 	enable_nfsv41=yes)
 	if test "$enable_nfsv41" = yes; then
+		if test "$enable_nfsv4" != yes; then
+			AC_MSG_ERROR([NFS v4.1 is enabled but NFS v4 is not. Use --disable-nfsv41])
+		fi
 		BLKMAPD=blkmapd
 	else
 		enable_nfsv41=
Signature · 1 line
1.7.6.2
author
#4 lore raw
In reply to Steve Dickson
Quoted 8 lines · Steve Dickson

Steve Dickson (3):
configure.ac: Remove the NFS v3 enable flag configure.ac: Removed unused defines in config.h configure.ac: Added a v4.1 dependency on v4.0

 configure.ac |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

All three committed...

steved.