ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Only enable the Mac driver on Mac OS X 10.6 or later.

This commit is contained in:
Ken Thomases 2012-12-20 19:02:00 -06:00 committed by Alexandre Julliard
parent 95279b87e4
commit 10c6f8436c
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -6669,12 +6669,24 @@ done
else else
as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported." as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported."
fi fi
if test "$ac_cv_header_Carbon_Carbon_h" = "yes" if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
then then
CARBONLIB="-framework Carbon" CARBONLIB="-framework Carbon"
enable_winemac_drv=${enable_winemac_drv:-yes}
fi fi
if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
then
ac_save_LIBS="$LIBS"
LIBS="$LIBS $APPLICATIONSERVICESLIB"
ac_fn_c_check_func "$LINENO" "CGDisplayModeGetWidth" "ac_cv_func_CGDisplayModeGetWidth"
if test "x$ac_cv_func_CGDisplayModeGetWidth" = xyes; then :
enable_winemac_drv=${enable_winemac_drv:-yes}
fi
LIBS="$ac_save_LIBS"
fi
if test "x$enable_win16" = "xyes" if test "x$enable_win16" = "xyes"
then then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 16-bit code can be built correctly" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 16-bit code can be built correctly" >&5

12
configure.ac
View File

@ -796,12 +796,20 @@ case $host_os in
else else
WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.])
fi fi
dnl Enable Mac driver on Mac OS X
if test "$ac_cv_header_Carbon_Carbon_h" = "yes" if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
then then
AC_SUBST(CARBONLIB,"-framework Carbon") AC_SUBST(CARBONLIB,"-framework Carbon")
enable_winemac_drv=${enable_winemac_drv:-yes}
fi fi
dnl Enable Mac driver on Mac OS X 10.6 or later
if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
then
ac_save_LIBS="$LIBS"
LIBS="$LIBS $APPLICATIONSERVICESLIB"
AC_CHECK_FUNC(CGDisplayModeGetWidth,enable_winemac_drv=${enable_winemac_drv:-yes})
LIBS="$ac_save_LIBS"
fi
dnl Check for Xcode 3.x broken 16-bit support dnl Check for Xcode 3.x broken 16-bit support
if test "x$enable_win16" = "xyes" if test "x$enable_win16" = "xyes"
then then