diff options
| author | Patrick Venture <venture@google.com> | 2018-11-26 09:08:49 -0800 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2018-11-26 09:09:37 -0800 |
| commit | f77ecc7bca600a228509e87ae348b2c3aecc7057 (patch) | |
| tree | 2c9823672717e0d6664aa85ad3aafc8251be190c | |
| parent | d75235701018d0540bbad62560e3d3978af80a22 (diff) | |
| download | phosphor-pid-control-f77ecc7bca600a228509e87ae348b2c3aecc7057.tar.gz phosphor-pid-control-f77ecc7bca600a228509e87ae348b2c3aecc7057.zip | |
build: cleanup for readability
Cleanup a few macro definitions to make it easier to read. The changes
in this patchset specifically don't touch openbmc package macros pending
a change to how the CI detects openbmc packages.
Change-Id: I1372f0545254a880b856a1b9b23fbbebdb4e7c65
Signed-off-by: Patrick Venture <venture@google.com>
| -rw-r--r-- | configure.ac | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 0f2e596..36ec6a5 100644 --- a/configure.ac +++ b/configure.ac @@ -34,15 +34,34 @@ AX_PTHREAD([], [AC_MSG_ERROR(["pthread required and not found"])]) LT_INIT # Required for systemd linking # Check/set gtest specific functions. -PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_NOTICE([gtest not found, tests will not build])]) -PKG_CHECK_MODULES([GMOCK], [gmock], [], [AC_MSG_NOTICE([gmock not found, tests will not build])]) -PKG_CHECK_MODULES([GTEST_MAIN], [gtest_main], [], [AC_MSG_NOTICE([gtest_main not found, tests will not build])]) +PKG_CHECK_MODULES( + [GTEST], + [gtest], + [], + [AC_MSG_NOTICE([gtest not found, tests will not build])] +) +PKG_CHECK_MODULES( + [GMOCK], + [gmock], + [], + [AC_MSG_NOTICE([gmock not found, tests will not build])] +) +PKG_CHECK_MODULES( + [GTEST_MAIN], + [gtest_main], + [], + [AC_MSG_NOTICE([gtest_main not found, tests will not build])] +) AC_ARG_ENABLE([oe-sdk], - AS_HELP_STRING([--enable-oe-sdk], [Link testcases absolutely against OE SDK so they can be ran within it.]) + AS_HELP_STRING( + [--enable-oe-sdk], + [Link testcases absolutely against OE SDK so they can be ran within it.] + ) ) AC_ARG_VAR(OECORE_TARGET_SYSROOT, - [Path to the OE SDK SYSROOT]) + [Path to the OE SDK SYSROOT] +) AS_IF([test "x$enable_oe_sdk" == "xyes"], AS_IF([test "x$OECORE_TARGET_SYSROOT" == "x"], AC_MSG_ERROR([OECORE_TARGET_SYSROOT must be set with --enable-oe-sdk]) @@ -69,7 +88,10 @@ ZONEGEN="$PYTHON ${srcdir}/scripts/zone_gen.py -i $ZONE_YAML_GEN" AC_SUBST(ZONEGEN) AC_ARG_ENABLE([configure-dbus], - AS_HELP_STRING([--enable-configure-dbus], [Enable configuring pid from D-Bus.])) + AS_HELP_STRING( + [--enable-configure-dbus], [Enable configuring pid from D-Bus.] + ) +) AM_CONDITIONAL(CONFIGURE_DBUS, [test "x$enable_configure_dbus" = "xyes"]) AS_IF([test "x$enable_configure_dbus" = "xyes"], [AC_DEFINE(CONFIGURE_DBUS, [1], [Read configuration from D-Bus.])], |
