--- configure.ac | 12 +----------- m4/guestfs_bash_completion.m4 | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 m4/guestfs_bash_completion.m4 diff --git a/configure.ac b/configure.ac index 80803c1..a86d676 100644 --- a/configure.ac +++ b/configure.ac @@ -1072,17 +1072,7 @@ m4_include([m4/guestfs_golang.m4]) m4_include([m4/guestfs_gobject.m4]) dnl Bash completion. -PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [ - bash_completion=yes - AC_MSG_CHECKING([for bash-completions directory]) - BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`" - AC_MSG_RESULT([$BASH_COMPLETIONS_DIR]) - AC_SUBST([BASH_COMPLETIONS_DIR]) -],[ - bash_completion=no - AC_MSG_WARN([bash-completion not installed]) -]) -AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"]) +m4_include([m4/guestfs_bash_completion.m4]) dnl For search paths. AC_DEFINE_UNQUOTED([PATH_SEPARATOR],["$PATH_SEPARATOR"], diff --git a/m4/guestfs_bash_completion.m4 b/m4/guestfs_bash_completion.m4 new file mode 100644 index 0000000..f32fba7 --- /dev/null +++ b/m4/guestfs_bash_completion.m4 @@ -0,0 +1,29 @@ +# libguestfs +# Copyright (C) 2009-2015 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +dnl Bash completion. +PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [ + bash_completion=yes + AC_MSG_CHECKING([for bash-completions directory]) + BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`" + AC_MSG_RESULT([$BASH_COMPLETIONS_DIR]) + AC_SUBST([BASH_COMPLETIONS_DIR]) +],[ + bash_completion=no + AC_MSG_WARN([bash-completion not installed]) +]) +AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"]) -- 2.5.0