Mercurial > hg > xemacs-beta
changeset 553:5c6dc7d576ad
[xemacs-hg @ 2001-05-21 08:02:46 by yoshiki]
Paul's patch "Patch for sound under latest Cygwin",
<yz1ae4lz76u.fsf@milhouse.cs.cornell.edu>
* configure.in: Reverse the order of Windows and Linux sound tests
so that Cygwin will find Windows first.
author | yoshiki |
---|---|
date | Mon, 21 May 2001 08:02:55 +0000 |
parents | a3adcf42bcec |
children | bc4355ec8a32 |
files | configure configure.in |
diffstat | 2 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon May 21 06:19:41 2001 +0000 +++ b/configure Mon May 21 08:02:55 2001 +0000 @@ -13101,18 +13101,25 @@ fi if test -z "$sound_found"; then + if test "$with_msw" = "yes"; then + sound_found=yes + native_sound_lib= + fi + fi + + if test -z "$sound_found"; then for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:13108: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13111 "configure" +echo "configure:13115: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13118 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13148,13 +13155,6 @@ done fi - if test -z "$sound_found"; then - if test "$with_msw" = "yes"; then - sound_found=yes - native_sound_lib= - fi - fi - test "$sound_found" = "yes" && with_native_sound=yes fi
--- a/configure.in Mon May 21 06:19:41 2001 +0000 +++ b/configure.in Mon May 21 08:02:55 2001 +0000 @@ -4050,6 +4050,14 @@ esac fi + dnl Win32 Native uses native sound + if test -z "$sound_found"; then + if test "$with_msw" = "yes"; then + sound_found=yes + native_sound_lib= + fi + fi + dnl Check for Linux/BSD native sound if test -z "$sound_found"; then for dir in "machine" "sys" "linux"; do @@ -4062,14 +4070,6 @@ done fi - dnl Win32 Native uses native sound - if test -z "$sound_found"; then - if test "$with_msw" = "yes"; then - sound_found=yes - native_sound_lib= - fi - fi - test "$sound_found" = "yes" && with_native_sound=yes fi