summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishwanatha Subbanna <vishwa@linux.vnet.ibm.com>2017-03-10 13:16:20 +0530
committerVishwanatha Subbanna <vishwa@linux.vnet.ibm.com>2017-03-13 18:03:31 +0530
commite89f7278d13f974000a7c8aae5e584a406633e07 (patch)
tree2c69dd1f4bf47cdaae01024f50ed33877425e309
parentcecb485e663c2e96dc8ef87521cabe2fc45c053c (diff)
downloadphosphor-led-manager-e89f7278d13f974000a7c8aae5e584a406633e07.zip
phosphor-led-manager-e89f7278d13f974000a7c8aae5e584a406633e07.tar.gz
Check for needed package modules than individual header files
Change-Id: I582caca53aa84ba7037a61f7a2a947ca0b313cc2 Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac8
2 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 228a810..337cad3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ CLEANFILES = led-gen.hpp
led-gen.hpp: ${srcdir}/parse_led.py
$(AM_V)@LEDGEN@ > $@
-phosphor_ledmanager_LDFLAGS = $(SYSTEMD_LIBS) $(SDBUSPLUS_LIBS) $(PHOSPHOR_LOGGING_LIBS)
-phosphor_ledmanager_CFLAGS = $(SYSTEMD_CFLAGS) $(SDBUSPLUS_CFLAGS) $(PHOSPHOR_LOGGING_CFLAGS)
+phosphor_ledmanager_LDFLAGS = $(SDBUSPLUS_LIBS) $(PHOSPHOR_LOGGING_LIBS)
+phosphor_ledmanager_CFLAGS = $(SDBUSPLUS_CFLAGS) $(PHOSPHOR_LOGGING_CFLAGS)
SUBDIRS = test
diff --git a/configure.ac b/configure.ac
index 83c45bd..51f6ad9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,6 @@ AX_APPEND_COMPILE_FLAGS([-Wall -Werror], [CXXFLAGS])
# Python
AM_PATH_PYTHON([2.7], [AC_SUBST([PYTHON], [echo "$PYTHON"])], [AC_MSG_ERROR([Could not find python-2.7 installed...python-2.7 is required])])
-# Checks for libraries.
-PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 221])
-
LT_INIT # Removes WARNING: unrecognized options: --with-libtool-sysroot
# Check/set gtest specific functions.
AX_PTHREAD([GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"],[GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"])
@@ -43,9 +40,8 @@ AS_IF([test "x$enable_oe_sdk" == "xyes"],
AC_SUBST([OESDK_TESTCASE_FLAGS], [$testcase_flags])
)
-# Checks for header files.
-AC_CHECK_HEADER(systemd/sd-bus.h, ,[AC_MSG_ERROR([Could not find systemd/sd-bus.h...systemd developement package required])])
-AC_CHECK_HEADER(sdbusplus/server.hpp, ,[AC_MSG_ERROR([Could not find sdbusplus/server.hpp...openbmc/sdbusplus package required])])
+# Checks for modules
+PKG_CHECK_MODULES([SDBUSPLUS], [sdbusplus],, [AC_MSG_ERROR([Could not find sdbusplus...openbmc/sdbusplus package required])])
PKG_CHECK_MODULES([PHOSPHOR_LOGGING], [phosphor-logging],, [AC_MSG_ERROR([Could not find phosphor-logging...openbmc/phosphor-logging package required])])
# Dbus service name
OpenPOWER on IntegriCloud