From 8b4431f1319b3c0cd734d7b5b823c43b57e7579f Mon Sep 17 00:00:00 2001
From: Ove Kaaven <ovek@arcticnet.no>
Date: Sat, 23 Jan 1999 13:59:11 +0000
Subject: [PATCH] Added "user-friendly" warning for missing X.

---
 configure    | 11 +++++++++--
 configure.in | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 45fb1751849..13fc1ddec1e 100755
--- a/configure
+++ b/configure
@@ -4506,12 +4506,20 @@ rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 
+if test "$have_x" = "no"
+then
+  echo
+  echo "*** Warning: X development files not found. Wine will be built without"
+  echo "*** X support, which currently does not work, and would probably not be"
+  echo "*** what you want anyway. You will need to install devel packages of"
+  echo "*** Xlib/Xfree86 and Xpm at the very least."
+fi
+
 if test "$ac_cv_lib_ncurses_resizeterm" = "no" -a "$ac_cv_lib_ncurses_waddch" = "yes"
 then
   echo
   echo "*** Warning: resizeterm not found in ncurses. Wine will be built without"
   echo "*** terminal resize support. Consider upgrading ncurses."
-  echo
 fi
 
 if test "$wine_cv_libc_reentrant" = "no" 
@@ -4520,7 +4528,6 @@ then
   echo "*** Warning: non-reentrant libc detected. Wine will be build without"
   echo "*** thread support. Consider upgrading libc to a more recent"
   echo "*** reentrant version of libc."
-  echo
 fi
 
 echo
diff --git a/configure.in b/configure.in
index 165d284edc0..cd4ad40eae6 100644
--- a/configure.in
+++ b/configure.in
@@ -619,12 +619,20 @@ windows/Makefile
 windows/ttydrv/Makefile
 windows/x11drv/Makefile ])
 
+if test "$have_x" = "no"
+then
+  echo
+  echo "*** Warning: X development files not found. Wine will be built without"
+  echo "*** X support, which currently does not work, and would probably not be"
+  echo "*** what you want anyway. You will need to install devel packages of"
+  echo "*** Xlib/Xfree86 and Xpm at the very least."
+fi
+
 if test "$ac_cv_lib_ncurses_resizeterm" = "no" -a "$ac_cv_lib_ncurses_waddch" = "yes"
 then
   echo
   echo "*** Warning: resizeterm not found in ncurses. Wine will be built without"
   echo "*** terminal resize support. Consider upgrading ncurses."
-  echo
 fi
 
 if test "$wine_cv_libc_reentrant" = "no" 
@@ -633,7 +641,6 @@ then
   echo "*** Warning: non-reentrant libc detected. Wine will be build without"
   echo "*** thread support. Consider upgrading libc to a more recent"
   echo "*** reentrant version of libc."
-  echo
 fi
 
 echo