Commit 43632238 authored by David King's avatar David King

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
parent 57403add
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment