Merge branch 'master' into v1.2.stable

04e6db24 · Ken Rice · 58b6f651 · 5dcc31e1 · 04e6db24
--- a/configure.in
+++ b/configure.in
@@ -1107,7 +1107,6 @@ AC_CONFIG_FILES([Makefile
 		libs/xmlrpc-c/config.mk
 		libs/xmlrpc-c/srcdir.mk
 		libs/xmlrpc-c/stamp-h
-		libs/sipcc/Makefile
 		scripts/gentls_cert])
 AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux])