Alexandre Julliard : configure: Don' t require X11 if we can build the Mac driver.
Alexandre Julliard
julliard at winehq.org
Mon May 15 16:09:23 CDT 2017
Module: wine
Branch: master
Commit: 2e980956c82a7a2d4d4042ce7bf226d3764335b3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e980956c82a7a2d4d4042ce7bf226d3764335b3
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon May 15 20:04:44 2017 +0200
configure: Don't require X11 if we can build the Mac driver.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 18 ++++++++++++++++--
configure.ac | 15 ++++++++++++---
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 15f618d..6623896 100755
--- a/configure
+++ b/configure
@@ -10910,16 +10910,30 @@ else
X_CFLAGS=""
X_LIBS=""
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
xno) ;;
*) 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
-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 ;;
esac
enable_winex11_drv=${enable_winex11_drv:-no}
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"
then
diff --git a/configure.ac b/configure.ac
index 2e76d5a..b5e76aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1161,10 +1161,19 @@ else
X_CFLAGS=""
X_LIBS=""
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
-to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.],
-[enable_winex11_drv])
+to install ${notice_platform}development packages of Xlib at the very least.],
+ [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 ****
if test "$ac_cv_header_CL_cl_h" = "yes"
More information about the wine-cvs
mailing list