diff -Nurd agg-2.6.1-r134+dfsg1.orig/Makefile.am agg-2.6.1-r134+dfsg1/Makefile.am
--- agg-2.6.1-r134+dfsg1.orig/Makefile.am	2020-03-12 19:36:06.000000000 -0400
+++ agg-2.6.1-r134+dfsg1/Makefile.am	2022-03-06 13:33:23.000000000 -0500
@@ -3,6 +3,8 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libagg.pc
 
+ACLOCAL_AMFLAGS = -I m4
+
 EXTRA_DIST = Makefile.AmigaOS \
 						 Makefile.in.BeOS \
 						 Makefile.in.CYGWIN_NT-5.0 \
diff -Nurd agg-2.6.1-r134+dfsg1.orig/configure.ac agg-2.6.1-r134+dfsg1/configure.ac
--- agg-2.6.1-r134+dfsg1.orig/configure.ac	2020-03-12 20:04:51.000000000 -0400
+++ agg-2.6.1-r134+dfsg1/configure.ac	2022-03-06 13:33:06.000000000 -0500
@@ -3,7 +3,7 @@
 AC_CANONICAL_TARGET
 AC_CONFIG_HEADERS(include/config.h)
 AM_INIT_AUTOMAKE
-
+AC_CONFIG_MACRO_DIRS([m4])
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -41,25 +41,6 @@
 # todo, make the PREFERED_PLATFORM selectable, after the set of possible 
 # Platforms to link the examples have been evaluated.
 PREFERED_PLATFORM=X11
-case "$host" in
-  *darwin* )
-    OSX_LIBS="-framework Carbon -framework QuickTime"
-    OSX_CFLAGS="-I/System/Library/Frameworks/Carbon.framework/Headers -I/System/Library/Frameworks/QuickTime.framework/Headers "
-    AC_SUBST(OSX_CFLAGS)
-    AC_SUBST(OSX_LIBS)
-    osx_host=yes
-    PREFERED_PLATFORM=mac
-  ;;
-dnl ####  Check if we are compiling for win32 #####
-  *mingw*)
-    win32_host=yes
-    WINDOWS_LIBS=-lgdi32
-    WINDOWS_CFLAGS=
-    AC_SUBST(WINDOWS_CFLAGS)
-    AC_SUBST(WINDOWS_LIBS)
-    PREFERED_PLATFORM=win32
-  ;;
-esac
 AM_CONDITIONAL(ENABLE_WIN32,[test x$win32_host = xyes -a x$enable_platform != xno ])
 AM_CONDITIONAL(ENABLE_OSX,[test x$osx_host = xyes -a x$enable_platform != xno ])
 dnl then enable font_win32tt
diff -Nurd agg-2.6.1-r134+dfsg1.orig/examples/Makefile.am agg-2.6.1-r134+dfsg1/examples/Makefile.am
--- agg-2.6.1-r134+dfsg1.orig/examples/Makefile.am	2020-03-12 19:36:06.000000000 -0400
+++ agg-2.6.1-r134+dfsg1/examples/Makefile.am	2022-03-06 13:34:37.000000000 -0500
@@ -14,7 +14,7 @@
 GPCP=gpc_test
 endif
 
-INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/font_freetype/ -I$(top_srcdir)/gpc -I$(top_srcdir)/font_win32_tt
+AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/font_freetype/ -I$(top_srcdir)/gpc -I$(top_srcdir)/font_win32_tt
 
 noinst_LTLIBRARIES=libexamples.la
 libexamples_la_SOURCES=parse_lion.cpp make_gb_poly.cpp make_arrows.cpp interactive_polygon.cpp
diff -Nurd agg-2.6.1-r134+dfsg1.orig/font_freetype/Makefile.am agg-2.6.1-r134+dfsg1/font_freetype/Makefile.am
--- agg-2.6.1-r134+dfsg1.orig/font_freetype/Makefile.am	2020-03-12 19:36:06.000000000 -0400
+++ agg-2.6.1-r134+dfsg1/font_freetype/Makefile.am	2022-03-06 14:11:23.000000000 -0500
@@ -4,8 +4,8 @@
 agginclude_HEADERS = agg_font_freetype.h
 lib_LTLIBRARIES = libaggfontfreetype.la
 
-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ 
+libaggfontfreetype_la_LDFLAGS = -no-undefined -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ ../src/libagg.la
 libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp
-libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ 
+libaggfontfreetype_la_CPPFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ 
 endif
 
diff -Nurd agg-2.6.1-r134+dfsg1.orig/src/Makefile.am agg-2.6.1-r134+dfsg1/src/Makefile.am
--- agg-2.6.1-r134+dfsg1.orig/src/Makefile.am	2020-03-12 19:36:06.000000000 -0400
+++ agg-2.6.1-r134+dfsg1/src/Makefile.am	2022-03-06 13:34:03.000000000 -0500
@@ -1,6 +1,6 @@
 SUBDIRS = ctrl . platform
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libagg.la
 
diff -Nurd agg-2.6.1-r134+dfsg1.orig/src/ctrl/Makefile.am agg-2.6.1-r134+dfsg1/src/ctrl/Makefile.am
--- agg-2.6.1-r134+dfsg1.orig/src/ctrl/Makefile.am	2020-03-12 19:36:06.000000000 -0400
+++ agg-2.6.1-r134+dfsg1/src/ctrl/Makefile.am	2022-03-06 13:34:14.000000000 -0500
@@ -1,5 +1,5 @@
 if ENABLE_CTRL
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES = libaggctrl.la
 
diff -Nurd agg-2.6.1-r134+dfsg1.orig/src/platform/X11/Makefile.am agg-2.6.1-r134+dfsg1/src/platform/X11/Makefile.am
--- agg-2.6.1-r134+dfsg1.orig/src/platform/X11/Makefile.am	2020-03-12 19:36:06.000000000 -0400
+++ agg-2.6.1-r134+dfsg1/src/platform/X11/Makefile.am	2022-03-06 14:14:00.000000000 -0500
@@ -3,6 +3,6 @@
 
 libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
 libaggplatformX11_la_SOURCES = agg_platform_support.cpp
-libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include @x_includes@
-libaggplatformX11_la_LIBADD = -lX11
+libaggplatformX11_la_CPPFLAGS =  -I$(top_srcdir)/include -I@x_includes@
+libaggplatformX11_la_LIBADD = -lX11 -L@x_libraries@
 endif
diff -Nurd agg-2.6.1-r134+dfsg1.orig/src/platform/sdl/Makefile.am agg-2.6.1-r134+dfsg1/src/platform/sdl/Makefile.am
--- agg-2.6.1-r134+dfsg1.orig/src/platform/sdl/Makefile.am	2020-03-12 19:36:06.000000000 -0400
+++ agg-2.6.1-r134+dfsg1/src/platform/sdl/Makefile.am	2022-03-06 14:14:22.000000000 -0500
@@ -4,7 +4,7 @@
 
 libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
 libaggplatformsdl_la_SOURCES = agg_platform_support.cpp
-libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@
+libaggplatformsdl_la_CPPFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@
 libaggplatformsdl_la_LIBADD = @SDL_LIBS@
 endif