Merge branch 'develop'

1 files changed, 22 insertions, 0 deletions

diff --git a/configure b/configure
index 1daaf26d..a5225890 100755
--- a/configure
+++ b/configure
@@ -38,6 +38,7 @@ oscar="default-on"
 twitter=1
 purple=0
 
+verbose=0
 doc=1
 debug=0
 strip=0
@@ -125,6 +126,8 @@ Option		Description				Default
 --pidfile=...						$pidfile
 --config=...						$config
 
+--verbose=0/1	Disable/enable verbose build		$verbose
+
 --msn=0/1	Disable/enable MSN part			$msn
 --jabber=0/1	Disable/enable Jabber part		$jabber
 --oscar=0/1	Disable/enable Oscar part (ICQ, AIM)	$oscar
@@ -282,6 +285,25 @@ if [ "$asan" = "1" ]; then
 	debug=1
 fi
 
+if [ "$verbose" = "0" ]; then
+	echo 'VERBOSE=@' >> Makefile.settings
+else
+	echo 'VERBOSE=' >> Makefile.settings
+fi
+
+cat <<EOF >>Makefile.settings
+
+# Enable/disable output verbosity
+ifdef V
+ifeq (\$(V),1)
+	VERBOSE=
+else
+	VERBOSE=@
+endif
+endif
+
+EOF
+
 if [ "$debug" = "1" ]; then
 	echo 'DEBUG=1' >> Makefile.settings
 	CFLAGS="$CFLAGS -g3 -DDEBUG -O0"