diff options
| -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 |