From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 4 Mar 2015 10:37:49 +0000 (+0000)
Subject: Move Autoconf/Automake droppings into /build-aux/
X-Git-Tag: dbus-1.9.16~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15e6b4f5b5a3a8ac02b3582519b044024cd350af;p=thirdparty%2Fdbus.git

Move Autoconf/Automake droppings into /build-aux/

Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89846
---

diff --git a/.gitignore b/.gitignore
index 351ae75d5..8d7468228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.rej
 *.o
 *~
+/build-aux/
 compile
 config.cache
 config.log
diff --git a/configure.ac b/configure.ac
index 40546d725..d1c1a0dc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ m4_define([dbus_micro_version], [15])
 m4_define([dbus_version],
           [dbus_major_version.dbus_minor_version.dbus_micro_version])
 AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus])
+AC_CONFIG_AUX_DIR([build-aux])
 
 AC_CANONICAL_HOST
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 4e46e325a..05459ed5f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,7 +38,7 @@ libdbus_testutils_la_LIBADD = \
 
 TEST_EXTENSIONS = .sh
 
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
 LOG_COMPILER = $(srcdir)/glib-tap-test.sh
 SH_LOG_DRIVER = $(LOG_DRIVER)
 SH_LOG_COMPILER = $(SHELL)
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index 3564c8514..0922558f0 100644
--- a/test/name-test/Makefile.am
+++ b/test/name-test/Makefile.am
@@ -9,7 +9,7 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
 TEST_EXTENSIONS = .sh
 
-SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
+SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
 SH_LOG_COMPILER = $(SHELL)
 
 ## note that TESTS has special meaning (stuff to use in make check)