diff --git a/configure b/configure
index 15f618d67f5..66238963341 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 2e76d5af3c5..b5e76aaedaa 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"