From 8818294f314d8749c387e0bac17f8ebddaa3427a Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 9 Jan 2007 03:56:24 +0000
Subject: [PATCH] Fix bug: add X include and libraries directories to CFLAGS
 and LIBS respectively.

---
 v7/src/microcode/configure.ac           | 18 +++++++++++-------
 v7/src/microcode/makegen/Makefile.in.in |  7 +++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/v7/src/microcode/configure.ac b/v7/src/microcode/configure.ac
index 49eeb1581..127788f1f 100644
--- a/v7/src/microcode/configure.ac
+++ b/v7/src/microcode/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([MIT/GNU Scheme microcode], [14.18], [bug-mit-scheme@gnu.org], [mit-scheme])
-AC_REVISION([$Id: configure.ac,v 1.20 2007/01/08 14:45:17 cph Exp $])
+AC_REVISION([$Id: configure.ac,v 1.21 2007/01/09 03:56:12 cph Exp $])
 AC_CONFIG_SRCDIR([boot.c])
 AC_CONFIG_HEADERS([config.h])
 AC_PROG_MAKE_SET
@@ -140,7 +140,6 @@ enable_c_back_end="${enable_c_back_end:-no}"
 dnl Substitution variables to be filled in below.
 AS_FLAGS=
 GC_HEAD_FILES=
-LIB_X11=
 M4_FLAGS=
 OPTIONAL_BASES=
 OPTIONAL_OBJECTS=
@@ -774,10 +773,16 @@ if test "${enable_valgrind_mode:-no}" != "no"; then
 fi
 
 dnl Add support for X if present.
-if test "${no_x}" = "yes"; then
-    LIB_X11=
-else
-    LIB_X11=-lX11
+if test "${no_x}" != "yes"; then
+    if test "x${x_includes}" != x; then
+	FOO=-I`echo ${x_includes} | sed -e "s/:/ -I/g"`
+	CFLAGS="${CFLAGS} ${FOO}"
+    fi
+    if test "x${x_libraries}" != x; then
+	FOO=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
+	LIBS="${LIBS} ${FOO}"
+    fi
+    LIBS="${LIBS} -lX11"
     OPTIONAL_BASES="${OPTIONAL_BASES} x11base x11term x11graph x11color"
 fi
 
@@ -909,7 +914,6 @@ fi
 
 AC_SUBST([AS_FLAGS])
 AC_SUBST([GC_HEAD_FILES])
-AC_SUBST([LIB_X11])
 AC_SUBST([M4_FLAGS])
 AC_SUBST([OPTIONAL_OBJECTS])
 AC_SUBST([OPTIONAL_SOURCES])
diff --git a/v7/src/microcode/makegen/Makefile.in.in b/v7/src/microcode/makegen/Makefile.in.in
index 4d82b2406..1a5052b76 100644
--- a/v7/src/microcode/makegen/Makefile.in.in
+++ b/v7/src/microcode/makegen/Makefile.in.in
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# $Id: Makefile.in.in,v 1.38 2007/01/08 14:45:17 cph Exp $
+# $Id: Makefile.in.in,v 1.39 2007/01/09 03:56:24 cph Exp $
 #
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -98,7 +98,6 @@ GC_HEAD_FILES = @GC_HEAD_FILES@
 OPTIONAL_SOURCES = @OPTIONAL_SOURCES@ $(COMPILED_SOURCES)
 OPTIONAL_OBJECTS = @OPTIONAL_OBJECTS@ $(COMPILED_OBJECTS)
 STATIC_LIBS = @STATIC_PREFIX@ @STATIC_LIBS@ @STATIC_SUFFIX@
-X_LIBS = @LIB_X11@
 PRBFISH_LIBS = @PRBFISH_LIBS@
 PRMD5_LIBS = @PRMD5_LIBS@
 
@@ -141,13 +140,13 @@ scheme_SOURCES = $(SHARED_SOURCES) $(STD_GC_SOURCES) usrdef.c
 scheme_OBJECTS = $(SHARED_OBJECTS) $(STD_GC_OBJECTS) usrdef.o
 scheme_DEPENDENCIES = 
 scheme_LDFLAGS = @DLD_LDFLAGS@
-scheme_LIBS = $(STATIC_LIBS) $(X_LIBS) $(LIBS)
+scheme_LIBS = $(STATIC_LIBS) $(LIBS)
 
 bchscheme_SOURCES = $(SHARED_SOURCES) $(BCH_GC_SOURCES) bchdef.c
 bchscheme_OBJECTS = $(SHARED_OBJECTS) $(BCH_GC_OBJECTS) bchdef.o
 bchscheme_DEPENDENCIES = 
 bchscheme_LDFLAGS = @DLD_LDFLAGS@
-bchscheme_LIBS = $(STATIC_LIBS) $(X_LIBS) $(LIBS)
+bchscheme_LIBS = $(STATIC_LIBS) $(LIBS)
 
 bchdrn_SOURCES = bchdrn.c bchutl.c
 bchdrn_OBJECTS = bchdrn.o bchutl.o
-- 
2.25.1