From ead8c0edb8d0f43d198401ac90633b3b7213bdfd Mon Sep 17 00:00:00 2001
From: Arun Persaud <arun@nubati.net>
Date: Sun, 23 Aug 2009 10:22:48 -0700
Subject: [PATCH] added missing X_LIBS references to Makefile.am

---
 Makefile.am  |    4 ++--
 configure.ac |    8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f84d4bc..d1e2c61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,8 @@ endif
 bin_PROGRAMS = xboard
 xboard_SOURCES = backend.c lists.c pgntags.c xedittags.c xhistory.c $(ZPY) childio.c moves.c uci.c xengineoutput.c xoptions.c gamelist.c parser.l xboard.c xgamelist.c book.c
 
-AM_CPPFLAGS=-DINFODIR='"$(infodir)"'
-AM_LDFLAGS= -lm @XAW_LIBS@
+AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@
+AM_LDFLAGS= -lm @X_PRE_LIBS@ @XAW_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ 
 
 info_TEXINFOS = copyright.texi xboard.texi
 man6_MANS = xboard.man 
diff --git a/configure.ac b/configure.ac
index 6ccd5d3..dd1123f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,14 +328,6 @@ dnl| USE_PTYS=1
       CONF_CFLAGS="-fwritable-strings"
     fi
   ;;
-dnl| OS X
-  *-apple-* )
-    if test -d /usr/X11/lib ; then
-      X_CFLAGS="$X_CFLAGS "
-      X_LIBS="$X_LIBS -L/usr/X11/lib -R/usr/X11/lib"
-      X_PRE_LIBS = "$X_PRE_LIBS -lXpm  -lSM -lICE"
-    fi
-  ;;
 esac
 
 AC_ARG_ENABLE(	[xpm],
-- 
1.7.0.4