diff options
| author | Pierre Ossman <ossman@cendio.se> | 2006-01-05 13:20:20 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2006-01-05 13:20:20 +0000 |
| commit | 70710e14d8f8bbab4f1a42db4993f27cb2ca7bc5 (patch) | |
| tree | 7a351eddadcb8d79f43207e3f4b47365638ee192 | |
| parent | 11a4c67a922c3af62c80500aca7f157430fdf926 (diff) | |
Check for OSS by looking for its header. Win32 isn't the only platform
where OSS isn't supported.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@365 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | polyp/Makefile.am | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 00273399..c8511643 100644 --- a/configure.ac +++ b/configure.ac @@ -223,6 +223,12 @@ PKG_CHECK_MODULES(LIBSNDFILE, [ sndfile >= 1.0.10 ]) AC_SUBST(LIBSNDFILE_CFLAGS) AC_SUBST(LIBSNDFILE_LIBS) +#### OSS support (optional) #### + +AC_CHECK_HEADERS([sys/soundcard.h], [HAVE_OSS=1], [HAVE_OSS=0]) +AC_SUBST(HAVE_OSS) +AM_CONDITIONAL([HAVE_OSS], [test "x$HAVE_OSS" = x1]) + #### ALSA support (optional) #### PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.0 ], [HAVE_ALSA=1], [HAVE_ALSA=0]) diff --git a/polyp/Makefile.am b/polyp/Makefile.am index 847be9a8..2cd2a1f3 100644 --- a/polyp/Makefile.am +++ b/polyp/Makefile.am @@ -478,7 +478,7 @@ modlib_LTLIBRARIES += \ libx11prop.la endif -if !OS_IS_WIN32 +if HAVE_OSS modlib_LTLIBRARIES += \ liboss-util.la endif @@ -662,7 +662,7 @@ modlib_LTLIBRARIES += \ module-x11-publish.la endif -if !OS_IS_WIN32 +if HAVE_OSS modlib_LTLIBRARIES += \ module-oss.la \ module-oss-mmap.la |