Commit e46c70b9 authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

acconfig.h, configure.in, config/gdm.conf.in, daemon/gdm.h, Define

2005-10-05  Brian Cameron <Brian.Cameron@sun.com>

        * acconfig.h, configure.in, config/gdm.conf.in,
          daemon/gdm.h, Define SoundProgram to be
          /usr/bin/audioplay instead of /usr/bin/play
          on Solaris.  /usr/bin/play doesn't exist on
          Solaris.
parent 41bf8dc3
2005-10-05 Brian Cameron <Brian.Cameron@sun.com>
* acconfig.h, configure.in, config/gdm.conf.in,
daemon/gdm.h, Define SoundProgram to be
/usr/bin/audioplay instead of /usr/bin/play
on Solaris. /usr/bin/play doesn't exist on
Solaris.
2005-10-04 Brian Cameron <Brian.Cameron@sun.com>
* gui/gdmflexiserver.c: Correct reading of
......
......@@ -6,6 +6,7 @@
#undef GDM_USER_PATH
#undef HALT_COMMAND
#undef REBOOT_COMMAND
#undef SOUND_PROGRAM
#undef SUSPEND_COMMAND
#undef ENABLE_IPV6
#undef ENABLE_NLS
......
......@@ -158,7 +158,7 @@ Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
# Program used to play sounds. Should not require any 'daemon' or anything
# like that as it will be run when no one is logged in yet.
#SoundProgram=/usr/bin/play
#SoundProgram=@SOUND_PROGRAM@
# These are the languages that the console cannot handle because of font
# issues. Here we mean the text console, not X. This is only used
......
......@@ -900,6 +900,7 @@ case "$host" in
REBOOT_COMMAND="/sbin/init 6"
SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n"
XSESSION_SHELL=/bin/ksh
SOUND_PROGRAM=/usr/bin/audioplay
;;
*)
GDM_USER_PATH="/bin:/usr/bin"
......@@ -907,6 +908,7 @@ case "$host" in
REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
SUSPEND_COMMAND=""
XSESSION_SHELL=/bin/sh
SOUND_PROGRAM=/usr/bin/play
;;
esac
......@@ -997,6 +999,8 @@ AC_SUBST(XSESSION_SHELL)
AC_DEFINE_UNQUOTED(XSESSION_SHELL,"$XSESSION_SHELL")
AC_SUBST(GDM_USER_PATH)
AC_DEFINE_UNQUOTED(GDM_USER_PATH,"$GDM_USER_PATH")
AC_SUBST(SOUND_PROGRAM)
AC_DEFINE_UNQUOTED(SOUND_PROGRAM,"$SOUND_PROGRAM")
AC_SUBST(X_PATH)
AC_SUBST(X_SERVER)
......
......@@ -331,7 +331,7 @@ enum {
#define GDM_KEY_SOUND_ON_LOGIN_READY_FILE "greeter/SoundOnLoginFile="
#define GDM_KEY_SOUND_ON_LOGIN_SUCCESS_FILE "greeter/SoundOnLoginSuccessFile="
#define GDM_KEY_SOUND_ON_LOGIN_FAILURE_FILE "greeter/SoundOnLoginFailureFile="
#define GDM_KEY_SOUND_PROGRAM "daemon/SoundProgram=/usr/bin/play"
#define GDM_KEY_SOUND_PROGRAM "daemon/SoundProgram=" SOUND_PROGRAM
#define GDM_KEY_SCAN "chooser/ScanTime=4"
#define GDM_KEY_HOST "chooser/DefaultHostImg=" EXPANDED_PIXMAPDIR "/nohost.png"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment