Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable mmedia contrib for wxMGL (blunt fix for tinderbox compilation error)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-16 23:33:22 +00:00
parent 428947f36f
commit a1b1cf33e1
2 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
configure vendored
View File

@@ -29267,7 +29267,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <X11/Xlib.h> #include <X11/Intrinsic.h>
_ACEOF _ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -29294,7 +29294,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir ac_x_includes=$ac_dir
break break
fi fi
@@ -29308,18 +29308,18 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options. # See if we find them without any special options.
# Don't add to $LIBS permanently. # Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS" LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <X11/Xlib.h> #include <X11/Intrinsic.h>
int int
main () main ()
{ {
XrmInitialize () XtMalloc (0)
; ;
return 0; return 0;
} }
@@ -29357,7 +29357,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do do
# Don't even attempt the hair of trying to link an X program! # Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do for ac_extension in a so sl; do
if test -r $ac_dir/libX11.$ac_extension; then if test -r $ac_dir/libXt.$ac_extension; then
ac_x_libraries=$ac_dir ac_x_libraries=$ac_dir
break 2 break 2
fi fi
@@ -42327,27 +42327,28 @@ _ACEOF
fi fi
if test "$USE_UNIX" = "1" ; then if test "$USE_UNIX" = "1" ; then
echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 if test "$wxUSE_MGL" != 1; then
echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6 echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6
if test "${ac_cv_header_sys_soundcard+set}" = set; then if test "${ac_cv_header_sys_soundcard+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>
int int
main () main ()
{ {
ioctl(0, SNDCTL_DSP_SPEED, 0); ioctl(0, SNDCTL_DSP_SPEED, 0);
; ;
return 0; return 0;
@@ -42380,23 +42381,23 @@ else
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
saveLibs="$LIBS" saveLibs="$LIBS"
LIBS="$saveLibs -lossaudio" LIBS="$saveLibs -lossaudio"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>
int int
main () main ()
{ {
ioctl(0, SNDCTL_DSP_SPEED, 0); ioctl(0, SNDCTL_DSP_SPEED, 0);
; ;
return 0; return 0;
@@ -42429,8 +42430,8 @@ else
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
LIBS="$saveLibs" LIBS="$saveLibs"
ac_cv_header_sys_soundcard=no ac_cv_header_sys_soundcard=no
fi fi
@@ -42445,6 +42446,7 @@ rm -f conftest.err conftest.$ac_objext \
fi fi
echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard" >&5 echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard" >&5
echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6 echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6
fi
if test "$ac_cv_header_sys_soundcard" = "yes"; then if test "$ac_cv_header_sys_soundcard" = "yes"; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
@@ -42455,6 +42457,7 @@ _ACEOF
DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia" DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
fi fi
fi fi
WITH_PLUGIN_SDL=0 WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then if test "$wxUSE_SOUND" = "yes"; then
if test "$USE_UNIX" = "1" ; then if test "$USE_UNIX" = "1" ; then

66
configure.in
View File

@@ -5669,37 +5669,40 @@ fi
dnl Unix implementation needs additional checks because audio support dnl Unix implementation needs additional checks because audio support
dnl comes in many favours: dnl comes in many favours:
if test "$USE_UNIX" = "1" ; then if test "$USE_UNIX" = "1" ; then
dnl it's not enough to check for just the header because OSS under NetBSD dnl mmedia doesn't compile with wxMGL, remove this if this is ever fixed
dnl redefines ioctl as oss_ioctrl inside it and so we also need to test if test "$wxUSE_MGL" != 1; then
dnl whether we need -lossaudio at link-time dnl it's not enough to check for just the header because OSS under NetBSD
AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [ dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
AC_TRY_LINK([ dnl whether we need -lossaudio at link-time
#include <sys/ioctl.h> AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
#include <sys/soundcard.h> AC_TRY_LINK([
], #include <sys/ioctl.h>
[ #include <sys/soundcard.h>
ioctl(0, SNDCTL_DSP_SPEED, 0); ],
], [
ac_cv_header_sys_soundcard=yes, ioctl(0, SNDCTL_DSP_SPEED, 0);
[ ],
saveLibs="$LIBS" ac_cv_header_sys_soundcard=yes,
LIBS="$saveLibs -lossaudio" [
AC_TRY_LINK([ saveLibs="$LIBS"
#include <sys/ioctl.h> LIBS="$saveLibs -lossaudio"
#include <sys/soundcard.h> AC_TRY_LINK([
], #include <sys/ioctl.h>
[ #include <sys/soundcard.h>
ioctl(0, SNDCTL_DSP_SPEED, 0); ],
], [
ac_cv_header_sys_soundcard=yes, ioctl(0, SNDCTL_DSP_SPEED, 0);
[ ],
LIBS="$saveLibs" ac_cv_header_sys_soundcard=yes,
ac_cv_header_sys_soundcard=no [
] LIBS="$saveLibs"
) ac_cv_header_sys_soundcard=no
] ]
) )
]) ]
)
])
fi
if test "$ac_cv_header_sys_soundcard" = "yes"; then if test "$ac_cv_header_sys_soundcard" = "yes"; then
AC_DEFINE(HAVE_SYS_SOUNDCARD_H) AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
@@ -5707,6 +5710,7 @@ if test "$USE_UNIX" = "1" ; then
DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia" DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
fi fi
fi fi
WITH_PLUGIN_SDL=0 WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then if test "$wxUSE_SOUND" = "yes"; then
if test "$USE_UNIX" = "1" ; then if test "$USE_UNIX" = "1" ; then