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>
diff --git a/configure.ac b/configure.ac
index 0f2e596..36ec6a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,15 +34,34 @@
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 @@
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.])],