diff --git a/configure.ac b/configure.ac
index 5a8b95ff0eb7f9a0b7956b2933b84321a5b1c808..7a69ecf6d9c4ff98d53f6e5a939dee88a3b1a011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,14 +28,15 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
 # Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
 XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
 AM_CONFIG_HEADER(config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
 
 # Check for dependencies
 PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])