diff options
author | Harald Welte <laforge@gnumonks.org> | 2015-11-21 11:57:06 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2015-11-21 12:49:40 +0100 |
commit | 5fa0dcc2750a79920d4a6404e960c50667840058 (patch) | |
tree | dc636eb2bb1ceceaa6d14c600a44882419ef2e15 /configure.ac | |
parent | d086f2119509af2e26a0d7a587b9e176df814998 (diff) |
configure: It should be --with-system-talloc, not --enable-system-talloc
As we are making a decision whether we should use an existing system
library, we call it --with-system-talloc, rather than
--enable-system-talloc.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 74c266e1..3daa392f 100644 --- a/configure.ac +++ b/configure.ac @@ -102,14 +102,14 @@ AC_ARG_ENABLE(talloc, [enable_talloc=$enableval], [enable_talloc="yes"]) AM_CONDITIONAL(ENABLE_TALLOC, [test x"$enable_talloc" = x"yes"]) -AC_ARG_ENABLE(system-talloc, +AC_ARG_WITH(system-talloc, [AS_HELP_STRING( - [--enable-system-talloc], - [Enable using a system-level talloc library] + [--with-system-talloc], + [Build using a system-level talloc library] )], - [enable_system_talloc=$enableval], [enable_system_talloc="no"]) -AM_CONDITIONAL(ENABLE_SYSTEM_TALLOC, [test x"$enable_system_talloc" = x"yes"]) -AS_IF([test x"$enable_system_talloc" = x"yes"], [ + [with_system_talloc=$withval], [with_system_talloc="no"]) +AM_CONDITIONAL(WITH_SYSTEM_TALLOC, [test x"$with_system_talloc" = x"yes"]) +AS_IF([test x"$with_system_talloc" = x"yes"], [ PKG_CHECK_MODULES(TALLOC, talloc) if test x"$enable_talloc" = x"yes"; then AC_MSG_ERROR([You cannot enable both internal and system talloc]) @@ -223,7 +223,7 @@ AC_OUTPUT_COMMANDS([ */ #pragma once _EOF_ - if test x"$enable_system_talloc" = x"yes"; then + if test x"$with_system_talloc" = x"yes"; then echo '#include <talloc.h>' >> $outfile else echo '#include <osmocom/core/talloc-internal.h>' >> $outfile @@ -231,7 +231,7 @@ _EOF_ esac ],[ srcdir=$srcdir - enable_system_talloc=$enable_system_talloc + with_system_talloc=$with_system_talloc ]) |