[PATCH] configure: check pkg_config conditional

[Michael Haener]

check pkg config in dependency to bootloader option.

Signed-off-by: Michael Haener <michael...@siemens.com>
---
configure.ac | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 87ba384..a2a2ea6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,13 +173,6 @@ AC_ARG_WITH([mem-uservars],

AC_DEFINE_UNQUOTED([ENV_MEM_USERVARS], [${ENV_MEM_USERVARS}], [Reserved memory for user variables])

-dnl pkg-config
-PKG_PROG_PKG_CONFIG()
-if test "x$PKG_CONFIG" = "xno"; then
- AC_MSG_ERROR([You need to install pkg-config])
-fi
-PKG_CHECK_MODULES(LIBCHECK, check)
-
AC_ARG_ENABLE([bootloader],
AS_HELP_STRING([--disable-bootloader], [Compile the bootloader disabled, only make the tools]),
[enable_bootloader="no"],
@@ -187,6 +180,13 @@ AC_ARG_ENABLE([bootloader],

AS_IF([test "x$enable_bootloader" != "xno"], [
PKG_CHECK_MODULES(LIBPCI, libpci)
+
+dnl pkg-config
+ PKG_PROG_PKG_CONFIG()
+ if test "x$PKG_CONFIG" = "xno"; then
+ AC_MSG_ERROR([You need to install pkg-config])
+ fi
+ PKG_CHECK_MODULES(LIBCHECK, check)
])
AM_CONDITIONAL([BOOTLOADER], [test "x$enable_bootloader" != "xno"])

--
2.34.1

[Jan Kiszka]

Indention seems inconsistent (space vs. tabs here).

Jan

> ])
> AM_CONDITIONAL([BOOTLOADER], [test "x$enable_bootloader" != "xno"])
>


--

Siemens AG, Technology
Competence Center Embedded Linux

[Jan Kiszka]

Massaged that myself, result is in next now.

Thanks,
Jan

[Michael Haener]

check pkg config in dependency to bootloader option.

Signed-off-by: Michael Haener <michael...@siemens.com>
---

configure.ac | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 87ba384..7d447e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,20 +173,19 @@ AC_ARG_WITH([mem-uservars],

AC_DEFINE_UNQUOTED([ENV_MEM_USERVARS], [${ENV_MEM_USERVARS}], [Reserved memory for user variables])

-dnl pkg-config
-PKG_PROG_PKG_CONFIG()
-if test "x$PKG_CONFIG" = "xno"; then
- AC_MSG_ERROR([You need to install pkg-config])
-fi
-PKG_CHECK_MODULES(LIBCHECK, check)
-
AC_ARG_ENABLE([bootloader],
AS_HELP_STRING([--disable-bootloader], [Compile the bootloader disabled, only make the tools]),
[enable_bootloader="no"],

[enable_bootloader="yes"])

AS_IF([test "x$enable_bootloader" != "xno"], [

- PKG_CHECK_MODULES(LIBPCI, libpci)
+ PKG_CHECK_MODULES(LIBPCI, libpci)
+ dnl pkg-config

+ PKG_PROG_PKG_CONFIG()
+ if test "x$PKG_CONFIG" = "xno"; then
+ AC_MSG_ERROR([You need to install pkg-config])
+ fi
+ PKG_CHECK_MODULES(LIBCHECK, check)

])
AM_CONDITIONAL([BOOTLOADER], [test "x$enable_bootloader" != "xno"])

--

2.34.1

[Michael Häner]

I have seen your second message too late :-)