AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

Browse Source 
platforms that do not have it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2005-04-29 01:14:26 +00:00
parent 177895fbab
commit 9c11255519
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@ -36061,9 +36061,7 @@ _ACEOF
fi
WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then
if test "$USE_UNIX" = "1" ; then
if test "$USE_UNIX" = "1" ; then
for ac_header in sys/soundcard.h
do
@ -36209,11 +36207,16 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
else
DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
fi
done
fi
WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then
if test "$USE_UNIX" = "1" ; then
if test "$wxUSE_LIBSDL" != "no"; then
# Check whether --with-sdl-prefix or --without-sdl-prefix was given.
@ -43792,7 +43795,11 @@ for subdir in `echo $SUBDIRS`; do
makefiles="samples/$sample/Makefile.in $makefiles"
fi
done
else makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
else
disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`;
eval "disabled=\$$disabled_var"
disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`
fi
else if test ${subdir} = "samples"; then
makefiles="samples/Makefile.in samples/console/Makefile.in"

20
configure.in
View File

@ -4870,13 +4870,15 @@ if test "$wxUSE_TIMER" = "yes"; then
AC_DEFINE(wxUSE_TIMER)
fi
dnl Unix implementation needs additional checks because audio support
dnl comes in many favours:
if test "$USE_UNIX" = "1" ; then
AC_CHECK_HEADERS([sys/soundcard.h],,
[DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"])
fi
WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then
dnl Unix implementation needs additional checks because audio support
dnl comes in many favours:
if test "$USE_UNIX" = "1" ; then
AC_CHECK_HEADERS([sys/soundcard.h])
if test "$wxUSE_LIBSDL" != "no"; then
AM_PATH_SDL([1.2.0],
[
@ -6869,8 +6871,14 @@ for subdir in `echo $SUBDIRS`; do
makefiles="samples/$sample/Makefile.in $makefiles"
fi
done
else dnl assume that everything compiles for utils &c
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
else
dnl assume that everything compiles for utils &c
dnl any that shouldn't be built can be added to
dnl DISABLED_UTILS, DISABLED_CONTRIB or DISABLED_DEMOS
disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
eval "disabled=\$$disabled_var"
disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`
fi
else dnl we build wxBase only
dnl don't take all samples/utils, just those which build with