From b80a225f7360c357f428055ee136caeb26b3b186 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Mon, 18 Nov 2019 17:54:35 +0100
Subject: [PATCH] Minor, simplify previous commit and add logger on/off to
 summary

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 configure.ac    | 15 ++++++---------
 src/Makefile.am |  2 --
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index e7acad7..7631ebe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ AC_ARG_WITH(systemd,
      [with_systemd=auto])
 
 AC_ARG_WITH(logger,
-     AS_HELP_STRING([--without-logger], [Do not build/install logger binary and man page, default: enabled]),
+     AS_HELP_STRING([--without-logger], [Build without extended logger tool, default: enabled]),
      [logger=$withval], [logger='yes'])
 
 AS_IF([test "x$klogd" != "xno"],
@@ -82,6 +82,9 @@ AS_IF([test "x$klogd_delay" != "xno"],[
 	AC_DEFINE_UNQUOTED(KLOGD_DELAY, $klogd_delay, [Delay klogd startup N seconds, default: 0]),
 	klogd_delay=0)
 
+AS_IF([test "x$logger" != "xno"], with_logger="yes", with_logger="no")
+AM_CONDITIONAL([ENABLE_LOGGER], [test "x$with_logger" != "xno"])
+
 AS_IF([test "x$suspend_time" != "xno"],[
 	AS_IF([test "x$suspend_time" = "xyes"],[
 		AC_MSG_ERROR([Must supply argument])])
@@ -95,18 +98,11 @@ AS_IF([test "x$with_systemd" = "xyes" -o "x$with_systemd" = "xauto"], [
      AS_IF([test "x$def_systemd" = "x"],
          [AS_IF([test "x$with_systemd" = "xyes"],
 	     [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
-	     with_systemd=no], [with_systemd="$def_systemd"])]
-)
+	     with_systemd=no], [with_systemd="$def_systemd"])])
 AS_IF([test "x$with_systemd" != "xno"],
      [AC_SUBST([systemddir], [$with_systemd])])
 AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemd" != "xno"])
 
-AS_IF([test "x$logger" != "xno"], [
-	with_logger="yes"
-	AC_DEFINE(LOGGER, 1, [Build with logger])],
-	with_logger="no")
-AM_CONDITIONAL([ENABLE_LOGGER], [test "x$with_logger" != "xno"])
-
 # Expand $sbindir early, into $SBINDIR, for systemd unit file
 # NOTE: This does *not* take prefix/exec_prefix override at "make
 #       install" into account, unfortunately.
@@ -130,6 +126,7 @@ cat <<EOF
  Optional features:
   klogd..........: $with_klogd
   klogd delay....: $klogd_delay sec
+  logger.........: $with_logger
   suspend time...: $suspend_time sec
   systemd........: $with_systemd
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 849e49b..8dba200 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,12 +43,10 @@ klogd_CPPFLAGS        = $(AM_CPPFLAGS)
 klogd_LDADD           = $(LIBS) $(LIBOBJS)
 klogd_LDADD          += libsyslog.la
 
-if ENABLE_LOGGER
 logger_SOURCES        = logger.c syslog.h
 logger_CPPFLAGS       = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600
 logger_LDADD          = $(LIBS) $(LIBOBJS)
 logger_LDADD         += libsyslog.la
-endif
 
 # Convenience library for libsyslog instead of linking with $(LTLIBOBJS),
 # which would pull in pidfile() and other (strong) symbols as well.