[xiph-cvs] cvs commit: ao configure.in

[Stan Seibert]

volsung     03/10/04 11:34:10

  Modified:    .        configure.in
  Log:
  Fix bad autoconf mojo and disable mmap io on the alsa09 driver by default.
  The dmix software mixer and some chipsets don't like mmap io.  Long term
  need to make this a runtime decision.

Revision  Changes    Path
1.52      +5 -8      ao/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ao/configure.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- configure.in	11 Sep 2003 07:46:48 -0000	1.51
+++ configure.in	4 Oct 2003 15:34:10 -0000	1.52
@@ -193,7 +193,6 @@
 if test "$BUILD_ALSA" = "yes"; then
    AC_CHECK_LIB(asound, snd_pcm_channel_params, have_alsa=yes, have_alsa=no)
    AC_CHECK_HEADER(sys/asoundlib.h, , have_alsa=no)
-   AM_CONDITIONAL(HAVE_ALSA,test "x$have_alsa" = xyes)
 fi
 
 if test "x$have_alsa" = xyes; then
@@ -201,6 +200,7 @@
 else
         ALSA_LIBS=""
 fi
+AM_CONDITIONAL(HAVE_ALSA,test "x$have_alsa" = xyes)
 AC_SUBST(ALSA_LIBS)
 
 
@@ -208,19 +208,15 @@
 
 AC_ARG_ENABLE(alsa09, [  --enable-alsa09         include alsa 0.9 output plugin ],
 [ BUILD_ALSA09="$enableval" ],[ BUILD_ALSA09="yes" ])
+AC_ARG_ENABLE(alsa09-mmap,
+   [  --enable-alsa09-mmap          use mmio with alsa 0.9 (experimental!) ],
+   [ BUILD_ALSA09MMIO="$enableval" ],[ BUILD_ALSA09MMIO="no" ])
 
 if test "$BUILD_ALSA09" = "yes"; then
-
-   AC_ARG_ENABLE(alsa09-mmap, [  --enable-alsa09-mmap          use mmio with alsa 0.9 ],
-   [ BUILD_ALSA09MMIO="$enableval" ],[ BUILD_ALSA09MMIO="yes" ])
-
    AC_CHECK_LIB(asound, snd_pcm_open, have_alsa09=yes, have_alsa09=no)
    AC_CHECK_HEADER(alsa/asoundlib.h, , have_alsa09=no)
-   AM_CONDITIONAL(HAVE_ALSA09,test "x$have_alsa09" = xyes)
-
    if test "$BUILD_ALSA09MMIO" = "yes" ; then
       AC_CHECK_HEADER(sys/mman.h, have_alsa09mmio=yes, have_alsa09mmio=no)
-      AM_CONDITIONAL(HAVE_ALSA09MMIO,test "x$have_alsa09mmio" = xyes)
    fi
 
 fi
@@ -233,6 +229,7 @@
 else
         ALSA09_LIBS=""
 fi
+AM_CONDITIONAL(HAVE_ALSA09,test "x$have_alsa09" = xyes)
 AC_SUBST(ALSA09_LIBS)
 
 dnl Decide whether we need to enable the workaround for broken OSS APIs

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.