osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

configure.ac: Use AS_IF() instead of shell-if for PKG_CONFIG 

https://autotools.io/pkgconfig/pkg_check_modules.html

> If you have the first call to PKG_CHECK_MODULES inside a bash
> conditional block, the expansion of PKG_PROG_PKG_CONFIG will also be
> conditional

> You can solve this problem in two ways; you can either explicitly call
> PKG_PROG_PKG_CONFIG outside of any conditional, forcing checking for
> pkg-config as soon as possible; or you can rewrite your conditionals
> to use the proper syntax
This commit is contained in:
Harald Welte 2015-11-21 11:38:09 +01:00
parent a10ef29b47
commit d086f21195
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -89,9 +89,9 @@ AC_ARG_ENABLE([pcsc], [AS_HELP_STRING([--disable-pcsc], [Build without PC/SC sup
[
enable_pcsc="yes"
])
if test "x$enable_pcsc" = "xyes" ; then
AS_IF([test "x$enable_pcsc" = "xyes"], [
PKG_CHECK_MODULES(PCSC, libpcsclite)
fi
])
AM_CONDITIONAL(ENABLE_PCSC, test "x$enable_pcsc" = "xyes")
AC_ARG_ENABLE(talloc,
@ -109,12 +109,12 @@ AC_ARG_ENABLE(system-talloc,
)],
[enable_system_talloc=$enableval], [enable_system_talloc="no"])
AM_CONDITIONAL(ENABLE_SYSTEM_TALLOC, [test x"$enable_system_talloc" = x"yes"])
if test x"$enable_system_talloc" = x"yes"; then
AS_IF([test x"$enable_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])
fi
fi
])
AC_ARG_ENABLE(plugin,
[AS_HELP_STRING(