mapper client: drop patch build configuration
Support for --enable-unpatched-systemd is dropped because
sd_bus_message_append_cmdline is no longer used after
2d04816fb5a1811694272818ec41b5364ce3c691.
Change-Id: I926ce4a0a1077ea99c14098230c2ee171ec13781
Fixes: 2d04816fb5a1811694272818ec41b5364ce3c691
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/configure.ac b/configure.ac
index 00fa5b6..7ab3d7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,10 +7,6 @@
AM_SILENT_RULES([yes])
AC_LANG([C++])
-# Modify header template
-AH_TOP([#pragma once])
-AH_BOTTOM([#include "libmapper/workaround/systemd.h"])
-
# Checks for programs.
AC_PROG_CC
AC_PROG_CXX
@@ -150,16 +146,6 @@
AC_DEFINE([MAPPER_INTERFACE], ["xyz.openbmc_project.ObjectMapper"], [Object mapper interface])
AC_DEFINE([MAPPER_PATH], ["/xyz/openbmc_project/object_mapper"], [Object mapper DBUS path])
-# Workaround for unpatched systemd installs
-AC_ARG_ENABLE([unpatched-systemd],
- AS_HELP_STRING([--enable-unpatched-systemd], [Enable unpatched systemd workarounds]))
-AS_IF([test "x$enable_unpatched_systemd" == "xyes"],
- AC_MSG_NOTICE([Enabling unpatched systemd workarounds])
- [
- AC_DEFINE([IS_UNPATCHED_SYSTEMD], ,[Enable unpatched systemd workarounds])
- ]
-)
-
# Create configured output
AC_CONFIG_FILES([Makefile fail-monitor/Makefile])
AC_OUTPUT
diff --git a/libmapper/workaround/systemd.h b/libmapper/workaround/systemd.h
deleted file mode 100644
index 5d336ca..0000000
--- a/libmapper/workaround/systemd.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef IS_UNPATCHED_SYSTEMD
-#include <systemd/sd-bus.h>
-
-int sd_bus_message_append_cmdline(sd_bus_message* m, const char* signature,
- char*** x)
-{
- return 0;
-}
-#endif