diff --git a/configure.ac b/configure.ac
index 75dd789c1..a0d157fee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ dnl LIBTOOL_VERSION=current:revision:age
 LIBTOOL_VERSION=4:0:0
 AC_SUBST(LIBTOOL_VERSION)
 
-m4_divert_text([DEFAULTS], [dnl
+m4_divert_text([INIT_PREPARE], [dnl
 # load the config.options
 if test -f ./config.options; then
   AX_LOG([using config.options << EOF])
diff --git a/m4/ax_arg.m4 b/m4/ax_arg.m4
index b3590df6f..732c6c9b3 100644
--- a/m4/ax_arg.m4
+++ b/m4/ax_arg.m4
@@ -23,6 +23,7 @@ AC_DEFUN([AX_ARG],
   m4_define([type],  [m4_toupper([[$1]])])dnl WITH or ENABLE
   AS_VAR_PUSHDEF([value], [m4_if(type, [WITH], [], type[_])[]m4_toupper([[$2]])])dnl
 
+  m4_divert_once([INIT_PREPARE], [dnl
   dnl switch between AC_ARG_(WITH|ENABLE), since I don't think you can indirect
   m4_if(type, [WITH],
     dnl WITH case.
@@ -35,7 +36,7 @@ AC_DEFUN([AX_ARG],
     [AC_ARG_ENABLE(lower,
     AC_HELP_STRING([--][]m4_if(yes, [$3], disable, enable)-lower, [$5][ ]m4_ifval([$3],[@<:@$3@:>@])),
     [ value=[$enableval] ],
-    [ AS_VAR_SET_IF([value], [], [value="[$3]"]) ])])
+    [ AS_VAR_SET_IF([value], [], [value="[$3]"]) ])])])
 
   dnl if the tag is none, generate no configure code here
   m4_bmatch([$4], [none], [], [dnl
diff --git a/m4/ax_group_pkg.m4 b/m4/ax_group_pkg.m4
index 518e91d87..aca6a8505 100644
--- a/m4/ax_group_pkg.m4
+++ b/m4/ax_group_pkg.m4
@@ -21,10 +21,11 @@ AC_DEFUN([AX_GROUP_PKG],
   AS_VAR_PUSHDEF([missing], [ax_group_pkg_missing_deps])
   AS_VAR_PUSHDEF([bool], [ax_group_pkg_have_pkg_bool])
 
+  m4_divert_once([INIT_PREPARE], [dnl
   AC_ARG_WITH(m4_tolower([[$1]]),
     AC_HELP_STRING([--with-]m4_tolower([[$1]]), [enable searching for the $1 package @<:@auto@:>@]),
     [ have_pkg=$withval ]
-  )
+  )])
 
   missing=""
   m4_if([$2], [], [have_pkg=[no_deps]], AX_LOAD_DEPS(pkg, m4_toupper([[$2]]), missing))
diff --git a/m4/ax_module.m4 b/m4/ax_module.m4
index 7109be526..9a054fc4d 100644
--- a/m4/ax_module.m4
+++ b/m4/ax_module.m4
@@ -38,7 +38,7 @@ AC_DEFUN([AX_MODULE],
 
     HAVE_PKG_$1_SRC=yes
 
-    m4_divert_once([DEFAULTS], [dnl
+    m4_divert_once([INIT_PREPARE], [dnl
       # Silently ignore modules that don't exist in this distribution
       # I'm diverting the output, so i need to do this twice.
       if test -d "$srcdir/$2" ; then
@@ -47,13 +47,12 @@ AC_DEFUN([AX_MODULE],
             WANT_MODULE_$1="$ENABLE_MODULE_$1"
         fi
       fi
-    ])
 
-    AC_ARG_ENABLE([module-]m4_tolower([[$1]]),
-      AC_HELP_STRING([--enable-module-]m4_tolower([[$1]]), [enable the $1 module @<:@$4@:>@]),
-      [ ENABLE_MODULE_$1=$enableval; WANT_MODULE_$1=$enableval; ],
-      [ if test x"$ENABLE_MODULE_$1" = x; then ENABLE_MODULE_$1=`/bin/echo -n $4 | tr [A-Z] [a-z]` ; fi ]
-    )
+      AC_ARG_ENABLE([module-]m4_tolower([[$1]]),
+        AC_HELP_STRING([--enable-module-]m4_tolower([[$1]]), [enable the $1 module @<:@$4@:>@]),
+        [ ENABLE_MODULE_$1=$enableval; WANT_MODULE_$1=$enableval; ],
+        [ if test x"$ENABLE_MODULE_$1" = x; then ENABLE_MODULE_$1=`/bin/echo -n $4 | tr [A-Z] [a-z]` ; fi ]
+      )])
 
     AC_MSG_CHECKING([whether to build module $1])
     ax_module_enable=$ENABLE_MODULE_$1
diff --git a/m4/ax_module_python.m4 b/m4/ax_module_python.m4
index 47952dfbb..b91d0c616 100644
--- a/m4/ax_module_python.m4
+++ b/m4/ax_module_python.m4
@@ -13,11 +13,12 @@ AC_DEFUN([AX_MODULE_PYTHON],
 
     HAVE_PKG_PYTHON_SRC=yes
 
+    m4_divert_once([INIT_PREPARE], [dnl
     AC_ARG_ENABLE([module-python],
       AC_HELP_STRING([--enable-module-python], [enable the python bindings @<:@$2@:>@]),
       [ ENABLE_MODULE_PYTHON=$enableval ],
       [ if test x"$ENABLE_MODULE_PYTHON" = x""; then ENABLE_MODULE_PYTHON=`/bin/echo -n $2 | tr [A-Z] [a-z]` ; fi ]
-    )
+    )])
 
     AC_MSG_CHECKING([whether to build module Python])
     ax_module_enable=$ENABLE_MODULE_PYTHON
diff --git a/m4/ax_pkg.m4 b/m4/ax_pkg.m4
index 491e58392..00b92be86 100644
--- a/m4/ax_pkg.m4
+++ b/m4/ax_pkg.m4
@@ -9,10 +9,11 @@ dnl Usage: AX_PKG(<name>, <dependencies>, <libraries>, <headers>[, <relative inc
 AC_DEFUN([AX_PKG],
 [
 
+  m4_divert_once([INIT_PREPARE], [dnl
   AC_ARG_WITH(m4_tolower([[$1]]),
     AC_HELP_STRING([--with-]m4_tolower([[$1]]), [enable searching for the $1 package @<:@auto@:>@]),
     [ HAVE_PKG_$1=$withval ]
-  )
+  )])
 
   ADD_$1_CPPFLAGS="$PKG_$1_CPPFLAGS"
   PKG_$1_CPPFLAGS=""
diff --git a/m4/ax_pkg_apple.m4 b/m4/ax_pkg_apple.m4
index fd4aab837..5beacebe3 100644
--- a/m4/ax_pkg_apple.m4
+++ b/m4/ax_pkg_apple.m4
@@ -15,10 +15,11 @@ AC_DEFUN([AX_PKG_APPLE],
   AS_VAR_PUSHDEF([pkg_l], [PKG_]pkg[_LIBS])
   AS_VAR_PUSHDEF([bool], [ax_pkg_apple_have_pkg_bool])
 
+  m4_divert_once([INIT_PREPARE], [dnl
   AC_ARG_WITH([apple_]m4_tolower([[$1]]),
     AC_HELP_STRING([--with-apple_]m4_tolower([[$1]]), [enable searching for the APPLE_$1 package @<:@auto@:>@]),
     [ HAVE_PKG_pkg=$withval ]
-  )
+  )])
 
   AC_MSG_CHECKING(for package pkg)
 
diff --git a/m4/ax_pkg_boost.m4 b/m4/ax_pkg_boost.m4
index 95ad0c7c8..ada213c93 100644
--- a/m4/ax_pkg_boost.m4
+++ b/m4/ax_pkg_boost.m4
@@ -8,10 +8,11 @@ dnl __END_LICENSE__
 # Usage: AX_PKG_BOOST
 AC_DEFUN([AX_PKG_BOOST],
 [
+  m4_divert_once([INIT_PREPARE], [dnl
   AC_ARG_WITH(boost,
     AC_HELP_STRING([--with-boost], [enable searching for the boost package @<:@auto@:>@]),
     [ HAVE_PKG_BOOST=$withval ]
-  )
+  )])
 
   AC_MSG_CHECKING(for package BOOST)