From 2672122c8b37677c50ad0da940970eaeef55aed7 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 21 Feb 2006 22:26:23 +0000
Subject: [PATCH] better configure reporting when X11 headers/libs missing

svn: r2295
---
 src/configure             | 30 +++++++++++++++++++-----------
 src/mzscheme/configure.ac | 30 +++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/configure b/src/configure
index 648f704dbf..4de6366c24 100755
--- a/src/configure
+++ b/src/configure
@@ -5037,16 +5037,6 @@ if test "${enable_dynlib}" = "no" ; then
   enable_shared=no
 fi
 
-if test "${enable_mred}" = "no" ; then
-  enable_wbuild=no
-  enable_xrender=no
-  enable_cairo=no
-  enable_libpng=no
-  enable_libjpeg=no
-  enable_gl=no
-  enable_pthread=no
-fi
-
 enable_quartz=no
 if test "${enable_xonx}" = "yes" ; then
   enable_quartz=no
@@ -5101,6 +5091,16 @@ if test "${enable_mred}" = "yes" ; then
   fi
 fi
 
+if test "${enable_mred}" = "no" ; then
+  enable_wbuild=no
+  enable_xrender=no
+  enable_cairo=no
+  enable_libpng=no
+  enable_libjpeg=no
+  enable_gl=no
+  enable_pthread=no
+fi
+
 ###### Some defaults #######
 
 OPTIONS=
@@ -8291,6 +8291,15 @@ fi
 
 fi
 
+   if test "${no_x}" = "yes" ; then
+     echo "***************************************************"
+     echo "configure: cannot find X11 headers and/or libraries,"
+     echo "           which are needed for MrEd"
+     echo "To build just MzScheme, configure with --disable-mred"
+     echo "***************************************************"
+     echo configure aborted
+     exit 1
+   fi
   fi
 
   MAKE_MRED=mr
@@ -12684,4 +12693,3 @@ echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
   done
 fi
 
-
diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac
index e1f0a246de..40718755d5 100644
--- a/src/mzscheme/configure.ac
+++ b/src/mzscheme/configure.ac
@@ -102,16 +102,6 @@ if test "${enable_dynlib}" = "no" ; then
   enable_shared=no
 fi
 
-if test "${enable_mred}" = "no" ; then
-  enable_wbuild=no
-  enable_xrender=no
-  enable_cairo=no
-  enable_libpng=no
-  enable_libjpeg=no
-  enable_gl=no
-  enable_pthread=no
-fi
-
 enable_quartz=no
 if test "${enable_xonx}" = "yes" ; then
   enable_quartz=no
@@ -166,6 +156,16 @@ if test "${enable_mred}" = "yes" ; then
   fi
 fi
 
+if test "${enable_mred}" = "no" ; then
+  enable_wbuild=no
+  enable_xrender=no
+  enable_cairo=no
+  enable_libpng=no
+  enable_libjpeg=no
+  enable_gl=no
+  enable_pthread=no
+fi
+
 ###### Some defaults #######
 
 OPTIONS=
@@ -304,6 +304,15 @@ if test "${enable_mred}" = "yes" ; then
    :
   else
    AC_PATH_XTRA
+   if test "${no_x}" = "yes" ; then
+     echo "***************************************************"
+     echo "configure: cannot find X11 headers and/or libraries,"
+     echo "           which are needed for MrEd"
+     echo "To build just MzScheme, configure with --disable-mred"
+     echo "***************************************************"
+     echo configure aborted
+     exit 1
+   fi
   fi
 
   MAKE_MRED=mr
@@ -1206,4 +1215,3 @@ if test "${enable_wbuild}" = "yes" ; then
 fi
 
 AC_OUTPUT($makefiles)
-