--- gigedit/trunk/configure.ac	2018/12/23 23:06:56	3449
+++ gigedit/trunk/configure.ac	2019/02/03 13:27:28	3462
@@ -77,7 +77,11 @@
 # code though would then not be executed and would lead to interesting
 # libtool errors on non-Mac systems due to this.
 AC_PROG_OBJC
-AC_PROG_OBJCXX
+# The OBJCXX macro didn't exist before autoconf 2.65, so ifdef it to
+# avoid warnings on old systems.
+m4_ifdef([AC_PROG_OBJCXX], [AC_PROG_OBJCXX])
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 PKG_CHECK_EXISTS(gtk+-3.0 >= 2.99,
         [PKG_CHECK_MODULES([GTK], [gtk+-3.0])],
@@ -90,6 +94,13 @@
         [PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.8 gthread-2.0 cairomm-1.0)])
 AM_CONDITIONAL(HAVE_GTK3, [test "$have_gtk3" = "yes"])
 
+# Check for cairommconfig.h, as it was moved in cairomm 1.8.4. We only
+# need it for newer versions.
+gigedit_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$GTKMM_CFLAGS $CPPFLAGS"
+AC_CHECK_HEADERS([cairommconfig.h])
+CPPFLAGS=$gigedit_save_CPPFLAGS
+
 PKG_CHECK_MODULES(SIGC, sigc++-2.0)
 AC_SUBST(SIGC_CFLAGS)
 AC_SUBST(SIGC_LIBS)