Merge branch 'develop'

13 files changed, 48 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index 2c6c69ff..346083c1 100644
--- a/Makefile
+++ b/Makefile
@@ -162,28 +162,28 @@ tar:
 	tar czf $$x.tar.gz --exclude=debian --exclude=.git* --exclude=.depend $$x
 
 $(subdirs):
-	@$(MAKE) -C $@ $(MAKECMDGOALS)
+	$(MAKE) -C $@ $(MAKECMDGOALS)
 
 $(OTR_PI): %.so: $(_SRCDIR_)%.c
 	@echo '*' Building plugin $@
-	@$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
+	$(VERBOSE) $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
 
 $(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
 	@echo '*' Building plugin skype
-	@$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
+	$(VERBOSE) $(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
 
 $(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 $(objects): Makefile Makefile.settings config.h
 
 $(OUTFILE): $(objects) $(subdirs)
 	@echo '*' Linking $(OUTFILE)
-	@$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
+	$(VERBOSE) $(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
 ifneq ($(firstword $(STRIP)), \#)
 	@echo '*' Stripping $(OUTFILE)
-	@-$(STRIP) $(OUTFILE)
+	$(VERBOSE) -$(STRIP) $(OUTFILE)
 endif
 
 ctags: 
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"
diff --git a/doc/CREDITS b/doc/CREDITS
index d53f6de0..b77a851a 100644
--- a/doc/CREDITS
+++ b/doc/CREDITS
@@ -21,7 +21,7 @@ The authors thank the following people:
   bug reports.
 - Bryan Williams, for the help in getting BitlBee to run on Cygwin.
 - Peter van Dijk for discovering a security leak in BitlBee.
-- Christian Häggeström, for the fix for the Jabber barf on high ASCII
+- Christian Häggeström, for the fix for the Jabber barf on high ASCII
   characters in away messages.
 - James Ray, for some testing, development and patching.
 - Yuri Pimenov, for writing the charset/iconv code, requested by a
diff --git a/ipc.c b/ipc.c
index 304a8ef2..e4e48a89 100644
--- a/ipc.c
+++ b/ipc.c
@@ -897,7 +897,7 @@ int ipc_master_listen_socket()
 	un_addr.sun_family = AF_UNIX;
 	strcpy(un_addr.sun_path, IPCSOCKET);
 
-	serversock = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
+	serversock = socket(AF_UNIX, SOCK_STREAM, 0);
 
 	if (serversock == -1) {
 		log_message(LOGLVL_WARNING, "Unable to create UNIX socket: %s", strerror(errno));
diff --git a/lib/Makefile b/lib/Makefile
index 05aaca7f..fc46aedc 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -35,12 +35,12 @@ distclean: clean $(subdirs)
 
 lib.o: $(objects) $(subdirs)
 	@echo '*' Linking lib.o
-	@$(LD) $(LFLAGS) $(objects) -o lib.o
+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o lib.o
 
 $(objects): ../Makefile.settings Makefile
 
 $(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 -include .depend/*.d
diff --git a/protocols/Makefile b/protocols/Makefile
index b4565ab6..10b8c95e 100644
--- a/protocols/Makefile
+++ b/protocols/Makefile
@@ -42,18 +42,18 @@ distclean: clean $(subdirs)
 	rm -rf .depend
 
 $(subdirs):
-	@$(MAKE) -C $@ $(MAKECMDGOALS)
+	$(MAKE) -C $@ $(MAKECMDGOALS)
 
 ### MAIN PROGRAM
 
 protocols.o: $(objects) $(subdirs)
 	@echo '*' Linking protocols.o
-	@$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
 
 $(objects): ../Makefile.settings Makefile
 
 $(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 -include .depend/*.d
diff --git a/protocols/jabber/Makefile b/protocols/jabber/Makefile
index 49a9b3f4..458f646b 100644
--- a/protocols/jabber/Makefile
+++ b/protocols/jabber/Makefile
@@ -37,10 +37,10 @@ $(objects): ../../Makefile.settings Makefile
 
 $(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 jabber_mod.o: $(objects)
 	@echo '*' Linking jabber_mod.o
-	@$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o
 
 -include .depend/*.d
diff --git a/protocols/msn/Makefile b/protocols/msn/Makefile
index 7d020942..089297f6 100644
--- a/protocols/msn/Makefile
+++ b/protocols/msn/Makefile
@@ -37,10 +37,10 @@ $(objects): ../../Makefile.settings Makefile
 
 $(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 msn_mod.o: $(objects)
 	@echo '*' Linking msn_mod.o
-	@$(LD) $(LFLAGS) $(objects) -o msn_mod.o
+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o msn_mod.o
 
 -include .depend/*.d
diff --git a/protocols/oscar/Makefile b/protocols/oscar/Makefile
index 8088bdb6..506e758c 100644
--- a/protocols/oscar/Makefile
+++ b/protocols/oscar/Makefile
@@ -38,10 +38,10 @@ $(objects): ../../Makefile.settings Makefile
 
 $(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 oscar_mod.o: $(objects)
 	@echo '*' Linking oscar_mod.o
-	@$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o oscar_mod.o
 
 -include .depend/*.d
diff --git a/protocols/purple/Makefile b/protocols/purple/Makefile
index 562b4db1..41cc7b6a 100644
--- a/protocols/purple/Makefile
+++ b/protocols/purple/Makefile
@@ -38,10 +38,10 @@ $(objects): ../../Makefile.settings Makefile
 
 $(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 purple_mod.o: $(objects)
 	@echo '*' Linking purple_mod.o
-	@$(LD) $(LFLAGS) $(objects) -o purple_mod.o
+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o purple_mod.o
 
 -include .depend/*.d
diff --git a/protocols/twitter/Makefile b/protocols/twitter/Makefile
index ce87090f..40ae9de4 100644
--- a/protocols/twitter/Makefile
+++ b/protocols/twitter/Makefile
@@ -37,10 +37,10 @@ $(objects): ../../Makefile.settings Makefile
 
 $(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
-	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 twitter_mod.o: $(objects)
 	@echo '*' Linking twitter_mod.o
-	@$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o
 	
 -include .depend/*.d
diff --git a/tests/Makefile b/tests/Makefile
index 09763e0c..76122a2f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -20,8 +20,8 @@ test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.
 
 check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o
 	@echo '*' Linking $@
-	@$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
+	$(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
 
 %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
-	@$(CC) -c $(CFLAGS) $< -o $@
+	$(VERBOSE) $(CC) -c $(CFLAGS) $< -o $@
diff --git a/tests/check.c b/tests/check.c
index 25e27b49..2fb51cc6 100644
--- a/tests/check.c
+++ b/tests/check.c
@@ -13,7 +13,7 @@ gboolean g_io_channel_pair(GIOChannel **ch1, GIOChannel **ch2)
 {
 	int sock[2];
 
-	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNIX, sock) < 0) {
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, sock) < 0) {
 		perror("socketpair");
 		return FALSE;
 	}