configure: Don't make shell completions without perl

The code that attempted to skip building the shell completions didn't
work properly and tried to build them even if perl wasn't available.
This step, as well as the install step, is now properly skipped without
perl.

Follow-up to 89733e2dd

Closes #13022

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 690c328e2812a5227e8e0eb42af0c34c45cff17c..e3e056ca7a76714a4534b943371ffccb8c780997 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -40,16 +40,16 @@ $(ZSH_COMPLETION_FUNCTION_FILENAME): completion.pl
 if CROSSCOMPILING
        @echo "NOTICE: we can't generate zsh completion when cross-compiling!"
 else # if not cross-compiling:
-       @if ! test -x "$(PERL)"; then echo "No perl: can't install completion script"; exit 0; fi
-       $(PERL) $(srcdir)/completion.pl --curl $(top_builddir)/src/curl$(EXEEXT) --shell zsh > $@
+       if test -z "$(PERL)"; then echo "No perl: can't install completion script"; else \
+       $(PERL) $(srcdir)/completion.pl --curl $(top_builddir)/src/curl$(EXEEXT) --shell zsh > $@ ; fi
 endif
 
 $(FISH_COMPLETION_FUNCTION_FILENAME): completion.pl
 if CROSSCOMPILING
        @echo "NOTICE: we can't generate fish completion when cross-compiling!"
 else # if not cross-compiling:
-       @if ! test -x "$(PERL)"; then echo "No perl: can't install completion scriptl"; exit 0; fi
-       $(PERL) $(srcdir)/completion.pl --curl $(top_builddir)/src/curl$(EXEEXT) --shell fish > $@
+       if test -z "$(PERL)"; then echo "No perl: can't install completion script"; else \
+       $(PERL) $(srcdir)/completion.pl --curl $(top_builddir)/src/curl$(EXEEXT) --shell fish > $@ ; fi
 endif
 
 install-data-local:
@@ -57,11 +57,15 @@ if CROSSCOMPILING
        @echo "NOTICE: we can't install completion scripts when cross-compiling!"
 else # if not cross-compiling:
 if USE_ZSH_COMPLETION
-       $(MKDIR_P) $(DESTDIR)$(ZSH_FUNCTIONS_DIR)
-       $(INSTALL_DATA) $(ZSH_COMPLETION_FUNCTION_FILENAME) $(DESTDIR)$(ZSH_FUNCTIONS_DIR)/$(ZSH_COMPLETION_FUNCTION_FILENAME)
+       if test -n "$(PERL)"; then \
+         $(MKDIR_P) $(DESTDIR)$(ZSH_FUNCTIONS_DIR); \
+         $(INSTALL_DATA) $(ZSH_COMPLETION_FUNCTION_FILENAME) $(DESTDIR)$(ZSH_FUNCTIONS_DIR)/$(ZSH_COMPLETION_FUNCTION_FILENAME) ; \
+  fi
 endif
 if USE_FISH_COMPLETION
-       $(MKDIR_P) $(DESTDIR)$(FISH_FUNCTIONS_DIR)
-       $(INSTALL_DATA) $(FISH_COMPLETION_FUNCTION_FILENAME) $(DESTDIR)$(FISH_FUNCTIONS_DIR)/$(FISH_COMPLETION_FUNCTION_FILENAME)
+       if test -n "$(PERL)"; then \
+         $(MKDIR_P) $(DESTDIR)$(FISH_FUNCTIONS_DIR); \
+         $(INSTALL_DATA) $(FISH_COMPLETION_FUNCTION_FILENAME) $(DESTDIR)$(FISH_FUNCTIONS_DIR)/$(FISH_COMPLETION_FUNCTION_FILENAME) ; \
+  fi
 endif
 endif