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

configure: Don't require X11 if we can build the Mac driver. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2017-05-15 20:04:44 +02:00
parent 7cc41589a9
commit 2e980956c8
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -10910,16 +10910,30 @@ else
X_CFLAGS="" X_CFLAGS=""
X_LIBS="" X_LIBS=""
fi fi
if test "x$X_LIBS" = "x"; then :
if test "$enable_winemac_drv" = "no"
then
if test "x$X_LIBS" = "x"; then :
case "x$with_x" in case "x$with_x" in
xno) ;; xno) ;;
*) as_fn_error $? "X ${notice_platform}development files not found. Wine will be built *) as_fn_error $? "X ${notice_platform}development files not found. Wine will be built
without X support, which probably isn't what you want. You will need without X support, which probably isn't what you want. You will need
to install ${notice_platform}development packages of Xlib/Xfree86 at the very least. to install ${notice_platform}development packages of Xlib at the very least.
Use the --without-x option if you really want this." "$LINENO" 5 ;; Use the --without-x option if you really want this." "$LINENO" 5 ;;
esac esac
enable_winex11_drv=${enable_winex11_drv:-no} enable_winex11_drv=${enable_winex11_drv:-no}
fi fi
else
if test "x$X_LIBS" = "x"; then :
case "x$with_x" in
x) as_fn_append wine_notices "|X ${notice_platform}development files not found, the X11 driver won't be supported." ;;
xno) ;;
*) as_fn_error $? "X ${notice_platform}development files not found, the X11 driver won't be supported.
This is an error since --with-x was requested." "$LINENO" 5 ;;
esac
enable_winex11_drv=${enable_winex11_drv:-no}
fi
fi
if test "$ac_cv_header_CL_cl_h" = "yes" if test "$ac_cv_header_CL_cl_h" = "yes"
then then

15
configure.ac
View File

@ -1161,10 +1161,19 @@ else
X_CFLAGS="" X_CFLAGS=""
X_LIBS="" X_LIBS=""
fi fi
WINE_ERROR_WITH(x,[test "x$X_LIBS" = "x"],[X ${notice_platform}development files not found. Wine will be built
if test "$enable_winemac_drv" = "no"
then
WINE_ERROR_WITH(x,[test "x$X_LIBS" = "x"],
[X ${notice_platform}development files not found. Wine will be built
without X support, which probably isn't what you want. You will need without X support, which probably isn't what you want. You will need
to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.], to install ${notice_platform}development packages of Xlib at the very least.],
[enable_winex11_drv]) [enable_winex11_drv])
else
WINE_NOTICE_WITH(x,[test "x$X_LIBS" = "x"],
[X ${notice_platform}development files not found, the X11 driver won't be supported.],
[enable_winex11_drv])
fi
dnl **** Check for OpenCL **** dnl **** Check for OpenCL ****
if test "$ac_cv_header_CL_cl_h" = "yes" if test "$ac_cv_header_CL_cl_h" = "yes"