diff --git a/Makefile.am b/Makefile.am
index c9ee604d..315e322c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@
 
 ACLOCAL_AMFLAGS = -I m4
 AM_LIBTOOLFLAGS = --silent
-MAKEFLAGS = --no-print-directory
 
 FIRMWARE_DIR = $(datadir)/sigrok-firmware
 
diff --git a/configure.ac b/configure.ac
index c35bf424..e88e5e49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,8 @@ AC_PROG_LN_S
 # Required for per-target flags or subdir-objects with C sources.
 AM_PROG_CC_C_O
 
-# Check if order-only dependencies are supported.
+# Check for optional make features.
+SR_PROG_MAKE_NO_PRINT_DIRECTORY
 SR_PROG_MAKE_ORDER_ONLY
 
 # Initialize libtool.