[PATCH 4/4] build: rename --with-suspend-resume to --with-systemd-suspend-resume

[Aleksander Morgado]

On Thu, Jun 22, 2017 at 10:59 AM, Aleksander Morgado
<aleksander at aleksander.es> wrote:
> And only define WITH_SYSTEMD_SUSPEND_RESUME when enabled.
>
> We already have other systemd specific features under the
> --with-systemd-* name scheme, so consolidate that, given that we don't
> have any other method to support suspend/resume notifications.

This has been merged to git master.

> ---
>  configure.ac    | 39 ++++++++++++++++++---------------------
>  src/Makefile.am |  2 +-
>  src/main.c      |  6 +++---
>  3 files changed, 22 insertions(+), 25 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 44730dc3..fa46b4f5 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -212,35 +212,32 @@ dnl
>
>  PKG_CHECK_MODULES(LIBSYSTEMD, [libsystemd >= 209],[have_libsystemd=yes],[have_libsystemd=no])
>  PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 183],[have_libsystemd_login=yes],[have_libsystemd_login=no])
> -AC_ARG_WITH(suspend-resume,
> -            AS_HELP_STRING([--with-suspend-resume=no|systemd],
> -                           [Enable suspend/resume support [[default=auto]]]),,
> -            [with_suspend_resume=auto])
> +AC_ARG_WITH(systemd-suspend-resume,
> +            AS_HELP_STRING([--with-systemd-suspend-resume=no|yes],
> +                           [Enable systemd suspend/resume support [[default=auto]]]),,
> +            [with_systemd_suspend_resume=auto])
>
> -if test "x$with_suspend_resume" = "xauto"; then
> +if test "x$with_systemd_suspend_resume" = "xauto"; then
>      if test "x$have_libsystemd" = "xyes" || test "x$have_libsystemd_login" = "xyes"; then
> -        with_suspend_resume=systemd
> +        with_systemd_suspend_resume=yes
>      else
> -        with_suspend_resume=no
> +        with_systemd_suspend_resume=no
>      fi
>  fi
>
> -case $with_suspend_resume in
> -    no)
> -        AC_DEFINE(WITH_SUSPEND_RESUME, 0, [Define if you have suspend-resume support])
> -        ;;
> -    systemd)
> +case $with_systemd_suspend_resume in
> +    yes)
>          if test "x$have_libsystemd" = "xno" && test "x$have_libsystemd_login" = "xno"; then
>                     AC_MSG_ERROR(libsystemd or libsystemd-login development headers are required)
>             fi
> -        AC_DEFINE(WITH_SUSPEND_RESUME, 1, [Define if you have suspend-resume support])
> +        AC_DEFINE(WITH_SYSTEMD_SUSPEND_RESUME, 1, [Define if you have systemd suspend-resume support])
>          ;;
>      *)
> -        AC_MSG_ERROR([Wrong value for --with-suspend-resume: $with_suspend_resume])
> +        with_systemd_suspend_resume=no
>          ;;
>  esac
>
> -AM_CONDITIONAL(SUSPEND_RESUME_SYSTEMD, test "x$with_suspend_resume" = "xsystemd")
> +AM_CONDITIONAL(WITH_SYSTEMD_SUSPEND_RESUME, test "x$with_systemd_suspend_resume" = "xyes")
>
>  dnl-----------------------------------------------------------------------------
>  dnl systemd journal support
> @@ -449,12 +446,12 @@ echo "
>        systemd unit directory:  ${with_systemdsystemunitdir}
>
>      Features:
> -      udev support:            ${with_udev}
> -      policykit support:       ${with_polkit}
> -      mbim support:            ${with_mbim}
> -      qmi support:             ${with_qmi}
> -      suspend/resume support:  ${with_suspend_resume}
> -      systemd journal support: ${with_systemd_journal}
> +      udev:                    ${with_udev}
> +      policykit:               ${with_polkit}
> +      mbim:                    ${with_mbim}
> +      qmi:                     ${with_qmi}
> +      systemd suspend/resume:  ${with_systemd_suspend_resume}
> +      systemd journal:         ${with_systemd_journal}
>
>      Miscellaneous:
>        gobject introspection:   ${found_introspection}
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 402b2ae9..5a735be9 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -354,7 +354,7 @@ ModemManager_SOURCES += mm-auth-provider-polkit.h mm-auth-provider-polkit.c
>  endif
>
>  # Additional suspend/resume support via systemd
> -if SUSPEND_RESUME_SYSTEMD
> +if WITH_SYSTEMD_SUSPEND_RESUME
>  ModemManager_SOURCES += mm-sleep-monitor.h mm-sleep-monitor.c
>  endif
>
> diff --git a/src/main.c b/src/main.c
> index b61cabd9..bf2564c9 100644
> --- a/src/main.c
> +++ b/src/main.c
> @@ -30,7 +30,7 @@
>  #include "mm-log.h"
>  #include "mm-context.h"
>
> -#if WITH_SUSPEND_RESUME
> +#if defined WITH_SYSTEMD_SUSPEND_RESUME
>  # include "mm-sleep-monitor.h"
>  #endif
>
> @@ -55,7 +55,7 @@ quit_cb (gpointer user_data)
>      return FALSE;
>  }
>
> -#if WITH_SUSPEND_RESUME
> +#if defined WITH_SYSTEMD_SUSPEND_RESUME
>
>  static void
>  sleeping_cb (MMSleepMonitor *sleep_monitor)
> @@ -165,7 +165,7 @@ main (int argc, char *argv[])
>                                name_lost_cb,
>                                NULL,
>                                NULL);
> -#if WITH_SUSPEND_RESUME
> +#if defined WITH_SYSTEMD_SUSPEND_RESUME
>      {
>          MMSleepMonitor *sleep_monitor;
>
> --
> 2.13.1
>



-- 
Aleksander
https://aleksander.es