Skip to content

Commit

Permalink
Merge pull request #605 from ffontaine/master
Browse files Browse the repository at this point in the history
autotools: make example build optional
  • Loading branch information
doegox committed Jun 24, 2020
2 parents 1f6f75a + 874d960 commit 4b7791f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ ACLOCAL_AMFLAGS = -I m4

AM_CFLAGS = $(LIBNFC_CFLAGS)

SUBDIRS = libnfc utils examples include contrib cmake test
SUBDIRS = libnfc utils

if EXAMPLE_ENABLED
SUBDIRS += examples
endif

SUBDIRS += include contrib cmake test

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnfc.pc
Expand Down
11 changes: 11 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,14 @@ then
fi
AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes])

# Example build (default: yes)
AC_ARG_ENABLE([example],AS_HELP_STRING([--enable-example],[Enable example build.]),[enable_example=$enableval],[enable_example="yes"])

AC_MSG_CHECKING(for example build)
AC_MSG_RESULT($enable_example)

AM_CONDITIONAL(EXAMPLE_ENABLED, [test x"$enable_example" = xyes])

# Dependencies
PKG_CONFIG_REQUIRES=""

Expand All @@ -175,7 +183,10 @@ if test x$ac_cv_with_cutter = xyes -a x$ac_cv_use_cutter = xno; then
fi
AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"])

if test x"$enable_example" = "xyes"
then
AC_CHECK_READLINE
fi

# Help us to write great code ;-)
CFLAGS="$CFLAGS -Wall -pedantic -Wextra"
Expand Down

0 comments on commit 4b7791f

Please sign in to comment.