Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -36,15 +36,10 @@
 
 dnl If your program uses plugins and should run on win32 as well, you need to
 dnl uncomment the following line
 dnl BUILDSYS_PROG_IMPLIB
 
-dnl We need this in order to run some initialization needed by the buildsys
-BUILDSYS_INIT
-dnl You need to call this to generate the .deps files required by the buildsys.
-BUILDSYS_TOUCH_DEPS
-
 dnl If you don't need any extra variables
 AC_CONFIG_FILES(buildsys.mk)
 dnl If you need any extra variables, they go to extra.mk.
 dnl If you use extra variables, comment the line above and uncomment the line
 dnl below.

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
-])