Commit 87eb0a54 authored by Brendan Shanks's avatar Brendan Shanks Committed by Alexandre Julliard

configure: Always enable Mac driver on macOS.

parent e2c081a8
......@@ -9807,6 +9807,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
LIBEXT="dylib"
DLLFLAGS="$DLLFLAGS -fPIC"
LDDLLFLAGS="-fPIC"
enable_winemac_drv=${enable_winemac_drv:-yes}
COREFOUNDATION_LIBS="-framework CoreFoundation"
IOKIT_LIBS="-framework IOKit -framework CoreFoundation"
......@@ -10036,19 +10037,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
then
ac_save_LIBS="$LIBS"
LIBS="$LIBS $APPLICATIONSERVICES_LIBS"
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
UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/"
LIBWINE_SHAREDLIB="libwine.$libwine_version.dylib"
......
......@@ -682,6 +682,7 @@ case $host_os in
LIBEXT="dylib"
DLLFLAGS="$DLLFLAGS -fPIC"
LDDLLFLAGS="-fPIC"
enable_winemac_drv=${enable_winemac_drv:-yes}
dnl declare needed frameworks
AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation")
AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation")
......@@ -760,15 +761,6 @@ case $host_os in
AC_LANG_POP([Objective C])
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 $APPLICATIONSERVICES_LIBS"
AC_CHECK_FUNC(CGDisplayModeGetWidth,enable_winemac_drv=${enable_winemac_drv:-yes})
LIBS="$ac_save_LIBS"
fi
UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/"
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib")
AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment