From b58629bbbef3d811700b016eb9fa97e2af71e1a1 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 3 Jul 2017 15:01:59 -0400 Subject: [PATCH] build: enable examples build by default the previous method of forcing this to be enabled for dist builds caused breaks when the original configure disabled examples, as the little-known DISTCHECK_CONFIGURE_FLAGS variable would need to also be set to disable examples even though the user would think they were disabled based on configure output --- Makefile.am | 3 +-- configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index a818b4e353..591cf998c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,8 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_MAKEFLAGS = --no-print-directory AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-tests=regular \ ---with-systemdunitdir=. \ ---enable-always-build-examples +--with-systemdunitdir=. SUBDIRS = src data config doc diff --git a/configure.ac b/configure.ac index 72c4d6c78b..2efd94dec3 100644 --- a/configure.ac +++ b/configure.ac @@ -5226,7 +5226,7 @@ if test "x${want_tests}" = "xyes" -a "x${want_wayland}" = "xyes"; then fi AC_ARG_ENABLE([always-build-examples], - [AS_HELP_STRING([--enable-always-build-examples],[always build examples. @<:@default=disabled@:>@])], + [AS_HELP_STRING([--enable-always-build-examples],[always build examples. @<:@default=enabled@:>@])], [ if test "x${enableval}" = "xyes" ; then want_always_build_examples="yes" @@ -5234,7 +5234,7 @@ AC_ARG_ENABLE([always-build-examples], want_always_build_examples="no" fi ], - [want_always_build_examples="no"]) + [want_always_build_examples="yes"]) AM_CONDITIONAL([ALWAYS_BUILD_EXAMPLES], [test "${want_always_build_examples}" = "yes"]) BARF_OK="xno"