Mercurial > hg > xemacs-beta
diff configure.in @ 1696:7032283c28db
[xemacs-hg @ 2003-09-19 15:56:52 by youngs]
2003-09-20 Steve Youngs <youngs@xemacs.org>
* configure: Re-generate after Martin's configure.in patch.
2003-09-20 Martin Buchholz <martin@xemacs.org>
* configure.in: XEmacs failed to build on Solaris9.
Solaris9 comes with /usr/demo/SOUND, but no headers or libraries
therein.
| author | youngs |
|---|---|
| date | Fri, 19 Sep 2003 15:56:54 +0000 |
| parents | 6265c9c31f53 |
| children | fca75a427ae3 |
line wrap: on
line diff
--- a/configure.in Fri Sep 19 09:50:09 2003 +0000 +++ b/configure.in Fri Sep 19 15:56:54 2003 +0000 @@ -4394,17 +4394,25 @@ dnl Autodetect Sun native sound from SUNWaudmo package if test -z "$sound_found" -a -d "/usr/demo/SOUND"; then - sound_found=yes - XE_ADD_OBJS(sunplay.o) - if test -d "/usr/demo/SOUND/include" - then sound_cflags="-I/usr/demo/SOUND/include" - else sound_cflags="-I/usr/demo/SOUND" + if test -d "/usr/demo/SOUND/include/multimedia"; then + sun_sound_cflags="-I/usr/demo/SOUND/include" + elif test -d "/usr/demo/SOUND/multimedia"; then + sun_sound_cflags="-I/usr/demo/SOUND" fi - if test -z "$native_sound_lib" ; then - if test -r "/usr/demo/SOUND/lib/libaudio.a" - then native_sound_lib="/usr/demo/SOUND/lib/libaudio.a" - else native_sound_lib="/usr/demo/SOUND/libaudio.a" - fi + + if test -n "$native_sound_lib"; then + sun_sound_lib="$native_sound_lib" + elif test -r "/usr/demo/SOUND/lib/libaudio.a"; then + sun_sound_lib="/usr/demo/SOUND/lib/libaudio.a" + elif test -r "/usr/demo/SOUND/libaudio.a"; then + sun_sound_lib="/usr/demo/SOUND/libaudio.a" + fi + + if test -n "$sun_sound_cflags" -a -n "$sun_sound_lib"; then + native_sound_lib="$sun_sound_lib" + sound_cflags="$sun_sound_cflags" + sound_found=yes + XE_ADD_OBJS(sunplay.o) fi fi