mirror of https://gerrit.osmocom.org/libosmocore
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.
This commit is contained in:
parent
d086f21195
commit
5fa0dcc275
16
configure.ac
16
configure.ac
|
@ -102,14 +102,14 @@ AC_ARG_ENABLE(talloc,
|
||||||
[enable_talloc=$enableval], [enable_talloc="yes"])
|
[enable_talloc=$enableval], [enable_talloc="yes"])
|
||||||
AM_CONDITIONAL(ENABLE_TALLOC, [test x"$enable_talloc" = x"yes"])
|
AM_CONDITIONAL(ENABLE_TALLOC, [test x"$enable_talloc" = x"yes"])
|
||||||
|
|
||||||
AC_ARG_ENABLE(system-talloc,
|
AC_ARG_WITH(system-talloc,
|
||||||
[AS_HELP_STRING(
|
[AS_HELP_STRING(
|
||||||
[--enable-system-talloc],
|
[--with-system-talloc],
|
||||||
[Enable using a system-level talloc library]
|
[Build using a system-level talloc library]
|
||||||
)],
|
)],
|
||||||
[enable_system_talloc=$enableval], [enable_system_talloc="no"])
|
[with_system_talloc=$withval], [with_system_talloc="no"])
|
||||||
AM_CONDITIONAL(ENABLE_SYSTEM_TALLOC, [test x"$enable_system_talloc" = x"yes"])
|
AM_CONDITIONAL(WITH_SYSTEM_TALLOC, [test x"$with_system_talloc" = x"yes"])
|
||||||
AS_IF([test x"$enable_system_talloc" = x"yes"], [
|
AS_IF([test x"$with_system_talloc" = x"yes"], [
|
||||||
PKG_CHECK_MODULES(TALLOC, talloc)
|
PKG_CHECK_MODULES(TALLOC, talloc)
|
||||||
if test x"$enable_talloc" = x"yes"; then
|
if test x"$enable_talloc" = x"yes"; then
|
||||||
AC_MSG_ERROR([You cannot enable both internal and system talloc])
|
AC_MSG_ERROR([You cannot enable both internal and system talloc])
|
||||||
|
@ -223,7 +223,7 @@ AC_OUTPUT_COMMANDS([
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
_EOF_
|
_EOF_
|
||||||
if test x"$enable_system_talloc" = x"yes"; then
|
if test x"$with_system_talloc" = x"yes"; then
|
||||||
echo '#include <talloc.h>' >> $outfile
|
echo '#include <talloc.h>' >> $outfile
|
||||||
else
|
else
|
||||||
echo '#include <osmocom/core/talloc-internal.h>' >> $outfile
|
echo '#include <osmocom/core/talloc-internal.h>' >> $outfile
|
||||||
|
@ -231,7 +231,7 @@ _EOF_
|
||||||
esac
|
esac
|
||||||
],[
|
],[
|
||||||
srcdir=$srcdir
|
srcdir=$srcdir
|
||||||
enable_system_talloc=$enable_system_talloc
|
with_system_talloc=$with_system_talloc
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue