diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2008-08-20 13:03:41 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2008-08-20 13:03:41 +0000 |
| commit | 72e9be1d098ba4c45becbc6a863bde0d9bb249d6 (patch) | |
| tree | 793ef31d451f36f42b7aef7cc8ff1ce9ca4cfc7c /gnome-base/gvfs/files/gvfs-0.2.5-bash-completion.patch | |
| parent | Stable on x86/amd64; bug #235279 (diff) | |
| download | gentoo-2-72e9be1d098ba4c45becbc6a863bde0d9bb249d6.tar.gz gentoo-2-72e9be1d098ba4c45becbc6a863bde0d9bb249d6.tar.bz2 gentoo-2-72e9be1d098ba4c45becbc6a863bde0d9bb249d6.zip | |
gnome-base/gvfs: fix location of bash-completion script
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 x86_64)
Diffstat (limited to 'gnome-base/gvfs/files/gvfs-0.2.5-bash-completion.patch')
| -rw-r--r-- | gnome-base/gvfs/files/gvfs-0.2.5-bash-completion.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/gnome-base/gvfs/files/gvfs-0.2.5-bash-completion.patch b/gnome-base/gvfs/files/gvfs-0.2.5-bash-completion.patch new file mode 100644 index 000000000000..b16d3a63afe6 --- /dev/null +++ b/gnome-base/gvfs/files/gvfs-0.2.5-bash-completion.patch @@ -0,0 +1,58 @@ +Index: trunk/programs/Makefile.am +=================================================================== +--- trunk/programs/Makefile.am (revision 1769) ++++ trunk/programs/Makefile.am (revision 1770) +@@ -32,8 +32,10 @@ + gvfs-less \ + $(NULL) + +-profiledir = $(sysconfdir)/profile.d ++if ENABLE_BASHCOMP ++profiledir = $(BASHCOMP_DIR) + profile_SCRIPTS = gvfs-bash-completion.sh ++endif + + gvfs_cat_SOURCES = gvfs-cat.c + gvfs_cat_LDADD = $(libraries) +@@ -80,4 +82,4 @@ + gvfs_mkdir_SOURCES = gvfs-mkdir.c + gvfs_mkdir_LDADD = $(libraries) + +-EXTRA_DIST=gvfs-less gvfs-bash-completion.sh ++EXTRA_DIST = gvfs-less gvfs-bash-completion.sh +Index: trunk/configure.ac +=================================================================== +--- trunk/configure.ac (revision 1769) ++++ trunk/configure.ac (revision 1770) +@@ -472,6 +472,25 @@ + AC_SUBST(ARCHIVE_CFLAGS) + AC_SUBST(ARCHIVE_LIBS) + ++dnl Install bash-completion file? ++AC_ARG_ENABLE([bash-completion], ++ AC_HELP_STRING([--disable-bash-completion], ++ [build without bash-completion support]), ++ msg_bash_completion=$enableval, ++ msg_bash_completion=yes) ++if test "x$enable_bash_completion" != "xno"; then ++ msg_bash_completion=yes ++fi ++AM_CONDITIONAL(ENABLE_BASHCOMP, test "$msg_bash_completion" = "yes") ++ ++AC_ARG_WITH([bash-completion-dir], ++ AC_HELP_STRING([--with-bash-completion-dir=PATH], ++ [choose directory for bash-completion file (default=SYSCONFDIR/profile.d)]), ++ with_bashcomp_dir=$withval, ++ with_bashcomp_dir=$sysconfdir/profile.d) ++BASHCOMP_DIR=$with_bashcomp_dir ++AC_SUBST(BASHCOMP_DIR) ++ + dnl ========================================================================== + + dnl Globally define_GNU_SOURCE and therefore enable the GNU extensions +@@ -555,4 +574,5 @@ + DNS-SD support: $msg_avahi + Use HAL for volume monitor: $msg_hal (with fast init path: $have_hal_fast_init) + GNOME Keyring support: $msg_keyring ++ Bash-completion support: $msg_bash_completion + " |