diff options
| author | Daniel Mack <github@zonque.org> | 2015-12-12 14:03:52 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-12-12 14:03:52 +0100 |
| commit | afcaed0cad3982bd68b08baf8bcdd5fedbb68d00 (patch) | |
| tree | 52d180ec14fcd6cf9052e2e326ed4eb319d48c16 | |
| parent | a0361331758dbdb2375d6f871bc959116b699e31 (diff) | |
| parent | c0957da3f4cc2a0fe0d8e0c03e695b99cf132718 (diff) | |
Merge pull request #2148 from evverx/fix-enable-smack
build-sys: fix ./configure --enable-smack
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index c2222c376c..3128ca8672 100644 --- a/configure.ac +++ b/configure.ac @@ -668,11 +668,14 @@ AC_ARG_ENABLE([smack], AS_HELP_STRING([--disable-smack],[Disable optional SMACK esac], [have_smack=auto]) -if test "x${have_smack}" = xauto; then +if test "x${have_smack}" != xno; then + AC_DEFINE(HAVE_SMACK, 1, [Define if SMACK is available]) M4_DEFINES="$M4_DEFINES -DHAVE_SMACK" have_smack=yes fi +AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) + have_smack_run_label=no AC_ARG_WITH(smack-run-label, AS_HELP_STRING([--with-smack-run-label=STRING], @@ -690,12 +693,6 @@ AS_HELP_STRING([--with-smack-default-process-label=STRING], [AC_DEFINE_UNQUOTED(SMACK_DEFAULT_PROCESS_LABEL, ["$withval"], [Default SMACK label for executed processes])], []) -if test "x${have_smack}" = xyes ; then - AC_DEFINE(HAVE_SMACK, 1, [Define if SMACK is available]) -fi - -AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) - # ------------------------------------------------------------------------------ AC_ARG_ENABLE([gcrypt], AS_HELP_STRING([--disable-gcrypt],[Disable optional GCRYPT support]), |