From: ross <unknown>
Date: Sun, 7 Mar 2004 17:56:36 +0000 (+0000)
Subject: [project @ 2004-03-07 17:56:35 by ross]
X-Git-Tag: Approx_11550_changesets_converted~18
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=ef8b706b5ab4217b5134eee75c0fe4e22a5154fb

[project @ 2004-03-07 17:56:35 by ross]
if X is available, build X11 and HGL packages.
---

diff --git a/configure.ac b/configure.ac
index 547f864..83a96e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1218,6 +1218,13 @@ AC_SUBST([LIBM])
 dnl ** check for X Window System
 AC_PATH_XTRA()
 
+if test "$no_x" = yes; then
+  GhcLibsWithX11=NO
+else
+  GhcLibsWithX11=YES
+fi
+AC_SUBST([GhcLibsWithX11])
+
 dnl ################################################################
 dnl Check for libraries
 dnl ################################################################
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 8daeff4..3040feb 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -411,6 +411,7 @@ GLUT_LIBS=@GLUT_LIBS@
 
 # X11 stuff
 #
+GhcLibsWithX11=@GhcLibsWithX11@
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@