diff --git a/Makefile.am b/Makefile.am index 610569898542d5156890c971bf1a730f246137de..51e3abf384a69fb7c5ee3e91f2e6580d4329c723 100644 --- a/Makefile.am +++ b/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 diff --git a/configure.ac b/configure.ac index 04a96f3169fceed4c824775216d174ab3750d65d..4819524bb64babc699cef1356021a29ac683d67b 100644 --- a/configure.ac +++ b/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]) diff --git a/samples/Makefile.am b/samples/Makefile.am index 4898cb0d57c56cf9c3a50c1f100001c43de48043..7171bdab411a7cfa485ff4d9ea0c6de588aefb47 100644 --- a/samples/Makefile.am +++ b/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