# HG changeset patch
# User youngs
# Date 1052296456 0
# Node ID c5da5c66fea7f43c31294c5725565f01c4766e6b
# Parent  cd9f293b42b7d246b072df5d7392198ec9f5b876
[xemacs-hg @ 2003-05-07 08:34:08 by youngs]
2003-05-07  Steve Youngs  <youngs@xemacs.org>

	* configure.in: Default ESD sound to off.

	* configure.usage (--with-sound): Document ESD defaulting to off.

	* configure: Regenerate.

diff -r cd9f293b42b7 -r c5da5c66fea7 ChangeLog
--- a/ChangeLog	Tue May 06 21:52:35 2003 +0000
+++ b/ChangeLog	Wed May 07 08:34:16 2003 +0000
@@ -1,3 +1,11 @@
+2003-05-07  Steve Youngs  <youngs@xemacs.org>
+
+	* configure.in: Default ESD sound to off.
+
+	* configure.usage (--with-sound): Document ESD defaulting to off.
+
+	* configure: Regenerate.
+
 2003-05-05  Steve Youngs  <youngs@xemacs.org>
 
 	* CHANGES.beta: Update.
diff -r cd9f293b42b7 -r c5da5c66fea7 configure
--- a/configure	Tue May 06 21:52:35 2003 +0000
+++ b/configure	Wed May 07 08:34:16 2003 +0000
@@ -12996,7 +12996,7 @@
   fi
 fi
 
-if test "$with_esd_sound" != "no"; then
+if test "$with_esd_sound" != "no" -a "x$with_esd_sound" != "x"; then
   # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
diff -r cd9f293b42b7 -r c5da5c66fea7 configure.in
--- a/configure.in	Tue May 06 21:52:35 2003 +0000
+++ b/configure.in	Wed May 07 08:34:16 2003 +0000
@@ -4303,8 +4303,8 @@
   fi
 fi
 
-dnl ESD Sound support
-if test "$with_esd_sound" != "no"; then
+dnl ESD Sound support (default to off)
+if test "$with_esd_sound" != "no" -a "x$with_esd_sound" != "x"; then
   AC_CHECK_PROG(have_esd_config, esd-config, yes, no)
   if test "$have_esd_config" = "yes"; then
     save_c_switch_site="$c_switch_site" save_LIBS="$LIBS"
diff -r cd9f293b42b7 -r c5da5c66fea7 configure.usage
--- a/configure.usage	Tue May 06 21:52:35 2003 +0000
+++ b/configure.usage	Wed May 07 08:34:16 2003 +0000
@@ -198,7 +198,8 @@
                         The first type can be `none' or `all'.  `none' means
                         `nonative,nonas,noesd'.  `all' means `native,nas,esd'.
                         Later options override earlier ones for the same TYPE.
-                        The default is to autodetect all sound support.
+                        The default is to autodetect all sound support except 
+                        for ESD which defaults to off.
 --native-sound-lib=LIB  Native sound support library.  Needed on Suns
                         with `--with-sound=native,nas' because both sound
                         libraries are called libaudio.