[CF-Devel] Sound support in client configure

[Pertti Karppinen (OH6KTR)]

I use debian linux (testing distribution) and due to some obscure
dependencies, I need to install some ALSA support libraries. The set is not
complete, so ALSA only programs won't work, or atleast have no sound.

So, to be able to compile crossfire clients, I added a --disable-alsa option
to configure.

I also did some rearranging in the order of the configure --help output, to
group things together a bit better. Some prettyprinting modifications also.

Patch to configure.in is included, so someone who usually does the official
autoconf run can apply it, if deemed appropriate.
-- 
BSc. Pertti Karppinen <
     
     pjka at iki.fi
     
     >                   |'Bridge Players |
Systems Designer, University of Jyvaskyla, Finland    |      Do        |
     
     http://www.iki.fi/~pjka/
     
      | Office  : +358 14 260 2088 |      It        |
HAM: OH6KTR QTH: KP22UF  | Cellular: +358 40 564 0786 | on the Table'  |
-------------- next part --------------
--- configure.in.orig	Sat Mar 10 11:24:42 2001
+++ configure.in	Sat Mar 10 10:55:39 2001
@@ -40,30 +40,35 @@
 AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]],
 		    , enable_ansi=no)
 
-AC_ARG_ENABLE(gtk, [  --disable-gtk             make x11 client [default=make gtk client if available]],
-		gtk=no, gtk=yes )
-
 
-AC_ARG_ENABLE(sound, [  --disable-sound             disable sound support [default=make sound support if we supported libraries exit]],
+AC_ARG_ENABLE(sound, [  --disable-sound         disable sound support [default=make sound support if supported libraries exit]],
 		sound=no, sound=yes )
 
+dnl This is because some of us use OSS sound, even with ALSA libs installed
+
+AC_ARG_ENABLE(alsa, [  --disable-alsa          disable ALSA sound support [default=use alsa sound support if alsa libraries exit]],
+		alsa=no, alsa=yes )
+
+AC_ARG_ENABLE(old-sound, [  --enable-old-sound      use the old sound code       ],
+		new_sound=no)
+
+AC_ARG_WITH(sound-dir, [  --with-sound-dir=dir    Directory where the sounds are located (default=/usr/local/lib/sounds)        ],
+		SOUNDDIR="$withval")
+
 
 dnl The follow two are really just a way to specify where the xpm information
 dnl resides if not with the normal X11 stuff (ie, in /usr/local and not /usr
 dnl /usr/X11
 
-AC_ARG_WITH(ldflags, [  --with-ldflags=dir     provide addition linker directives to find libraries ],
+AC_ARG_WITH(ldflags, [  --with-ldflags=dir      provide addition linker directives to find libraries ],
 		EXTRA_LIB="$withval")
 
 AC_ARG_WITH(includes, [  --with-includes=dir     provide different compiler options to find headers with ],
 		EXTRA_INC="$withval")
 
-AC_ARG_WITH(sound-dir, [  --with-sound-dir=dir     Directory where the sounds are located (default=/usr/local/lib/sounds)        ],
-		SOUNDDIR="$withval")
-
-AC_ARG_ENABLE(old-sound, [  --enable-old-sound     use the old sound code       ],
-		new_sound=no)
 
+AC_ARG_ENABLE(gtk, [  --disable-gtk           make x11 client [default=make gtk client if available]],
+		gtk=no, gtk=yes )
 
 AC_PROG_CC
 
@@ -149,7 +154,9 @@
 fi
 
 if eval "test x$sound = xyes"; then
-  AC_CHECK_LIB(asound, main, alsa_sound=yes, , -lm)
+  if eval "test x$alsa = xyes"; then
+    AC_CHECK_LIB(asound, main, alsa_sound=yes, , -lm)
+  fi
   AC_CHECK_LIB(audio, alNewConfig, sgi_sound=yes, )
   AC_CHECK_HEADER(sys/soundcard.h, oss_sound=yes, oss_sound=no)
   AC_CHECK_HEADER(sys/audioio.h, sun_sound=yes, sun_sound=no)