Index: Makefile.in
--- Makefile.in.orig	2018-10-19 22:20:07.000000000 +0200
+++ Makefile.in	2021-12-06 19:17:27.111551000 +0100
@@ -718,7 +718,7 @@
 #	$(NULL)
 ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
 DIST_SUBDIRS = src doc util boilerplate test perf
-SUBDIRS = src doc util $(am__append_1)
+SUBDIRS = src doc util
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc \
 	--enable-test-surfaces \
Index: configure
--- configure.orig	2018-10-19 22:20:08.000000000 +0200
+++ configure	2021-12-06 19:17:40.628464000 +0100
@@ -19148,17 +19148,9 @@
 
 # -Wlogical-op causes too much noise from strcmp("literal", str)
 
-MAYBE_WARN="-Wall -Wextra \
--Wmissing-declarations -Werror-implicit-function-declaration \
--Wpointer-arith -Wwrite-strings -Wsign-compare -Wpacked \
--Wswitch-enum -Wmissing-format-attribute -Wvolatile-register-var \
--Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
--Wno-missing-field-initializers -Wno-unused-parameter \
--Wno-attributes -Wno-long-long -Winline"
-
-MAYBE_C_SPECIFIC_WARN="-Wold-style-definition \
--Wdeclaration-after-statement -Wstrict-prototypes \
--Wmissing-prototypes -Wbad-function-cast -Wnested-externs"
+MAYBE_WARN="-Wno-attributes -Wno-incompatible-pointer-types -Wno-deprecated-declarations"
+
+MAYBE_C_SPECIFIC_WARN=""
 
 # New -Wno options should be added here
 # gcc-4.4 and later accept every -Wno- option but may complain later that this
@@ -19166,13 +19158,6 @@
 # -Wunused-but-set-variable is too noisy at present
 NO_WARN="unused-but-set-variable"
 
-MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
-			-erroff=E_ENUM_TYPE_MISMATCH_OP"
-
-MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
-
-MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
-
 # invalidate cached value if MAYBE_WARN has changed
 if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then
 	unset cairo_cv_warn_cflags
@@ -30773,7 +30758,7 @@
 fi
 
     if test "x$freetype_pkgconfig" = "xyes"; then
-      ft_REQUIRES="freetype2 >= $FREETYPE_MIN_VERSION $ft_REQUIRES"
+      ft_REQUIRES="$ft_REQUIRES freetype2 >= $FREETYPE_MIN_VERSION"
     else
 
       if test -z "$FREETYPE_CONFIG"; then