# HG changeset patch # User yoshiki # Date 990432175 0 # Node ID 5c6dc7d576ad4b8ae47237b509211e640d8d546e # Parent a3adcf42bcecb393733c11836582ab0d571d1c0a [xemacs-hg @ 2001-05-21 08:02:46 by yoshiki] Paul's patch "Patch for sound under latest Cygwin", * configure.in: Reverse the order of Windows and Linux sound tests so that Cygwin will find Windows first. diff -r a3adcf42bcec -r 5c6dc7d576ad configure --- 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 <&5 + +cat > conftest.$ac_ext < 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 diff -r a3adcf42bcec -r 5c6dc7d576ad configure.in --- 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