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.

5 files changed, 15 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f792d3f7..35479aec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
diff --git a/acconfig.h b/acconfig.h
index 47843a34..266ec22d 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -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
diff --git a/config/gdm.conf.in b/config/gdm.conf.in
index 98105ab3..6b2f3264 100644
--- a/config/gdm.conf.in
+++ b/config/gdm.conf.in
@@ -153,7 +153,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
diff --git a/configure.in b/configure.in
index 862c2342..8d6cb9f9 100644
--- a/configure.in
+++ b/configure.in
@@ -897,6 +897,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"
@@ -904,6 +905,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
 
@@ -994,6 +996,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)
diff --git a/daemon/gdm.h b/daemon/gdm.h
index 02b4354f..ed081592 100644
--- a/daemon/gdm.h
+++ b/daemon/gdm.h
@@ -330,7 +330,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"