Skip to contentSkip to conversation

Makefile: Added the creation of config.guess and config.sub

PATCH In review Steve Dickson 1 participant 5 messages Jun 16, 2022 – Jun 21, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 Makefile: Added the creation of config.guess and config.sub

---
 .gitignore | 2 ++
 Makefile   | 3 +++
 2 files changed, 5 insertions(+)
.gitignore +2 -0
index df58159..72bdb22 100644
@@ -6,6 +6,8 @@
 aclocal.m4
 autom4te.cache/
 config.log
+config.guess
+config.sub
 config.status
 configure
 include/builddefs
Makefile +3 -0
index 5302e11..be7454d 100644
@@ -60,6 +60,7 @@ clean:	# if configure hasn't run, nothing to clean
 endif
 
 $(CONFIGURE): aclocal.m4
+	autoreconf --install
 	autoconf
 	./configure \
 		--prefix=/ \
@@ -96,3 +97,5 @@ install-lib: default
 realclean distclean: clean
 	rm -f $(LDIRT) $(CONFIGURE)
 	rm -rf autom4te.cache Logs
+	rm -rf config.guess config.sub configure~
+
Signature · 1 line
2.36.1
#1 lore raw

PATCH 2/4 configure.ac: Removed a number warnings

---
 Makefile             | 4 ++--
 configure.ac         | 8 ++++----
 include/builddefs.in | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)
Makefile +2 -2
index be7454d..a460e78 100644
@@ -60,8 +60,8 @@ clean:	# if configure hasn't run, nothing to clean
 endif
 
 $(CONFIGURE): aclocal.m4
+	autoupdate --force
 	autoreconf --install
-	autoconf
 	./configure \
 		--prefix=/ \
 		--exec-prefix=/ \
@@ -96,6 +96,6 @@ install-lib: default
 
 realclean distclean: clean
 	rm -f $(LDIRT) $(CONFIGURE)
-	rm -rf autom4te.cache Logs
+	rm -rf autom4te.cache Logs configure.ac~
 	rm -rf config.guess config.sub configure~
 
configure.ac +4 -4
index c624295..3337575 100644
@@ -1,5 +1,5 @@
-AC_INIT([nfs4-acl-tools], [0.3.3])
-AC_CONFIG_HEADER(include/config.h)
+AC_INIT([nfs4-acl-tools],[0.3.3])
+AC_CONFIG_HEADERS(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local)
 
 AC_CONFIG_MACRO_DIRS([m4])
@@ -12,7 +12,6 @@ AC_SUBST(enable_shared)
 AC_PROG_INSTALL
 AC_PROG_CC
 
-AC_HEADER_STDC
 AC_CHECK_HEADERS([netinet/in.h stdlib.h string.h unistd.h])
 AC_CHECK_HEADERS([attr/xattr.h sys/xattr.h])
 
@@ -33,4 +32,5 @@ AC_PACKAGE_UTILITIES([nfs4acl])
 AC_PACKAGE_NEED_GETXATTR_LIBATTR
 AC_MANUAL_FORMAT
 
-AC_OUTPUT(include/builddefs)
+AC_CONFIG_FILES([include/builddefs])
+AC_OUTPUT
include/builddefs.in +1 -0
index fe49b08..3dab1de 100644
@@ -43,6 +43,7 @@ LIBNFS4ACL = $(TOPDIR)/libnfs4acl/libnfs4acl.la
 LIBATTR = @libattr@
 
 prefix = @prefix@
+datarootdir = @datarootdir@
 exec_prefix = @exec_prefix@
 
 DESTDIR =
Signature · 1 line
2.36.1
#2 lore raw

PATCH 3/4 nfs4_print_ace_verbose: Removed a differ in signedness warning

In reply to Steve Dickson
---
 libnfs4acl/nfs4_print_ace_verbose.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libnfs4acl/nfs4_print_ace_verbose.c +1 -1
index 96a6573..ef87e89 100644
@@ -64,7 +64,7 @@ int nfs4_print_ace_verbose(struct nfs4_ace * ace, u32 is_dir)
 	char * whotype_s;
 	char * type_s;
 	u32 flag;
-	u32 whotype;
+	int whotype;
 	u32 mask;
 
 
Signature · 1 line
2.36.1
#3 lore raw

PATCH 4/4 acl_nfs4_get_who: removed an always false evaluate warning

In reply to Steve Dickson
---
 libnfs4acl/acl_nfs4_get_who.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libnfs4acl/acl_nfs4_get_who.c +1 -1
index 695db2e..3e2fd7c 100644
@@ -49,7 +49,7 @@ int acl_nfs4_get_who(struct nfs4_ace* ace, int* type, char** who)
 	char* iwho = NULL;
 	int wholen;
 
-	if (ace == NULL || ace->who == NULL)
+	if (ace == NULL)
 		goto inval_failed;
 
 	itype = acl_nfs4_get_whotype(ace->who);
Signature · 1 line
2.36.1
#4 lore raw
In reply to Steve Dickson

all 4 patches committed...

Quoted 37 lines · Steve Dickson
---
  .gitignore | 2 ++
  Makefile   | 3 +++
  2 files changed, 5 insertions(+)
.gitignore +2 -0
index df58159..72bdb22 100644
@@ -6,6 +6,8 @@
  aclocal.m4
  autom4te.cache/
  config.log
+config.guess
+config.sub
  config.status
  configure
  include/builddefs
Makefile +3 -0
index 5302e11..be7454d 100644
@@ -60,6 +60,7 @@ clean:	# if configure hasn't run, nothing to clean
  endif
 
  $(CONFIGURE): aclocal.m4
+	autoreconf --install
  	autoconf
  	./configure \
  		--prefix=/ \
@@ -96,3 +97,5 @@ install-lib: default
  realclean distclean: clean
  	rm -f $(LDIRT) $(CONFIGURE)
  	rm -rf autom4te.cache Logs
+	rm -rf config.guess config.sub configure~
+