diff options
| author | David King <amigadave@amigadave.com> | 2015-06-28 22:04:28 +0100 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2015-06-28 22:06:19 +0100 |
| commit | 4363223839649f4e5d01dc6d0b3e23a629ddcd8a (patch) | |
| tree | fe8171a3d1013b659b2bf2844c52926b052e78a3 | |
| parent | 57403addd36276aac8fc52d200177fb6366d888d (diff) | |
| download | gnome-common-4363223839649f4e5d01dc6d0b3e23a629ddcd8a.tar.gz | |
build: Make autoconf-archive support optional
As autoconf-archive installs the same ax_*.m4 macros that gnome-common
installs, which are copied from autoconf-archive into gnome-common, add
a configure argument to toggle autoconf-archive support.
Passing --without-autoconf-archive to configure (or not providing an
argument) disables compatibility (parallel-installability) with
autoconf-archive, and installs the ax_*.m4 macros. If
--with-autoconf-archive is passed to configure, the macros are not
installed, and gnome-common will not install any M4 macros that conflict
with autoconf-archive.
https://bugzilla.gnome.org/show_bug.cgi?id=747920
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | macros2/Makefile.am | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 9d81b72..0a503a1 100644 --- a/configure.ac +++ b/configure.ac @@ -13,6 +13,14 @@ if test -z "$enable_maintainer_mode"; then fi AM_MAINTAINER_MODE([enable]) +AC_ARG_WITH([autoconf-archive], + [AS_HELP_STRING([--with-autoconf-archive], + [Enable parallel-installability with autoconf-archive, by disabling installation of its M4 macros])], + [], [with_autoconf_archive=no]) + +AM_CONDITIONAL([WITH_AUTOCONF_ARCHIVE], + [test "x$with_autoconf_archive" != "xno"]) + AC_CONFIG_FILES([ Makefile macros2/Makefile diff --git a/macros2/Makefile.am b/macros2/Makefile.am index 9d5b294..400f290 100644 --- a/macros2/Makefile.am +++ b/macros2/Makefile.am @@ -10,10 +10,13 @@ GNOME2_MACROS = \ # these should be dropped as soon as the deprecated GNOME2_MACROS which use them # are removed. Until then, they should be kept up to date, and all changes to # them submitted upstream. +if !WITH_AUTOCONF_ARCHIVE +# Install the macros only if autoconf-archive support is disabled. AUTOCONF_ARCHIVE_MACROS = \ ax_check_enable_debug.m4 \ ax_code_coverage.m4 \ $(NULL) +endif EXTRA_DIST = $(GNOME2_MACROS) $(AUTOCONF_ARCHIVE_MACROS) gnome-autogen.sh |