diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-24 15:58:01 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-24 15:58:01 +0000 |
| commit | fb06b43956355619a2513bfda41a32185be8a9c8 (patch) | |
| tree | 55555c7398a6e60875af27f365111e9f64ca1dad | |
| parent | 260f70e0afacabcda74a713d81b98f47e2d9060c (diff) | |
| download | dbus-fb06b43956355619a2513bfda41a32185be8a9c8.tar.gz | |
Honour aclocal flags in Makefile.am, rather than gluing them onto ACLOCAL
Part of a patch by Javier Jardón.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index ac7dcb15..52b40e9f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,6 @@ update-authors: DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} include tools/lcov.am diff --git a/configure.ac b/configure.ac index e8ac2aa2..42ec552b 100644 --- a/configure.ac +++ b/configure.ac @@ -15,9 +15,6 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability]) -# Honor aclocal flags -ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - GETTEXT_PACKAGE=dbus-1 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain]) |