diff --git a/configure.ac b/configure.ac index 3b3fd5d6a..8242f856b 100644 --- a/configure.ac +++ b/configure.ac @@ -687,6 +687,19 @@ AC_E_OPTIONAL_MODULE([comp], true) AC_E_CHECK_PKG(ENOTIFY, [edbus >= 1.0.0 enotify >= 1.0.0], [], []) +AC_PATH_PROGS([SUSPEND], [sleep.sh pm-suspend zzz],[/etc/acpi/sleep.sh], [/etc/acpi:/sbin:/usr/sbin:$PATH]) +if test $SUSPEND = /etc/acpi/sleep.sh ; then + SUSPEND="/etc/acpi/sleep.sh force" + AC_MSG_NOTICE([use suspend method: $SUSPEND]) +fi + +AC_PATH_PROGS([HIBERNATE], [hibernate.sh pm-hibernate],[/etc/acpi/hibernate.sh], [/etc/acpi:/sbin:/usr/sbin:$PATH]) +if test $HIBERNATE = "/etc/acpi/hibernate.sh" ; then + HIBERNATE="/etc/acpi/hibernate.sh force" + AC_MSG_NOTICE([use hibernate method: $HIBERNATE]) +fi + + AC_OUTPUT([ Makefile enlightenment.spec @@ -879,6 +892,7 @@ data/xsession/Makefile data/xsession/enlightenment.desktop data/tools/Makefile data/etc/Makefile +data/etc/sysactions.conf data/icons/Makefile data/backgrounds/Makefile doc/Makefile diff --git a/data/etc/sysactions.conf b/data/etc/sysactions.conf.in similarity index 96% rename from data/etc/sysactions.conf rename to data/etc/sysactions.conf.in index 130f66dba..179a5707b 100644 --- a/data/etc/sysactions.conf +++ b/data/etc/sysactions.conf.in @@ -45,8 +45,8 @@ action: halt /sbin/shutdown -h now action: reboot /sbin/shutdown -r now -action: suspend /etc/acpi/sleep.sh force -action: hibernate /etc/acpi/hibernate.sh force +action: suspend @SUSPEND@ +action: hibernate @HIBERNATE@ # on FreeBSD use this instead of the above. #action suspend /usr/sbin/zzz