Update Makefile.in's with new Autotools; add extra 'return NULL' to placate some -Wall

7 files changed, 20 insertions, 9 deletions

diff --git a/Makefile.in b/Makefile.in
index 5729ffac..9eaa6dae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -277,7 +277,7 @@ distclean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -302,7 +302,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -466,7 +466,8 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -510,17 +511,17 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
diff --git a/include/urweb.h b/include/urweb.h
index 3a2d2baf..be3a9bd1 100644
--- a/include/urweb.h
+++ b/include/urweb.h
@@ -223,6 +223,7 @@ __attribute__((noreturn)) void uw_return_blob(uw_context, uw_Basis_blob, uw_Basi
 __attribute__((noreturn)) void uw_redirect(uw_context, uw_Basis_string url);
 
 uw_Basis_time uw_Basis_now(uw_context);
+uw_Basis_time uw_Basis_minusSeconds(uw_context, uw_Basis_time, uw_Basis_int);
 extern const uw_Basis_time uw_Basis_minTime;
 
 void uw_register_transactional(uw_context, void *data, uw_callback commit, uw_callback rollback, uw_callback free);
diff --git a/lib/ur/basis.urs b/lib/ur/basis.urs
index 5bd97fed..2d6e50ed 100644
--- a/lib/ur/basis.urs
+++ b/lib/ur/basis.urs
@@ -135,6 +135,7 @@ val current : t ::: Type -> signal t -> transaction t
 
 val now : transaction time
 val minTime : time
+val minusSeconds : time -> int -> time
 
 
 (** HTTP operations *)
diff --git a/src/c/Makefile.in b/src/c/Makefile.in
index cdcd0226..0eb09175 100644
--- a/src/c/Makefile.in
+++ b/src/c/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/c/fastcgi.c b/src/c/fastcgi.c
index 24617f89..2c9d1da1 100644
--- a/src/c/fastcgi.c
+++ b/src/c/fastcgi.c
@@ -478,6 +478,8 @@ static void *worker(void *data) {
     fastcgi_input_reset(in);
     uw_reset(ctx);
   }
+
+  return NULL;
 }
 
 static void help(char *cmd) {
diff --git a/src/c/http.c b/src/c/http.c
index 7a8110dc..80131674 100644
--- a/src/c/http.c
+++ b/src/c/http.c
@@ -210,6 +210,8 @@ static void *worker(void *data) {
   done:
     uw_reset(ctx);
   }
+
+  return NULL;
 }
 
 static void help(char *cmd) {
diff --git a/src/c/urweb.c b/src/c/urweb.c
index c97ce5f8..036740aa 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -3279,6 +3279,10 @@ uw_Basis_time uw_Basis_now(uw_context ctx) {
   return time(NULL);
 }
 
+uw_Basis_time uw_Basis_minusSeconds(uw_context ctx, uw_Basis_time tm, uw_Basis_int n) {
+  return tm - n;
+}
+
 void *uw_get_global(uw_context ctx, char *name) {
   int i;