From 1110fcadb18b86234763309b5bf6927f1deb480a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 18 Dec 2010 12:56:28 +0200
Subject: [PATCH] Do not load bash_completion in profile.d script if progcomp
 is not enabled.

---
 CHANGES               | 1 +
 bash_completion.sh.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 51489daf..6f43f657 100644
--- a/CHANGES
+++ b/CHANGES
@@ -39,6 +39,7 @@ bash-completion (2.x)
     dynamically when needed instead.
   * Add/improve various autotools completions.
   * Add *.apk to unzip and jar filename completions.
+  * Do not load bash_completion in profile.d script if progcomp is not enabled.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion.sh.in b/bash_completion.sh.in
index bdddeee0..f6a983fb 100644
--- a/bash_completion.sh.in
+++ b/bash_completion.sh.in
@@ -4,7 +4,7 @@
 # Check for recent enough version of bash.
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
 if [ $bmajor -gt 3 ] || [ $bmajor -eq 3 -a $bminor -ge 2 ]; then
-    if [ -r @sysconfdir@/bash_completion ]; then
+    if shopt -q progcomp && [ -r @sysconfdir@/bash_completion ]; then
         # Source completion code.
         . @sysconfdir@/bash_completion
     fi