From 05e30dae9dccf051693d53dd27faec71077b5f7d Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Mon, 1 Jul 2013 14:56:28 +0200 Subject: [PATCH] Remove BUILDSYS_INIT and BUILDSYS_TOUCH_DEPS. --- configure.ac | 5 ----- m4/buildsys.m4 | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index afaaa54..b6d33b8 100644 --- a/configure.ac +++ b/configure.ac @@ -38,11 +38,6 @@ 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. diff --git a/m4/buildsys.m4 b/m4/buildsys.m4 index 969978e..6afd8c6 100644 --- a/m4/buildsys.m4 +++ b/m4/buildsys.m4 @@ -21,7 +21,7 @@ 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) @@ -73,6 +73,15 @@ AC_DEFUN([BUILDSYS_INIT], [ ]) ]) +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) @@ -181,12 +190,3 @@ AC_DEFUN([BUILDSYS_SHARED_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 -])