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
This commit is contained in:
Mike Blumenkrantz 2017-07-03 15:01:59 -04:00
parent ded5b1e764
commit b58629bbbe
2 changed files with 3 additions and 4 deletions

View File

@ -2,8 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
AM_MAKEFLAGS = --no-print-directory AM_MAKEFLAGS = --no-print-directory
AM_DISTCHECK_CONFIGURE_FLAGS = \ AM_DISTCHECK_CONFIGURE_FLAGS = \
--with-tests=regular \ --with-tests=regular \
--with-systemdunitdir=. \ --with-systemdunitdir=.
--enable-always-build-examples
SUBDIRS = src data config doc SUBDIRS = src data config doc

View File

@ -5226,7 +5226,7 @@ if test "x${want_tests}" = "xyes" -a "x${want_wayland}" = "xyes"; then
fi fi
AC_ARG_ENABLE([always-build-examples], 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 if test "x${enableval}" = "xyes" ; then
want_always_build_examples="yes" want_always_build_examples="yes"
@ -5234,7 +5234,7 @@ AC_ARG_ENABLE([always-build-examples],
want_always_build_examples="no" want_always_build_examples="no"
fi fi
], ],
[want_always_build_examples="no"]) [want_always_build_examples="yes"])
AM_CONDITIONAL([ALWAYS_BUILD_EXAMPLES], [test "${want_always_build_examples}" = "yes"]) AM_CONDITIONAL([ALWAYS_BUILD_EXAMPLES], [test "${want_always_build_examples}" = "yes"])
BARF_OK="xno" BARF_OK="xno"