Merge branch 'install_without_completition' into 'master'

Makefile: don't install bash completition

See merge request !427

Makefile.am

@@ -5,8 +5,7 @@ singlehtml install-singlehtml:
 	$(MAKE) -C doc $@
 
 AM_DISTCHECK_CONFIGURE_FLAGS = \
-	--disable-code-coverage \
-	--without-bash-completions
+	--disable-code-coverage
 
 CODE_COVERAGE_INFO = coverage.info
 CODE_COVERAGE_HTML = coverage.html

configure.ac

@@ -374,24 +374,6 @@ AS_IF([test "$with_libidn" != "no"],[
 
 ]) # Knot DNS utilities dependencies
 
-# Bash completions
-AC_ARG_WITH([bash-completions],
-  AC_HELP_STRING([--with-bash-completions=[DIR]], [Bash completions directory [default=auto]]),
-  [with_bash_completions="$withval"],
-  [with_bash_completions=auto]
-)
-AS_CASE([$with_bash_completions],
-  [auto], [PKG_CHECK_VAR([bash_completions_dir], [bash-completion], [completionsdir])],
-  [yes], [PKG_CHECK_VAR([bash_completions_dir], [bash-completion], [completionsdir], [], [AC_MSG_ERROR([bash completions not found])])],
-  [no], [bash_completions_dir=],
-  [bash_completions_dir="$with_bash_completions"]
-)
-AM_CONDITIONAL([HAVE_BASH_COMPLETIONS], [test -n "$bash_completions_dir"])
-AS_IF([test -n "$bash_completions_dir"],
-  [bash_completions_output="${bash_completions_dir}"],
-  [bash_completions_output=no]
-)
-
 AC_SEARCH_LIBS([pow], [m])
 AC_SEARCH_LIBS([pthread_create], [pthread], [], [AC_MSG_ERROR([pthreads not found])])
 AC_SEARCH_LIBS([dlopen], [dl])

samples/Makefile.am

@@ -24,19 +24,10 @@ install-data-local: knot.sample.conf
 	  $(INSTALL) -d $(DESTDIR)/$(config_dir); \
 	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir); \
 	fi
-if HAVE_BASH_COMPLETIONS
-	if [ \! -f $(DESTDIR)/$(bash_completions_dir)/keymgr ]; then \
-	  $(INSTALL) -d $(DESTDIR)/$(bash_completions_dir); \
-	  $(INSTALL_DATA) $(srcdir)/keymgr-completion.sh $(DESTDIR)/$(bash_completions_dir)/keymgr; \
-	fi
-endif # HAVE_BASH_COMPLETIONS
 
 uninstall-local:
 	-rm -rf $(DESTDIR)/$(config_dir)/knot.sample.conf \
 	        $(DESTDIR)/$(config_dir)/example.com.zone
-if HAVE_BASH_COMPLETIONS
-	-rm -rf $(DESTDIR)/$(bash_completions_dir)/keymgr
-endif # HAVE_BASH_COMPLETIONS
 
 endif # HAVE_DAEMON