diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-08-10 21:33:42 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-08-10 21:33:42 +0200 |
| commit | d8d26979facaf4b3603e795b2320811daa7ac263 (patch) | |
| tree | 3eab62c3f8382a23bfd26c7121a1459e9c665160 | |
| parent | 23a294c97e62e0bee9b17b1f8ad20a39e1ba15da (diff) | |
| parent | 10e4171265381f250c7f243d566b4c0b937b86e1 (diff) | |
Merge commit 'flameeyes/master'
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index f7034792..db73d91c 100644 --- a/configure.ac +++ b/configure.ac @@ -1356,9 +1356,15 @@ if test "x$HAVE_X11" = "x1" ; then ENABLE_X11=yes fi -ENABLE_OSS=no +ENABLE_OSS_OUTPUT=no +ENABLE_OSS_WRAPPER=no if test "x$HAVE_OSS" = "x1" ; then - ENABLE_OSS=yes + if test "x$enable_oss_output" != "xno"; then + ENABLE_OSS_OUTPUT=yes + fi + if test "x$enable_oss_wrapper" != "xno"; then + ENABLE_OSS_WRAPPER=yes + fi fi ENABLE_ALSA=no @@ -1469,7 +1475,8 @@ echo " CFLAGS: ${CFLAGS} Have X11: ${ENABLE_X11} - Enable OSS: ${ENABLE_OSS} + Enable OSS Output: ${ENABLE_OSS_OUTPUT} + Enable OSS Wrapper: ${ENABLE_OSS_WRAPPER} Enable Alsa: ${ENABLE_ALSA} Enable Solaris: ${ENABLE_SOLARIS} Enable GLib 2.0: ${ENABLE_GLIB20} |