2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 088c07e3cf..8bbc932bfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-12  Aaron Bockover  <abock@gnome.org>
+
+	* configure: Support CONFIG_SITE (BNC #350629)
+
 2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* Makefile: Added test target.
diff --git a/configure b/configure
index fccd182f26..fc8452d3e4 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,11 @@
 #!/bin/bash
 VERSION=0.17
-prefix=/usr/local
 profile=stable
 
+prefix=NONE
+test -e "$CONFIG_SITE" && . "$CONFIG_SITE"
+test "$prefix" = NONE && prefix=/usr/local
+
 usage ()
 {
 	echo "Usage : configure [--prefix=PREFIX] [--profile=PROFILE]"