Merge pull request #605 from ffontaine/master
autotools: make example build optional
This commit is contained in:
commit
4b7791f845
2 changed files with 18 additions and 1 deletions
|
@ -2,7 +2,13 @@ ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
AM_CFLAGS = $(LIBNFC_CFLAGS)
|
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
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = libnfc.pc
|
pkgconfig_DATA = libnfc.pc
|
||||||
|
|
11
configure.ac
11
configure.ac
|
@ -157,6 +157,14 @@ then
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes])
|
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
|
# Dependencies
|
||||||
PKG_CONFIG_REQUIRES=""
|
PKG_CONFIG_REQUIRES=""
|
||||||
|
|
||||||
|
@ -175,7 +183,10 @@ if test x$ac_cv_with_cutter = xyes -a x$ac_cv_use_cutter = xno; then
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"])
|
AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"])
|
||||||
|
|
||||||
|
if test x"$enable_example" = "xyes"
|
||||||
|
then
|
||||||
AC_CHECK_READLINE
|
AC_CHECK_READLINE
|
||||||
|
fi
|
||||||
|
|
||||||
# Help us to write great code ;-)
|
# Help us to write great code ;-)
|
||||||
CFLAGS="$CFLAGS -Wall -pedantic -Wextra"
|
CFLAGS="$CFLAGS -Wall -pedantic -Wextra"
|
||||||
|
|
Loading…
Add table
Reference in a new issue