diff --git a/configure b/configure
index 69803a7907..06c0e99382 100755
--- a/configure
+++ b/configure
@@ -2000,6 +2000,9 @@ stubdom=n
 
 fi
 
+fi
+
+
 if test -e "stubdom/configure"; then :
 
 if test "x$stubdom" = "xy" || test "x$stubdom" = "x" ; then
@@ -2011,9 +2014,6 @@ fi
 
 
 
-fi
-
-
 
 # Check whether --enable-docs was given.
 if test "${enable_docs+set}" = set; then :
diff --git a/m4/subsystem.m4 b/m4/subsystem.m4
index 9e1e61f848..5e2eb581af 100644
--- a/m4/subsystem.m4
+++ b/m4/subsystem.m4
@@ -39,10 +39,10 @@ AX_ENABLE_SUBSYSTEM([$1])
 ],[
 AX_DISABLE_SUBSYSTEM([$1])
 ])
+])
 AX_SUBSYSTEM_CONFIGURE([$1])
 AC_SUBST($1)
 ])
-])
 
 AC_DEFUN([AX_SUBSYSTEM_FINISH], [
 AC_SUBST(SUBSYSTEMS)