Index: buildsys.mk.in
==================================================================
--- buildsys.mk.in
+++ buildsys.mk.in
@@ -58,10 +58,11 @@
 PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
 PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
 INSTALL_LIB = @INSTALL_LIB@
 UNINSTALL_LIB = @UNINSTALL_LIB@
 CLEAN_LIB = @CLEAN_LIB@
+AS_DEPENDS = @AS_DEPENDS@
 CC_DEPENDS = @CC_DEPENDS@
 CXX_DEPENDS = @CXX_DEPENDS@
 OBJC_DEPENDS = @OBJC_DEPENDS@
 OBJCXX_DEPENDS = @OBJCXX_DEPENDS@
 LN_S = @LN_S@

Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -119,17 +119,14 @@
 		AC_MSG_RESULT(yes)
 		OBJCFLAGS="$old_OBJCFLAGS"
 	])
 ])
 
-BUILDSYS_INIT
-BUILDSYS_TOUCH_DEPS
-
 dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
 dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
 AC_SUBST(CPP)
 AC_SUBST(CPPFLAGS)
 
 AC_SUBST(PACKAGE, ObjXMPP)
 AC_CONFIG_FILES([buildsys.mk extra.mk])
 AC_CONFIG_HEADERS(config.h)
 AC_OUTPUT

Index: m4/buildsys.m4
==================================================================
--- m4/buildsys.m4
+++ m4/buildsys.m4
@@ -19,11 +19,11 @@
 dnl CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 dnl POSSIBILITY OF SUCH DAMAGE.
 dnl
 
-AC_DEFUN([BUILDSYS_INIT], [
+AC_CONFIG_COMMANDS_PRE([
 	AC_SUBST(CC_DEPENDS, $GCC)
 	AC_SUBST(CXX_DEPENDS, $GXX)
 	AC_SUBST(OBJC_DEPENDS, $GOBJC)
 	AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
 
@@ -70,10 +70,19 @@
 		AC_SUBST(TERM_SETAF3, '\033\13333m')
 		AC_SUBST(TERM_SETAF4, '\033\13334m')
 		AC_SUBST(TERM_SETAF6, '\033\13336m')
 	])
 ])
+
+AC_CONFIG_COMMANDS_POST([
+	${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
+	for i in $(find . -name Makefile); do
+		DEPSFILE="$(dirname $i)/.deps"
+		test -f "$DEPSFILE" && rm "$DEPSFILE"
+		touch -t 0001010000 "$DEPSFILE"
+	done
+])
 
 AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
 	AC_REQUIRE([AC_CANONICAL_HOST])
 	AC_MSG_CHECKING(whether we need an implib)
 	case "$host_os" in
@@ -179,14 +188,5 @@
 	AC_SUBST(PLUGIN_SUFFIX)
 	AC_SUBST(INSTALL_LIB)
 	AC_SUBST(UNINSTALL_LIB)
 	AC_SUBST(CLEAN_LIB)
 ])
-
-AC_DEFUN([BUILDSYS_TOUCH_DEPS], [
-	${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
-	for i in $(find . -name Makefile); do
-		DEPSFILE="$(dirname $i)/.deps"
-		test -f "$DEPSFILE" && rm "$DEPSFILE"
-		touch -t 0001010000 "$DEPSFILE"
-	done
-])