Index: config-scripts/cups-common.m4
===================================================================
--- config-scripts/cups-common.m4	(revision 9816)
+++ config-scripts/cups-common.m4	(working copy)
@@ -406,7 +406,7 @@
 
 case "$COMPONENTS" in
 	all)
-		BUILDDIRS="filter backend berkeley cgi-bin driver monitor notifier ppdc scheduler systemv conf data locale man doc examples templates"
+		BUILDDIRS="filter backend berkeley cgi-bin driver monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
 		;;
 
 	core)
Index: config-scripts/cups-compiler.m4
===================================================================
--- config-scripts/cups-compiler.m4	(revision 9816)
+++ config-scripts/cups-compiler.m4	(working copy)
@@ -162,7 +162,7 @@
 		else
 			AC_MSG_CHECKING(if GCC supports -Wno-tautological-compare)
 			OLDCFLAGS="$CFLAGS"
-			CFLAGS="$CFLAGS -Wno-tautological-compare"
+			CFLAGS="$CFLAGS -Werror -Wno-tautological-compare"
 			AC_TRY_COMPILE(,,
 				[OPTIM="$OPTIM -Wno-tautological-compare"
 				AC_MSG_RESULT(yes)],
Index: scheduler/client.c
===================================================================
--- scheduler/client.c	(revision 9816)
+++ scheduler/client.c	(working copy)
@@ -3220,7 +3220,7 @@
   gnutls_certificate_set_x509_key_file(*credentials, ServerCertificate,
 				       ServerKey, GNUTLS_X509_FMT_PEM);
 
-  gnutls_init(&con->http.tls), GNUTLS_SERVER);
+  gnutls_init(&con->http.tls, GNUTLS_SERVER);
   gnutls_set_default_priority(con->http.tls);
   gnutls_credentials_set(con->http.tls, GNUTLS_CRD_CERTIFICATE, *credentials);
   gnutls_transport_set_ptr(con->http.tls, (gnutls_transport_ptr)HTTP(con));
