[tor-commits] [tor/master] Run check-spaces only when Perl is available

[nickm@xxxxxxxxxxxxxx]

commit 032da29d28599cfb76afd58e2bff4662912ae109
Author: cypherpunks <cypherpunks@xxxxxxxxxxxxxx>
Date:   Thu Dec 15 12:02:42 2016 +0000

    Run check-spaces only when Perl is available
    
    Also permit users to override the Perl variable with relative paths.
---
 Makefile.am  | 4 +++-
 configure.ac | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f400728..649ce72 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -181,11 +181,13 @@ coverage-html-full: all
 # Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c,
 # tinytest*.[ch]
 check-spaces:
-	$(top_srcdir)/scripts/maint/checkSpace.pl -C \
+if USE_PERL
+	$(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \
 		$(top_srcdir)/src/common/*.[ch] \
 		$(top_srcdir)/src/or/*.[ch] \
 		$(top_srcdir)/src/test/*.[ch] \
 		$(top_srcdir)/src/tools/*.[ch]
+endif
 
 check-docs: all
 	$(PERL) $(top_builddir)/scripts/maint/checkOptionDocs.pl
diff --git a/configure.ac b/configure.ac
index afe40a4..552465c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,7 +195,9 @@ AC_PROG_CPP
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
-AC_PATH_PROG([PERL], [perl])
+AC_ARG_VAR([PERL], [path to Perl binary])
+AC_CHECK_PROGS([PERL], [perl])
+AM_CONDITIONAL(USE_PERL, [test "x$ac_cv_prog_PERL" != "x"])
 
 dnl autoconf 2.59 appears not to support AC_PROG_SED
 AC_CHECK_PROG([SED],[sed],[sed],[/bin/false])



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits